Skip to content

Commit adb447a

Browse files
committed
Fix navigation for multi-session
1 parent 4a297c3 commit adb447a

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

packages/clerk-js/src/ui/components/SignIn/shared.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,12 @@ function useHandleAuthenticateWithPasskey(onSecondFactor: () => Promise<unknown>
3434
case 'complete':
3535
return setActive({
3636
session: res.createdSessionId,
37-
redirectUrl: afterSignInUrl,
3837
navigate: async ({ session }) => {
38+
if (!session.currentTask) {
39+
await navigate(afterSignInUrl);
40+
return;
41+
}
42+
3943
await navigateIfTaskExists(session, {
4044
baseUrl: signInUrl,
4145
navigate: navigate,

packages/clerk-js/src/ui/components/UserButton/useMultisessionActions.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,12 @@ export const useMultisessionActions = (opts: UseMultisessionActionsParams) => {
7575

7676
return setActive({
7777
session,
78-
redirectUrl: opts.afterSwitchSessionUrl,
7978
navigate: async ({ session }) => {
79+
if (!session.currentTask && opts.afterSwitchSessionUrl) {
80+
await navigate(opts.afterSwitchSessionUrl);
81+
return;
82+
}
83+
8084
await navigateIfTaskExists(session, {
8185
baseUrl: opts.signInUrl ?? displayConfig.signInUrl,
8286
navigate,

0 commit comments

Comments
 (0)