fix(clerk-js): Fix SSO callback for after-auth custom flows#6430

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 5 commits into from
Jul 30, 2025
Merged

fix(clerk-js): Fix SSO callback for after-auth custom flows #6430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4e85e51
Fix SSO callback for after-auth
LauraBeatris Jul 29, 2025
15c7a49
Add changeset
LauraBeatris Jul 29, 2025
2d50e64
Call `__internal_navigateToTask`
LauraBeatris Jul 29, 2025
4871e4d
Update JSDocs for `session` return from `useSession`
LauraBeatris Jul 30, 2025
613f916
Do not pass `redirectUrlComplete` to `navigateToTask`
LauraBeatris Jul 30, 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/metal-geese-double.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/types': patch
---

Fix `UseSessionReturn['session']` JSDocs to not mention active status, since pending sessions are also returned
5 changes: 5 additions & 0 deletions .changeset/yummy-ghosts-share.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Fix SSO callback for after-auth custom flows
112 changes: 112 additions & 0 deletions packages/clerk-js/src/core/__tests__/clerk.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -923,6 +923,118 @@ describe('Clerk singleton', () => {
mockEnvironmentFetch.mockReset();
});

describe('with after-auth flows', () => {
beforeEach(() => {
mockClientFetch.mockReset();
mockEnvironmentFetch.mockReturnValue(
Promise.resolve({
userSettings: mockUserSettings,
displayConfig: mockDisplayConfig,
isSingleSession: () => false,
isProduction: () => false,
isDevelopmentOrStaging: () => true,
organizationSettings: {
forceOrganizationSelection: true,
},
}),
);
});

it('redirects to pending task', async () => {
const mockSession = {
id: '1',
status: 'pending',
user: {},
tasks: [{ key: 'select-organization' }],
currentTask: { key: 'select-organization', __internal_getUrl: () => 'https://sut/tasks/select-organization' },
lastActiveToken: { getRawString: () => 'mocked-token' },
};

const mockResource = {
...mockSession,
remove: jest.fn(),
touch: jest.fn(() => Promise.resolve()),
getToken: jest.fn(),
reload: jest.fn(() => Promise.resolve(mockSession)),
};

mockResource.touch.mockReturnValueOnce(Promise.resolve());
mockClientFetch.mockReturnValue(
Promise.resolve({
signedInSessions: [mockResource],
signIn: new SignIn(null),
signUp: new SignUp({
status: 'complete',
} as any as SignUpJSON),
}),
);

const mockSetActive = jest.fn();
const mockSignUpCreate = jest
.fn()
.mockReturnValue(Promise.resolve({ status: 'complete', createdSessionId: '123' }));

const sut = new Clerk(productionPublishableKey);
await sut.load(mockedLoadOptions);
if (!sut.client) {
fail('we should always have a client');
}
sut.client.signUp.create = mockSignUpCreate;
sut.setActive = mockSetActive;

await sut.handleRedirectCallback();

await waitFor(() => {
expect(mockNavigate.mock.calls[0][0]).toBe('/sign-in#/tasks/select-organization');
});
});

it('redirects to after sign-in URL when task has been resolved', async () => {
const mockSession = {
id: '1',
status: 'active',
user: {},
lastActiveToken: { getRawString: () => 'mocked-token' },
};

const mockResource = {
...mockSession,
remove: jest.fn(),
touch: jest.fn(() => Promise.resolve()),
getToken: jest.fn(),
reload: jest.fn(() => Promise.resolve(mockSession)),
};

mockResource.touch.mockReturnValueOnce(Promise.resolve());
mockClientFetch.mockReturnValue(
Promise.resolve({
signedInSessions: [mockResource],
signIn: new SignIn(null),
signUp: new SignUp(null),
}),
);

const mockSetActive = jest.fn();
const mockSignUpCreate = jest
.fn()
.mockReturnValue(Promise.resolve({ status: 'complete', createdSessionId: '123' }));

const sut = new Clerk(productionPublishableKey);
await sut.load(mockedLoadOptions);
if (!sut.client) {
fail('we should always have a client');
}
sut.client.signUp.create = mockSignUpCreate;
sut.setActive = mockSetActive;

await sut.handleRedirectCallback();

await waitFor(() => {
expect(mockNavigate.mock.calls[0][0]).toBe('/');
});
});
});

it('creates a new user and calls setActive if the user was not found during sso signup', async () => {
mockEnvironmentFetch.mockReturnValue(
Promise.resolve({
Expand Down
16 changes: 12 additions & 4 deletions packages/clerk-js/src/core/clerk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1879,10 +1879,11 @@ export class Clerk implements ClerkInterface {
};

if (si.status === 'complete') {
return this.setActive({
await this.setActive({
session: si.sessionId,
redirectUrl: redirectUrls.getAfterSignInUrl(),
});
return this.__internal_navigateToTaskIfAvailable();
}

const userExistsButNeedsToSignIn =
Expand All@@ -1892,10 +1893,11 @@ export class Clerk implements ClerkInterface {
const res = await signIn.create({ transfer: true });
switch (res.status) {
case 'complete':
return this.setActive({
await this.setActive({
session: res.createdSessionId,
redirectUrl: redirectUrls.getAfterSignInUrl(),
});
return this.__internal_navigateToTaskIfAvailable();
case 'needs_first_factor':
return navigateToFactorOne();
case 'needs_second_factor':
Expand DownExpand Up@@ -1941,10 +1943,11 @@ export class Clerk implements ClerkInterface {
const res = await signUp.create({ transfer: true });
switch (res.status) {
case 'complete':
return this.setActive({
await this.setActive({
session: res.createdSessionId,
redirectUrl: redirectUrls.getAfterSignUpUrl(),
});
return this.__internal_navigateToTaskIfAvailable();
case 'missing_requirements':
return navigateToNextStepSignUp({ missingFields: res.missingFields });
default:
Expand All@@ -1953,10 +1956,11 @@ export class Clerk implements ClerkInterface {
}

if (su.status === 'complete') {
return this.setActive({
await this.setActive({
session: su.sessionId,
redirectUrl: redirectUrls.getAfterSignUpUrl(),
});
return this.__internal_navigateToTaskIfAvailable();
}

if (si.status === 'needs_second_factor') {
Expand DownExpand Up@@ -1992,6 +1996,10 @@ export class Clerk implements ClerkInterface {
return navigateToNextStepSignUp({ missingFields: signUp.missingFields });
}

if (this.__internal_hasAfterAuthFlows) {
return this.__internal_navigateToTaskIfAvailable({ redirectUrlComplete: redirectUrls.getAfterSignInUrl() });
}

return navigateToSignIn();
};

Expand Down
6 changes: 5 additions & 1 deletion packages/clerk-js/src/core/resources/SignIn.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ import type {
} from '@clerk/types';

import {
buildURL,
generateSignatureWithCoinbaseWallet,
generateSignatureWithMetamask,
generateSignatureWithOKXWallet,
Expand DownExpand Up@@ -239,7 +240,10 @@ export class SignIn extends BaseResource implements SignInResource {
// This ensures organization selection tasks are displayed after sign-in,
// rather than redirecting to potentially unprotected pages while the session is pending.
const actionCompleteRedirectUrl = SignIn.clerk.__internal_hasAfterAuthFlows
? redirectUrlWithAuthToken
? buildURL({
base: redirectUrlWithAuthToken,
search: `?redirect_url=${redirectUrlComplete}`,
}).toString()
: redirectUrlComplete;

if (!this.id || !continueSignIn) {
Expand Down
8 changes: 1 addition & 7 deletions packages/clerk-js/src/ui/common/SSOCallback.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,19 +19,13 @@ export const SSOCallback = withCardStateProvider<HandleOAuthCallbackParams | Han
});

export const SSOCallbackCard = (props: HandleOAuthCallbackParams | HandleSamlCallbackParams) => {
const { handleRedirectCallback, __internal_setActiveInProgress, __internal_navigateToTaskIfAvailable, session } =
useClerk();
const { handleRedirectCallback, __internal_setActiveInProgress } = useClerk();
const { navigate } = useRouter();
const card = useCardState();

React.useEffect(() => {
let timeoutId: ReturnType<typeof setTimeout>;
if (__internal_setActiveInProgress !== true) {
if (session?.currentTask) {
void __internal_navigateToTaskIfAvailable();
return;
}

const intent = new URLSearchParams(window.location.search).get('intent');
const reloadResource = intent === 'signIn' || intent === 'signUp' ? intent : undefined;
handleRedirectCallback({ ...props, reloadResource }, navigate).catch(e => {
Expand Down
2 changes: 1 addition & 1 deletion packages/types/src/hooks.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -180,7 +180,7 @@ export type UseSessionReturn =
*/
isSignedIn: undefined;
/**
* The current active session for the user.
* The current session for the user.
*/
session: undefined;
}
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): Fix SSO callback for after-auth custom flows#6430

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

from

Jul 30, 2025
 Merged


fix(clerk-js): Fix SSO callback for after-auth custom flows
#6430
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
4e85e51

Fix SSO callback for after-auth


LauraBeatris Jul 29, 2025
15c7a49

Add changeset


LauraBeatris Jul 29, 2025
2d50e64

Call `__internal_navigateToTask`


LauraBeatris Jul 29, 2025
4871e4d

Update JSDocs for `session` return from `useSession`


LauraBeatris Jul 30, 2025
613f916

Do not pass `redirectUrlComplete` to `navigateToTask`


LauraBeatris Jul 30, 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/metal-geese-double.md

View file


Open in desktop

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

Fix `UseSessionReturn['session']` JSDocs to not mention active status, since pending sessions are also returned

5 changes: 5 additions & 0 deletions
.changeset/yummy-ghosts-share.md

View file


Open in desktop

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

Fix SSO callback for after-auth custom flows

112 changes: 112 additions & 0 deletions
packages/clerk-js/src/core/__tests__/clerk.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -923,6 +923,118 @@ describe('Clerk singleton', () => {
 mockEnvironmentFetch.mockReset();
 });

 describe('with after-auth flows', () => {
 beforeEach(() => {
 mockClientFetch.mockReset();
 mockEnvironmentFetch.mockReturnValue(
 Promise.resolve({
 userSettings: mockUserSettings,
 displayConfig: mockDisplayConfig,
 isSingleSession: () => false,
 isProduction: () => false,
 isDevelopmentOrStaging: () => true,
 organizationSettings: {
 forceOrganizationSelection: true,
 },
 }),
 );
 });

 it('redirects to pending task', async () => {
 const mockSession = {
 id: '1',
 status: 'pending',
 user: {},
 tasks: [{ key: 'select-organization' }],
 currentTask: { key: 'select-organization', __internal_getUrl: () => 'https://sut/tasks/select-organization' },
 lastActiveToken: { getRawString: () => 'mocked-token' },
 };

 const mockResource = {
 ...mockSession,
 remove: jest.fn(),
 touch: jest.fn(() => Promise.resolve()),
 getToken: jest.fn(),
 reload: jest.fn(() => Promise.resolve(mockSession)),
 };

 mockResource.touch.mockReturnValueOnce(Promise.resolve());
 mockClientFetch.mockReturnValue(
 Promise.resolve({
 signedInSessions: [mockResource],
 signIn: new SignIn(null),
 signUp: new SignUp({
 status: 'complete',
 } as any as SignUpJSON),
 }),
 );

 const mockSetActive = jest.fn();
 const mockSignUpCreate = jest
 .fn()
 .mockReturnValue(Promise.resolve({ status: 'complete', createdSessionId: '123' }));

 const sut = new Clerk(productionPublishableKey);
 await sut.load(mockedLoadOptions);
 if (!sut.client) {
 fail('we should always have a client');
 }
 sut.client.signUp.create = mockSignUpCreate;
 sut.setActive = mockSetActive;

 await sut.handleRedirectCallback();

 await waitFor(() => {
 expect(mockNavigate.mock.calls[0][0]).toBe('/sign-in#/tasks/select-organization');
 });
 });

 it('redirects to after sign-in URL when task has been resolved', async () => {
 const mockSession = {
 id: '1',
 status: 'active',
 user: {},
 lastActiveToken: { getRawString: () => 'mocked-token' },
 };

 const mockResource = {
 ...mockSession,
 remove: jest.fn(),
 touch: jest.fn(() => Promise.resolve()),
 getToken: jest.fn(),
 reload: jest.fn(() => Promise.resolve(mockSession)),
 };

 mockResource.touch.mockReturnValueOnce(Promise.resolve());
 mockClientFetch.mockReturnValue(
 Promise.resolve({
 signedInSessions: [mockResource],
 signIn: new SignIn(null),
 signUp: new SignUp(null),
 }),
 );

 const mockSetActive = jest.fn();
 const mockSignUpCreate = jest
 .fn()
 .mockReturnValue(Promise.resolve({ status: 'complete', createdSessionId: '123' }));

 const sut = new Clerk(productionPublishableKey);
 await sut.load(mockedLoadOptions);
 if (!sut.client) {
 fail('we should always have a client');
 }
 sut.client.signUp.create = mockSignUpCreate;
 sut.setActive = mockSetActive;

 await sut.handleRedirectCallback();

 await waitFor(() => {
 expect(mockNavigate.mock.calls[0][0]).toBe('/');
 });
 });
 });

 it('creates a new user and calls setActive if the user was not found during sso signup', async () => {
 mockEnvironmentFetch.mockReturnValue(
 Promise.resolve({
Expand Down

16 changes: 12 additions & 4 deletions
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1879,10 +1879,11 @@ export class Clerk implements ClerkInterface {
 };

 if (si.status === 'complete') {
return this.setActive({
await this.setActive({
 session: si.sessionId,
 redirectUrl: redirectUrls.getAfterSignInUrl(),
 });
 return this.__internal_navigateToTaskIfAvailable();
 }

 const userExistsButNeedsToSignIn =
Expand All@@ -1892,10 +1893,11 @@ export class Clerk implements ClerkInterface {
 const res = await signIn.create({ transfer: true });
 switch (res.status) {
 case 'complete':
return this.setActive({
await this.setActive({
 session: res.createdSessionId,
 redirectUrl: redirectUrls.getAfterSignInUrl(),
 });
 return this.__internal_navigateToTaskIfAvailable();
 case 'needs_first_factor':
 return navigateToFactorOne();
 case 'needs_second_factor':
Expand DownExpand Up@@ -1941,10 +1943,11 @@ export class Clerk implements ClerkInterface {
 const res = await signUp.create({ transfer: true });
 switch (res.status) {
 case 'complete':
return this.setActive({
await this.setActive({
 session: res.createdSessionId,
 redirectUrl: redirectUrls.getAfterSignUpUrl(),
 });
 return this.__internal_navigateToTaskIfAvailable();
 case 'missing_requirements':
 return navigateToNextStepSignUp({ missingFields: res.missingFields });
 default:
Expand All@@ -1953,10 +1956,11 @@ export class Clerk implements ClerkInterface {
 }

 if (su.status === 'complete') {
return this.setActive({
await this.setActive({
 session: su.sessionId,
 redirectUrl: redirectUrls.getAfterSignUpUrl(),
 });
 return this.__internal_navigateToTaskIfAvailable();
 }

 if (si.status === 'needs_second_factor') {
Expand DownExpand Up@@ -1992,6 +1996,10 @@ export class Clerk implements ClerkInterface {
 return navigateToNextStepSignUp({ missingFields: signUp.missingFields });
 }

 if (this.__internal_hasAfterAuthFlows) {
 return this.__internal_navigateToTaskIfAvailable({ redirectUrlComplete: redirectUrls.getAfterSignInUrl() });
 }

 return navigateToSignIn();
 };

Expand Down

6 changes: 5 additions & 1 deletion
packages/clerk-js/src/core/resources/SignIn.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ import type {
} from '@clerk/types';

import {
 buildURL,
 generateSignatureWithCoinbaseWallet,
 generateSignatureWithMetamask,
 generateSignatureWithOKXWallet,
Expand DownExpand Up@@ -239,7 +240,10 @@ export class SignIn extends BaseResource implements SignInResource {
 // This ensures organization selection tasks are displayed after sign-in,
 // rather than redirecting to potentially unprotected pages while the session is pending.
 const actionCompleteRedirectUrl = SignIn.clerk.__internal_hasAfterAuthFlows
 ? redirectUrlWithAuthToken
 ? buildURL({
 base: redirectUrlWithAuthToken,
 search: `?redirect_url=${redirectUrlComplete}`,
 }).toString()
 : redirectUrlComplete;

 if (!this.id || !continueSignIn) {
Expand Down

8 changes: 1 addition & 7 deletions
packages/clerk-js/src/ui/common/SSOCallback.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,19 +19,13 @@ export const SSOCallback = withCardStateProvider<HandleOAuthCallbackParams | Han
});

export const SSOCallbackCard = (props: HandleOAuthCallbackParams | HandleSamlCallbackParams) => {
 const { handleRedirectCallback, __internal_setActiveInProgress, __internal_navigateToTaskIfAvailable, session } =
 useClerk();
 const { handleRedirectCallback, __internal_setActiveInProgress } = useClerk();
 const { navigate } = useRouter();
 const card = useCardState();

 React.useEffect(() => {
 let timeoutId: ReturnType<typeof setTimeout>;
 if (__internal_setActiveInProgress !== true) {
 if (session?.currentTask) {
 void __internal_navigateToTaskIfAvailable();
 return;
 }

 const intent = new URLSearchParams(window.location.search).get('intent');
 const reloadResource = intent === 'signIn' || intent === 'signUp' ? intent : undefined;
 handleRedirectCallback({ ...props, reloadResource }, navigate).catch(e => {
Expand Down

2 changes: 1 addition & 1 deletion
packages/types/src/hooks.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -180,7 +180,7 @@ export type UseSessionReturn =
 */
 isSignedIn: undefined;
 /**
 * The current active session for the user.
 * The current session for the user.
 */
 session: undefined;
 }
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): Fix SSO callback for after-auth custom flows#6430

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

from

Jul 30, 2025
 Merged


fix(clerk-js): Fix SSO callback for after-auth custom flows
#6430
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
4e85e51

Fix SSO callback for after-auth


LauraBeatris Jul 29, 2025
15c7a49

Add changeset


LauraBeatris Jul 29, 2025
2d50e64

Call `__internal_navigateToTask`


LauraBeatris Jul 29, 2025
4871e4d

Update JSDocs for `session` return from `useSession`


LauraBeatris Jul 30, 2025
613f916

Do not pass `redirectUrlComplete` to `navigateToTask`


LauraBeatris Jul 30, 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/metal-geese-double.md

View file


Open in desktop

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

Fix `UseSessionReturn['session']` JSDocs to not mention active status, since pending sessions are also returned

5 changes: 5 additions & 0 deletions
.changeset/yummy-ghosts-share.md

View file


Open in desktop

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

Fix SSO callback for after-auth custom flows

112 changes: 112 additions & 0 deletions
packages/clerk-js/src/core/__tests__/clerk.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -923,6 +923,118 @@ describe('Clerk singleton', () => {
 mockEnvironmentFetch.mockReset();
 });

 describe('with after-auth flows', () => {
 beforeEach(() => {
 mockClientFetch.mockReset();
 mockEnvironmentFetch.mockReturnValue(
 Promise.resolve({
 userSettings: mockUserSettings,
 displayConfig: mockDisplayConfig,
 isSingleSession: () => false,
 isProduction: () => false,
 isDevelopmentOrStaging: () => true,
 organizationSettings: {
 forceOrganizationSelection: true,
 },
 }),
 );
 });

 it('redirects to pending task', async () => {
 const mockSession = {
 id: '1',
 status: 'pending',
 user: {},
 tasks: [{ key: 'select-organization' }],
 currentTask: { key: 'select-organization', __internal_getUrl: () => 'https://sut/tasks/select-organization' },
 lastActiveToken: { getRawString: () => 'mocked-token' },
 };

 const mockResource = {
 ...mockSession,
 remove: jest.fn(),
 touch: jest.fn(() => Promise.resolve()),
 getToken: jest.fn(),
 reload: jest.fn(() => Promise.resolve(mockSession)),
 };

 mockResource.touch.mockReturnValueOnce(Promise.resolve());
 mockClientFetch.mockReturnValue(
 Promise.resolve({
 signedInSessions: [mockResource],
 signIn: new SignIn(null),
 signUp: new SignUp({
 status: 'complete',
 } as any as SignUpJSON),
 }),
 );

 const mockSetActive = jest.fn();
 const mockSignUpCreate = jest
 .fn()
 .mockReturnValue(Promise.resolve({ status: 'complete', createdSessionId: '123' }));

 const sut = new Clerk(productionPublishableKey);
 await sut.load(mockedLoadOptions);
 if (!sut.client) {
 fail('we should always have a client');
 }
 sut.client.signUp.create = mockSignUpCreate;
 sut.setActive = mockSetActive;

 await sut.handleRedirectCallback();

 await waitFor(() => {
 expect(mockNavigate.mock.calls[0][0]).toBe('/sign-in#/tasks/select-organization');
 });
 });

 it('redirects to after sign-in URL when task has been resolved', async () => {
 const mockSession = {
 id: '1',
 status: 'active',
 user: {},
 lastActiveToken: { getRawString: () => 'mocked-token' },
 };

 const mockResource = {
 ...mockSession,
 remove: jest.fn(),
 touch: jest.fn(() => Promise.resolve()),
 getToken: jest.fn(),
 reload: jest.fn(() => Promise.resolve(mockSession)),
 };

 mockResource.touch.mockReturnValueOnce(Promise.resolve());
 mockClientFetch.mockReturnValue(
 Promise.resolve({
 signedInSessions: [mockResource],
 signIn: new SignIn(null),
 signUp: new SignUp(null),
 }),
 );

 const mockSetActive = jest.fn();
 const mockSignUpCreate = jest
 .fn()
 .mockReturnValue(Promise.resolve({ status: 'complete', createdSessionId: '123' }));

 const sut = new Clerk(productionPublishableKey);
 await sut.load(mockedLoadOptions);
 if (!sut.client) {
 fail('we should always have a client');
 }
 sut.client.signUp.create = mockSignUpCreate;
 sut.setActive = mockSetActive;

 await sut.handleRedirectCallback();

 await waitFor(() => {
 expect(mockNavigate.mock.calls[0][0]).toBe('/');
 });
 });
 });

 it('creates a new user and calls setActive if the user was not found during sso signup', async () => {
 mockEnvironmentFetch.mockReturnValue(
 Promise.resolve({
Expand Down

16 changes: 12 additions & 4 deletions
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1879,10 +1879,11 @@ export class Clerk implements ClerkInterface {
 };

 if (si.status === 'complete') {
return this.setActive({
await this.setActive({
 session: si.sessionId,
 redirectUrl: redirectUrls.getAfterSignInUrl(),
 });
 return this.__internal_navigateToTaskIfAvailable();
 }

 const userExistsButNeedsToSignIn =
Expand All@@ -1892,10 +1893,11 @@ export class Clerk implements ClerkInterface {
 const res = await signIn.create({ transfer: true });
 switch (res.status) {
 case 'complete':
return this.setActive({
await this.setActive({
 session: res.createdSessionId,
 redirectUrl: redirectUrls.getAfterSignInUrl(),
 });
 return this.__internal_navigateToTaskIfAvailable();
 case 'needs_first_factor':
 return navigateToFactorOne();
 case 'needs_second_factor':
Expand DownExpand Up@@ -1941,10 +1943,11 @@ export class Clerk implements ClerkInterface {
 const res = await signUp.create({ transfer: true });
 switch (res.status) {
 case 'complete':
return this.setActive({
await this.setActive({
 session: res.createdSessionId,
 redirectUrl: redirectUrls.getAfterSignUpUrl(),
 });
 return this.__internal_navigateToTaskIfAvailable();
 case 'missing_requirements':
 return navigateToNextStepSignUp({ missingFields: res.missingFields });
 default:
Expand All@@ -1953,10 +1956,11 @@ export class Clerk implements ClerkInterface {
 }

 if (su.status === 'complete') {
return this.setActive({
await this.setActive({
 session: su.sessionId,
 redirectUrl: redirectUrls.getAfterSignUpUrl(),
 });
 return this.__internal_navigateToTaskIfAvailable();
 }

 if (si.status === 'needs_second_factor') {
Expand DownExpand Up@@ -1992,6 +1996,10 @@ export class Clerk implements ClerkInterface {
 return navigateToNextStepSignUp({ missingFields: signUp.missingFields });
 }

 if (this.__internal_hasAfterAuthFlows) {
 return this.__internal_navigateToTaskIfAvailable({ redirectUrlComplete: redirectUrls.getAfterSignInUrl() });
 }

 return navigateToSignIn();
 };

Expand Down

6 changes: 5 additions & 1 deletion
packages/clerk-js/src/core/resources/SignIn.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ import type {
} from '@clerk/types';

import {
 buildURL,
 generateSignatureWithCoinbaseWallet,
 generateSignatureWithMetamask,
 generateSignatureWithOKXWallet,
Expand DownExpand Up@@ -239,7 +240,10 @@ export class SignIn extends BaseResource implements SignInResource {
 // This ensures organization selection tasks are displayed after sign-in,
 // rather than redirecting to potentially unprotected pages while the session is pending.
 const actionCompleteRedirectUrl = SignIn.clerk.__internal_hasAfterAuthFlows
 ? redirectUrlWithAuthToken
 ? buildURL({
 base: redirectUrlWithAuthToken,
 search: `?redirect_url=${redirectUrlComplete}`,
 }).toString()
 : redirectUrlComplete;

 if (!this.id || !continueSignIn) {
Expand Down

8 changes: 1 addition & 7 deletions
packages/clerk-js/src/ui/common/SSOCallback.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,19 +19,13 @@ export const SSOCallback = withCardStateProvider<HandleOAuthCallbackParams | Han
});

export const SSOCallbackCard = (props: HandleOAuthCallbackParams | HandleSamlCallbackParams) => {
 const { handleRedirectCallback, __internal_setActiveInProgress, __internal_navigateToTaskIfAvailable, session } =
 useClerk();
 const { handleRedirectCallback, __internal_setActiveInProgress } = useClerk();
 const { navigate } = useRouter();
 const card = useCardState();

 React.useEffect(() => {
 let timeoutId: ReturnType<typeof setTimeout>;
 if (__internal_setActiveInProgress !== true) {
 if (session?.currentTask) {
 void __internal_navigateToTaskIfAvailable();
 return;
 }

 const intent = new URLSearchParams(window.location.search).get('intent');
 const reloadResource = intent === 'signIn' || intent === 'signUp' ? intent : undefined;
 handleRedirectCallback({ ...props, reloadResource }, navigate).catch(e => {
Expand Down

2 changes: 1 addition & 1 deletion
packages/types/src/hooks.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -180,7 +180,7 @@ export type UseSessionReturn =
 */
 isSignedIn: undefined;
 /**
 * The current active session for the user.
 * The current session for the user.
 */
 session: undefined;
 }
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): Fix SSO callback for after-auth custom flows#6430

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

from

Jul 30, 2025
 Merged


fix(clerk-js): Fix SSO callback for after-auth custom flows
#6430
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
4e85e51

Fix SSO callback for after-auth


LauraBeatris Jul 29, 2025
15c7a49

Add changeset


LauraBeatris Jul 29, 2025
2d50e64

Call `__internal_navigateToTask`


LauraBeatris Jul 29, 2025
4871e4d

Update JSDocs for `session` return from `useSession`


LauraBeatris Jul 30, 2025
613f916

Do not pass `redirectUrlComplete` to `navigateToTask`


LauraBeatris Jul 30, 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/metal-geese-double.md

View file


Open in desktop

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

Fix `UseSessionReturn['session']` JSDocs to not mention active status, since pending sessions are also returned

5 changes: 5 additions & 0 deletions
.changeset/yummy-ghosts-share.md

View file


Open in desktop

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

Fix SSO callback for after-auth custom flows

112 changes: 112 additions & 0 deletions
packages/clerk-js/src/core/__tests__/clerk.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -923,6 +923,118 @@ describe('Clerk singleton', () => {
 mockEnvironmentFetch.mockReset();
 });

 describe('with after-auth flows', () => {
 beforeEach(() => {
 mockClientFetch.mockReset();
 mockEnvironmentFetch.mockReturnValue(
 Promise.resolve({
 userSettings: mockUserSettings,
 displayConfig: mockDisplayConfig,
 isSingleSession: () => false,
 isProduction: () => false,
 isDevelopmentOrStaging: () => true,
 organizationSettings: {
 forceOrganizationSelection: true,
 },
 }),
 );
 });

 it('redirects to pending task', async () => {
 const mockSession = {
 id: '1',
 status: 'pending',
 user: {},
 tasks: [{ key: 'select-organization' }],
 currentTask: { key: 'select-organization', __internal_getUrl: () => 'https://sut/tasks/select-organization' },
 lastActiveToken: { getRawString: () => 'mocked-token' },
 };

 const mockResource = {
 ...mockSession,
 remove: jest.fn(),
 touch: jest.fn(() => Promise.resolve()),
 getToken: jest.fn(),
 reload: jest.fn(() => Promise.resolve(mockSession)),
 };

 mockResource.touch.mockReturnValueOnce(Promise.resolve());
 mockClientFetch.mockReturnValue(
 Promise.resolve({
 signedInSessions: [mockResource],
 signIn: new SignIn(null),
 signUp: new SignUp({
 status: 'complete',
 } as any as SignUpJSON),
 }),
 );

 const mockSetActive = jest.fn();
 const mockSignUpCreate = jest
 .fn()
 .mockReturnValue(Promise.resolve({ status: 'complete', createdSessionId: '123' }));

 const sut = new Clerk(productionPublishableKey);
 await sut.load(mockedLoadOptions);
 if (!sut.client) {
 fail('we should always have a client');
 }
 sut.client.signUp.create = mockSignUpCreate;
 sut.setActive = mockSetActive;

 await sut.handleRedirectCallback();

 await waitFor(() => {
 expect(mockNavigate.mock.calls[0][0]).toBe('/sign-in#/tasks/select-organization');
 });
 });

 it('redirects to after sign-in URL when task has been resolved', async () => {
 const mockSession = {
 id: '1',
 status: 'active',
 user: {},
 lastActiveToken: { getRawString: () => 'mocked-token' },
 };

 const mockResource = {
 ...mockSession,
 remove: jest.fn(),
 touch: jest.fn(() => Promise.resolve()),
 getToken: jest.fn(),
 reload: jest.fn(() => Promise.resolve(mockSession)),
 };

 mockResource.touch.mockReturnValueOnce(Promise.resolve());
 mockClientFetch.mockReturnValue(
 Promise.resolve({
 signedInSessions: [mockResource],
 signIn: new SignIn(null),
 signUp: new SignUp(null),
 }),
 );

 const mockSetActive = jest.fn();
 const mockSignUpCreate = jest
 .fn()
 .mockReturnValue(Promise.resolve({ status: 'complete', createdSessionId: '123' }));

 const sut = new Clerk(productionPublishableKey);
 await sut.load(mockedLoadOptions);
 if (!sut.client) {
 fail('we should always have a client');
 }
 sut.client.signUp.create = mockSignUpCreate;
 sut.setActive = mockSetActive;

 await sut.handleRedirectCallback();

 await waitFor(() => {
 expect(mockNavigate.mock.calls[0][0]).toBe('/');
 });
 });
 });

 it('creates a new user and calls setActive if the user was not found during sso signup', async () => {
 mockEnvironmentFetch.mockReturnValue(
 Promise.resolve({
Expand Down

16 changes: 12 additions & 4 deletions
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1879,10 +1879,11 @@ export class Clerk implements ClerkInterface {
 };

 if (si.status === 'complete') {
return this.setActive({
await this.setActive({
 session: si.sessionId,
 redirectUrl: redirectUrls.getAfterSignInUrl(),
 });
 return this.__internal_navigateToTaskIfAvailable();
 }

 const userExistsButNeedsToSignIn =
Expand All@@ -1892,10 +1893,11 @@ export class Clerk implements ClerkInterface {
 const res = await signIn.create({ transfer: true });
 switch (res.status) {
 case 'complete':
return this.setActive({
await this.setActive({
 session: res.createdSessionId,
 redirectUrl: redirectUrls.getAfterSignInUrl(),
 });
 return this.__internal_navigateToTaskIfAvailable();
 case 'needs_first_factor':
 return navigateToFactorOne();
 case 'needs_second_factor':
Expand DownExpand Up@@ -1941,10 +1943,11 @@ export class Clerk implements ClerkInterface {
 const res = await signUp.create({ transfer: true });
 switch (res.status) {
 case 'complete':
return this.setActive({
await this.setActive({
 session: res.createdSessionId,
 redirectUrl: redirectUrls.getAfterSignUpUrl(),
 });
 return this.__internal_navigateToTaskIfAvailable();
 case 'missing_requirements':
 return navigateToNextStepSignUp({ missingFields: res.missingFields });
 default:
Expand All@@ -1953,10 +1956,11 @@ export class Clerk implements ClerkInterface {
 }

 if (su.status === 'complete') {
return this.setActive({
await this.setActive({
 session: su.sessionId,
 redirectUrl: redirectUrls.getAfterSignUpUrl(),
 });
 return this.__internal_navigateToTaskIfAvailable();
 }

 if (si.status === 'needs_second_factor') {
Expand DownExpand Up@@ -1992,6 +1996,10 @@ export class Clerk implements ClerkInterface {
 return navigateToNextStepSignUp({ missingFields: signUp.missingFields });
 }

 if (this.__internal_hasAfterAuthFlows) {
 return this.__internal_navigateToTaskIfAvailable({ redirectUrlComplete: redirectUrls.getAfterSignInUrl() });
 }

 return navigateToSignIn();
 };

Expand Down

6 changes: 5 additions & 1 deletion
packages/clerk-js/src/core/resources/SignIn.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ import type {
} from '@clerk/types';

import {
 buildURL,
 generateSignatureWithCoinbaseWallet,
 generateSignatureWithMetamask,
 generateSignatureWithOKXWallet,
Expand DownExpand Up@@ -239,7 +240,10 @@ export class SignIn extends BaseResource implements SignInResource {
 // This ensures organization selection tasks are displayed after sign-in,
 // rather than redirecting to potentially unprotected pages while the session is pending.
 const actionCompleteRedirectUrl = SignIn.clerk.__internal_hasAfterAuthFlows
 ? redirectUrlWithAuthToken
 ? buildURL({
 base: redirectUrlWithAuthToken,
 search: `?redirect_url=${redirectUrlComplete}`,
 }).toString()
 : redirectUrlComplete;

 if (!this.id || !continueSignIn) {
Expand Down

8 changes: 1 addition & 7 deletions
packages/clerk-js/src/ui/common/SSOCallback.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,19 +19,13 @@ export const SSOCallback = withCardStateProvider<HandleOAuthCallbackParams | Han
});

export const SSOCallbackCard = (props: HandleOAuthCallbackParams | HandleSamlCallbackParams) => {
 const { handleRedirectCallback, __internal_setActiveInProgress, __internal_navigateToTaskIfAvailable, session } =
 useClerk();
 const { handleRedirectCallback, __internal_setActiveInProgress } = useClerk();
 const { navigate } = useRouter();
 const card = useCardState();

 React.useEffect(() => {
 let timeoutId: ReturnType<typeof setTimeout>;
 if (__internal_setActiveInProgress !== true) {
 if (session?.currentTask) {
 void __internal_navigateToTaskIfAvailable();
 return;
 }

 const intent = new URLSearchParams(window.location.search).get('intent');
 const reloadResource = intent === 'signIn' || intent === 'signUp' ? intent : undefined;
 handleRedirectCallback({ ...props, reloadResource }, navigate).catch(e => {
Expand Down

2 changes: 1 addition & 1 deletion
packages/types/src/hooks.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -180,7 +180,7 @@ export type UseSessionReturn =
 */
 isSignedIn: undefined;
 /**
 * The current active session for the user.
 * The current session for the user.
 */
 session: undefined;
 }
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): Fix SSO callback for after-auth custom flows#6430

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

from

Jul 30, 2025
 Merged


fix(clerk-js): Fix SSO callback for after-auth custom flows
#6430
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
4e85e51

Fix SSO callback for after-auth


LauraBeatris Jul 29, 2025
15c7a49

Add changeset


LauraBeatris Jul 29, 2025
2d50e64

Call `__internal_navigateToTask`


LauraBeatris Jul 29, 2025
4871e4d

Update JSDocs for `session` return from `useSession`


LauraBeatris Jul 30, 2025
613f916

Do not pass `redirectUrlComplete` to `navigateToTask`


LauraBeatris Jul 30, 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/metal-geese-double.md

View file


Open in desktop

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

Fix `UseSessionReturn['session']` JSDocs to not mention active status, since pending sessions are also returned

5 changes: 5 additions & 0 deletions
.changeset/yummy-ghosts-share.md

View file


Open in desktop

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

Fix SSO callback for after-auth custom flows

112 changes: 112 additions & 0 deletions
packages/clerk-js/src/core/__tests__/clerk.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -923,6 +923,118 @@ describe('Clerk singleton', () => {
 mockEnvironmentFetch.mockReset();
 });

 describe('with after-auth flows', () => {
 beforeEach(() => {
 mockClientFetch.mockReset();
 mockEnvironmentFetch.mockReturnValue(
 Promise.resolve({
 userSettings: mockUserSettings,
 displayConfig: mockDisplayConfig,
 isSingleSession: () => false,
 isProduction: () => false,
 isDevelopmentOrStaging: () => true,
 organizationSettings: {
 forceOrganizationSelection: true,
 },
 }),
 );
 });

 it('redirects to pending task', async () => {
 const mockSession = {
 id: '1',
 status: 'pending',
 user: {},
 tasks: [{ key: 'select-organization' }],
 currentTask: { key: 'select-organization', __internal_getUrl: () => 'https://sut/tasks/select-organization' },
 lastActiveToken: { getRawString: () => 'mocked-token' },
 };

 const mockResource = {
 ...mockSession,
 remove: jest.fn(),
 touch: jest.fn(() => Promise.resolve()),
 getToken: jest.fn(),
 reload: jest.fn(() => Promise.resolve(mockSession)),
 };

 mockResource.touch.mockReturnValueOnce(Promise.resolve());
 mockClientFetch.mockReturnValue(
 Promise.resolve({
 signedInSessions: [mockResource],
 signIn: new SignIn(null),
 signUp: new SignUp({
 status: 'complete',
 } as any as SignUpJSON),
 }),
 );

 const mockSetActive = jest.fn();
 const mockSignUpCreate = jest
 .fn()
 .mockReturnValue(Promise.resolve({ status: 'complete', createdSessionId: '123' }));

 const sut = new Clerk(productionPublishableKey);
 await sut.load(mockedLoadOptions);
 if (!sut.client) {
 fail('we should always have a client');
 }
 sut.client.signUp.create = mockSignUpCreate;
 sut.setActive = mockSetActive;

 await sut.handleRedirectCallback();

 await waitFor(() => {
 expect(mockNavigate.mock.calls[0][0]).toBe('/sign-in#/tasks/select-organization');
 });
 });

 it('redirects to after sign-in URL when task has been resolved', async () => {
 const mockSession = {
 id: '1',
 status: 'active',
 user: {},
 lastActiveToken: { getRawString: () => 'mocked-token' },
 };

 const mockResource = {
 ...mockSession,
 remove: jest.fn(),
 touch: jest.fn(() => Promise.resolve()),
 getToken: jest.fn(),
 reload: jest.fn(() => Promise.resolve(mockSession)),
 };

 mockResource.touch.mockReturnValueOnce(Promise.resolve());
 mockClientFetch.mockReturnValue(
 Promise.resolve({
 signedInSessions: [mockResource],
 signIn: new SignIn(null),
 signUp: new SignUp(null),
 }),
 );

 const mockSetActive = jest.fn();
 const mockSignUpCreate = jest
 .fn()
 .mockReturnValue(Promise.resolve({ status: 'complete', createdSessionId: '123' }));

 const sut = new Clerk(productionPublishableKey);
 await sut.load(mockedLoadOptions);
 if (!sut.client) {
 fail('we should always have a client');
 }
 sut.client.signUp.create = mockSignUpCreate;
 sut.setActive = mockSetActive;

 await sut.handleRedirectCallback();

 await waitFor(() => {
 expect(mockNavigate.mock.calls[0][0]).toBe('/');
 });
 });
 });

 it('creates a new user and calls setActive if the user was not found during sso signup', async () => {
 mockEnvironmentFetch.mockReturnValue(
 Promise.resolve({
Expand Down

16 changes: 12 additions & 4 deletions
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1879,10 +1879,11 @@ export class Clerk implements ClerkInterface {
 };

 if (si.status === 'complete') {
return this.setActive({
await this.setActive({
 session: si.sessionId,
 redirectUrl: redirectUrls.getAfterSignInUrl(),
 });
 return this.__internal_navigateToTaskIfAvailable();
 }

 const userExistsButNeedsToSignIn =
Expand All@@ -1892,10 +1893,11 @@ export class Clerk implements ClerkInterface {
 const res = await signIn.create({ transfer: true });
 switch (res.status) {
 case 'complete':
return this.setActive({
await this.setActive({
 session: res.createdSessionId,
 redirectUrl: redirectUrls.getAfterSignInUrl(),
 });
 return this.__internal_navigateToTaskIfAvailable();
 case 'needs_first_factor':
 return navigateToFactorOne();
 case 'needs_second_factor':
Expand DownExpand Up@@ -1941,10 +1943,11 @@ export class Clerk implements ClerkInterface {
 const res = await signUp.create({ transfer: true });
 switch (res.status) {
 case 'complete':
return this.setActive({
await this.setActive({
 session: res.createdSessionId,
 redirectUrl: redirectUrls.getAfterSignUpUrl(),
 });
 return this.__internal_navigateToTaskIfAvailable();
 case 'missing_requirements':
 return navigateToNextStepSignUp({ missingFields: res.missingFields });
 default:
Expand All@@ -1953,10 +1956,11 @@ export class Clerk implements ClerkInterface {
 }

 if (su.status === 'complete') {
return this.setActive({
await this.setActive({
 session: su.sessionId,
 redirectUrl: redirectUrls.getAfterSignUpUrl(),
 });
 return this.__internal_navigateToTaskIfAvailable();
 }

 if (si.status === 'needs_second_factor') {
Expand DownExpand Up@@ -1992,6 +1996,10 @@ export class Clerk implements ClerkInterface {
 return navigateToNextStepSignUp({ missingFields: signUp.missingFields });
 }

 if (this.__internal_hasAfterAuthFlows) {
 return this.__internal_navigateToTaskIfAvailable({ redirectUrlComplete: redirectUrls.getAfterSignInUrl() });
 }

 return navigateToSignIn();
 };

Expand Down

6 changes: 5 additions & 1 deletion
packages/clerk-js/src/core/resources/SignIn.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ import type {
} from '@clerk/types';

import {
 buildURL,
 generateSignatureWithCoinbaseWallet,
 generateSignatureWithMetamask,
 generateSignatureWithOKXWallet,
Expand DownExpand Up@@ -239,7 +240,10 @@ export class SignIn extends BaseResource implements SignInResource {
 // This ensures organization selection tasks are displayed after sign-in,
 // rather than redirecting to potentially unprotected pages while the session is pending.
 const actionCompleteRedirectUrl = SignIn.clerk.__internal_hasAfterAuthFlows
 ? redirectUrlWithAuthToken
 ? buildURL({
 base: redirectUrlWithAuthToken,
 search: `?redirect_url=${redirectUrlComplete}`,
 }).toString()
 : redirectUrlComplete;

 if (!this.id || !continueSignIn) {
Expand Down

8 changes: 1 addition & 7 deletions
packages/clerk-js/src/ui/common/SSOCallback.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,19 +19,13 @@ export const SSOCallback = withCardStateProvider<HandleOAuthCallbackParams | Han
});

export const SSOCallbackCard = (props: HandleOAuthCallbackParams | HandleSamlCallbackParams) => {
 const { handleRedirectCallback, __internal_setActiveInProgress, __internal_navigateToTaskIfAvailable, session } =
 useClerk();
 const { handleRedirectCallback, __internal_setActiveInProgress } = useClerk();
 const { navigate } = useRouter();
 const card = useCardState();

 React.useEffect(() => {
 let timeoutId: ReturnType<typeof setTimeout>;
 if (__internal_setActiveInProgress !== true) {
 if (session?.currentTask) {
 void __internal_navigateToTaskIfAvailable();
 return;
 }

 const intent = new URLSearchParams(window.location.search).get('intent');
 const reloadResource = intent === 'signIn' || intent === 'signUp' ? intent : undefined;
 handleRedirectCallback({ ...props, reloadResource }, navigate).catch(e => {
Expand Down

2 changes: 1 addition & 1 deletion
packages/types/src/hooks.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -180,7 +180,7 @@ export type UseSessionReturn =
 */
 isSignedIn: undefined;
 /**
 * The current active session for the user.
 * The current session for the user.
 */
 session: undefined;
 }
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): Fix SSO callback for after-auth custom flows#6430

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

from

Jul 30, 2025
 Merged


fix(clerk-js): Fix SSO callback for after-auth custom flows
#6430
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
4e85e51

Fix SSO callback for after-auth


LauraBeatris Jul 29, 2025
15c7a49

Add changeset


LauraBeatris Jul 29, 2025
2d50e64

Call `__internal_navigateToTask`


LauraBeatris Jul 29, 2025
4871e4d

Update JSDocs for `session` return from `useSession`


LauraBeatris Jul 30, 2025
613f916

Do not pass `redirectUrlComplete` to `navigateToTask`


LauraBeatris Jul 30, 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/metal-geese-double.md

View file


Open in desktop

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

Fix `UseSessionReturn['session']` JSDocs to not mention active status, since pending sessions are also returned

5 changes: 5 additions & 0 deletions
.changeset/yummy-ghosts-share.md

View file


Open in desktop

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

Fix SSO callback for after-auth custom flows

112 changes: 112 additions & 0 deletions
packages/clerk-js/src/core/__tests__/clerk.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -923,6 +923,118 @@ describe('Clerk singleton', () => {
 mockEnvironmentFetch.mockReset();
 });

 describe('with after-auth flows', () => {
 beforeEach(() => {
 mockClientFetch.mockReset();
 mockEnvironmentFetch.mockReturnValue(
 Promise.resolve({
 userSettings: mockUserSettings,
 displayConfig: mockDisplayConfig,
 isSingleSession: () => false,
 isProduction: () => false,
 isDevelopmentOrStaging: () => true,
 organizationSettings: {
 forceOrganizationSelection: true,
 },
 }),
 );
 });

 it('redirects to pending task', async () => {
 const mockSession = {
 id: '1',
 status: 'pending',
 user: {},
 tasks: [{ key: 'select-organization' }],
 currentTask: { key: 'select-organization', __internal_getUrl: () => 'https://sut/tasks/select-organization' },
 lastActiveToken: { getRawString: () => 'mocked-token' },
 };

 const mockResource = {
 ...mockSession,
 remove: jest.fn(),
 touch: jest.fn(() => Promise.resolve()),
 getToken: jest.fn(),
 reload: jest.fn(() => Promise.resolve(mockSession)),
 };

 mockResource.touch.mockReturnValueOnce(Promise.resolve());
 mockClientFetch.mockReturnValue(
 Promise.resolve({
 signedInSessions: [mockResource],
 signIn: new SignIn(null),
 signUp: new SignUp({
 status: 'complete',
 } as any as SignUpJSON),
 }),
 );

 const mockSetActive = jest.fn();
 const mockSignUpCreate = jest
 .fn()
 .mockReturnValue(Promise.resolve({ status: 'complete', createdSessionId: '123' }));

 const sut = new Clerk(productionPublishableKey);
 await sut.load(mockedLoadOptions);
 if (!sut.client) {
 fail('we should always have a client');
 }
 sut.client.signUp.create = mockSignUpCreate;
 sut.setActive = mockSetActive;

 await sut.handleRedirectCallback();

 await waitFor(() => {
 expect(mockNavigate.mock.calls[0][0]).toBe('/sign-in#/tasks/select-organization');
 });
 });

 it('redirects to after sign-in URL when task has been resolved', async () => {
 const mockSession = {
 id: '1',
 status: 'active',
 user: {},
 lastActiveToken: { getRawString: () => 'mocked-token' },
 };

 const mockResource = {
 ...mockSession,
 remove: jest.fn(),
 touch: jest.fn(() => Promise.resolve()),
 getToken: jest.fn(),
 reload: jest.fn(() => Promise.resolve(mockSession)),
 };

 mockResource.touch.mockReturnValueOnce(Promise.resolve());
 mockClientFetch.mockReturnValue(
 Promise.resolve({
 signedInSessions: [mockResource],
 signIn: new SignIn(null),
 signUp: new SignUp(null),
 }),
 );

 const mockSetActive = jest.fn();
 const mockSignUpCreate = jest
 .fn()
 .mockReturnValue(Promise.resolve({ status: 'complete', createdSessionId: '123' }));

 const sut = new Clerk(productionPublishableKey);
 await sut.load(mockedLoadOptions);
 if (!sut.client) {
 fail('we should always have a client');
 }
 sut.client.signUp.create = mockSignUpCreate;
 sut.setActive = mockSetActive;

 await sut.handleRedirectCallback();

 await waitFor(() => {
 expect(mockNavigate.mock.calls[0][0]).toBe('/');
 });
 });
 });

 it('creates a new user and calls setActive if the user was not found during sso signup', async () => {
 mockEnvironmentFetch.mockReturnValue(
 Promise.resolve({
Expand Down

16 changes: 12 additions & 4 deletions
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1879,10 +1879,11 @@ export class Clerk implements ClerkInterface {
 };

 if (si.status === 'complete') {
return this.setActive({
await this.setActive({
 session: si.sessionId,
 redirectUrl: redirectUrls.getAfterSignInUrl(),
 });
 return this.__internal_navigateToTaskIfAvailable();
 }

 const userExistsButNeedsToSignIn =
Expand All@@ -1892,10 +1893,11 @@ export class Clerk implements ClerkInterface {
 const res = await signIn.create({ transfer: true });
 switch (res.status) {
 case 'complete':
return this.setActive({
await this.setActive({
 session: res.createdSessionId,
 redirectUrl: redirectUrls.getAfterSignInUrl(),
 });
 return this.__internal_navigateToTaskIfAvailable();
 case 'needs_first_factor':
 return navigateToFactorOne();
 case 'needs_second_factor':
Expand DownExpand Up@@ -1941,10 +1943,11 @@ export class Clerk implements ClerkInterface {
 const res = await signUp.create({ transfer: true });
 switch (res.status) {
 case 'complete':
return this.setActive({
await this.setActive({
 session: res.createdSessionId,
 redirectUrl: redirectUrls.getAfterSignUpUrl(),
 });
 return this.__internal_navigateToTaskIfAvailable();
 case 'missing_requirements':
 return navigateToNextStepSignUp({ missingFields: res.missingFields });
 default:
Expand All@@ -1953,10 +1956,11 @@ export class Clerk implements ClerkInterface {
 }

 if (su.status === 'complete') {
return this.setActive({
await this.setActive({
 session: su.sessionId,
 redirectUrl: redirectUrls.getAfterSignUpUrl(),
 });
 return this.__internal_navigateToTaskIfAvailable();
 }

 if (si.status === 'needs_second_factor') {
Expand DownExpand Up@@ -1992,6 +1996,10 @@ export class Clerk implements ClerkInterface {
 return navigateToNextStepSignUp({ missingFields: signUp.missingFields });
 }

 if (this.__internal_hasAfterAuthFlows) {
 return this.__internal_navigateToTaskIfAvailable({ redirectUrlComplete: redirectUrls.getAfterSignInUrl() });
 }

 return navigateToSignIn();
 };

Expand Down

6 changes: 5 additions & 1 deletion
packages/clerk-js/src/core/resources/SignIn.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ import type {
} from '@clerk/types';

import {
 buildURL,
 generateSignatureWithCoinbaseWallet,
 generateSignatureWithMetamask,
 generateSignatureWithOKXWallet,
Expand DownExpand Up@@ -239,7 +240,10 @@ export class SignIn extends BaseResource implements SignInResource {
 // This ensures organization selection tasks are displayed after sign-in,
 // rather than redirecting to potentially unprotected pages while the session is pending.
 const actionCompleteRedirectUrl = SignIn.clerk.__internal_hasAfterAuthFlows
 ? redirectUrlWithAuthToken
 ? buildURL({
 base: redirectUrlWithAuthToken,
 search: `?redirect_url=${redirectUrlComplete}`,
 }).toString()
 : redirectUrlComplete;

 if (!this.id || !continueSignIn) {
Expand Down

8 changes: 1 addition & 7 deletions
packages/clerk-js/src/ui/common/SSOCallback.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,19 +19,13 @@ export const SSOCallback = withCardStateProvider<HandleOAuthCallbackParams | Han
});

export const SSOCallbackCard = (props: HandleOAuthCallbackParams | HandleSamlCallbackParams) => {
 const { handleRedirectCallback, __internal_setActiveInProgress, __internal_navigateToTaskIfAvailable, session } =
 useClerk();
 const { handleRedirectCallback, __internal_setActiveInProgress } = useClerk();
 const { navigate } = useRouter();
 const card = useCardState();

 React.useEffect(() => {
 let timeoutId: ReturnType<typeof setTimeout>;
 if (__internal_setActiveInProgress !== true) {
 if (session?.currentTask) {
 void __internal_navigateToTaskIfAvailable();
 return;
 }

 const intent = new URLSearchParams(window.location.search).get('intent');
 const reloadResource = intent === 'signIn' || intent === 'signUp' ? intent : undefined;
 handleRedirectCallback({ ...props, reloadResource }, navigate).catch(e => {
Expand Down

2 changes: 1 addition & 1 deletion
packages/types/src/hooks.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -180,7 +180,7 @@ export type UseSessionReturn =
 */
 isSignedIn: undefined;
 /**
 * The current active session for the user.
 * The current session for the user.
 */
 session: undefined;
 }
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): Fix SSO callback for after-auth custom flows#6430

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

from

Jul 30, 2025
 Merged


fix(clerk-js): Fix SSO callback for after-auth custom flows
#6430
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
4e85e51

Fix SSO callback for after-auth


LauraBeatris Jul 29, 2025
15c7a49

Add changeset


LauraBeatris Jul 29, 2025
2d50e64

Call `__internal_navigateToTask`


LauraBeatris Jul 29, 2025
4871e4d

Update JSDocs for `session` return from `useSession`


LauraBeatris Jul 30, 2025
613f916

Do not pass `redirectUrlComplete` to `navigateToTask`


LauraBeatris Jul 30, 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/metal-geese-double.md

View file


Open in desktop

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

Fix `UseSessionReturn['session']` JSDocs to not mention active status, since pending sessions are also returned

5 changes: 5 additions & 0 deletions
.changeset/yummy-ghosts-share.md

View file


Open in desktop

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

Fix SSO callback for after-auth custom flows

112 changes: 112 additions & 0 deletions
packages/clerk-js/src/core/__tests__/clerk.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -923,6 +923,118 @@ describe('Clerk singleton', () => {
 mockEnvironmentFetch.mockReset();
 });

 describe('with after-auth flows', () => {
 beforeEach(() => {
 mockClientFetch.mockReset();
 mockEnvironmentFetch.mockReturnValue(
 Promise.resolve({
 userSettings: mockUserSettings,
 displayConfig: mockDisplayConfig,
 isSingleSession: () => false,
 isProduction: () => false,
 isDevelopmentOrStaging: () => true,
 organizationSettings: {
 forceOrganizationSelection: true,
 },
 }),
 );
 });

 it('redirects to pending task', async () => {
 const mockSession = {
 id: '1',
 status: 'pending',
 user: {},
 tasks: [{ key: 'select-organization' }],
 currentTask: { key: 'select-organization', __internal_getUrl: () => 'https://sut/tasks/select-organization' },
 lastActiveToken: { getRawString: () => 'mocked-token' },
 };

 const mockResource = {
 ...mockSession,
 remove: jest.fn(),
 touch: jest.fn(() => Promise.resolve()),
 getToken: jest.fn(),
 reload: jest.fn(() => Promise.resolve(mockSession)),
 };

 mockResource.touch.mockReturnValueOnce(Promise.resolve());
 mockClientFetch.mockReturnValue(
 Promise.resolve({
 signedInSessions: [mockResource],
 signIn: new SignIn(null),
 signUp: new SignUp({
 status: 'complete',
 } as any as SignUpJSON),
 }),
 );

 const mockSetActive = jest.fn();
 const mockSignUpCreate = jest
 .fn()
 .mockReturnValue(Promise.resolve({ status: 'complete', createdSessionId: '123' }));

 const sut = new Clerk(productionPublishableKey);
 await sut.load(mockedLoadOptions);
 if (!sut.client) {
 fail('we should always have a client');
 }
 sut.client.signUp.create = mockSignUpCreate;
 sut.setActive = mockSetActive;

 await sut.handleRedirectCallback();

 await waitFor(() => {
 expect(mockNavigate.mock.calls[0][0]).toBe('/sign-in#/tasks/select-organization');
 });
 });

 it('redirects to after sign-in URL when task has been resolved', async () => {
 const mockSession = {
 id: '1',
 status: 'active',
 user: {},
 lastActiveToken: { getRawString: () => 'mocked-token' },
 };

 const mockResource = {
 ...mockSession,
 remove: jest.fn(),
 touch: jest.fn(() => Promise.resolve()),
 getToken: jest.fn(),
 reload: jest.fn(() => Promise.resolve(mockSession)),
 };

 mockResource.touch.mockReturnValueOnce(Promise.resolve());
 mockClientFetch.mockReturnValue(
 Promise.resolve({
 signedInSessions: [mockResource],
 signIn: new SignIn(null),
 signUp: new SignUp(null),
 }),
 );

 const mockSetActive = jest.fn();
 const mockSignUpCreate = jest
 .fn()
 .mockReturnValue(Promise.resolve({ status: 'complete', createdSessionId: '123' }));

 const sut = new Clerk(productionPublishableKey);
 await sut.load(mockedLoadOptions);
 if (!sut.client) {
 fail('we should always have a client');
 }
 sut.client.signUp.create = mockSignUpCreate;
 sut.setActive = mockSetActive;

 await sut.handleRedirectCallback();

 await waitFor(() => {
 expect(mockNavigate.mock.calls[0][0]).toBe('/');
 });
 });
 });

 it('creates a new user and calls setActive if the user was not found during sso signup', async () => {
 mockEnvironmentFetch.mockReturnValue(
 Promise.resolve({
Expand Down

16 changes: 12 additions & 4 deletions
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1879,10 +1879,11 @@ export class Clerk implements ClerkInterface {
 };

 if (si.status === 'complete') {
return this.setActive({
await this.setActive({
 session: si.sessionId,
 redirectUrl: redirectUrls.getAfterSignInUrl(),
 });
 return this.__internal_navigateToTaskIfAvailable();
 }

 const userExistsButNeedsToSignIn =
Expand All@@ -1892,10 +1893,11 @@ export class Clerk implements ClerkInterface {
 const res = await signIn.create({ transfer: true });
 switch (res.status) {
 case 'complete':
return this.setActive({
await this.setActive({
 session: res.createdSessionId,
 redirectUrl: redirectUrls.getAfterSignInUrl(),
 });
 return this.__internal_navigateToTaskIfAvailable();
 case 'needs_first_factor':
 return navigateToFactorOne();
 case 'needs_second_factor':
Expand DownExpand Up@@ -1941,10 +1943,11 @@ export class Clerk implements ClerkInterface {
 const res = await signUp.create({ transfer: true });
 switch (res.status) {
 case 'complete':
return this.setActive({
await this.setActive({
 session: res.createdSessionId,
 redirectUrl: redirectUrls.getAfterSignUpUrl(),
 });
 return this.__internal_navigateToTaskIfAvailable();
 case 'missing_requirements':
 return navigateToNextStepSignUp({ missingFields: res.missingFields });
 default:
Expand All@@ -1953,10 +1956,11 @@ export class Clerk implements ClerkInterface {
 }

 if (su.status === 'complete') {
return this.setActive({
await this.setActive({
 session: su.sessionId,
 redirectUrl: redirectUrls.getAfterSignUpUrl(),
 });
 return this.__internal_navigateToTaskIfAvailable();
 }

 if (si.status === 'needs_second_factor') {
Expand DownExpand Up@@ -1992,6 +1996,10 @@ export class Clerk implements ClerkInterface {
 return navigateToNextStepSignUp({ missingFields: signUp.missingFields });
 }

 if (this.__internal_hasAfterAuthFlows) {
 return this.__internal_navigateToTaskIfAvailable({ redirectUrlComplete: redirectUrls.getAfterSignInUrl() });
 }

 return navigateToSignIn();
 };

Expand Down

6 changes: 5 additions & 1 deletion
packages/clerk-js/src/core/resources/SignIn.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ import type {
} from '@clerk/types';

import {
 buildURL,
 generateSignatureWithCoinbaseWallet,
 generateSignatureWithMetamask,
 generateSignatureWithOKXWallet,
Expand DownExpand Up@@ -239,7 +240,10 @@ export class SignIn extends BaseResource implements SignInResource {
 // This ensures organization selection tasks are displayed after sign-in,
 // rather than redirecting to potentially unprotected pages while the session is pending.
 const actionCompleteRedirectUrl = SignIn.clerk.__internal_hasAfterAuthFlows
 ? redirectUrlWithAuthToken
 ? buildURL({
 base: redirectUrlWithAuthToken,
 search: `?redirect_url=${redirectUrlComplete}`,
 }).toString()
 : redirectUrlComplete;

 if (!this.id || !continueSignIn) {
Expand Down

8 changes: 1 addition & 7 deletions
packages/clerk-js/src/ui/common/SSOCallback.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,19 +19,13 @@ export const SSOCallback = withCardStateProvider<HandleOAuthCallbackParams | Han
});

export const SSOCallbackCard = (props: HandleOAuthCallbackParams | HandleSamlCallbackParams) => {
 const { handleRedirectCallback, __internal_setActiveInProgress, __internal_navigateToTaskIfAvailable, session } =
 useClerk();
 const { handleRedirectCallback, __internal_setActiveInProgress } = useClerk();
 const { navigate } = useRouter();
 const card = useCardState();

 React.useEffect(() => {
 let timeoutId: ReturnType<typeof setTimeout>;
 if (__internal_setActiveInProgress !== true) {
 if (session?.currentTask) {
 void __internal_navigateToTaskIfAvailable();
 return;
 }

 const intent = new URLSearchParams(window.location.search).get('intent');
 const reloadResource = intent === 'signIn' || intent === 'signUp' ? intent : undefined;
 handleRedirectCallback({ ...props, reloadResource }, navigate).catch(e => {
Expand Down

2 changes: 1 addition & 1 deletion
packages/types/src/hooks.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -180,7 +180,7 @@ export type UseSessionReturn =
 */
 isSignedIn: undefined;
 /**
 * The current active session for the user.
 * The current session for the user.
 */
 session: undefined;
 }
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): Fix SSO callback for after-auth custom flows#6430

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

from

Jul 30, 2025
 Merged


fix(clerk-js): Fix SSO callback for after-auth custom flows
#6430
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
4e85e51

Fix SSO callback for after-auth


LauraBeatris Jul 29, 2025
15c7a49

Add changeset


LauraBeatris Jul 29, 2025
2d50e64

Call `__internal_navigateToTask`


LauraBeatris Jul 29, 2025
4871e4d

Update JSDocs for `session` return from `useSession`


LauraBeatris Jul 30, 2025
613f916

Do not pass `redirectUrlComplete` to `navigateToTask`


LauraBeatris Jul 30, 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/metal-geese-double.md

View file


Open in desktop

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

Fix `UseSessionReturn['session']` JSDocs to not mention active status, since pending sessions are also returned

5 changes: 5 additions & 0 deletions
.changeset/yummy-ghosts-share.md

View file


Open in desktop

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

Fix SSO callback for after-auth custom flows

112 changes: 112 additions & 0 deletions
packages/clerk-js/src/core/__tests__/clerk.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -923,6 +923,118 @@ describe('Clerk singleton', () => {
 mockEnvironmentFetch.mockReset();
 });

 describe('with after-auth flows', () => {
 beforeEach(() => {
 mockClientFetch.mockReset();
 mockEnvironmentFetch.mockReturnValue(
 Promise.resolve({
 userSettings: mockUserSettings,
 displayConfig: mockDisplayConfig,
 isSingleSession: () => false,
 isProduction: () => false,
 isDevelopmentOrStaging: () => true,
 organizationSettings: {
 forceOrganizationSelection: true,
 },
 }),
 );
 });

 it('redirects to pending task', async () => {
 const mockSession = {
 id: '1',
 status: 'pending',
 user: {},
 tasks: [{ key: 'select-organization' }],
 currentTask: { key: 'select-organization', __internal_getUrl: () => 'https://sut/tasks/select-organization' },
 lastActiveToken: { getRawString: () => 'mocked-token' },
 };

 const mockResource = {
 ...mockSession,
 remove: jest.fn(),
 touch: jest.fn(() => Promise.resolve()),
 getToken: jest.fn(),
 reload: jest.fn(() => Promise.resolve(mockSession)),
 };

 mockResource.touch.mockReturnValueOnce(Promise.resolve());
 mockClientFetch.mockReturnValue(
 Promise.resolve({
 signedInSessions: [mockResource],
 signIn: new SignIn(null),
 signUp: new SignUp({
 status: 'complete',
 } as any as SignUpJSON),
 }),
 );

 const mockSetActive = jest.fn();
 const mockSignUpCreate = jest
 .fn()
 .mockReturnValue(Promise.resolve({ status: 'complete', createdSessionId: '123' }));

 const sut = new Clerk(productionPublishableKey);
 await sut.load(mockedLoadOptions);
 if (!sut.client) {
 fail('we should always have a client');
 }
 sut.client.signUp.create = mockSignUpCreate;
 sut.setActive = mockSetActive;

 await sut.handleRedirectCallback();

 await waitFor(() => {
 expect(mockNavigate.mock.calls[0][0]).toBe('/sign-in#/tasks/select-organization');
 });
 });

 it('redirects to after sign-in URL when task has been resolved', async () => {
 const mockSession = {
 id: '1',
 status: 'active',
 user: {},
 lastActiveToken: { getRawString: () => 'mocked-token' },
 };

 const mockResource = {
 ...mockSession,
 remove: jest.fn(),
 touch: jest.fn(() => Promise.resolve()),
 getToken: jest.fn(),
 reload: jest.fn(() => Promise.resolve(mockSession)),
 };

 mockResource.touch.mockReturnValueOnce(Promise.resolve());
 mockClientFetch.mockReturnValue(
 Promise.resolve({
 signedInSessions: [mockResource],
 signIn: new SignIn(null),
 signUp: new SignUp(null),
 }),
 );

 const mockSetActive = jest.fn();
 const mockSignUpCreate = jest
 .fn()
 .mockReturnValue(Promise.resolve({ status: 'complete', createdSessionId: '123' }));

 const sut = new Clerk(productionPublishableKey);
 await sut.load(mockedLoadOptions);
 if (!sut.client) {
 fail('we should always have a client');
 }
 sut.client.signUp.create = mockSignUpCreate;
 sut.setActive = mockSetActive;

 await sut.handleRedirectCallback();

 await waitFor(() => {
 expect(mockNavigate.mock.calls[0][0]).toBe('/');
 });
 });
 });

 it('creates a new user and calls setActive if the user was not found during sso signup', async () => {
 mockEnvironmentFetch.mockReturnValue(
 Promise.resolve({
Expand Down

16 changes: 12 additions & 4 deletions
packages/clerk-js/src/core/clerk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1879,10 +1879,11 @@ export class Clerk implements ClerkInterface {
 };

 if (si.status === 'complete') {
return this.setActive({
await this.setActive({
 session: si.sessionId,
 redirectUrl: redirectUrls.getAfterSignInUrl(),
 });
 return this.__internal_navigateToTaskIfAvailable();
 }

 const userExistsButNeedsToSignIn =
Expand All@@ -1892,10 +1893,11 @@ export class Clerk implements ClerkInterface {
 const res = await signIn.create({ transfer: true });
 switch (res.status) {
 case 'complete':
return this.setActive({
await this.setActive({
 session: res.createdSessionId,
 redirectUrl: redirectUrls.getAfterSignInUrl(),
 });
 return this.__internal_navigateToTaskIfAvailable();
 case 'needs_first_factor':
 return navigateToFactorOne();
 case 'needs_second_factor':
Expand DownExpand Up@@ -1941,10 +1943,11 @@ export class Clerk implements ClerkInterface {
 const res = await signUp.create({ transfer: true });
 switch (res.status) {
 case 'complete':
return this.setActive({
await this.setActive({
 session: res.createdSessionId,
 redirectUrl: redirectUrls.getAfterSignUpUrl(),
 });
 return this.__internal_navigateToTaskIfAvailable();
 case 'missing_requirements':
 return navigateToNextStepSignUp({ missingFields: res.missingFields });
 default:
Expand All@@ -1953,10 +1956,11 @@ export class Clerk implements ClerkInterface {
 }

 if (su.status === 'complete') {
return this.setActive({
await this.setActive({
 session: su.sessionId,
 redirectUrl: redirectUrls.getAfterSignUpUrl(),
 });
 return this.__internal_navigateToTaskIfAvailable();
 }

 if (si.status === 'needs_second_factor') {
Expand DownExpand Up@@ -1992,6 +1996,10 @@ export class Clerk implements ClerkInterface {
 return navigateToNextStepSignUp({ missingFields: signUp.missingFields });
 }

 if (this.__internal_hasAfterAuthFlows) {
 return this.__internal_navigateToTaskIfAvailable({ redirectUrlComplete: redirectUrls.getAfterSignInUrl() });
 }

 return navigateToSignIn();
 };

Expand Down

6 changes: 5 additions & 1 deletion
packages/clerk-js/src/core/resources/SignIn.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ import type {
} from '@clerk/types';

import {
 buildURL,
 generateSignatureWithCoinbaseWallet,
 generateSignatureWithMetamask,
 generateSignatureWithOKXWallet,
Expand DownExpand Up@@ -239,7 +240,10 @@ export class SignIn extends BaseResource implements SignInResource {
 // This ensures organization selection tasks are displayed after sign-in,
 // rather than redirecting to potentially unprotected pages while the session is pending.
 const actionCompleteRedirectUrl = SignIn.clerk.__internal_hasAfterAuthFlows
 ? redirectUrlWithAuthToken
 ? buildURL({
 base: redirectUrlWithAuthToken,
 search: `?redirect_url=${redirectUrlComplete}`,
 }).toString()
 : redirectUrlComplete;

 if (!this.id || !continueSignIn) {
Expand Down

8 changes: 1 addition & 7 deletions
packages/clerk-js/src/ui/common/SSOCallback.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,19 +19,13 @@ export const SSOCallback = withCardStateProvider<HandleOAuthCallbackParams | Han
});

export const SSOCallbackCard = (props: HandleOAuthCallbackParams | HandleSamlCallbackParams) => {
 const { handleRedirectCallback, __internal_setActiveInProgress, __internal_navigateToTaskIfAvailable, session } =
 useClerk();
 const { handleRedirectCallback, __internal_setActiveInProgress } = useClerk();
 const { navigate } = useRouter();
 const card = useCardState();

 React.useEffect(() => {
 let timeoutId: ReturnType<typeof setTimeout>;
 if (__internal_setActiveInProgress !== true) {
 if (session?.currentTask) {
 void __internal_navigateToTaskIfAvailable();
 return;
 }

 const intent = new URLSearchParams(window.location.search).get('intent');
 const reloadResource = intent === 'signIn' || intent === 'signUp' ? intent : undefined;
 handleRedirectCallback({ ...props, reloadResource }, navigate).catch(e => {
Expand Down

2 changes: 1 addition & 1 deletion
packages/types/src/hooks.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -180,7 +180,7 @@ export type UseSessionReturn =
 */
 isSignedIn: undefined;
 /**
 * The current active session for the user.
 * The current session for the user.
 */
 session: undefined;
 }
Expand Down