Skip to content

fix(clerk-js): Improve multi-session navigation to tasks #6575

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

Merged
LauraBeatris merged 3 commits into from
Aug 19, 2025
Merged

fix(clerk-js): Improve multi-session navigation to tasks #6575

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
9c211e1
Remove `withRedirectToTask` guard from `/sign-in/choose`
LauraBeatris Aug 19, 2025
b69283e
Pass `taskUrl` with path routing
LauraBeatris Aug 19, 2025
0d4d009
Add changeset
LauraBeatris Aug 19, 2025
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/sour-meals-see.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Improve multi-session navigation to tasks
9 changes: 4 additions & 5 deletions packages/clerk-js/src/ui/components/SignIn/SignInAccountSwitcher.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Header } from '@/ui/elements/Header';
import { PreviewButton } from '@/ui/elements/PreviewButton';
import { UserPreview } from '@/ui/elements/UserPreview';

import { withRedirectToAfterSignIn, withRedirectToSignInTask } from '../../common';
import { withRedirectToAfterSignIn } from '../../common';
import { useEnvironment, useSignInContext, useSignOutContext } from '../../contexts';
import { Col, descriptors, Flow, localizationKeys } from '../../customizables';
import { Add, SwitchArrowRight } from '../../icons';
Expand All @@ -15,10 +15,11 @@ import { useMultisessionActions } from '../UserButton/useMultisessionActions';
const SignInAccountSwitcherInternal = () => {
const card = useCardState();
const { userProfileUrl } = useEnvironment().displayConfig;
const { afterSignInUrl, path: signInPath, signInUrl } = useSignInContext();
const { afterSignInUrl, path: signInPath, signInUrl, taskUrl } = useSignInContext();
const { navigateAfterSignOut } = useSignOutContext();
const { handleSignOutAllClicked, handleSessionClicked, signedInSessions, handleAddAccountClicked } =
useMultisessionActions({
taskUrl,
navigateAfterSignOut,
afterSwitchSessionUrl: afterSignInUrl,
userProfileUrl,
Expand Down Expand Up @@ -125,6 +126,4 @@ const SignInAccountSwitcherInternal = () => {
</Flow.Part>
);
};
export const SignInAccountSwitcher = withRedirectToSignInTask(
Copy link
Member Author

@LauraBeatris LauraBeatris Aug 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've removed the withRedirectToSignInTask guard from here since the user should be allowed to switch sessions regardless if they have a pending task

withRedirectToAfterSignIn(withCardStateProvider(SignInAccountSwitcherInternal)),
);
export const SignInAccountSwitcher = withRedirectToAfterSignIn(withCardStateProvider(SignInAccountSwitcherInternal));
6 changes: 6 additions & 0 deletions packages/clerk-js/src/ui/components/UserButton/useMultisessionActions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ type UseMultisessionActionsParams = {
afterSwitchSessionUrl?: string;
userProfileUrl?: string;
signInUrl?: string;
taskUrl?: string | null;
} & Pick<UserButtonProps, 'userProfileMode' | 'appearance' | 'userProfileProps'>;

export const useMultisessionActions = (opts: UseMultisessionActionsParams) => {
Expand Down Expand Up @@ -81,6 +82,11 @@ export const useMultisessionActions = (opts: UseMultisessionActionsParams) => {
return;
}

if (opts.taskUrl) {
await navigate(opts.taskUrl);
return;
}

await navigateIfTaskExists(session, {
baseUrl: opts.signInUrl ?? displayConfig.signInUrl,
navigate,
Expand Down
Loading