jnd/beszel-ipv6
1
0
Fork 0
mirror of https://github.com/henrygd/beszel.git synced 2026-08-13 05:47:47 +02:00
Code Issues Packages Projects Releases 2 Wiki Activity

Fixes redirect-based OAuth login when OAUTH_DISABLE_POPUP=true is set (#2171)

Browse Source 
Switch to localStorage, which is shared across all tabs/windows of the
same origin. Also clean up the stored entry and strip the callback URL
on both success and failure paths.
This commit is contained in:
Pavel Artsishevsky
2026-08-11 22:33:05 +02:00
committed by GitHub
parent bd52134558
commit 1aa9fcd31d
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/site/src/components/login/auth-form.tsx
View File

@@ -175,8 +175,8 @@ export function UserAuthForm({
*/ */
function redirectToOauthProvider(provider: AuthProviderInfo) { function redirectToOauthProvider(provider: AuthProviderInfo) {
const url = new URL(provider.authURL) const url = new URL(provider.authURL)
// url.searchParams.set("redirect_uri", `${window.location.origin}${basePath}`) url.searchParams.set("redirect_uri", `${window.location.origin}${basePath}`)
sessionStorage.setItem("provider", JSON.stringify(provider)) localStorage.setItem("provider", JSON.stringify(provider))
window.location.href = url.toString() window.location.href = url.toString()
} }
@@ -186,12 +186,13 @@ export function UserAuthForm({
const code = params.get("code") const code = params.get("code")
if (code) { if (code) {
const state = params.get("state") const state = params.get("state")
const provider: AuthProviderInfo = JSON.parse(sessionStorage.getItem("provider") ?? "{}") const provider: AuthProviderInfo = JSON.parse(localStorage.getItem("provider") ?? "{}")
localStorage.removeItem("provider")
window.history.replaceState({}, "", window.location.pathname)
if (!state || provider.state !== state) { if (!state || provider.state !== state) {
showLoginFaliedToast() showLoginFaliedToast()
} else { } else {
setIsOauthLoading(true) setIsOauthLoading(true)
window.history.replaceState({}, "", window.location.pathname)
pb.collection("users") pb.collection("users")
.authWithOAuth2Code(provider.name, code, provider.codeVerifier, `${window.location.origin}${basePath}`) .authWithOAuth2Code(provider.name, code, provider.codeVerifier, `${window.location.origin}${basePath}`)
.then(() => $authenticated.set(pb.authStore.isValid)) .then(() => $authenticated.set(pb.authStore.isValid))