Skip to content

fix(auth): preserve addAccount param through SSO redirect #877

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
Just-Insane wants to merge 3 commits into from
Closed

fix(auth): preserve addAccount param through SSO redirect #877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3c2e47
fix(auth): preserve addAccount parameter through SSO redirect
Just-Insane May 18, 2026
7464983
chore: add changeset
Just-Insane May 19, 2026
1638922
style: apply oxfmt formatting
Just-Insane May 19, 2026
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
5 changes: 5 additions & 0 deletions .changeset/auth-sso-addaccount.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
default: patch
---

Preserve addAccount parameter through SSO redirect.
9 changes: 8 additions & 1 deletion src/app/pages/auth/login/Login.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,14 @@ export function Login() {
const { loginFlows } = useAuthFlows();
const [searchParams] = useSearchParams();
const loginSearchParams = useLoginSearchParams(searchParams);
const ssoRedirectUrl = usePathWithOrigin(getLoginPath(server));

// Preserve addAccount parameter through SSO redirect
const baseRedirectUrl = usePathWithOrigin(getLoginPath(server));
const isAddingAccount = searchParams.get('addAccount') === '1';
const ssoRedirectUrl = isAddingAccount
? withSearchParam(baseRedirectUrl, { addAccount: '1' })
: baseRedirectUrl;

const loginTokenForHashRouter = getLoginTokenSearchParam();
const absoluteLoginPath = usePathWithOrigin(getLoginPath(server));

Expand Down
11 changes: 8 additions & 3 deletions src/app/pages/auth/register/Register.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { useAuthServer } from '$hooks/useAuthServer';
import { RegisterFlowStatus, useAuthFlows } from '$hooks/useAuthFlows';
import { useParsedLoginFlows } from '$hooks/useParsedLoginFlows';
import { SupportedUIAFlowsLoader } from '$components/SupportedUIAFlowsLoader';
import { getLoginPath } from '$pages/pathUtils';
import { getLoginPath, withSearchParam } from '$pages/pathUtils';
import { usePathWithOrigin } from '$hooks/usePathWithOrigin';
import type { RegisterPathSearchParams } from '$pages/paths';
import { SSOLogin } from '$pages/auth/SSOLogin';
Expand All @@ -30,8 +30,13 @@ export function Register() {
const registerSearchParams = useRegisterSearchParams(searchParams);
const { sso } = useParsedLoginFlows(loginFlows.flows);

// redirect to /login because only that path handle m.login.token
const ssoRedirectUrl = usePathWithOrigin(getLoginPath(server));
// redirect to /login because only that path handles m.login.token
// Preserve addAccount parameter through SSO redirect
const baseRedirectUrl = usePathWithOrigin(getLoginPath(server));
const isAddingAccount = searchParams.get('addAccount') === '1';
const ssoRedirectUrl = isAddingAccount
? withSearchParam(baseRedirectUrl, { addAccount: '1' })
: baseRedirectUrl;

return (
<Box direction="Column" gap="500">
Expand Down
Loading