fix(clerk-js): Navigate to tasks when switching sessions#6273

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 13 commits into from
Jul 11, 2025
Merged

fix(clerk-js): Navigate to tasks when switching sessions #6273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
81b6009
Navigate to tasks when switching sessions with `setActive`
LauraBeatris Jul 9, 2025
8a71b72
Revalidate server state
LauraBeatris Jul 9, 2025
c8e724b
Add changeset
LauraBeatris Jul 9, 2025
c428009
Create user on every test block instead of on hook
LauraBeatris Jul 9, 2025
c290255
Remove duplicated test block between sign-in
LauraBeatris Jul 9, 2025
1f929d6
Add E2E test for switching sessions with task
LauraBeatris Jul 9, 2025
46cf927
Introduce separate suite for multi-session
LauraBeatris Jul 10, 2025
fe58e39
Add method to await for task to be mounted
LauraBeatris Jul 11, 2025
3adbec7
Revalidate server state on `setActive` with pending session
LauraBeatris Jul 11, 2025
46bf92f
Fix `SignIn` to use hash routing
LauraBeatris Jul 11, 2025
7221d8f
Update organization slug to avoid colision
LauraBeatris Jul 11, 2025
26448fc
Update bundlewatch
LauraBeatris Jul 11, 2025
0a8fdea
Decrease flakyness when switching account
LauraBeatris Jul 11, 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/tall-dolls-wish.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Navigate to tasks when switching sessions
4 changes: 2 additions & 2 deletions integration/templates/next-app-router/src/app/page.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { SignedIn, SignedOut, SignIn, UserButton, Protect } from '@clerk/nextjs';
import { Protect, SignedIn, SignedOut, SignIn, UserButton } from '@clerk/nextjs';
import Link from 'next/link';
import { ClientId } from './client-id';

Expand All@@ -11,7 +11,7 @@ export default function Home() {
<SignedOut>SignedOut</SignedOut>
<Protect fallback={'SignedOut from protect'}>SignedIn from protect</Protect>
<SignIn
path={'/'}
routing='hash'
signUpUrl={'/sign-up'}
/>
<ul>
Expand Down
96 changes: 96 additions & 0 deletions integration/tests/session-tasks-multi-session.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
import { test } from '@playwright/test';

import { appConfigs } from '../presets';
import type { FakeUser } from '../testUtils';
import { createTestUtils, testAgainstRunningApps } from '../testUtils';

testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
'session tasks multi-session flow @nextjs',
({ app }) => {
test.describe.configure({ mode: 'serial' });

let user1: FakeUser;
let user2: FakeUser;

test.beforeAll(async () => {
const u = createTestUtils({ app });

user1 = u.services.users.createFakeUser();
user2 = u.services.users.createFakeUser();

await u.services.users.createBapiUser(user1);
await u.services.users.createBapiUser(user2);
});

test.afterAll(async () => {
const u = createTestUtils({ app });
await user1.deleteIfExists();
await user2.deleteIfExists();
await u.services.organizations.deleteAll();
await app.teardown();
});

test.afterEach(async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await u.page.signOut();
await u.page.context().clearCookies();
});

test('when switching sessions, navigate to task', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

// Performs sign-in
await u.po.signIn.goTo();
await u.po.signIn.setIdentifier(user1.email);
await u.po.signIn.continue();
await u.po.signIn.setPassword(user1.password);
await u.po.signIn.continue();
await u.po.expect.toBeSignedIn();

// Resolves task
const fakeOrganization = Object.assign(u.services.organizations.createFakeOrganization(), {
slug: u.services.organizations.createFakeOrganization().slug + '-with-session-tasks',
});

await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
await u.po.expect.toHaveResolvedTask();

// Navigates to after sign-in
await u.page.waitForAppUrl('/');

// Create second user, to initiate a pending session
// Don't resolve task and switch to active session afterwards
await u.po.signIn.goTo();
await u.po.signIn.setIdentifier(user2.email);
await u.po.signIn.continue();
await u.po.signIn.setPassword(user2.password);
await u.po.signIn.continue();

// Sign-in again back with active session
await u.po.signIn.goTo();
await u.po.signIn.setIdentifier(user1.email);
await u.po.signIn.continue();
await u.po.signIn.setPassword(user1.password);
await u.po.signIn.continue();

// Navigate to protected page, with active session, where user button gets rendered
await u.page.goToRelative('/user-button');

// Switch account, to a session that has a pending status
await u.po.userButton.waitForMounted();
await u.po.userButton.toggleTrigger();
await u.po.userButton.waitForPopover();
await u.po.userButton.toHaveVisibleMenuItems([/Manage account/i, /Sign out$/i]);
await u.po.userButton.switchAccount(user2.email);

// Resolve task
await u.po.signIn.waitForMounted();
const fakeOrganization2 = u.services.organizations.createFakeOrganization();
await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization2);
await u.po.expect.toHaveResolvedTask();

// Navigates to after sign-in
await u.page.waitForAppUrl('/');
});
},
);
45 changes: 28 additions & 17 deletions integration/tests/session-tasks-sign-in.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { createClerkClient } from '@clerk/backend';
import { expect, test } from '@playwright/test';
import { test } from '@playwright/test';

import { appConfigs } from '../presets';
import { instanceKeys } from '../presets/envs';
Expand All@@ -12,46 +12,54 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
({ app }) => {
test.describe.configure({ mode: 'serial' });

let fakeUser: FakeUser;
let user: FakeUser;

test.beforeAll(async () => {
const u = createTestUtils({ app });
fakeUser = u.services.users.createFakeUser();
await u.services.users.createBapiUser(fakeUser);
user = u.services.users.createFakeUser();
await u.services.users.createBapiUser(user);
});

test.afterAll(async () => {
const u = createTestUtils({ app });
await fakeUser.deleteIfExists();
await user.deleteIfExists();
await u.services.organizations.deleteAll();
await app.teardown();
});

test.skip('with email and password, navigate to task on after sign-in', async ({ page, context }) => {
test.afterEach(async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
await u.page.signOut();
await u.page.context().clearCookies();
});

test('with email and password, navigate to task on after sign-in', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

// Performs sign-in
await u.po.signIn.goTo();
await u.po.signIn.setIdentifier(fakeUser.email);
await u.po.signIn.setIdentifier(user.email);
await u.po.signIn.continue();
await u.po.signIn.setPassword(fakeUser.password);
await u.po.signIn.setPassword(user.password);
await u.po.signIn.continue();
await u.po.expect.toBeSignedIn();

// Redirects back to tasks when accessing protected route by `auth.protect`
await u.page.goToRelative('/page-protected');
expect(page.url()).toContain('tasks');

// Resolves task
const fakeOrganization = u.services.organizations.createFakeOrganization();
const fakeOrganization = Object.assign(u.services.organizations.createFakeOrganization(), {
slug: u.services.organizations.createFakeOrganization().slug + '-with-sign-in-password',
});
await u.po.signIn.waitForMounted();
await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
await u.po.expect.toHaveResolvedTask();

// Navigates to after sign-in
await u.page.waitForAppUrl('/');
});

test.skip('with sso, navigate to task on after sign-in', async ({ page, context }) => {
test('with sso, navigate to task on after sign-in', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

// Create a clerkClient for the OAuth provider instance
Expand All@@ -60,32 +68,35 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
publishableKey: instanceKeys.get('oauth-provider').pk,
});
const users = createUserService(client);
fakeUser = users.createFakeUser({
const userFromOAuth = users.createFakeUser({
withUsername: true,
});
// Create the user on the OAuth provider instance so we do not need to sign up twice
await users.createBapiUser(fakeUser);
await users.createBapiUser(userFromOAuth);

// Performs sign-in with SSO
await u.po.signIn.goTo();
await u.page.getByRole('button', { name: 'E2E OAuth Provider' }).click();
await u.page.getByText('Sign in to oauth-provider').waitFor();
await u.po.signIn.setIdentifier(fakeUser.email);
await u.po.signIn.setIdentifier(userFromOAuth.email);
await u.po.signIn.continue();
await u.po.signIn.enterTestOtpCode();

// Resolves task
const fakeOrganization = u.services.organizations.createFakeOrganization();
await u.po.signIn.waitForMounted();
const fakeOrganization = Object.assign(u.services.organizations.createFakeOrganization(), {
slug: u.services.organizations.createFakeOrganization().slug + '-with-sign-in-sso',
});
await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
await u.po.expect.toHaveResolvedTask();

// Navigates to after sign-in
await u.page.waitForAppUrl('/');

// Delete the user on the OAuth provider instance
await fakeUser.deleteIfExists();
await userFromOAuth.deleteIfExists();
// Delete the user on the app instance.
await u.services.users.deleteIfExists({ email: fakeUser.email });
await u.services.users.deleteIfExists({ email: userFromOAuth.email });
});
},
);
46 changes: 4 additions & 42 deletions integration/tests/session-tasks-sign-up.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
import { expect, test } from '@playwright/test';

import { createClerkClient } from '@clerk/backend';
import { appConfigs } from '../presets';
import { instanceKeys } from '../presets/envs';
import type { FakeUser } from '../testUtils';
import { createTestUtils, testAgainstRunningApps } from '../testUtils';
import { createUserService } from '../testUtils/usersService';

testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
'session tasks after sign-up flow @nextjs',
Expand All@@ -30,7 +27,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
await app.teardown();
});

test.skip('navigate to task on after sign-up', async ({ page, context }) => {
test('navigate to task on after sign-up', async ({ page, context }) => {
// Performs sign-up
const u = createTestUtils({ app, page, context });
await u.po.signUp.goTo();
Expand All@@ -42,52 +39,17 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(

// Redirects back to tasks when accessing protected route by `auth.protect`
await u.page.goToRelative('/page-protected');
expect(page.url()).toContain('tasks');
expect(u.page.url()).toContain('tasks');

// Resolves task
const fakeOrganization = u.services.organizations.createFakeOrganization();
await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
await u.po.expect.toHaveResolvedTask();

// Navigates to after sign-up
await u.page.waitForAppUrl('/');
});

test.skip('with sso, navigate to task on after sign-up', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

// Create a clerkClient for the OAuth provider instance
const client = createClerkClient({
secretKey: instanceKeys.get('oauth-provider').sk,
publishableKey: instanceKeys.get('oauth-provider').pk,
});
const users = createUserService(client);
fakeUser = users.createFakeUser({
withUsername: true,
const fakeOrganization = Object.assign(u.services.organizations.createFakeOrganization(), {
slug: u.services.organizations.createFakeOrganization().slug + '-with-sign-up',
});
// Create the user on the OAuth provider instance so we do not need to sign up twice
await users.createBapiUser(fakeUser);

// Performs sign-up (transfer flow with sign-in) with SSO
await u.po.signIn.goTo();
await u.page.getByRole('button', { name: 'E2E OAuth Provider' }).click();
await u.page.getByText('Sign in to oauth-provider').waitFor();
await u.po.signIn.setIdentifier(fakeUser.email);
await u.po.signIn.continue();
await u.po.signIn.enterTestOtpCode();

// Resolves task
const fakeOrganization = u.services.organizations.createFakeOrganization();
await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
await u.po.expect.toHaveResolvedTask();

// Navigates to after sign-up
await u.page.waitForAppUrl('/');

// Delete the user on the OAuth provider instance
await fakeUser.deleteIfExists();
// Delete the user on the app instance.
await u.services.users.deleteIfExists({ email: fakeUser.email });
});
},
);
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "612.37kB" },
{ "path": "./dist/clerk.js", "maxSize": "614kB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "72.2KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "115KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55KB" },
Expand Down
19 changes: 11 additions & 8 deletions packages/clerk-js/src/core/clerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1209,16 +1209,17 @@ export class Clerk implements ClerkInterface {
}
}

if (newSession?.status === 'pending') {
await this.#handlePendingSession(newSession);
return;
}

/**
* Hint to each framework, that the user will be signed out when `{session: null}` is provided.
*/
await onBeforeSetActive(newSession === null ? 'sign-out' : undefined);

if (newSession?.status === 'pending') {
await this.#handlePendingSession(newSession);
await onAfterSetActive();
Comment on lines +1218 to +1219

@LauraBeatrisLauraBeatrisJul 11, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

We weren't revalidating the server state on setActive with a pending session, fixing it now.

return;
}

//1. setLastActiveSession to passed user session (add a param).
// Note that this will also update the session's active organization
// id.
Expand DownExpand Up@@ -1301,8 +1302,10 @@ export class Clerk implements ClerkInterface {
eventBus.emit(events.TokenUpdate, { token: null });
}

// Only triggers navigation for internal routing, in order to not affect custom flows
if (newSession?.currentTask && this.#componentNavigationContext) {
// Only triggers navigation for internal AIO components routing or multi-session switch
const isSwitchingSessions = this.session?.id != session.id;
const shouldNavigateOnSetActive = this.#componentNavigationContext || isSwitchingSessions;
if (newSession?.currentTask && shouldNavigateOnSetActive) {
await navigateToTask(session.currentTask.key, {
options: this.#options,
environment: this.environment,
Expand All@@ -1317,7 +1320,7 @@ export class Clerk implements ClerkInterface {

public __experimental_navigateToTask = async ({ redirectUrlComplete }: NextTaskParams = {}): Promise<void> => {
/**
* Invalidate previously cache pages with auth state before navigating
* Invalidate previously cached pages with auth state before navigating
*/
const onBeforeSetActive: SetActiveHook =
typeof window !== 'undefined' && typeof window.__unstable__onBeforeSetActive === 'function'
Expand Down
3 changes: 3 additions & 0 deletions packages/testing/src/playwright/unstable/page-objects/userButton.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,9 @@ export const createUserButtonPageObject = (testArgs: { page: EnhancedPage }) =>
triggerManageAccount: () => {
return page.getByRole('menuitem', { name: /Manage account/i }).click();
},
switchAccount: (emailAddress: string) => {
return page.getByText(emailAddress).click();
},
};

return self;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix(clerk-js): Navigate to tasks when switching sessions#6273

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 13 commits into

from

Jul 11, 2025
 Merged


fix(clerk-js): Navigate to tasks when switching sessions
#6273
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
81b6009

Navigate to tasks when switching sessions with `setActive`


LauraBeatris Jul 9, 2025
8a71b72

Revalidate server state


LauraBeatris Jul 9, 2025
c8e724b

Add changeset


LauraBeatris Jul 9, 2025
c428009

Create user on every test block instead of on hook


LauraBeatris Jul 9, 2025
c290255

Remove duplicated test block between sign-in


LauraBeatris Jul 9, 2025
1f929d6

Add E2E test for switching sessions with task


LauraBeatris Jul 9, 2025
46cf927

Introduce separate suite for multi-session


LauraBeatris Jul 10, 2025
fe58e39

Add method to await for task to be mounted


LauraBeatris Jul 11, 2025
3adbec7

Revalidate server state on `setActive` with pending session


LauraBeatris Jul 11, 2025
46bf92f

Fix `SignIn` to use hash routing


LauraBeatris Jul 11, 2025
7221d8f

Update organization slug to avoid colision


LauraBeatris Jul 11, 2025
26448fc

Update bundlewatch


LauraBeatris Jul 11, 2025
0a8fdea

Decrease flakyness when switching account


LauraBeatris Jul 11, 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/tall-dolls-wish.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Navigate to tasks when switching sessions

4 changes: 2 additions & 2 deletions
integration/templates/next-app-router/src/app/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { SignedIn, SignedOut, SignIn, UserButton, Protect } from '@clerk/nextjs';
import { Protect, SignedIn, SignedOut, SignIn, UserButton } from '@clerk/nextjs';
import Link from 'next/link';
import { ClientId } from './client-id';

Expand All@@ -11,7 +11,7 @@ export default function Home() {
 <SignedOut>SignedOut</SignedOut>
 <Protect fallback={'SignedOut from protect'}>SignedIn from protect</Protect>
 <SignIn
path={'/'}
routing='hash'
 signUpUrl={'/sign-up'}
 />
 <ul>
Expand Down

96 changes: 96 additions & 0 deletions
integration/tests/session-tasks-multi-session.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
import { test } from '@playwright/test';

import { appConfigs } from '../presets';
import type { FakeUser } from '../testUtils';
import { createTestUtils, testAgainstRunningApps } from '../testUtils';

testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
 'session tasks multi-session flow @nextjs',
 ({ app }) => {
 test.describe.configure({ mode: 'serial' });

 let user1: FakeUser;
 let user2: FakeUser;

 test.beforeAll(async () => {
 const u = createTestUtils({ app });

 user1 = u.services.users.createFakeUser();
 user2 = u.services.users.createFakeUser();

 await u.services.users.createBapiUser(user1);
 await u.services.users.createBapiUser(user2);
 });

 test.afterAll(async () => {
 const u = createTestUtils({ app });
 await user1.deleteIfExists();
 await user2.deleteIfExists();
 await u.services.organizations.deleteAll();
 await app.teardown();
 });

 test.afterEach(async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });
 await u.page.signOut();
 await u.page.context().clearCookies();
 });

 test('when switching sessions, navigate to task', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });

 // Performs sign-in
 await u.po.signIn.goTo();
 await u.po.signIn.setIdentifier(user1.email);
 await u.po.signIn.continue();
 await u.po.signIn.setPassword(user1.password);
 await u.po.signIn.continue();
 await u.po.expect.toBeSignedIn();

 // Resolves task
 const fakeOrganization = Object.assign(u.services.organizations.createFakeOrganization(), {
 slug: u.services.organizations.createFakeOrganization().slug + '-with-session-tasks',
 });

 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-in
 await u.page.waitForAppUrl('/');

 // Create second user, to initiate a pending session
 // Don't resolve task and switch to active session afterwards
 await u.po.signIn.goTo();
 await u.po.signIn.setIdentifier(user2.email);
 await u.po.signIn.continue();
 await u.po.signIn.setPassword(user2.password);
 await u.po.signIn.continue();

 // Sign-in again back with active session
 await u.po.signIn.goTo();
 await u.po.signIn.setIdentifier(user1.email);
 await u.po.signIn.continue();
 await u.po.signIn.setPassword(user1.password);
 await u.po.signIn.continue();

 // Navigate to protected page, with active session, where user button gets rendered
 await u.page.goToRelative('/user-button');

 // Switch account, to a session that has a pending status
 await u.po.userButton.waitForMounted();
 await u.po.userButton.toggleTrigger();
 await u.po.userButton.waitForPopover();
 await u.po.userButton.toHaveVisibleMenuItems([/Manage account/i, /Sign out$/i]);
 await u.po.userButton.switchAccount(user2.email);

 // Resolve task
 await u.po.signIn.waitForMounted();
 const fakeOrganization2 = u.services.organizations.createFakeOrganization();
 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization2);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-in
 await u.page.waitForAppUrl('/');
 });
 },
);

45 changes: 28 additions & 17 deletions
integration/tests/session-tasks-sign-in.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { createClerkClient } from '@clerk/backend';
import { expect, test } from '@playwright/test';
import { test } from '@playwright/test';

import { appConfigs } from '../presets';
import { instanceKeys } from '../presets/envs';
Expand All@@ -12,46 +12,54 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
 ({ app }) => {
 test.describe.configure({ mode: 'serial' });

 let fakeUser: FakeUser;
 let user: FakeUser;

 test.beforeAll(async () => {
 const u = createTestUtils({ app });
fakeUser = u.services.users.createFakeUser();
 await u.services.users.createBapiUser(fakeUser);
user = u.services.users.createFakeUser();
 await u.services.users.createBapiUser(user);
 });

 test.afterAll(async () => {
 const u = createTestUtils({ app });
 await fakeUser.deleteIfExists();
 await user.deleteIfExists();
 await u.services.organizations.deleteAll();
 await app.teardown();
 });

 test.skip('with email and password, navigate to task on after sign-in', async ({ page, context }) => {
 test.afterEach(async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });
 await u.page.signOut();
 await u.page.context().clearCookies();
 });

 test('with email and password, navigate to task on after sign-in', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });

 // Performs sign-in
 await u.po.signIn.goTo();
 await u.po.signIn.setIdentifier(fakeUser.email);
 await u.po.signIn.setIdentifier(user.email);
 await u.po.signIn.continue();
 await u.po.signIn.setPassword(fakeUser.password);
 await u.po.signIn.setPassword(user.password);
 await u.po.signIn.continue();
 await u.po.expect.toBeSignedIn();

 // Redirects back to tasks when accessing protected route by `auth.protect`
 await u.page.goToRelative('/page-protected');
 expect(page.url()).toContain('tasks');

 // Resolves task
 const fakeOrganization = u.services.organizations.createFakeOrganization();
 const fakeOrganization = Object.assign(u.services.organizations.createFakeOrganization(), {
 slug: u.services.organizations.createFakeOrganization().slug + '-with-sign-in-password',
 });
 await u.po.signIn.waitForMounted();
 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-in
 await u.page.waitForAppUrl('/');
 });

 test.skip('with sso, navigate to task on after sign-in', async ({ page, context }) => {
 test('with sso, navigate to task on after sign-in', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });

 // Create a clerkClient for the OAuth provider instance
Expand All@@ -60,32 +68,35 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
 publishableKey: instanceKeys.get('oauth-provider').pk,
 });
 const users = createUserService(client);
fakeUser = users.createFakeUser({
const userFromOAuth = users.createFakeUser({
 withUsername: true,
 });
 // Create the user on the OAuth provider instance so we do not need to sign up twice
 await users.createBapiUser(fakeUser);
 await users.createBapiUser(userFromOAuth);

 // Performs sign-in with SSO
 await u.po.signIn.goTo();
 await u.page.getByRole('button', { name: 'E2E OAuth Provider' }).click();
 await u.page.getByText('Sign in to oauth-provider').waitFor();
 await u.po.signIn.setIdentifier(fakeUser.email);
 await u.po.signIn.setIdentifier(userFromOAuth.email);
 await u.po.signIn.continue();
 await u.po.signIn.enterTestOtpCode();

 // Resolves task
 const fakeOrganization = u.services.organizations.createFakeOrganization();
 await u.po.signIn.waitForMounted();
 const fakeOrganization = Object.assign(u.services.organizations.createFakeOrganization(), {
 slug: u.services.organizations.createFakeOrganization().slug + '-with-sign-in-sso',
 });
 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-in
 await u.page.waitForAppUrl('/');

 // Delete the user on the OAuth provider instance
 await fakeUser.deleteIfExists();
 await userFromOAuth.deleteIfExists();
 // Delete the user on the app instance.
 await u.services.users.deleteIfExists({ email: fakeUser.email });
 await u.services.users.deleteIfExists({ email: userFromOAuth.email });
 });
 },
);

46 changes: 4 additions & 42 deletions
integration/tests/session-tasks-sign-up.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
import { expect, test } from '@playwright/test';

import { createClerkClient } from '@clerk/backend';
import { appConfigs } from '../presets';
import { instanceKeys } from '../presets/envs';
import type { FakeUser } from '../testUtils';
import { createTestUtils, testAgainstRunningApps } from '../testUtils';
import { createUserService } from '../testUtils/usersService';

testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
 'session tasks after sign-up flow @nextjs',
Expand All@@ -30,7 +27,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
 await app.teardown();
 });

 test.skip('navigate to task on after sign-up', async ({ page, context }) => {
 test('navigate to task on after sign-up', async ({ page, context }) => {
 // Performs sign-up
 const u = createTestUtils({ app, page, context });
 await u.po.signUp.goTo();
Expand All@@ -42,52 +39,17 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(

 // Redirects back to tasks when accessing protected route by `auth.protect`
 await u.page.goToRelative('/page-protected');
 expect(page.url()).toContain('tasks');
 expect(u.page.url()).toContain('tasks');

 // Resolves task
 const fakeOrganization = u.services.organizations.createFakeOrganization();
 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-up
 await u.page.waitForAppUrl('/');
 });

 test.skip('with sso, navigate to task on after sign-up', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });

 // Create a clerkClient for the OAuth provider instance
 const client = createClerkClient({
 secretKey: instanceKeys.get('oauth-provider').sk,
 publishableKey: instanceKeys.get('oauth-provider').pk,
 });
 const users = createUserService(client);
 fakeUser = users.createFakeUser({
 withUsername: true,
 const fakeOrganization = Object.assign(u.services.organizations.createFakeOrganization(), {
 slug: u.services.organizations.createFakeOrganization().slug + '-with-sign-up',
 });
 // Create the user on the OAuth provider instance so we do not need to sign up twice
 await users.createBapiUser(fakeUser);

 // Performs sign-up (transfer flow with sign-in) with SSO
 await u.po.signIn.goTo();
 await u.page.getByRole('button', { name: 'E2E OAuth Provider' }).click();
 await u.page.getByText('Sign in to oauth-provider').waitFor();
 await u.po.signIn.setIdentifier(fakeUser.email);
 await u.po.signIn.continue();
 await u.po.signIn.enterTestOtpCode();

 // Resolves task
 const fakeOrganization = u.services.organizations.createFakeOrganization();
 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-up
 await u.page.waitForAppUrl('/');

 // Delete the user on the OAuth provider instance
 await fakeUser.deleteIfExists();
 // Delete the user on the app instance.
 await u.services.users.deleteIfExists({ email: fakeUser.email });
 });
 },
);

2 changes: 1 addition & 1 deletion
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "files": [
 { "path": "./dist/clerk.js", "maxSize": "612.37kB" },
 { "path": "./dist/clerk.js", "maxSize": "614kB" },
 { "path": "./dist/clerk.browser.js", "maxSize": "72.2KB" },
 { "path": "./dist/clerk.legacy.browser.js", "maxSize": "115KB" },
 { "path": "./dist/clerk.headless*.js", "maxSize": "55KB" },
Expand Down

19 changes: 11 additions & 8 deletions
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1209,16 +1209,17 @@ export class Clerk implements ClerkInterface {
 }
 }

 if (newSession?.status === 'pending') {
 await this.#handlePendingSession(newSession);
 return;
 }

 /**
 * Hint to each framework, that the user will be signed out when `{session: null}` is provided.
 */
 await onBeforeSetActive(newSession === null ? 'sign-out' : undefined);

 if (newSession?.status === 'pending') {
 await this.#handlePendingSession(newSession);
 await onAfterSetActive();

Comment on lines

+1218
 to 
+1219

@LauraBeatrisLauraBeatrisJul 11, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

We weren't revalidating the server state on setActive with a pending session, fixing it now.
 return;
 }

 //1. setLastActiveSession to passed user session (add a param).
 // Note that this will also update the session's active organization
 // id.
Expand DownExpand Up@@ -1301,8 +1302,10 @@ export class Clerk implements ClerkInterface {
 eventBus.emit(events.TokenUpdate, { token: null });
 }

 // Only triggers navigation for internal routing, in order to not affect custom flows
 if (newSession?.currentTask && this.#componentNavigationContext) {
 // Only triggers navigation for internal AIO components routing or multi-session switch
 const isSwitchingSessions = this.session?.id != session.id;
 const shouldNavigateOnSetActive = this.#componentNavigationContext || isSwitchingSessions;
 if (newSession?.currentTask && shouldNavigateOnSetActive) {
 await navigateToTask(session.currentTask.key, {
 options: this.#options,
 environment: this.environment,
Expand All@@ -1317,7 +1320,7 @@ export class Clerk implements ClerkInterface {

 public __experimental_navigateToTask = async ({ redirectUrlComplete }: NextTaskParams = {}): Promise<void> => {
 /**
 * Invalidate previously cache pages with auth state before navigating
 * Invalidate previously cached pages with auth state before navigating
 */
 const onBeforeSetActive: SetActiveHook =
 typeof window !== 'undefined' && typeof window.__unstable__onBeforeSetActive === 'function'
Expand Down

3 changes: 3 additions & 0 deletions
packages/testing/src/playwright/unstable/page-objects/userButton.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,9 @@ export const createUserButtonPageObject = (testArgs: { page: EnhancedPage }) =>
 triggerManageAccount: () => {
 return page.getByRole('menuitem', { name: /Manage account/i }).click();
 },
 switchAccount: (emailAddress: string) => {
 return page.getByText(emailAddress).click();
 },
 };

 return self;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(clerk-js): Navigate to tasks when switching sessions#6273

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 13 commits into

from

Jul 11, 2025
 Merged


fix(clerk-js): Navigate to tasks when switching sessions
#6273
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
81b6009

Navigate to tasks when switching sessions with `setActive`


LauraBeatris Jul 9, 2025
8a71b72

Revalidate server state


LauraBeatris Jul 9, 2025
c8e724b

Add changeset


LauraBeatris Jul 9, 2025
c428009

Create user on every test block instead of on hook


LauraBeatris Jul 9, 2025
c290255

Remove duplicated test block between sign-in


LauraBeatris Jul 9, 2025
1f929d6

Add E2E test for switching sessions with task


LauraBeatris Jul 9, 2025
46cf927

Introduce separate suite for multi-session


LauraBeatris Jul 10, 2025
fe58e39

Add method to await for task to be mounted


LauraBeatris Jul 11, 2025
3adbec7

Revalidate server state on `setActive` with pending session


LauraBeatris Jul 11, 2025
46bf92f

Fix `SignIn` to use hash routing


LauraBeatris Jul 11, 2025
7221d8f

Update organization slug to avoid colision


LauraBeatris Jul 11, 2025
26448fc

Update bundlewatch


LauraBeatris Jul 11, 2025
0a8fdea

Decrease flakyness when switching account


LauraBeatris Jul 11, 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/tall-dolls-wish.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Navigate to tasks when switching sessions

4 changes: 2 additions & 2 deletions
integration/templates/next-app-router/src/app/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { SignedIn, SignedOut, SignIn, UserButton, Protect } from '@clerk/nextjs';
import { Protect, SignedIn, SignedOut, SignIn, UserButton } from '@clerk/nextjs';
import Link from 'next/link';
import { ClientId } from './client-id';

Expand All@@ -11,7 +11,7 @@ export default function Home() {
 <SignedOut>SignedOut</SignedOut>
 <Protect fallback={'SignedOut from protect'}>SignedIn from protect</Protect>
 <SignIn
path={'/'}
routing='hash'
 signUpUrl={'/sign-up'}
 />
 <ul>
Expand Down

96 changes: 96 additions & 0 deletions
integration/tests/session-tasks-multi-session.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
import { test } from '@playwright/test';

import { appConfigs } from '../presets';
import type { FakeUser } from '../testUtils';
import { createTestUtils, testAgainstRunningApps } from '../testUtils';

testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
 'session tasks multi-session flow @nextjs',
 ({ app }) => {
 test.describe.configure({ mode: 'serial' });

 let user1: FakeUser;
 let user2: FakeUser;

 test.beforeAll(async () => {
 const u = createTestUtils({ app });

 user1 = u.services.users.createFakeUser();
 user2 = u.services.users.createFakeUser();

 await u.services.users.createBapiUser(user1);
 await u.services.users.createBapiUser(user2);
 });

 test.afterAll(async () => {
 const u = createTestUtils({ app });
 await user1.deleteIfExists();
 await user2.deleteIfExists();
 await u.services.organizations.deleteAll();
 await app.teardown();
 });

 test.afterEach(async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });
 await u.page.signOut();
 await u.page.context().clearCookies();
 });

 test('when switching sessions, navigate to task', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });

 // Performs sign-in
 await u.po.signIn.goTo();
 await u.po.signIn.setIdentifier(user1.email);
 await u.po.signIn.continue();
 await u.po.signIn.setPassword(user1.password);
 await u.po.signIn.continue();
 await u.po.expect.toBeSignedIn();

 // Resolves task
 const fakeOrganization = Object.assign(u.services.organizations.createFakeOrganization(), {
 slug: u.services.organizations.createFakeOrganization().slug + '-with-session-tasks',
 });

 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-in
 await u.page.waitForAppUrl('/');

 // Create second user, to initiate a pending session
 // Don't resolve task and switch to active session afterwards
 await u.po.signIn.goTo();
 await u.po.signIn.setIdentifier(user2.email);
 await u.po.signIn.continue();
 await u.po.signIn.setPassword(user2.password);
 await u.po.signIn.continue();

 // Sign-in again back with active session
 await u.po.signIn.goTo();
 await u.po.signIn.setIdentifier(user1.email);
 await u.po.signIn.continue();
 await u.po.signIn.setPassword(user1.password);
 await u.po.signIn.continue();

 // Navigate to protected page, with active session, where user button gets rendered
 await u.page.goToRelative('/user-button');

 // Switch account, to a session that has a pending status
 await u.po.userButton.waitForMounted();
 await u.po.userButton.toggleTrigger();
 await u.po.userButton.waitForPopover();
 await u.po.userButton.toHaveVisibleMenuItems([/Manage account/i, /Sign out$/i]);
 await u.po.userButton.switchAccount(user2.email);

 // Resolve task
 await u.po.signIn.waitForMounted();
 const fakeOrganization2 = u.services.organizations.createFakeOrganization();
 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization2);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-in
 await u.page.waitForAppUrl('/');
 });
 },
);

45 changes: 28 additions & 17 deletions
integration/tests/session-tasks-sign-in.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { createClerkClient } from '@clerk/backend';
import { expect, test } from '@playwright/test';
import { test } from '@playwright/test';

import { appConfigs } from '../presets';
import { instanceKeys } from '../presets/envs';
Expand All@@ -12,46 +12,54 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
 ({ app }) => {
 test.describe.configure({ mode: 'serial' });

 let fakeUser: FakeUser;
 let user: FakeUser;

 test.beforeAll(async () => {
 const u = createTestUtils({ app });
fakeUser = u.services.users.createFakeUser();
 await u.services.users.createBapiUser(fakeUser);
user = u.services.users.createFakeUser();
 await u.services.users.createBapiUser(user);
 });

 test.afterAll(async () => {
 const u = createTestUtils({ app });
 await fakeUser.deleteIfExists();
 await user.deleteIfExists();
 await u.services.organizations.deleteAll();
 await app.teardown();
 });

 test.skip('with email and password, navigate to task on after sign-in', async ({ page, context }) => {
 test.afterEach(async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });
 await u.page.signOut();
 await u.page.context().clearCookies();
 });

 test('with email and password, navigate to task on after sign-in', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });

 // Performs sign-in
 await u.po.signIn.goTo();
 await u.po.signIn.setIdentifier(fakeUser.email);
 await u.po.signIn.setIdentifier(user.email);
 await u.po.signIn.continue();
 await u.po.signIn.setPassword(fakeUser.password);
 await u.po.signIn.setPassword(user.password);
 await u.po.signIn.continue();
 await u.po.expect.toBeSignedIn();

 // Redirects back to tasks when accessing protected route by `auth.protect`
 await u.page.goToRelative('/page-protected');
 expect(page.url()).toContain('tasks');

 // Resolves task
 const fakeOrganization = u.services.organizations.createFakeOrganization();
 const fakeOrganization = Object.assign(u.services.organizations.createFakeOrganization(), {
 slug: u.services.organizations.createFakeOrganization().slug + '-with-sign-in-password',
 });
 await u.po.signIn.waitForMounted();
 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-in
 await u.page.waitForAppUrl('/');
 });

 test.skip('with sso, navigate to task on after sign-in', async ({ page, context }) => {
 test('with sso, navigate to task on after sign-in', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });

 // Create a clerkClient for the OAuth provider instance
Expand All@@ -60,32 +68,35 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
 publishableKey: instanceKeys.get('oauth-provider').pk,
 });
 const users = createUserService(client);
fakeUser = users.createFakeUser({
const userFromOAuth = users.createFakeUser({
 withUsername: true,
 });
 // Create the user on the OAuth provider instance so we do not need to sign up twice
 await users.createBapiUser(fakeUser);
 await users.createBapiUser(userFromOAuth);

 // Performs sign-in with SSO
 await u.po.signIn.goTo();
 await u.page.getByRole('button', { name: 'E2E OAuth Provider' }).click();
 await u.page.getByText('Sign in to oauth-provider').waitFor();
 await u.po.signIn.setIdentifier(fakeUser.email);
 await u.po.signIn.setIdentifier(userFromOAuth.email);
 await u.po.signIn.continue();
 await u.po.signIn.enterTestOtpCode();

 // Resolves task
 const fakeOrganization = u.services.organizations.createFakeOrganization();
 await u.po.signIn.waitForMounted();
 const fakeOrganization = Object.assign(u.services.organizations.createFakeOrganization(), {
 slug: u.services.organizations.createFakeOrganization().slug + '-with-sign-in-sso',
 });
 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-in
 await u.page.waitForAppUrl('/');

 // Delete the user on the OAuth provider instance
 await fakeUser.deleteIfExists();
 await userFromOAuth.deleteIfExists();
 // Delete the user on the app instance.
 await u.services.users.deleteIfExists({ email: fakeUser.email });
 await u.services.users.deleteIfExists({ email: userFromOAuth.email });
 });
 },
);

46 changes: 4 additions & 42 deletions
integration/tests/session-tasks-sign-up.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
import { expect, test } from '@playwright/test';

import { createClerkClient } from '@clerk/backend';
import { appConfigs } from '../presets';
import { instanceKeys } from '../presets/envs';
import type { FakeUser } from '../testUtils';
import { createTestUtils, testAgainstRunningApps } from '../testUtils';
import { createUserService } from '../testUtils/usersService';

testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
 'session tasks after sign-up flow @nextjs',
Expand All@@ -30,7 +27,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
 await app.teardown();
 });

 test.skip('navigate to task on after sign-up', async ({ page, context }) => {
 test('navigate to task on after sign-up', async ({ page, context }) => {
 // Performs sign-up
 const u = createTestUtils({ app, page, context });
 await u.po.signUp.goTo();
Expand All@@ -42,52 +39,17 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(

 // Redirects back to tasks when accessing protected route by `auth.protect`
 await u.page.goToRelative('/page-protected');
 expect(page.url()).toContain('tasks');
 expect(u.page.url()).toContain('tasks');

 // Resolves task
 const fakeOrganization = u.services.organizations.createFakeOrganization();
 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-up
 await u.page.waitForAppUrl('/');
 });

 test.skip('with sso, navigate to task on after sign-up', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });

 // Create a clerkClient for the OAuth provider instance
 const client = createClerkClient({
 secretKey: instanceKeys.get('oauth-provider').sk,
 publishableKey: instanceKeys.get('oauth-provider').pk,
 });
 const users = createUserService(client);
 fakeUser = users.createFakeUser({
 withUsername: true,
 const fakeOrganization = Object.assign(u.services.organizations.createFakeOrganization(), {
 slug: u.services.organizations.createFakeOrganization().slug + '-with-sign-up',
 });
 // Create the user on the OAuth provider instance so we do not need to sign up twice
 await users.createBapiUser(fakeUser);

 // Performs sign-up (transfer flow with sign-in) with SSO
 await u.po.signIn.goTo();
 await u.page.getByRole('button', { name: 'E2E OAuth Provider' }).click();
 await u.page.getByText('Sign in to oauth-provider').waitFor();
 await u.po.signIn.setIdentifier(fakeUser.email);
 await u.po.signIn.continue();
 await u.po.signIn.enterTestOtpCode();

 // Resolves task
 const fakeOrganization = u.services.organizations.createFakeOrganization();
 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-up
 await u.page.waitForAppUrl('/');

 // Delete the user on the OAuth provider instance
 await fakeUser.deleteIfExists();
 // Delete the user on the app instance.
 await u.services.users.deleteIfExists({ email: fakeUser.email });
 });
 },
);

2 changes: 1 addition & 1 deletion
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "files": [
 { "path": "./dist/clerk.js", "maxSize": "612.37kB" },
 { "path": "./dist/clerk.js", "maxSize": "614kB" },
 { "path": "./dist/clerk.browser.js", "maxSize": "72.2KB" },
 { "path": "./dist/clerk.legacy.browser.js", "maxSize": "115KB" },
 { "path": "./dist/clerk.headless*.js", "maxSize": "55KB" },
Expand Down

19 changes: 11 additions & 8 deletions
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1209,16 +1209,17 @@ export class Clerk implements ClerkInterface {
 }
 }

 if (newSession?.status === 'pending') {
 await this.#handlePendingSession(newSession);
 return;
 }

 /**
 * Hint to each framework, that the user will be signed out when `{session: null}` is provided.
 */
 await onBeforeSetActive(newSession === null ? 'sign-out' : undefined);

 if (newSession?.status === 'pending') {
 await this.#handlePendingSession(newSession);
 await onAfterSetActive();

Comment on lines

+1218
 to 
+1219

@LauraBeatrisLauraBeatrisJul 11, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

We weren't revalidating the server state on setActive with a pending session, fixing it now.
 return;
 }

 //1. setLastActiveSession to passed user session (add a param).
 // Note that this will also update the session's active organization
 // id.
Expand DownExpand Up@@ -1301,8 +1302,10 @@ export class Clerk implements ClerkInterface {
 eventBus.emit(events.TokenUpdate, { token: null });
 }

 // Only triggers navigation for internal routing, in order to not affect custom flows
 if (newSession?.currentTask && this.#componentNavigationContext) {
 // Only triggers navigation for internal AIO components routing or multi-session switch
 const isSwitchingSessions = this.session?.id != session.id;
 const shouldNavigateOnSetActive = this.#componentNavigationContext || isSwitchingSessions;
 if (newSession?.currentTask && shouldNavigateOnSetActive) {
 await navigateToTask(session.currentTask.key, {
 options: this.#options,
 environment: this.environment,
Expand All@@ -1317,7 +1320,7 @@ export class Clerk implements ClerkInterface {

 public __experimental_navigateToTask = async ({ redirectUrlComplete }: NextTaskParams = {}): Promise<void> => {
 /**
 * Invalidate previously cache pages with auth state before navigating
 * Invalidate previously cached pages with auth state before navigating
 */
 const onBeforeSetActive: SetActiveHook =
 typeof window !== 'undefined' && typeof window.__unstable__onBeforeSetActive === 'function'
Expand Down

3 changes: 3 additions & 0 deletions
packages/testing/src/playwright/unstable/page-objects/userButton.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,9 @@ export const createUserButtonPageObject = (testArgs: { page: EnhancedPage }) =>
 triggerManageAccount: () => {
 return page.getByRole('menuitem', { name: /Manage account/i }).click();
 },
 switchAccount: (emailAddress: string) => {
 return page.getByText(emailAddress).click();
 },
 };

 return self;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(clerk-js): Navigate to tasks when switching sessions#6273

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 13 commits into

from

Jul 11, 2025
 Merged


fix(clerk-js): Navigate to tasks when switching sessions
#6273
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
81b6009

Navigate to tasks when switching sessions with `setActive`


LauraBeatris Jul 9, 2025
8a71b72

Revalidate server state


LauraBeatris Jul 9, 2025
c8e724b

Add changeset


LauraBeatris Jul 9, 2025
c428009

Create user on every test block instead of on hook


LauraBeatris Jul 9, 2025
c290255

Remove duplicated test block between sign-in


LauraBeatris Jul 9, 2025
1f929d6

Add E2E test for switching sessions with task


LauraBeatris Jul 9, 2025
46cf927

Introduce separate suite for multi-session


LauraBeatris Jul 10, 2025
fe58e39

Add method to await for task to be mounted


LauraBeatris Jul 11, 2025
3adbec7

Revalidate server state on `setActive` with pending session


LauraBeatris Jul 11, 2025
46bf92f

Fix `SignIn` to use hash routing


LauraBeatris Jul 11, 2025
7221d8f

Update organization slug to avoid colision


LauraBeatris Jul 11, 2025
26448fc

Update bundlewatch


LauraBeatris Jul 11, 2025
0a8fdea

Decrease flakyness when switching account


LauraBeatris Jul 11, 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/tall-dolls-wish.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Navigate to tasks when switching sessions

4 changes: 2 additions & 2 deletions
integration/templates/next-app-router/src/app/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { SignedIn, SignedOut, SignIn, UserButton, Protect } from '@clerk/nextjs';
import { Protect, SignedIn, SignedOut, SignIn, UserButton } from '@clerk/nextjs';
import Link from 'next/link';
import { ClientId } from './client-id';

Expand All@@ -11,7 +11,7 @@ export default function Home() {
 <SignedOut>SignedOut</SignedOut>
 <Protect fallback={'SignedOut from protect'}>SignedIn from protect</Protect>
 <SignIn
path={'/'}
routing='hash'
 signUpUrl={'/sign-up'}
 />
 <ul>
Expand Down

96 changes: 96 additions & 0 deletions
integration/tests/session-tasks-multi-session.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
import { test } from '@playwright/test';

import { appConfigs } from '../presets';
import type { FakeUser } from '../testUtils';
import { createTestUtils, testAgainstRunningApps } from '../testUtils';

testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
 'session tasks multi-session flow @nextjs',
 ({ app }) => {
 test.describe.configure({ mode: 'serial' });

 let user1: FakeUser;
 let user2: FakeUser;

 test.beforeAll(async () => {
 const u = createTestUtils({ app });

 user1 = u.services.users.createFakeUser();
 user2 = u.services.users.createFakeUser();

 await u.services.users.createBapiUser(user1);
 await u.services.users.createBapiUser(user2);
 });

 test.afterAll(async () => {
 const u = createTestUtils({ app });
 await user1.deleteIfExists();
 await user2.deleteIfExists();
 await u.services.organizations.deleteAll();
 await app.teardown();
 });

 test.afterEach(async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });
 await u.page.signOut();
 await u.page.context().clearCookies();
 });

 test('when switching sessions, navigate to task', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });

 // Performs sign-in
 await u.po.signIn.goTo();
 await u.po.signIn.setIdentifier(user1.email);
 await u.po.signIn.continue();
 await u.po.signIn.setPassword(user1.password);
 await u.po.signIn.continue();
 await u.po.expect.toBeSignedIn();

 // Resolves task
 const fakeOrganization = Object.assign(u.services.organizations.createFakeOrganization(), {
 slug: u.services.organizations.createFakeOrganization().slug + '-with-session-tasks',
 });

 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-in
 await u.page.waitForAppUrl('/');

 // Create second user, to initiate a pending session
 // Don't resolve task and switch to active session afterwards
 await u.po.signIn.goTo();
 await u.po.signIn.setIdentifier(user2.email);
 await u.po.signIn.continue();
 await u.po.signIn.setPassword(user2.password);
 await u.po.signIn.continue();

 // Sign-in again back with active session
 await u.po.signIn.goTo();
 await u.po.signIn.setIdentifier(user1.email);
 await u.po.signIn.continue();
 await u.po.signIn.setPassword(user1.password);
 await u.po.signIn.continue();

 // Navigate to protected page, with active session, where user button gets rendered
 await u.page.goToRelative('/user-button');

 // Switch account, to a session that has a pending status
 await u.po.userButton.waitForMounted();
 await u.po.userButton.toggleTrigger();
 await u.po.userButton.waitForPopover();
 await u.po.userButton.toHaveVisibleMenuItems([/Manage account/i, /Sign out$/i]);
 await u.po.userButton.switchAccount(user2.email);

 // Resolve task
 await u.po.signIn.waitForMounted();
 const fakeOrganization2 = u.services.organizations.createFakeOrganization();
 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization2);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-in
 await u.page.waitForAppUrl('/');
 });
 },
);

45 changes: 28 additions & 17 deletions
integration/tests/session-tasks-sign-in.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { createClerkClient } from '@clerk/backend';
import { expect, test } from '@playwright/test';
import { test } from '@playwright/test';

import { appConfigs } from '../presets';
import { instanceKeys } from '../presets/envs';
Expand All@@ -12,46 +12,54 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
 ({ app }) => {
 test.describe.configure({ mode: 'serial' });

 let fakeUser: FakeUser;
 let user: FakeUser;

 test.beforeAll(async () => {
 const u = createTestUtils({ app });
fakeUser = u.services.users.createFakeUser();
 await u.services.users.createBapiUser(fakeUser);
user = u.services.users.createFakeUser();
 await u.services.users.createBapiUser(user);
 });

 test.afterAll(async () => {
 const u = createTestUtils({ app });
 await fakeUser.deleteIfExists();
 await user.deleteIfExists();
 await u.services.organizations.deleteAll();
 await app.teardown();
 });

 test.skip('with email and password, navigate to task on after sign-in', async ({ page, context }) => {
 test.afterEach(async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });
 await u.page.signOut();
 await u.page.context().clearCookies();
 });

 test('with email and password, navigate to task on after sign-in', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });

 // Performs sign-in
 await u.po.signIn.goTo();
 await u.po.signIn.setIdentifier(fakeUser.email);
 await u.po.signIn.setIdentifier(user.email);
 await u.po.signIn.continue();
 await u.po.signIn.setPassword(fakeUser.password);
 await u.po.signIn.setPassword(user.password);
 await u.po.signIn.continue();
 await u.po.expect.toBeSignedIn();

 // Redirects back to tasks when accessing protected route by `auth.protect`
 await u.page.goToRelative('/page-protected');
 expect(page.url()).toContain('tasks');

 // Resolves task
 const fakeOrganization = u.services.organizations.createFakeOrganization();
 const fakeOrganization = Object.assign(u.services.organizations.createFakeOrganization(), {
 slug: u.services.organizations.createFakeOrganization().slug + '-with-sign-in-password',
 });
 await u.po.signIn.waitForMounted();
 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-in
 await u.page.waitForAppUrl('/');
 });

 test.skip('with sso, navigate to task on after sign-in', async ({ page, context }) => {
 test('with sso, navigate to task on after sign-in', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });

 // Create a clerkClient for the OAuth provider instance
Expand All@@ -60,32 +68,35 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
 publishableKey: instanceKeys.get('oauth-provider').pk,
 });
 const users = createUserService(client);
fakeUser = users.createFakeUser({
const userFromOAuth = users.createFakeUser({
 withUsername: true,
 });
 // Create the user on the OAuth provider instance so we do not need to sign up twice
 await users.createBapiUser(fakeUser);
 await users.createBapiUser(userFromOAuth);

 // Performs sign-in with SSO
 await u.po.signIn.goTo();
 await u.page.getByRole('button', { name: 'E2E OAuth Provider' }).click();
 await u.page.getByText('Sign in to oauth-provider').waitFor();
 await u.po.signIn.setIdentifier(fakeUser.email);
 await u.po.signIn.setIdentifier(userFromOAuth.email);
 await u.po.signIn.continue();
 await u.po.signIn.enterTestOtpCode();

 // Resolves task
 const fakeOrganization = u.services.organizations.createFakeOrganization();
 await u.po.signIn.waitForMounted();
 const fakeOrganization = Object.assign(u.services.organizations.createFakeOrganization(), {
 slug: u.services.organizations.createFakeOrganization().slug + '-with-sign-in-sso',
 });
 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-in
 await u.page.waitForAppUrl('/');

 // Delete the user on the OAuth provider instance
 await fakeUser.deleteIfExists();
 await userFromOAuth.deleteIfExists();
 // Delete the user on the app instance.
 await u.services.users.deleteIfExists({ email: fakeUser.email });
 await u.services.users.deleteIfExists({ email: userFromOAuth.email });
 });
 },
);

46 changes: 4 additions & 42 deletions
integration/tests/session-tasks-sign-up.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
import { expect, test } from '@playwright/test';

import { createClerkClient } from '@clerk/backend';
import { appConfigs } from '../presets';
import { instanceKeys } from '../presets/envs';
import type { FakeUser } from '../testUtils';
import { createTestUtils, testAgainstRunningApps } from '../testUtils';
import { createUserService } from '../testUtils/usersService';

testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
 'session tasks after sign-up flow @nextjs',
Expand All@@ -30,7 +27,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
 await app.teardown();
 });

 test.skip('navigate to task on after sign-up', async ({ page, context }) => {
 test('navigate to task on after sign-up', async ({ page, context }) => {
 // Performs sign-up
 const u = createTestUtils({ app, page, context });
 await u.po.signUp.goTo();
Expand All@@ -42,52 +39,17 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(

 // Redirects back to tasks when accessing protected route by `auth.protect`
 await u.page.goToRelative('/page-protected');
 expect(page.url()).toContain('tasks');
 expect(u.page.url()).toContain('tasks');

 // Resolves task
 const fakeOrganization = u.services.organizations.createFakeOrganization();
 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-up
 await u.page.waitForAppUrl('/');
 });

 test.skip('with sso, navigate to task on after sign-up', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });

 // Create a clerkClient for the OAuth provider instance
 const client = createClerkClient({
 secretKey: instanceKeys.get('oauth-provider').sk,
 publishableKey: instanceKeys.get('oauth-provider').pk,
 });
 const users = createUserService(client);
 fakeUser = users.createFakeUser({
 withUsername: true,
 const fakeOrganization = Object.assign(u.services.organizations.createFakeOrganization(), {
 slug: u.services.organizations.createFakeOrganization().slug + '-with-sign-up',
 });
 // Create the user on the OAuth provider instance so we do not need to sign up twice
 await users.createBapiUser(fakeUser);

 // Performs sign-up (transfer flow with sign-in) with SSO
 await u.po.signIn.goTo();
 await u.page.getByRole('button', { name: 'E2E OAuth Provider' }).click();
 await u.page.getByText('Sign in to oauth-provider').waitFor();
 await u.po.signIn.setIdentifier(fakeUser.email);
 await u.po.signIn.continue();
 await u.po.signIn.enterTestOtpCode();

 // Resolves task
 const fakeOrganization = u.services.organizations.createFakeOrganization();
 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-up
 await u.page.waitForAppUrl('/');

 // Delete the user on the OAuth provider instance
 await fakeUser.deleteIfExists();
 // Delete the user on the app instance.
 await u.services.users.deleteIfExists({ email: fakeUser.email });
 });
 },
);

2 changes: 1 addition & 1 deletion
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "files": [
 { "path": "./dist/clerk.js", "maxSize": "612.37kB" },
 { "path": "./dist/clerk.js", "maxSize": "614kB" },
 { "path": "./dist/clerk.browser.js", "maxSize": "72.2KB" },
 { "path": "./dist/clerk.legacy.browser.js", "maxSize": "115KB" },
 { "path": "./dist/clerk.headless*.js", "maxSize": "55KB" },
Expand Down

19 changes: 11 additions & 8 deletions
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1209,16 +1209,17 @@ export class Clerk implements ClerkInterface {
 }
 }

 if (newSession?.status === 'pending') {
 await this.#handlePendingSession(newSession);
 return;
 }

 /**
 * Hint to each framework, that the user will be signed out when `{session: null}` is provided.
 */
 await onBeforeSetActive(newSession === null ? 'sign-out' : undefined);

 if (newSession?.status === 'pending') {
 await this.#handlePendingSession(newSession);
 await onAfterSetActive();

Comment on lines

+1218
 to 
+1219

@LauraBeatrisLauraBeatrisJul 11, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

We weren't revalidating the server state on setActive with a pending session, fixing it now.
 return;
 }

 //1. setLastActiveSession to passed user session (add a param).
 // Note that this will also update the session's active organization
 // id.
Expand DownExpand Up@@ -1301,8 +1302,10 @@ export class Clerk implements ClerkInterface {
 eventBus.emit(events.TokenUpdate, { token: null });
 }

 // Only triggers navigation for internal routing, in order to not affect custom flows
 if (newSession?.currentTask && this.#componentNavigationContext) {
 // Only triggers navigation for internal AIO components routing or multi-session switch
 const isSwitchingSessions = this.session?.id != session.id;
 const shouldNavigateOnSetActive = this.#componentNavigationContext || isSwitchingSessions;
 if (newSession?.currentTask && shouldNavigateOnSetActive) {
 await navigateToTask(session.currentTask.key, {
 options: this.#options,
 environment: this.environment,
Expand All@@ -1317,7 +1320,7 @@ export class Clerk implements ClerkInterface {

 public __experimental_navigateToTask = async ({ redirectUrlComplete }: NextTaskParams = {}): Promise<void> => {
 /**
 * Invalidate previously cache pages with auth state before navigating
 * Invalidate previously cached pages with auth state before navigating
 */
 const onBeforeSetActive: SetActiveHook =
 typeof window !== 'undefined' && typeof window.__unstable__onBeforeSetActive === 'function'
Expand Down

3 changes: 3 additions & 0 deletions
packages/testing/src/playwright/unstable/page-objects/userButton.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,9 @@ export const createUserButtonPageObject = (testArgs: { page: EnhancedPage }) =>
 triggerManageAccount: () => {
 return page.getByRole('menuitem', { name: /Manage account/i }).click();
 },
 switchAccount: (emailAddress: string) => {
 return page.getByText(emailAddress).click();
 },
 };

 return self;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
fix(clerk-js): Navigate to tasks when switching sessions#6273

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 13 commits into

from

Jul 11, 2025
 Merged


fix(clerk-js): Navigate to tasks when switching sessions
#6273
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
81b6009

Navigate to tasks when switching sessions with `setActive`


LauraBeatris Jul 9, 2025
8a71b72

Revalidate server state


LauraBeatris Jul 9, 2025
c8e724b

Add changeset


LauraBeatris Jul 9, 2025
c428009

Create user on every test block instead of on hook


LauraBeatris Jul 9, 2025
c290255

Remove duplicated test block between sign-in


LauraBeatris Jul 9, 2025
1f929d6

Add E2E test for switching sessions with task


LauraBeatris Jul 9, 2025
46cf927

Introduce separate suite for multi-session


LauraBeatris Jul 10, 2025
fe58e39

Add method to await for task to be mounted


LauraBeatris Jul 11, 2025
3adbec7

Revalidate server state on `setActive` with pending session


LauraBeatris Jul 11, 2025
46bf92f

Fix `SignIn` to use hash routing


LauraBeatris Jul 11, 2025
7221d8f

Update organization slug to avoid colision


LauraBeatris Jul 11, 2025
26448fc

Update bundlewatch


LauraBeatris Jul 11, 2025
0a8fdea

Decrease flakyness when switching account


LauraBeatris Jul 11, 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/tall-dolls-wish.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Navigate to tasks when switching sessions

4 changes: 2 additions & 2 deletions
integration/templates/next-app-router/src/app/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { SignedIn, SignedOut, SignIn, UserButton, Protect } from '@clerk/nextjs';
import { Protect, SignedIn, SignedOut, SignIn, UserButton } from '@clerk/nextjs';
import Link from 'next/link';
import { ClientId } from './client-id';

Expand All@@ -11,7 +11,7 @@ export default function Home() {
 <SignedOut>SignedOut</SignedOut>
 <Protect fallback={'SignedOut from protect'}>SignedIn from protect</Protect>
 <SignIn
path={'/'}
routing='hash'
 signUpUrl={'/sign-up'}
 />
 <ul>
Expand Down

96 changes: 96 additions & 0 deletions
integration/tests/session-tasks-multi-session.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
import { test } from '@playwright/test';

import { appConfigs } from '../presets';
import type { FakeUser } from '../testUtils';
import { createTestUtils, testAgainstRunningApps } from '../testUtils';

testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
 'session tasks multi-session flow @nextjs',
 ({ app }) => {
 test.describe.configure({ mode: 'serial' });

 let user1: FakeUser;
 let user2: FakeUser;

 test.beforeAll(async () => {
 const u = createTestUtils({ app });

 user1 = u.services.users.createFakeUser();
 user2 = u.services.users.createFakeUser();

 await u.services.users.createBapiUser(user1);
 await u.services.users.createBapiUser(user2);
 });

 test.afterAll(async () => {
 const u = createTestUtils({ app });
 await user1.deleteIfExists();
 await user2.deleteIfExists();
 await u.services.organizations.deleteAll();
 await app.teardown();
 });

 test.afterEach(async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });
 await u.page.signOut();
 await u.page.context().clearCookies();
 });

 test('when switching sessions, navigate to task', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });

 // Performs sign-in
 await u.po.signIn.goTo();
 await u.po.signIn.setIdentifier(user1.email);
 await u.po.signIn.continue();
 await u.po.signIn.setPassword(user1.password);
 await u.po.signIn.continue();
 await u.po.expect.toBeSignedIn();

 // Resolves task
 const fakeOrganization = Object.assign(u.services.organizations.createFakeOrganization(), {
 slug: u.services.organizations.createFakeOrganization().slug + '-with-session-tasks',
 });

 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-in
 await u.page.waitForAppUrl('/');

 // Create second user, to initiate a pending session
 // Don't resolve task and switch to active session afterwards
 await u.po.signIn.goTo();
 await u.po.signIn.setIdentifier(user2.email);
 await u.po.signIn.continue();
 await u.po.signIn.setPassword(user2.password);
 await u.po.signIn.continue();

 // Sign-in again back with active session
 await u.po.signIn.goTo();
 await u.po.signIn.setIdentifier(user1.email);
 await u.po.signIn.continue();
 await u.po.signIn.setPassword(user1.password);
 await u.po.signIn.continue();

 // Navigate to protected page, with active session, where user button gets rendered
 await u.page.goToRelative('/user-button');

 // Switch account, to a session that has a pending status
 await u.po.userButton.waitForMounted();
 await u.po.userButton.toggleTrigger();
 await u.po.userButton.waitForPopover();
 await u.po.userButton.toHaveVisibleMenuItems([/Manage account/i, /Sign out$/i]);
 await u.po.userButton.switchAccount(user2.email);

 // Resolve task
 await u.po.signIn.waitForMounted();
 const fakeOrganization2 = u.services.organizations.createFakeOrganization();
 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization2);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-in
 await u.page.waitForAppUrl('/');
 });
 },
);

45 changes: 28 additions & 17 deletions
integration/tests/session-tasks-sign-in.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { createClerkClient } from '@clerk/backend';
import { expect, test } from '@playwright/test';
import { test } from '@playwright/test';

import { appConfigs } from '../presets';
import { instanceKeys } from '../presets/envs';
Expand All@@ -12,46 +12,54 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
 ({ app }) => {
 test.describe.configure({ mode: 'serial' });

 let fakeUser: FakeUser;
 let user: FakeUser;

 test.beforeAll(async () => {
 const u = createTestUtils({ app });
fakeUser = u.services.users.createFakeUser();
 await u.services.users.createBapiUser(fakeUser);
user = u.services.users.createFakeUser();
 await u.services.users.createBapiUser(user);
 });

 test.afterAll(async () => {
 const u = createTestUtils({ app });
 await fakeUser.deleteIfExists();
 await user.deleteIfExists();
 await u.services.organizations.deleteAll();
 await app.teardown();
 });

 test.skip('with email and password, navigate to task on after sign-in', async ({ page, context }) => {
 test.afterEach(async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });
 await u.page.signOut();
 await u.page.context().clearCookies();
 });

 test('with email and password, navigate to task on after sign-in', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });

 // Performs sign-in
 await u.po.signIn.goTo();
 await u.po.signIn.setIdentifier(fakeUser.email);
 await u.po.signIn.setIdentifier(user.email);
 await u.po.signIn.continue();
 await u.po.signIn.setPassword(fakeUser.password);
 await u.po.signIn.setPassword(user.password);
 await u.po.signIn.continue();
 await u.po.expect.toBeSignedIn();

 // Redirects back to tasks when accessing protected route by `auth.protect`
 await u.page.goToRelative('/page-protected');
 expect(page.url()).toContain('tasks');

 // Resolves task
 const fakeOrganization = u.services.organizations.createFakeOrganization();
 const fakeOrganization = Object.assign(u.services.organizations.createFakeOrganization(), {
 slug: u.services.organizations.createFakeOrganization().slug + '-with-sign-in-password',
 });
 await u.po.signIn.waitForMounted();
 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-in
 await u.page.waitForAppUrl('/');
 });

 test.skip('with sso, navigate to task on after sign-in', async ({ page, context }) => {
 test('with sso, navigate to task on after sign-in', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });

 // Create a clerkClient for the OAuth provider instance
Expand All@@ -60,32 +68,35 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
 publishableKey: instanceKeys.get('oauth-provider').pk,
 });
 const users = createUserService(client);
fakeUser = users.createFakeUser({
const userFromOAuth = users.createFakeUser({
 withUsername: true,
 });
 // Create the user on the OAuth provider instance so we do not need to sign up twice
 await users.createBapiUser(fakeUser);
 await users.createBapiUser(userFromOAuth);

 // Performs sign-in with SSO
 await u.po.signIn.goTo();
 await u.page.getByRole('button', { name: 'E2E OAuth Provider' }).click();
 await u.page.getByText('Sign in to oauth-provider').waitFor();
 await u.po.signIn.setIdentifier(fakeUser.email);
 await u.po.signIn.setIdentifier(userFromOAuth.email);
 await u.po.signIn.continue();
 await u.po.signIn.enterTestOtpCode();

 // Resolves task
 const fakeOrganization = u.services.organizations.createFakeOrganization();
 await u.po.signIn.waitForMounted();
 const fakeOrganization = Object.assign(u.services.organizations.createFakeOrganization(), {
 slug: u.services.organizations.createFakeOrganization().slug + '-with-sign-in-sso',
 });
 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-in
 await u.page.waitForAppUrl('/');

 // Delete the user on the OAuth provider instance
 await fakeUser.deleteIfExists();
 await userFromOAuth.deleteIfExists();
 // Delete the user on the app instance.
 await u.services.users.deleteIfExists({ email: fakeUser.email });
 await u.services.users.deleteIfExists({ email: userFromOAuth.email });
 });
 },
);

46 changes: 4 additions & 42 deletions
integration/tests/session-tasks-sign-up.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
import { expect, test } from '@playwright/test';

import { createClerkClient } from '@clerk/backend';
import { appConfigs } from '../presets';
import { instanceKeys } from '../presets/envs';
import type { FakeUser } from '../testUtils';
import { createTestUtils, testAgainstRunningApps } from '../testUtils';
import { createUserService } from '../testUtils/usersService';

testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
 'session tasks after sign-up flow @nextjs',
Expand All@@ -30,7 +27,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
 await app.teardown();
 });

 test.skip('navigate to task on after sign-up', async ({ page, context }) => {
 test('navigate to task on after sign-up', async ({ page, context }) => {
 // Performs sign-up
 const u = createTestUtils({ app, page, context });
 await u.po.signUp.goTo();
Expand All@@ -42,52 +39,17 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(

 // Redirects back to tasks when accessing protected route by `auth.protect`
 await u.page.goToRelative('/page-protected');
 expect(page.url()).toContain('tasks');
 expect(u.page.url()).toContain('tasks');

 // Resolves task
 const fakeOrganization = u.services.organizations.createFakeOrganization();
 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-up
 await u.page.waitForAppUrl('/');
 });

 test.skip('with sso, navigate to task on after sign-up', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });

 // Create a clerkClient for the OAuth provider instance
 const client = createClerkClient({
 secretKey: instanceKeys.get('oauth-provider').sk,
 publishableKey: instanceKeys.get('oauth-provider').pk,
 });
 const users = createUserService(client);
 fakeUser = users.createFakeUser({
 withUsername: true,
 const fakeOrganization = Object.assign(u.services.organizations.createFakeOrganization(), {
 slug: u.services.organizations.createFakeOrganization().slug + '-with-sign-up',
 });
 // Create the user on the OAuth provider instance so we do not need to sign up twice
 await users.createBapiUser(fakeUser);

 // Performs sign-up (transfer flow with sign-in) with SSO
 await u.po.signIn.goTo();
 await u.page.getByRole('button', { name: 'E2E OAuth Provider' }).click();
 await u.page.getByText('Sign in to oauth-provider').waitFor();
 await u.po.signIn.setIdentifier(fakeUser.email);
 await u.po.signIn.continue();
 await u.po.signIn.enterTestOtpCode();

 // Resolves task
 const fakeOrganization = u.services.organizations.createFakeOrganization();
 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-up
 await u.page.waitForAppUrl('/');

 // Delete the user on the OAuth provider instance
 await fakeUser.deleteIfExists();
 // Delete the user on the app instance.
 await u.services.users.deleteIfExists({ email: fakeUser.email });
 });
 },
);

2 changes: 1 addition & 1 deletion
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "files": [
 { "path": "./dist/clerk.js", "maxSize": "612.37kB" },
 { "path": "./dist/clerk.js", "maxSize": "614kB" },
 { "path": "./dist/clerk.browser.js", "maxSize": "72.2KB" },
 { "path": "./dist/clerk.legacy.browser.js", "maxSize": "115KB" },
 { "path": "./dist/clerk.headless*.js", "maxSize": "55KB" },
Expand Down

19 changes: 11 additions & 8 deletions
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1209,16 +1209,17 @@ export class Clerk implements ClerkInterface {
 }
 }

 if (newSession?.status === 'pending') {
 await this.#handlePendingSession(newSession);
 return;
 }

 /**
 * Hint to each framework, that the user will be signed out when `{session: null}` is provided.
 */
 await onBeforeSetActive(newSession === null ? 'sign-out' : undefined);

 if (newSession?.status === 'pending') {
 await this.#handlePendingSession(newSession);
 await onAfterSetActive();

Comment on lines

+1218
 to 
+1219

@LauraBeatrisLauraBeatrisJul 11, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

We weren't revalidating the server state on setActive with a pending session, fixing it now.
 return;
 }

 //1. setLastActiveSession to passed user session (add a param).
 // Note that this will also update the session's active organization
 // id.
Expand DownExpand Up@@ -1301,8 +1302,10 @@ export class Clerk implements ClerkInterface {
 eventBus.emit(events.TokenUpdate, { token: null });
 }

 // Only triggers navigation for internal routing, in order to not affect custom flows
 if (newSession?.currentTask && this.#componentNavigationContext) {
 // Only triggers navigation for internal AIO components routing or multi-session switch
 const isSwitchingSessions = this.session?.id != session.id;
 const shouldNavigateOnSetActive = this.#componentNavigationContext || isSwitchingSessions;
 if (newSession?.currentTask && shouldNavigateOnSetActive) {
 await navigateToTask(session.currentTask.key, {
 options: this.#options,
 environment: this.environment,
Expand All@@ -1317,7 +1320,7 @@ export class Clerk implements ClerkInterface {

 public __experimental_navigateToTask = async ({ redirectUrlComplete }: NextTaskParams = {}): Promise<void> => {
 /**
 * Invalidate previously cache pages with auth state before navigating
 * Invalidate previously cached pages with auth state before navigating
 */
 const onBeforeSetActive: SetActiveHook =
 typeof window !== 'undefined' && typeof window.__unstable__onBeforeSetActive === 'function'
Expand Down

3 changes: 3 additions & 0 deletions
packages/testing/src/playwright/unstable/page-objects/userButton.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,9 @@ export const createUserButtonPageObject = (testArgs: { page: EnhancedPage }) =>
 triggerManageAccount: () => {
 return page.getByRole('menuitem', { name: /Manage account/i }).click();
 },
 switchAccount: (emailAddress: string) => {
 return page.getByText(emailAddress).click();
 },
 };

 return self;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(clerk-js): Navigate to tasks when switching sessions#6273

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 13 commits into

from

Jul 11, 2025
 Merged


fix(clerk-js): Navigate to tasks when switching sessions
#6273
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
81b6009

Navigate to tasks when switching sessions with `setActive`


LauraBeatris Jul 9, 2025
8a71b72

Revalidate server state


LauraBeatris Jul 9, 2025
c8e724b

Add changeset


LauraBeatris Jul 9, 2025
c428009

Create user on every test block instead of on hook


LauraBeatris Jul 9, 2025
c290255

Remove duplicated test block between sign-in


LauraBeatris Jul 9, 2025
1f929d6

Add E2E test for switching sessions with task


LauraBeatris Jul 9, 2025
46cf927

Introduce separate suite for multi-session


LauraBeatris Jul 10, 2025
fe58e39

Add method to await for task to be mounted


LauraBeatris Jul 11, 2025
3adbec7

Revalidate server state on `setActive` with pending session


LauraBeatris Jul 11, 2025
46bf92f

Fix `SignIn` to use hash routing


LauraBeatris Jul 11, 2025
7221d8f

Update organization slug to avoid colision


LauraBeatris Jul 11, 2025
26448fc

Update bundlewatch


LauraBeatris Jul 11, 2025
0a8fdea

Decrease flakyness when switching account


LauraBeatris Jul 11, 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/tall-dolls-wish.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Navigate to tasks when switching sessions

4 changes: 2 additions & 2 deletions
integration/templates/next-app-router/src/app/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { SignedIn, SignedOut, SignIn, UserButton, Protect } from '@clerk/nextjs';
import { Protect, SignedIn, SignedOut, SignIn, UserButton } from '@clerk/nextjs';
import Link from 'next/link';
import { ClientId } from './client-id';

Expand All@@ -11,7 +11,7 @@ export default function Home() {
 <SignedOut>SignedOut</SignedOut>
 <Protect fallback={'SignedOut from protect'}>SignedIn from protect</Protect>
 <SignIn
path={'/'}
routing='hash'
 signUpUrl={'/sign-up'}
 />
 <ul>
Expand Down

96 changes: 96 additions & 0 deletions
integration/tests/session-tasks-multi-session.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
import { test } from '@playwright/test';

import { appConfigs } from '../presets';
import type { FakeUser } from '../testUtils';
import { createTestUtils, testAgainstRunningApps } from '../testUtils';

testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
 'session tasks multi-session flow @nextjs',
 ({ app }) => {
 test.describe.configure({ mode: 'serial' });

 let user1: FakeUser;
 let user2: FakeUser;

 test.beforeAll(async () => {
 const u = createTestUtils({ app });

 user1 = u.services.users.createFakeUser();
 user2 = u.services.users.createFakeUser();

 await u.services.users.createBapiUser(user1);
 await u.services.users.createBapiUser(user2);
 });

 test.afterAll(async () => {
 const u = createTestUtils({ app });
 await user1.deleteIfExists();
 await user2.deleteIfExists();
 await u.services.organizations.deleteAll();
 await app.teardown();
 });

 test.afterEach(async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });
 await u.page.signOut();
 await u.page.context().clearCookies();
 });

 test('when switching sessions, navigate to task', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });

 // Performs sign-in
 await u.po.signIn.goTo();
 await u.po.signIn.setIdentifier(user1.email);
 await u.po.signIn.continue();
 await u.po.signIn.setPassword(user1.password);
 await u.po.signIn.continue();
 await u.po.expect.toBeSignedIn();

 // Resolves task
 const fakeOrganization = Object.assign(u.services.organizations.createFakeOrganization(), {
 slug: u.services.organizations.createFakeOrganization().slug + '-with-session-tasks',
 });

 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-in
 await u.page.waitForAppUrl('/');

 // Create second user, to initiate a pending session
 // Don't resolve task and switch to active session afterwards
 await u.po.signIn.goTo();
 await u.po.signIn.setIdentifier(user2.email);
 await u.po.signIn.continue();
 await u.po.signIn.setPassword(user2.password);
 await u.po.signIn.continue();

 // Sign-in again back with active session
 await u.po.signIn.goTo();
 await u.po.signIn.setIdentifier(user1.email);
 await u.po.signIn.continue();
 await u.po.signIn.setPassword(user1.password);
 await u.po.signIn.continue();

 // Navigate to protected page, with active session, where user button gets rendered
 await u.page.goToRelative('/user-button');

 // Switch account, to a session that has a pending status
 await u.po.userButton.waitForMounted();
 await u.po.userButton.toggleTrigger();
 await u.po.userButton.waitForPopover();
 await u.po.userButton.toHaveVisibleMenuItems([/Manage account/i, /Sign out$/i]);
 await u.po.userButton.switchAccount(user2.email);

 // Resolve task
 await u.po.signIn.waitForMounted();
 const fakeOrganization2 = u.services.organizations.createFakeOrganization();
 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization2);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-in
 await u.page.waitForAppUrl('/');
 });
 },
);

45 changes: 28 additions & 17 deletions
integration/tests/session-tasks-sign-in.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { createClerkClient } from '@clerk/backend';
import { expect, test } from '@playwright/test';
import { test } from '@playwright/test';

import { appConfigs } from '../presets';
import { instanceKeys } from '../presets/envs';
Expand All@@ -12,46 +12,54 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
 ({ app }) => {
 test.describe.configure({ mode: 'serial' });

 let fakeUser: FakeUser;
 let user: FakeUser;

 test.beforeAll(async () => {
 const u = createTestUtils({ app });
fakeUser = u.services.users.createFakeUser();
 await u.services.users.createBapiUser(fakeUser);
user = u.services.users.createFakeUser();
 await u.services.users.createBapiUser(user);
 });

 test.afterAll(async () => {
 const u = createTestUtils({ app });
 await fakeUser.deleteIfExists();
 await user.deleteIfExists();
 await u.services.organizations.deleteAll();
 await app.teardown();
 });

 test.skip('with email and password, navigate to task on after sign-in', async ({ page, context }) => {
 test.afterEach(async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });
 await u.page.signOut();
 await u.page.context().clearCookies();
 });

 test('with email and password, navigate to task on after sign-in', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });

 // Performs sign-in
 await u.po.signIn.goTo();
 await u.po.signIn.setIdentifier(fakeUser.email);
 await u.po.signIn.setIdentifier(user.email);
 await u.po.signIn.continue();
 await u.po.signIn.setPassword(fakeUser.password);
 await u.po.signIn.setPassword(user.password);
 await u.po.signIn.continue();
 await u.po.expect.toBeSignedIn();

 // Redirects back to tasks when accessing protected route by `auth.protect`
 await u.page.goToRelative('/page-protected');
 expect(page.url()).toContain('tasks');

 // Resolves task
 const fakeOrganization = u.services.organizations.createFakeOrganization();
 const fakeOrganization = Object.assign(u.services.organizations.createFakeOrganization(), {
 slug: u.services.organizations.createFakeOrganization().slug + '-with-sign-in-password',
 });
 await u.po.signIn.waitForMounted();
 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-in
 await u.page.waitForAppUrl('/');
 });

 test.skip('with sso, navigate to task on after sign-in', async ({ page, context }) => {
 test('with sso, navigate to task on after sign-in', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });

 // Create a clerkClient for the OAuth provider instance
Expand All@@ -60,32 +68,35 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
 publishableKey: instanceKeys.get('oauth-provider').pk,
 });
 const users = createUserService(client);
fakeUser = users.createFakeUser({
const userFromOAuth = users.createFakeUser({
 withUsername: true,
 });
 // Create the user on the OAuth provider instance so we do not need to sign up twice
 await users.createBapiUser(fakeUser);
 await users.createBapiUser(userFromOAuth);

 // Performs sign-in with SSO
 await u.po.signIn.goTo();
 await u.page.getByRole('button', { name: 'E2E OAuth Provider' }).click();
 await u.page.getByText('Sign in to oauth-provider').waitFor();
 await u.po.signIn.setIdentifier(fakeUser.email);
 await u.po.signIn.setIdentifier(userFromOAuth.email);
 await u.po.signIn.continue();
 await u.po.signIn.enterTestOtpCode();

 // Resolves task
 const fakeOrganization = u.services.organizations.createFakeOrganization();
 await u.po.signIn.waitForMounted();
 const fakeOrganization = Object.assign(u.services.organizations.createFakeOrganization(), {
 slug: u.services.organizations.createFakeOrganization().slug + '-with-sign-in-sso',
 });
 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-in
 await u.page.waitForAppUrl('/');

 // Delete the user on the OAuth provider instance
 await fakeUser.deleteIfExists();
 await userFromOAuth.deleteIfExists();
 // Delete the user on the app instance.
 await u.services.users.deleteIfExists({ email: fakeUser.email });
 await u.services.users.deleteIfExists({ email: userFromOAuth.email });
 });
 },
);

46 changes: 4 additions & 42 deletions
integration/tests/session-tasks-sign-up.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
import { expect, test } from '@playwright/test';

import { createClerkClient } from '@clerk/backend';
import { appConfigs } from '../presets';
import { instanceKeys } from '../presets/envs';
import type { FakeUser } from '../testUtils';
import { createTestUtils, testAgainstRunningApps } from '../testUtils';
import { createUserService } from '../testUtils/usersService';

testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
 'session tasks after sign-up flow @nextjs',
Expand All@@ -30,7 +27,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
 await app.teardown();
 });

 test.skip('navigate to task on after sign-up', async ({ page, context }) => {
 test('navigate to task on after sign-up', async ({ page, context }) => {
 // Performs sign-up
 const u = createTestUtils({ app, page, context });
 await u.po.signUp.goTo();
Expand All@@ -42,52 +39,17 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(

 // Redirects back to tasks when accessing protected route by `auth.protect`
 await u.page.goToRelative('/page-protected');
 expect(page.url()).toContain('tasks');
 expect(u.page.url()).toContain('tasks');

 // Resolves task
 const fakeOrganization = u.services.organizations.createFakeOrganization();
 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-up
 await u.page.waitForAppUrl('/');
 });

 test.skip('with sso, navigate to task on after sign-up', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });

 // Create a clerkClient for the OAuth provider instance
 const client = createClerkClient({
 secretKey: instanceKeys.get('oauth-provider').sk,
 publishableKey: instanceKeys.get('oauth-provider').pk,
 });
 const users = createUserService(client);
 fakeUser = users.createFakeUser({
 withUsername: true,
 const fakeOrganization = Object.assign(u.services.organizations.createFakeOrganization(), {
 slug: u.services.organizations.createFakeOrganization().slug + '-with-sign-up',
 });
 // Create the user on the OAuth provider instance so we do not need to sign up twice
 await users.createBapiUser(fakeUser);

 // Performs sign-up (transfer flow with sign-in) with SSO
 await u.po.signIn.goTo();
 await u.page.getByRole('button', { name: 'E2E OAuth Provider' }).click();
 await u.page.getByText('Sign in to oauth-provider').waitFor();
 await u.po.signIn.setIdentifier(fakeUser.email);
 await u.po.signIn.continue();
 await u.po.signIn.enterTestOtpCode();

 // Resolves task
 const fakeOrganization = u.services.organizations.createFakeOrganization();
 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-up
 await u.page.waitForAppUrl('/');

 // Delete the user on the OAuth provider instance
 await fakeUser.deleteIfExists();
 // Delete the user on the app instance.
 await u.services.users.deleteIfExists({ email: fakeUser.email });
 });
 },
);

2 changes: 1 addition & 1 deletion
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "files": [
 { "path": "./dist/clerk.js", "maxSize": "612.37kB" },
 { "path": "./dist/clerk.js", "maxSize": "614kB" },
 { "path": "./dist/clerk.browser.js", "maxSize": "72.2KB" },
 { "path": "./dist/clerk.legacy.browser.js", "maxSize": "115KB" },
 { "path": "./dist/clerk.headless*.js", "maxSize": "55KB" },
Expand Down

19 changes: 11 additions & 8 deletions
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1209,16 +1209,17 @@ export class Clerk implements ClerkInterface {
 }
 }

 if (newSession?.status === 'pending') {
 await this.#handlePendingSession(newSession);
 return;
 }

 /**
 * Hint to each framework, that the user will be signed out when `{session: null}` is provided.
 */
 await onBeforeSetActive(newSession === null ? 'sign-out' : undefined);

 if (newSession?.status === 'pending') {
 await this.#handlePendingSession(newSession);
 await onAfterSetActive();

Comment on lines

+1218
 to 
+1219

@LauraBeatrisLauraBeatrisJul 11, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

We weren't revalidating the server state on setActive with a pending session, fixing it now.
 return;
 }

 //1. setLastActiveSession to passed user session (add a param).
 // Note that this will also update the session's active organization
 // id.
Expand DownExpand Up@@ -1301,8 +1302,10 @@ export class Clerk implements ClerkInterface {
 eventBus.emit(events.TokenUpdate, { token: null });
 }

 // Only triggers navigation for internal routing, in order to not affect custom flows
 if (newSession?.currentTask && this.#componentNavigationContext) {
 // Only triggers navigation for internal AIO components routing or multi-session switch
 const isSwitchingSessions = this.session?.id != session.id;
 const shouldNavigateOnSetActive = this.#componentNavigationContext || isSwitchingSessions;
 if (newSession?.currentTask && shouldNavigateOnSetActive) {
 await navigateToTask(session.currentTask.key, {
 options: this.#options,
 environment: this.environment,
Expand All@@ -1317,7 +1320,7 @@ export class Clerk implements ClerkInterface {

 public __experimental_navigateToTask = async ({ redirectUrlComplete }: NextTaskParams = {}): Promise<void> => {
 /**
 * Invalidate previously cache pages with auth state before navigating
 * Invalidate previously cached pages with auth state before navigating
 */
 const onBeforeSetActive: SetActiveHook =
 typeof window !== 'undefined' && typeof window.__unstable__onBeforeSetActive === 'function'
Expand Down

3 changes: 3 additions & 0 deletions
packages/testing/src/playwright/unstable/page-objects/userButton.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,9 @@ export const createUserButtonPageObject = (testArgs: { page: EnhancedPage }) =>
 triggerManageAccount: () => {
 return page.getByRole('menuitem', { name: /Manage account/i }).click();
 },
 switchAccount: (emailAddress: string) => {
 return page.getByText(emailAddress).click();
 },
 };

 return self;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(clerk-js): Navigate to tasks when switching sessions#6273

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 13 commits into

from

Jul 11, 2025
 Merged


fix(clerk-js): Navigate to tasks when switching sessions
#6273
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
81b6009

Navigate to tasks when switching sessions with `setActive`


LauraBeatris Jul 9, 2025
8a71b72

Revalidate server state


LauraBeatris Jul 9, 2025
c8e724b

Add changeset


LauraBeatris Jul 9, 2025
c428009

Create user on every test block instead of on hook


LauraBeatris Jul 9, 2025
c290255

Remove duplicated test block between sign-in


LauraBeatris Jul 9, 2025
1f929d6

Add E2E test for switching sessions with task


LauraBeatris Jul 9, 2025
46cf927

Introduce separate suite for multi-session


LauraBeatris Jul 10, 2025
fe58e39

Add method to await for task to be mounted


LauraBeatris Jul 11, 2025
3adbec7

Revalidate server state on `setActive` with pending session


LauraBeatris Jul 11, 2025
46bf92f

Fix `SignIn` to use hash routing


LauraBeatris Jul 11, 2025
7221d8f

Update organization slug to avoid colision


LauraBeatris Jul 11, 2025
26448fc

Update bundlewatch


LauraBeatris Jul 11, 2025
0a8fdea

Decrease flakyness when switching account


LauraBeatris Jul 11, 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/tall-dolls-wish.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Navigate to tasks when switching sessions

4 changes: 2 additions & 2 deletions
integration/templates/next-app-router/src/app/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { SignedIn, SignedOut, SignIn, UserButton, Protect } from '@clerk/nextjs';
import { Protect, SignedIn, SignedOut, SignIn, UserButton } from '@clerk/nextjs';
import Link from 'next/link';
import { ClientId } from './client-id';

Expand All@@ -11,7 +11,7 @@ export default function Home() {
 <SignedOut>SignedOut</SignedOut>
 <Protect fallback={'SignedOut from protect'}>SignedIn from protect</Protect>
 <SignIn
path={'/'}
routing='hash'
 signUpUrl={'/sign-up'}
 />
 <ul>
Expand Down

96 changes: 96 additions & 0 deletions
integration/tests/session-tasks-multi-session.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
import { test } from '@playwright/test';

import { appConfigs } from '../presets';
import type { FakeUser } from '../testUtils';
import { createTestUtils, testAgainstRunningApps } from '../testUtils';

testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
 'session tasks multi-session flow @nextjs',
 ({ app }) => {
 test.describe.configure({ mode: 'serial' });

 let user1: FakeUser;
 let user2: FakeUser;

 test.beforeAll(async () => {
 const u = createTestUtils({ app });

 user1 = u.services.users.createFakeUser();
 user2 = u.services.users.createFakeUser();

 await u.services.users.createBapiUser(user1);
 await u.services.users.createBapiUser(user2);
 });

 test.afterAll(async () => {
 const u = createTestUtils({ app });
 await user1.deleteIfExists();
 await user2.deleteIfExists();
 await u.services.organizations.deleteAll();
 await app.teardown();
 });

 test.afterEach(async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });
 await u.page.signOut();
 await u.page.context().clearCookies();
 });

 test('when switching sessions, navigate to task', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });

 // Performs sign-in
 await u.po.signIn.goTo();
 await u.po.signIn.setIdentifier(user1.email);
 await u.po.signIn.continue();
 await u.po.signIn.setPassword(user1.password);
 await u.po.signIn.continue();
 await u.po.expect.toBeSignedIn();

 // Resolves task
 const fakeOrganization = Object.assign(u.services.organizations.createFakeOrganization(), {
 slug: u.services.organizations.createFakeOrganization().slug + '-with-session-tasks',
 });

 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-in
 await u.page.waitForAppUrl('/');

 // Create second user, to initiate a pending session
 // Don't resolve task and switch to active session afterwards
 await u.po.signIn.goTo();
 await u.po.signIn.setIdentifier(user2.email);
 await u.po.signIn.continue();
 await u.po.signIn.setPassword(user2.password);
 await u.po.signIn.continue();

 // Sign-in again back with active session
 await u.po.signIn.goTo();
 await u.po.signIn.setIdentifier(user1.email);
 await u.po.signIn.continue();
 await u.po.signIn.setPassword(user1.password);
 await u.po.signIn.continue();

 // Navigate to protected page, with active session, where user button gets rendered
 await u.page.goToRelative('/user-button');

 // Switch account, to a session that has a pending status
 await u.po.userButton.waitForMounted();
 await u.po.userButton.toggleTrigger();
 await u.po.userButton.waitForPopover();
 await u.po.userButton.toHaveVisibleMenuItems([/Manage account/i, /Sign out$/i]);
 await u.po.userButton.switchAccount(user2.email);

 // Resolve task
 await u.po.signIn.waitForMounted();
 const fakeOrganization2 = u.services.organizations.createFakeOrganization();
 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization2);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-in
 await u.page.waitForAppUrl('/');
 });
 },
);

45 changes: 28 additions & 17 deletions
integration/tests/session-tasks-sign-in.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { createClerkClient } from '@clerk/backend';
import { expect, test } from '@playwright/test';
import { test } from '@playwright/test';

import { appConfigs } from '../presets';
import { instanceKeys } from '../presets/envs';
Expand All@@ -12,46 +12,54 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
 ({ app }) => {
 test.describe.configure({ mode: 'serial' });

 let fakeUser: FakeUser;
 let user: FakeUser;

 test.beforeAll(async () => {
 const u = createTestUtils({ app });
fakeUser = u.services.users.createFakeUser();
 await u.services.users.createBapiUser(fakeUser);
user = u.services.users.createFakeUser();
 await u.services.users.createBapiUser(user);
 });

 test.afterAll(async () => {
 const u = createTestUtils({ app });
 await fakeUser.deleteIfExists();
 await user.deleteIfExists();
 await u.services.organizations.deleteAll();
 await app.teardown();
 });

 test.skip('with email and password, navigate to task on after sign-in', async ({ page, context }) => {
 test.afterEach(async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });
 await u.page.signOut();
 await u.page.context().clearCookies();
 });

 test('with email and password, navigate to task on after sign-in', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });

 // Performs sign-in
 await u.po.signIn.goTo();
 await u.po.signIn.setIdentifier(fakeUser.email);
 await u.po.signIn.setIdentifier(user.email);
 await u.po.signIn.continue();
 await u.po.signIn.setPassword(fakeUser.password);
 await u.po.signIn.setPassword(user.password);
 await u.po.signIn.continue();
 await u.po.expect.toBeSignedIn();

 // Redirects back to tasks when accessing protected route by `auth.protect`
 await u.page.goToRelative('/page-protected');
 expect(page.url()).toContain('tasks');

 // Resolves task
 const fakeOrganization = u.services.organizations.createFakeOrganization();
 const fakeOrganization = Object.assign(u.services.organizations.createFakeOrganization(), {
 slug: u.services.organizations.createFakeOrganization().slug + '-with-sign-in-password',
 });
 await u.po.signIn.waitForMounted();
 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-in
 await u.page.waitForAppUrl('/');
 });

 test.skip('with sso, navigate to task on after sign-in', async ({ page, context }) => {
 test('with sso, navigate to task on after sign-in', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });

 // Create a clerkClient for the OAuth provider instance
Expand All@@ -60,32 +68,35 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
 publishableKey: instanceKeys.get('oauth-provider').pk,
 });
 const users = createUserService(client);
fakeUser = users.createFakeUser({
const userFromOAuth = users.createFakeUser({
 withUsername: true,
 });
 // Create the user on the OAuth provider instance so we do not need to sign up twice
 await users.createBapiUser(fakeUser);
 await users.createBapiUser(userFromOAuth);

 // Performs sign-in with SSO
 await u.po.signIn.goTo();
 await u.page.getByRole('button', { name: 'E2E OAuth Provider' }).click();
 await u.page.getByText('Sign in to oauth-provider').waitFor();
 await u.po.signIn.setIdentifier(fakeUser.email);
 await u.po.signIn.setIdentifier(userFromOAuth.email);
 await u.po.signIn.continue();
 await u.po.signIn.enterTestOtpCode();

 // Resolves task
 const fakeOrganization = u.services.organizations.createFakeOrganization();
 await u.po.signIn.waitForMounted();
 const fakeOrganization = Object.assign(u.services.organizations.createFakeOrganization(), {
 slug: u.services.organizations.createFakeOrganization().slug + '-with-sign-in-sso',
 });
 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-in
 await u.page.waitForAppUrl('/');

 // Delete the user on the OAuth provider instance
 await fakeUser.deleteIfExists();
 await userFromOAuth.deleteIfExists();
 // Delete the user on the app instance.
 await u.services.users.deleteIfExists({ email: fakeUser.email });
 await u.services.users.deleteIfExists({ email: userFromOAuth.email });
 });
 },
);

46 changes: 4 additions & 42 deletions
integration/tests/session-tasks-sign-up.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
import { expect, test } from '@playwright/test';

import { createClerkClient } from '@clerk/backend';
import { appConfigs } from '../presets';
import { instanceKeys } from '../presets/envs';
import type { FakeUser } from '../testUtils';
import { createTestUtils, testAgainstRunningApps } from '../testUtils';
import { createUserService } from '../testUtils/usersService';

testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
 'session tasks after sign-up flow @nextjs',
Expand All@@ -30,7 +27,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
 await app.teardown();
 });

 test.skip('navigate to task on after sign-up', async ({ page, context }) => {
 test('navigate to task on after sign-up', async ({ page, context }) => {
 // Performs sign-up
 const u = createTestUtils({ app, page, context });
 await u.po.signUp.goTo();
Expand All@@ -42,52 +39,17 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(

 // Redirects back to tasks when accessing protected route by `auth.protect`
 await u.page.goToRelative('/page-protected');
 expect(page.url()).toContain('tasks');
 expect(u.page.url()).toContain('tasks');

 // Resolves task
 const fakeOrganization = u.services.organizations.createFakeOrganization();
 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-up
 await u.page.waitForAppUrl('/');
 });

 test.skip('with sso, navigate to task on after sign-up', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });

 // Create a clerkClient for the OAuth provider instance
 const client = createClerkClient({
 secretKey: instanceKeys.get('oauth-provider').sk,
 publishableKey: instanceKeys.get('oauth-provider').pk,
 });
 const users = createUserService(client);
 fakeUser = users.createFakeUser({
 withUsername: true,
 const fakeOrganization = Object.assign(u.services.organizations.createFakeOrganization(), {
 slug: u.services.organizations.createFakeOrganization().slug + '-with-sign-up',
 });
 // Create the user on the OAuth provider instance so we do not need to sign up twice
 await users.createBapiUser(fakeUser);

 // Performs sign-up (transfer flow with sign-in) with SSO
 await u.po.signIn.goTo();
 await u.page.getByRole('button', { name: 'E2E OAuth Provider' }).click();
 await u.page.getByText('Sign in to oauth-provider').waitFor();
 await u.po.signIn.setIdentifier(fakeUser.email);
 await u.po.signIn.continue();
 await u.po.signIn.enterTestOtpCode();

 // Resolves task
 const fakeOrganization = u.services.organizations.createFakeOrganization();
 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-up
 await u.page.waitForAppUrl('/');

 // Delete the user on the OAuth provider instance
 await fakeUser.deleteIfExists();
 // Delete the user on the app instance.
 await u.services.users.deleteIfExists({ email: fakeUser.email });
 });
 },
);

2 changes: 1 addition & 1 deletion
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "files": [
 { "path": "./dist/clerk.js", "maxSize": "612.37kB" },
 { "path": "./dist/clerk.js", "maxSize": "614kB" },
 { "path": "./dist/clerk.browser.js", "maxSize": "72.2KB" },
 { "path": "./dist/clerk.legacy.browser.js", "maxSize": "115KB" },
 { "path": "./dist/clerk.headless*.js", "maxSize": "55KB" },
Expand Down

19 changes: 11 additions & 8 deletions
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1209,16 +1209,17 @@ export class Clerk implements ClerkInterface {
 }
 }

 if (newSession?.status === 'pending') {
 await this.#handlePendingSession(newSession);
 return;
 }

 /**
 * Hint to each framework, that the user will be signed out when `{session: null}` is provided.
 */
 await onBeforeSetActive(newSession === null ? 'sign-out' : undefined);

 if (newSession?.status === 'pending') {
 await this.#handlePendingSession(newSession);
 await onAfterSetActive();

Comment on lines

+1218
 to 
+1219

@LauraBeatrisLauraBeatrisJul 11, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

We weren't revalidating the server state on setActive with a pending session, fixing it now.
 return;
 }

 //1. setLastActiveSession to passed user session (add a param).
 // Note that this will also update the session's active organization
 // id.
Expand DownExpand Up@@ -1301,8 +1302,10 @@ export class Clerk implements ClerkInterface {
 eventBus.emit(events.TokenUpdate, { token: null });
 }

 // Only triggers navigation for internal routing, in order to not affect custom flows
 if (newSession?.currentTask && this.#componentNavigationContext) {
 // Only triggers navigation for internal AIO components routing or multi-session switch
 const isSwitchingSessions = this.session?.id != session.id;
 const shouldNavigateOnSetActive = this.#componentNavigationContext || isSwitchingSessions;
 if (newSession?.currentTask && shouldNavigateOnSetActive) {
 await navigateToTask(session.currentTask.key, {
 options: this.#options,
 environment: this.environment,
Expand All@@ -1317,7 +1320,7 @@ export class Clerk implements ClerkInterface {

 public __experimental_navigateToTask = async ({ redirectUrlComplete }: NextTaskParams = {}): Promise<void> => {
 /**
 * Invalidate previously cache pages with auth state before navigating
 * Invalidate previously cached pages with auth state before navigating
 */
 const onBeforeSetActive: SetActiveHook =
 typeof window !== 'undefined' && typeof window.__unstable__onBeforeSetActive === 'function'
Expand Down

3 changes: 3 additions & 0 deletions
packages/testing/src/playwright/unstable/page-objects/userButton.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,9 @@ export const createUserButtonPageObject = (testArgs: { page: EnhancedPage }) =>
 triggerManageAccount: () => {
 return page.getByRole('menuitem', { name: /Manage account/i }).click();
 },
 switchAccount: (emailAddress: string) => {
 return page.getByText(emailAddress).click();
 },
 };

 return self;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix(clerk-js): Navigate to tasks when switching sessions#6273

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 13 commits into

from

Jul 11, 2025
 Merged


fix(clerk-js): Navigate to tasks when switching sessions
#6273
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
81b6009

Navigate to tasks when switching sessions with `setActive`


LauraBeatris Jul 9, 2025
8a71b72

Revalidate server state


LauraBeatris Jul 9, 2025
c8e724b

Add changeset


LauraBeatris Jul 9, 2025
c428009

Create user on every test block instead of on hook


LauraBeatris Jul 9, 2025
c290255

Remove duplicated test block between sign-in


LauraBeatris Jul 9, 2025
1f929d6

Add E2E test for switching sessions with task


LauraBeatris Jul 9, 2025
46cf927

Introduce separate suite for multi-session


LauraBeatris Jul 10, 2025
fe58e39

Add method to await for task to be mounted


LauraBeatris Jul 11, 2025
3adbec7

Revalidate server state on `setActive` with pending session


LauraBeatris Jul 11, 2025
46bf92f

Fix `SignIn` to use hash routing


LauraBeatris Jul 11, 2025
7221d8f

Update organization slug to avoid colision


LauraBeatris Jul 11, 2025
26448fc

Update bundlewatch


LauraBeatris Jul 11, 2025
0a8fdea

Decrease flakyness when switching account


LauraBeatris Jul 11, 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/tall-dolls-wish.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Navigate to tasks when switching sessions

4 changes: 2 additions & 2 deletions
integration/templates/next-app-router/src/app/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { SignedIn, SignedOut, SignIn, UserButton, Protect } from '@clerk/nextjs';
import { Protect, SignedIn, SignedOut, SignIn, UserButton } from '@clerk/nextjs';
import Link from 'next/link';
import { ClientId } from './client-id';

Expand All@@ -11,7 +11,7 @@ export default function Home() {
 <SignedOut>SignedOut</SignedOut>
 <Protect fallback={'SignedOut from protect'}>SignedIn from protect</Protect>
 <SignIn
path={'/'}
routing='hash'
 signUpUrl={'/sign-up'}
 />
 <ul>
Expand Down

96 changes: 96 additions & 0 deletions
integration/tests/session-tasks-multi-session.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
import { test } from '@playwright/test';

import { appConfigs } from '../presets';
import type { FakeUser } from '../testUtils';
import { createTestUtils, testAgainstRunningApps } from '../testUtils';

testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
 'session tasks multi-session flow @nextjs',
 ({ app }) => {
 test.describe.configure({ mode: 'serial' });

 let user1: FakeUser;
 let user2: FakeUser;

 test.beforeAll(async () => {
 const u = createTestUtils({ app });

 user1 = u.services.users.createFakeUser();
 user2 = u.services.users.createFakeUser();

 await u.services.users.createBapiUser(user1);
 await u.services.users.createBapiUser(user2);
 });

 test.afterAll(async () => {
 const u = createTestUtils({ app });
 await user1.deleteIfExists();
 await user2.deleteIfExists();
 await u.services.organizations.deleteAll();
 await app.teardown();
 });

 test.afterEach(async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });
 await u.page.signOut();
 await u.page.context().clearCookies();
 });

 test('when switching sessions, navigate to task', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });

 // Performs sign-in
 await u.po.signIn.goTo();
 await u.po.signIn.setIdentifier(user1.email);
 await u.po.signIn.continue();
 await u.po.signIn.setPassword(user1.password);
 await u.po.signIn.continue();
 await u.po.expect.toBeSignedIn();

 // Resolves task
 const fakeOrganization = Object.assign(u.services.organizations.createFakeOrganization(), {
 slug: u.services.organizations.createFakeOrganization().slug + '-with-session-tasks',
 });

 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-in
 await u.page.waitForAppUrl('/');

 // Create second user, to initiate a pending session
 // Don't resolve task and switch to active session afterwards
 await u.po.signIn.goTo();
 await u.po.signIn.setIdentifier(user2.email);
 await u.po.signIn.continue();
 await u.po.signIn.setPassword(user2.password);
 await u.po.signIn.continue();

 // Sign-in again back with active session
 await u.po.signIn.goTo();
 await u.po.signIn.setIdentifier(user1.email);
 await u.po.signIn.continue();
 await u.po.signIn.setPassword(user1.password);
 await u.po.signIn.continue();

 // Navigate to protected page, with active session, where user button gets rendered
 await u.page.goToRelative('/user-button');

 // Switch account, to a session that has a pending status
 await u.po.userButton.waitForMounted();
 await u.po.userButton.toggleTrigger();
 await u.po.userButton.waitForPopover();
 await u.po.userButton.toHaveVisibleMenuItems([/Manage account/i, /Sign out$/i]);
 await u.po.userButton.switchAccount(user2.email);

 // Resolve task
 await u.po.signIn.waitForMounted();
 const fakeOrganization2 = u.services.organizations.createFakeOrganization();
 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization2);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-in
 await u.page.waitForAppUrl('/');
 });
 },
);

45 changes: 28 additions & 17 deletions
integration/tests/session-tasks-sign-in.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { createClerkClient } from '@clerk/backend';
import { expect, test } from '@playwright/test';
import { test } from '@playwright/test';

import { appConfigs } from '../presets';
import { instanceKeys } from '../presets/envs';
Expand All@@ -12,46 +12,54 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
 ({ app }) => {
 test.describe.configure({ mode: 'serial' });

 let fakeUser: FakeUser;
 let user: FakeUser;

 test.beforeAll(async () => {
 const u = createTestUtils({ app });
fakeUser = u.services.users.createFakeUser();
 await u.services.users.createBapiUser(fakeUser);
user = u.services.users.createFakeUser();
 await u.services.users.createBapiUser(user);
 });

 test.afterAll(async () => {
 const u = createTestUtils({ app });
 await fakeUser.deleteIfExists();
 await user.deleteIfExists();
 await u.services.organizations.deleteAll();
 await app.teardown();
 });

 test.skip('with email and password, navigate to task on after sign-in', async ({ page, context }) => {
 test.afterEach(async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });
 await u.page.signOut();
 await u.page.context().clearCookies();
 });

 test('with email and password, navigate to task on after sign-in', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });

 // Performs sign-in
 await u.po.signIn.goTo();
 await u.po.signIn.setIdentifier(fakeUser.email);
 await u.po.signIn.setIdentifier(user.email);
 await u.po.signIn.continue();
 await u.po.signIn.setPassword(fakeUser.password);
 await u.po.signIn.setPassword(user.password);
 await u.po.signIn.continue();
 await u.po.expect.toBeSignedIn();

 // Redirects back to tasks when accessing protected route by `auth.protect`
 await u.page.goToRelative('/page-protected');
 expect(page.url()).toContain('tasks');

 // Resolves task
 const fakeOrganization = u.services.organizations.createFakeOrganization();
 const fakeOrganization = Object.assign(u.services.organizations.createFakeOrganization(), {
 slug: u.services.organizations.createFakeOrganization().slug + '-with-sign-in-password',
 });
 await u.po.signIn.waitForMounted();
 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-in
 await u.page.waitForAppUrl('/');
 });

 test.skip('with sso, navigate to task on after sign-in', async ({ page, context }) => {
 test('with sso, navigate to task on after sign-in', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });

 // Create a clerkClient for the OAuth provider instance
Expand All@@ -60,32 +68,35 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
 publishableKey: instanceKeys.get('oauth-provider').pk,
 });
 const users = createUserService(client);
fakeUser = users.createFakeUser({
const userFromOAuth = users.createFakeUser({
 withUsername: true,
 });
 // Create the user on the OAuth provider instance so we do not need to sign up twice
 await users.createBapiUser(fakeUser);
 await users.createBapiUser(userFromOAuth);

 // Performs sign-in with SSO
 await u.po.signIn.goTo();
 await u.page.getByRole('button', { name: 'E2E OAuth Provider' }).click();
 await u.page.getByText('Sign in to oauth-provider').waitFor();
 await u.po.signIn.setIdentifier(fakeUser.email);
 await u.po.signIn.setIdentifier(userFromOAuth.email);
 await u.po.signIn.continue();
 await u.po.signIn.enterTestOtpCode();

 // Resolves task
 const fakeOrganization = u.services.organizations.createFakeOrganization();
 await u.po.signIn.waitForMounted();
 const fakeOrganization = Object.assign(u.services.organizations.createFakeOrganization(), {
 slug: u.services.organizations.createFakeOrganization().slug + '-with-sign-in-sso',
 });
 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-in
 await u.page.waitForAppUrl('/');

 // Delete the user on the OAuth provider instance
 await fakeUser.deleteIfExists();
 await userFromOAuth.deleteIfExists();
 // Delete the user on the app instance.
 await u.services.users.deleteIfExists({ email: fakeUser.email });
 await u.services.users.deleteIfExists({ email: userFromOAuth.email });
 });
 },
);

46 changes: 4 additions & 42 deletions
integration/tests/session-tasks-sign-up.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
import { expect, test } from '@playwright/test';

import { createClerkClient } from '@clerk/backend';
import { appConfigs } from '../presets';
import { instanceKeys } from '../presets/envs';
import type { FakeUser } from '../testUtils';
import { createTestUtils, testAgainstRunningApps } from '../testUtils';
import { createUserService } from '../testUtils/usersService';

testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
 'session tasks after sign-up flow @nextjs',
Expand All@@ -30,7 +27,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
 await app.teardown();
 });

 test.skip('navigate to task on after sign-up', async ({ page, context }) => {
 test('navigate to task on after sign-up', async ({ page, context }) => {
 // Performs sign-up
 const u = createTestUtils({ app, page, context });
 await u.po.signUp.goTo();
Expand All@@ -42,52 +39,17 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(

 // Redirects back to tasks when accessing protected route by `auth.protect`
 await u.page.goToRelative('/page-protected');
 expect(page.url()).toContain('tasks');
 expect(u.page.url()).toContain('tasks');

 // Resolves task
 const fakeOrganization = u.services.organizations.createFakeOrganization();
 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-up
 await u.page.waitForAppUrl('/');
 });

 test.skip('with sso, navigate to task on after sign-up', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });

 // Create a clerkClient for the OAuth provider instance
 const client = createClerkClient({
 secretKey: instanceKeys.get('oauth-provider').sk,
 publishableKey: instanceKeys.get('oauth-provider').pk,
 });
 const users = createUserService(client);
 fakeUser = users.createFakeUser({
 withUsername: true,
 const fakeOrganization = Object.assign(u.services.organizations.createFakeOrganization(), {
 slug: u.services.organizations.createFakeOrganization().slug + '-with-sign-up',
 });
 // Create the user on the OAuth provider instance so we do not need to sign up twice
 await users.createBapiUser(fakeUser);

 // Performs sign-up (transfer flow with sign-in) with SSO
 await u.po.signIn.goTo();
 await u.page.getByRole('button', { name: 'E2E OAuth Provider' }).click();
 await u.page.getByText('Sign in to oauth-provider').waitFor();
 await u.po.signIn.setIdentifier(fakeUser.email);
 await u.po.signIn.continue();
 await u.po.signIn.enterTestOtpCode();

 // Resolves task
 const fakeOrganization = u.services.organizations.createFakeOrganization();
 await u.po.sessionTask.resolveForceOrganizationSelectionTask(fakeOrganization);
 await u.po.expect.toHaveResolvedTask();

 // Navigates to after sign-up
 await u.page.waitForAppUrl('/');

 // Delete the user on the OAuth provider instance
 await fakeUser.deleteIfExists();
 // Delete the user on the app instance.
 await u.services.users.deleteIfExists({ email: fakeUser.email });
 });
 },
);

2 changes: 1 addition & 1 deletion
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "files": [
 { "path": "./dist/clerk.js", "maxSize": "612.37kB" },
 { "path": "./dist/clerk.js", "maxSize": "614kB" },
 { "path": "./dist/clerk.browser.js", "maxSize": "72.2KB" },
 { "path": "./dist/clerk.legacy.browser.js", "maxSize": "115KB" },
 { "path": "./dist/clerk.headless*.js", "maxSize": "55KB" },
Expand Down

19 changes: 11 additions & 8 deletions
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1209,16 +1209,17 @@ export class Clerk implements ClerkInterface {
 }
 }

 if (newSession?.status === 'pending') {
 await this.#handlePendingSession(newSession);
 return;
 }

 /**
 * Hint to each framework, that the user will be signed out when `{session: null}` is provided.
 */
 await onBeforeSetActive(newSession === null ? 'sign-out' : undefined);

 if (newSession?.status === 'pending') {
 await this.#handlePendingSession(newSession);
 await onAfterSetActive();

Comment on lines

+1218
 to 
+1219

@LauraBeatrisLauraBeatrisJul 11, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

We weren't revalidating the server state on setActive with a pending session, fixing it now.
 return;
 }

 //1. setLastActiveSession to passed user session (add a param).
 // Note that this will also update the session's active organization
 // id.
Expand DownExpand Up@@ -1301,8 +1302,10 @@ export class Clerk implements ClerkInterface {
 eventBus.emit(events.TokenUpdate, { token: null });
 }

 // Only triggers navigation for internal routing, in order to not affect custom flows
 if (newSession?.currentTask && this.#componentNavigationContext) {
 // Only triggers navigation for internal AIO components routing or multi-session switch
 const isSwitchingSessions = this.session?.id != session.id;
 const shouldNavigateOnSetActive = this.#componentNavigationContext || isSwitchingSessions;
 if (newSession?.currentTask && shouldNavigateOnSetActive) {
 await navigateToTask(session.currentTask.key, {
 options: this.#options,
 environment: this.environment,
Expand All@@ -1317,7 +1320,7 @@ export class Clerk implements ClerkInterface {

 public __experimental_navigateToTask = async ({ redirectUrlComplete }: NextTaskParams = {}): Promise<void> => {
 /**
 * Invalidate previously cache pages with auth state before navigating
 * Invalidate previously cached pages with auth state before navigating
 */
 const onBeforeSetActive: SetActiveHook =
 typeof window !== 'undefined' && typeof window.__unstable__onBeforeSetActive === 'function'
Expand Down

3 changes: 3 additions & 0 deletions
packages/testing/src/playwright/unstable/page-objects/userButton.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,9 @@ export const createUserButtonPageObject = (testArgs: { page: EnhancedPage }) =>
 triggerManageAccount: () => {
 return page.getByRole('menuitem', { name: /Manage account/i }).click();
 },
 switchAccount: (emailAddress: string) => {
 return page.getByText(emailAddress).click();
 },
 };

 return self;
Expand Down