Skip to content

fix(logout): use NEXT_PUBLIC_LOGOUT_REDIRECT_URL env, drop hostname regex #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
awais786 wants to merge 1 commit into from
+13 −4
Closed

fix(logout): use NEXT_PUBLIC_LOGOUT_REDIRECT_URL env, drop hostname regex #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions surfsense_web/lib/auth-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,10 +239,19 @@ export async function logout(): Promise<boolean> {
clearAllTokens();

if (typeof window !== "undefined") {
// Strip the first subdomain so we land on the portal (outside ForwardAuth)
// instead of SurfSense's own root, which would silently re-auth.
const portalHost = window.location.hostname.replace(/^[^.]+\.(?=[^.]*\.[^.]*\.)/, "");
window.location.href = `${window.location.protocol}//${portalHost}`;
// Land on the portal (outside ForwardAuth) instead of SurfSense's own
// root, which would silently re-auth. The portal URL is provided by
// the build/deploy pipeline (NEXT_PUBLIC_LOGOUT_REDIRECT_URL), so the
// same image works across hostname shapes — `<app>-<smb>.<domain>`,
// `<app>.<smb>.<domain>`, etc. — without regex acrobatics.
const redirectUrl = process.env.NEXT_PUBLIC_LOGOUT_REDIRECT_URL;
if (!redirectUrl) {
console.error(
"NEXT_PUBLIC_LOGOUT_REDIRECT_URL is not set; cannot redirect to portal after logout"
);
return false;
}
window.location.href = redirectUrl;
return true;
}

Expand Down
Loading