feat(clerk-js): Introduce reset password session task (#7268)#7339

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
octoper merged 3 commits into from
Dec 2, 2025
Merged

feat(clerk-js): Introduce reset password session task (#7268) #7339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
569acf1
feat(clerk-js): Introduce reset password session task (#7268)
octoper Nov 28, 2025
a3b19ff
fix(ui): Fix import paths and type issues
octoper Dec 1, 2025
e2d734a
chore: Remove changesets
octoper Dec 2, 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
8 changes: 8 additions & 0 deletions integration/presets/envs.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -164,6 +164,13 @@ const withSessionTasks = base
.setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-session-tasks').pk)
.setEnvVariable('private', 'CLERK_ENCRYPTION_KEY', constants.E2E_CLERK_ENCRYPTION_KEY || 'a-key');

const withSessionTasksResetPassword = base
.clone()
.setId('withSessionTasksResetPassword')
.setEnvVariable('private', 'CLERK_API_URL', 'https://api.clerkstage.dev')
.setEnvVariable('private', 'CLERK_SECRET_KEY', instanceKeys.get('with-session-tasks-reset-password').sk)
.setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-session-tasks-reset-password').pk);

const withBillingJwtV2 = base
.clone()
.setId('withBillingJwtV2')
Expand DownExpand Up@@ -217,6 +224,7 @@ export const envs = {
withRestrictedMode,
withReverification,
withSessionTasks,
withSessionTasksResetPassword,
withSignInOrUpEmailLinksFlow,
withSignInOrUpFlow,
withSignInOrUpwithRestrictedModeFlow,
Expand Down
11 changes: 6 additions & 5 deletions integration/presets/longRunningApps.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,14 +30,15 @@ export const createLongRunningApps = () => {
{ id: 'next.appRouter.withSignInOrUpFlow', config: next.appRouter, env: envs.withSignInOrUpFlow },
{ id: 'next.appRouter.withSignInOrUpEmailLinksFlow', config: next.appRouter, env: envs.withSignInOrUpEmailLinksFlow },
{ id: 'next.appRouter.withSessionTasks', config: next.appRouter, env: envs.withSessionTasks },
{ id: 'next.appRouter.withSessionTasksResetPassword', config: next.appRouter, env: envs.withSessionTasksResetPassword },
{ id: 'next.appRouter.withLegalConsent', config: next.appRouter, env: envs.withLegalConsent },

/**
* Quickstart apps
*/
{ id: 'quickstart.next.appRouter', config: next.appRouterQuickstart, env: envs.withEmailCodesQuickstart },

/**
/**
* Billing apps
*/
{ id: 'withBillingJwtV2.next.appRouter', config: next.appRouter, env: envs.withBillingJwtV2 },
Expand All@@ -59,14 +60,14 @@ export const createLongRunningApps = () => {
{ id: 'react.vite.withEmailLinks', config: react.vite, env: envs.withEmailLinks },
{ id: 'vue.vite', config: vue.vite, env: envs.withCustomRoles },

/**
/**
* Tanstack apps - basic flows
*/
{ id: 'tanstack.react-start', config: tanstack.reactStart, env: envs.withEmailCodes },

/**
* Various apps - basic flows
*/
*/
{ id: 'withBilling.astro.node', config: astro.node, env: envs.withBilling },
{ id: 'astro.node.withCustomRoles', config: astro.node, env: envs.withCustomRoles },
{ id: 'astro.static.withCustomRoles', config: astro.static, env: envs.withCustomRoles },
Expand All@@ -78,7 +79,7 @@ export const createLongRunningApps = () => {

const apps = configs.map(longRunningApplication);

return {
return {
getByPattern: (patterns: Array<string | (typeof configs)[number]['id']>) => {
const res = new Set(patterns.map(pattern => apps.filter(app => idMatchesPattern(app.id, pattern))).flat());
if (!res.size) {
Expand Down
9 changes: 9 additions & 0 deletions integration/testUtils/organizationsService.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ export type FakeOrganization = Pick<Organization, 'slug' | 'name'>;
export type OrganizationService = {
deleteAll: () => Promise<void>;
createFakeOrganization: () => FakeOrganization;
createBapiOrganization: (fakeOrganization: FakeOrganization & { createdBy: string }) => Promise<Organization>;
};

export const createOrganizationsService = (clerkClient: ClerkClient) => {
Expand All@@ -19,6 +20,14 @@ export const createOrganizationsService = (clerkClient: ClerkClient) => {
const bulkDeletionPromises = organizations.data.map(({ id }) => clerkClient.organizations.deleteOrganization(id));
await Promise.all(bulkDeletionPromises);
},
createBapiOrganization: async (fakeOrganization: FakeOrganization & { createdBy: string }) => {
const organization = await clerkClient.organizations.createOrganization({
name: fakeOrganization.name,
slug: fakeOrganization.slug,
createdBy: fakeOrganization.createdBy,
});
return organization;
},
};

return self;
Expand Down
4 changes: 4 additions & 0 deletions integration/testUtils/usersService.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ export type UserService = {
createFakeOrganization: (userId: string) => Promise<FakeOrganization>;
getUser: (opts: { id?: string; email?: string }) => Promise<User | undefined>;
createFakeAPIKey: (userId: string) => Promise<FakeAPIKey>;
passwordUntrusted: (userId: string) => Promise<void>;
};

/**
Expand DownExpand Up@@ -210,6 +211,9 @@ export const createUserService = (clerkClient: ClerkClient) => {
revoke: () => clerkClient.apiKeys.revoke({ apiKeyId: apiKey.id, revocationReason: 'For testing purposes' }),
} satisfies FakeAPIKey;
},
passwordUntrusted: async (userId: string) => {
await clerkClient.users.__experimental_passwordUntrusted(userId);
},
};

return self;
Expand Down
99 changes: 99 additions & 0 deletions integration/tests/session-tasks-sign-in-reset-password.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
import { test } from '@playwright/test';

import { hash } from '../models/helpers';
import { appConfigs } from '../presets';
import { createTestUtils, testAgainstRunningApps } from '../testUtils';

testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasksResetPassword] })(
'session tasks after sign-in reset password flow @nextjs',
({ app }) => {
test.describe.configure({ mode: 'parallel' });

test.afterAll(async () => {
await app.teardown();
});

test('resolve both reset password and organization selection tasks after sign-in', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

const user = u.services.users.createFakeUser();
const createdUser = await u.services.users.createBapiUser(user);

await u.services.users.passwordUntrusted(createdUser.id);

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

await u.page.getByRole('textbox', { name: 'code' }).click();
await u.page.keyboard.type('424242', { delay: 100 });

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

const newPassword = `${hash()}_testtest`;
await u.po.sessionTask.resolveResetPasswordTask({
newPassword: newPassword,
confirmPassword: newPassword,
});

await u.po.sessionTask.resolveForceOrganizationSelectionTask({
name: 'Test Organization',
});

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

await u.page.signOut();
await u.page.context().clearCookies();

await user.deleteIfExists();
await u.services.organizations.deleteAll();
});

test('sign-in with email and resolve the reset password task', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
const user = u.services.users.createFakeUser();
const createdUser = await u.services.users.createBapiUser(user);

await u.services.users.passwordUntrusted(createdUser.id);
const fakeOrganization = u.services.organizations.createFakeOrganization();
await u.services.organizations.createBapiOrganization({
...fakeOrganization,
createdBy: createdUser.id,
});

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

await u.page.getByRole('textbox', { name: 'code' }).fill('424242');

await u.po.expect.toBeSignedIn();

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

const newPassword = `${hash()}_testtest`;
await u.po.sessionTask.resolveResetPasswordTask({
newPassword: newPassword,
confirmPassword: newPassword,
});

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

await u.page.signOut();
await u.page.context().clearCookies();

await user.deleteIfExists();
await u.services.organizations.deleteAll();
});
},
);
11 changes: 11 additions & 0 deletions packages/backend/src/api/endpoints/UserApi.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -447,4 +447,15 @@ export class UserAPI extends AbstractAPI {
path: joinPaths(basePath, userId, 'totp'),
});
}

public async __experimental_passwordUntrusted(userId: string) {
this.requireId(userId);
return this.request<User>({
method: 'POST',
path: joinPaths(basePath, userId, 'password_untrusted'),
bodyParams: {
revokeAllSessions: false,
},
});
}
}
25 changes: 24 additions & 1 deletion packages/clerk-js/bundlewatch.config.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,29 @@
{ "path": "./dist/stripe-vendors*.js", "maxSize": "1KB" },
{ "path": "./dist/query-core-vendors*.js", "maxSize": "11KB" },
{ "path": "./dist/zxcvbn-ts-core*.js", "maxSize": "12KB" },
{ "path": "./dist/zxcvbn-common*.js", "maxSize": "226KB" }
{ "path": "./dist/zxcvbn-common*.js", "maxSize": "226KB" },
{ "path": "./dist/createorganization*.js", "maxSize": "5KB" },
{ "path": "./dist/impersonationfab*.js", "maxSize": "5KB" },
{ "path": "./dist/organizationprofile*.js", "maxSize": "10KB" },
{ "path": "./dist/organizationswitcher*.js", "maxSize": "5KB" },
{ "path": "./dist/organizationlist*.js", "maxSize": "5.5KB" },
{ "path": "./dist/signin*.js", "maxSize": "18KB" },
{ "path": "./dist/signup*.js", "maxSize": "9.5KB" },
{ "path": "./dist/userbutton*.js", "maxSize": "5KB" },
{ "path": "./dist/userprofile*.js", "maxSize": "16KB" },
{ "path": "./dist/userverification*.js", "maxSize": "5KB" },
{ "path": "./dist/onetap*.js", "maxSize": "1KB" },
{ "path": "./dist/waitlist*.js", "maxSize": "1.5KB" },
{ "path": "./dist/keylessPrompt*.js", "maxSize": "6.5KB" },
{ "path": "./dist/enableOrganizationsPrompt*.js", "maxSize": "6.5KB" },
{ "path": "./dist/pricingTable*.js", "maxSize": "4.02KB" },
{ "path": "./dist/checkout*.js", "maxSize": "8.82KB" },
{ "path": "./dist/up-billing-page*.js", "maxSize": "3.0KB" },
{ "path": "./dist/op-billing-page*.js", "maxSize": "3.0KB" },
{ "path": "./dist/up-plans-page*.js", "maxSize": "1.0KB" },
{ "path": "./dist/op-plans-page*.js", "maxSize": "1.0KB" },
{ "path": "./dist/statement-page*.js", "maxSize": "1.0KB" },
{ "path": "./dist/payment-attempt-page*.js", "maxSize": "3.0KB" },
{ "path": "./dist/sessionTasks*.js", "maxSize": "3.0KB" }
]
}
3 changes: 2 additions & 1 deletion packages/clerk-js/src/test/fixture-helpers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ const createUserFixtureHelpers = (baseClient: ClientJSON) => {
Partial<UserJSON>,
'email_addresses' | 'phone_numbers' | 'external_accounts' | 'organization_memberships'
> & {
identifier?: string;
email_addresses?: Array<string | Partial<EmailAddressJSON>>;
phone_numbers?: Array<string | Partial<PhoneNumberJSON>>;
external_accounts?: Array<OAuthProvider | Partial<ExternalAccountJSON>>;
Expand All@@ -57,7 +58,7 @@ const createUserFixtureHelpers = (baseClient: ClientJSON) => {
first_name: 'FirstName',
last_name: 'LastName',
image_url: '',
identifier: 'email@test.com',
identifier: params.identifier || 'email@test.com',
user_id: '',
...params,
} as PublicUserDataJSON;
Expand Down
8 changes: 8 additions & 0 deletions packages/localizations/src/ar-SA.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -858,6 +858,14 @@ export const arSA: LocalizationResource = {
actionText: undefined,
},
},
taskResetPassword: {
formButtonPrimary: undefined,
signOut: {
actionLink: undefined,
actionText: undefined,
},
title: undefined,
},
unstable__errors: {
already_a_member_in_organization: undefined,
captcha_invalid:
Expand Down
8 changes: 8 additions & 0 deletions packages/localizations/src/be-BY.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -866,6 +866,14 @@ export const beBY: LocalizationResource = {
actionText: undefined,
},
},
taskResetPassword: {
formButtonPrimary: undefined,
signOut: {
actionLink: undefined,
actionText: undefined,
},
title: undefined,
},
unstable__errors: {
already_a_member_in_organization: 'Вы ўжо з’яўляецеся членам гэтай арганізацыі.',
captcha_invalid:
Expand Down
8 changes: 8 additions & 0 deletions packages/localizations/src/bg-BG.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -862,6 +862,14 @@ export const bgBG: LocalizationResource = {
actionText: undefined,
},
},
taskResetPassword: {
formButtonPrimary: undefined,
signOut: {
actionLink: undefined,
actionText: undefined,
},
title: undefined,
},
unstable__errors: {
already_a_member_in_organization: 'Вие вече сте член на тази организация.',
captcha_invalid: undefined,
Expand Down
8 changes: 8 additions & 0 deletions packages/localizations/src/bn-IN.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -866,6 +866,14 @@ export const bnIN: LocalizationResource = {
actionText: undefined,
},
},
taskResetPassword: {
formButtonPrimary: undefined,
signOut: {
actionLink: undefined,
actionText: undefined,
},
title: undefined,
},
unstable__errors: {
already_a_member_in_organization: '{{email}} ইতিমধ্যে সংগঠনের একজন সদস্য।',
captcha_invalid:
Expand Down
8 changes: 8 additions & 0 deletions packages/localizations/src/ca-ES.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -861,6 +861,14 @@ export const caES: LocalizationResource = {
actionText: undefined,
},
},
taskResetPassword: {
formButtonPrimary: undefined,
signOut: {
actionLink: undefined,
actionText: undefined,
},
title: undefined,
},
unstable__errors: {
already_a_member_in_organization: undefined,
captcha_invalid:
Expand Down
8 changes: 8 additions & 0 deletions packages/localizations/src/cs-CZ.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -872,6 +872,14 @@ export const csCZ: LocalizationResource = {
actionText: undefined,
},
},
taskResetPassword: {
formButtonPrimary: undefined,
signOut: {
actionLink: undefined,
actionText: undefined,
},
title: undefined,
},
unstable__errors: {
already_a_member_in_organization: '{{email}} je již členem organizace.',
captcha_invalid:
Expand Down
8 changes: 8 additions & 0 deletions packages/localizations/src/da-DK.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -859,6 +859,14 @@ export const daDK: LocalizationResource = {
actionText: undefined,
},
},
taskResetPassword: {
formButtonPrimary: undefined,
signOut: {
actionLink: undefined,
actionText: undefined,
},
title: undefined,
},
unstable__errors: {
already_a_member_in_organization: undefined,
captcha_invalid:
Expand Down
8 changes: 8 additions & 0 deletions packages/localizations/src/de-DE.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -876,6 +876,14 @@ export const deDE: LocalizationResource = {
actionText: 'Angemeldet als {{identifier}}',
},
},
taskResetPassword: {
formButtonPrimary: undefined,
signOut: {
actionLink: undefined,
actionText: undefined,
},
title: undefined,
},
unstable__errors: {
already_a_member_in_organization: 'Sie sind bereits Mitglied in dieser Organisation.',
captcha_invalid:
Expand Down
Loading
Loading
, '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
feat(clerk-js): Introduce reset password session task (#7268)#7339

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

octoper
merged 3 commits into

from

Dec 2, 2025
 Merged


feat(clerk-js): Introduce reset password session task (#7268)
#7339
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
569acf1

feat(clerk-js): Introduce reset password session task (#7268)


octoper Nov 28, 2025
a3b19ff

fix(ui): Fix import paths and type issues


octoper Dec 1, 2025
e2d734a

chore: Remove changesets


octoper Dec 2, 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


8 changes: 8 additions & 0 deletions
integration/presets/envs.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,6 +164,13 @@ const withSessionTasks = base
 .setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-session-tasks').pk)
 .setEnvVariable('private', 'CLERK_ENCRYPTION_KEY', constants.E2E_CLERK_ENCRYPTION_KEY || 'a-key');

const withSessionTasksResetPassword = base
 .clone()
 .setId('withSessionTasksResetPassword')
 .setEnvVariable('private', 'CLERK_API_URL', 'https://api.clerkstage.dev')
 .setEnvVariable('private', 'CLERK_SECRET_KEY', instanceKeys.get('with-session-tasks-reset-password').sk)
 .setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-session-tasks-reset-password').pk);

const withBillingJwtV2 = base
 .clone()
 .setId('withBillingJwtV2')
Expand DownExpand Up@@ -217,6 +224,7 @@ export const envs = {
 withRestrictedMode,
 withReverification,
 withSessionTasks,
 withSessionTasksResetPassword,
 withSignInOrUpEmailLinksFlow,
 withSignInOrUpFlow,
 withSignInOrUpwithRestrictedModeFlow,
Expand Down

11 changes: 6 additions & 5 deletions
integration/presets/longRunningApps.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,14 +30,15 @@ export const createLongRunningApps = () => {
 { id: 'next.appRouter.withSignInOrUpFlow', config: next.appRouter, env: envs.withSignInOrUpFlow },
 { id: 'next.appRouter.withSignInOrUpEmailLinksFlow', config: next.appRouter, env: envs.withSignInOrUpEmailLinksFlow },
 { id: 'next.appRouter.withSessionTasks', config: next.appRouter, env: envs.withSessionTasks },
 { id: 'next.appRouter.withSessionTasksResetPassword', config: next.appRouter, env: envs.withSessionTasksResetPassword },
 { id: 'next.appRouter.withLegalConsent', config: next.appRouter, env: envs.withLegalConsent },

 /**
 * Quickstart apps
 */
 { id: 'quickstart.next.appRouter', config: next.appRouterQuickstart, env: envs.withEmailCodesQuickstart },

 /**
 /**
 * Billing apps
 */
 { id: 'withBillingJwtV2.next.appRouter', config: next.appRouter, env: envs.withBillingJwtV2 },
Expand All@@ -59,14 +60,14 @@ export const createLongRunningApps = () => {
 { id: 'react.vite.withEmailLinks', config: react.vite, env: envs.withEmailLinks },
 { id: 'vue.vite', config: vue.vite, env: envs.withCustomRoles },

 /**
 /**
 * Tanstack apps - basic flows
 */
 { id: 'tanstack.react-start', config: tanstack.reactStart, env: envs.withEmailCodes },

 /**
 * Various apps - basic flows
 */
 */
 { id: 'withBilling.astro.node', config: astro.node, env: envs.withBilling },
 { id: 'astro.node.withCustomRoles', config: astro.node, env: envs.withCustomRoles },
 { id: 'astro.static.withCustomRoles', config: astro.static, env: envs.withCustomRoles },
Expand All@@ -78,7 +79,7 @@ export const createLongRunningApps = () => {

 const apps = configs.map(longRunningApplication);

 return {
 return {
 getByPattern: (patterns: Array<string | (typeof configs)[number]['id']>) => {
 const res = new Set(patterns.map(pattern => apps.filter(app => idMatchesPattern(app.id, pattern))).flat());
 if (!res.size) {
Expand Down

9 changes: 9 additions & 0 deletions
integration/testUtils/organizationsService.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ export type FakeOrganization = Pick<Organization, 'slug' | 'name'>;
export type OrganizationService = {
 deleteAll: () => Promise<void>;
 createFakeOrganization: () => FakeOrganization;
 createBapiOrganization: (fakeOrganization: FakeOrganization & { createdBy: string }) => Promise<Organization>;
};

export const createOrganizationsService = (clerkClient: ClerkClient) => {
Expand All@@ -19,6 +20,14 @@ export const createOrganizationsService = (clerkClient: ClerkClient) => {
 const bulkDeletionPromises = organizations.data.map(({ id }) => clerkClient.organizations.deleteOrganization(id));
 await Promise.all(bulkDeletionPromises);
 },
 createBapiOrganization: async (fakeOrganization: FakeOrganization & { createdBy: string }) => {
 const organization = await clerkClient.organizations.createOrganization({
 name: fakeOrganization.name,
 slug: fakeOrganization.slug,
 createdBy: fakeOrganization.createdBy,
 });
 return organization;
 },
 };

 return self;
Expand Down

4 changes: 4 additions & 0 deletions
integration/testUtils/usersService.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ export type UserService = {
 createFakeOrganization: (userId: string) => Promise<FakeOrganization>;
 getUser: (opts: { id?: string; email?: string }) => Promise<User | undefined>;
 createFakeAPIKey: (userId: string) => Promise<FakeAPIKey>;
 passwordUntrusted: (userId: string) => Promise<void>;
};

/**
Expand DownExpand Up@@ -210,6 +211,9 @@ export const createUserService = (clerkClient: ClerkClient) => {
 revoke: () => clerkClient.apiKeys.revoke({ apiKeyId: apiKey.id, revocationReason: 'For testing purposes' }),
 } satisfies FakeAPIKey;
 },
 passwordUntrusted: async (userId: string) => {
 await clerkClient.users.__experimental_passwordUntrusted(userId);
 },
 };

 return self;
Expand Down

99 changes: 99 additions & 0 deletions
integration/tests/session-tasks-sign-in-reset-password.test.ts

View file


Open in desktop

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

import { hash } from '../models/helpers';
import { appConfigs } from '../presets';
import { createTestUtils, testAgainstRunningApps } from '../testUtils';

testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasksResetPassword] })(
 'session tasks after sign-in reset password flow @nextjs',
 ({ app }) => {
 test.describe.configure({ mode: 'parallel' });

 test.afterAll(async () => {
 await app.teardown();
 });

 test('resolve both reset password and organization selection tasks after sign-in', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });

 const user = u.services.users.createFakeUser();
 const createdUser = await u.services.users.createBapiUser(user);

 await u.services.users.passwordUntrusted(createdUser.id);

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

 await u.page.getByRole('textbox', { name: 'code' }).click();
 await u.page.keyboard.type('424242', { delay: 100 });

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

 const newPassword = `${hash()}_testtest`;
 await u.po.sessionTask.resolveResetPasswordTask({
 newPassword: newPassword,
 confirmPassword: newPassword,
 });

 await u.po.sessionTask.resolveForceOrganizationSelectionTask({
 name: 'Test Organization',
 });

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

 await u.page.signOut();
 await u.page.context().clearCookies();

 await user.deleteIfExists();
 await u.services.organizations.deleteAll();
 });

 test('sign-in with email and resolve the reset password task', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });
 const user = u.services.users.createFakeUser();
 const createdUser = await u.services.users.createBapiUser(user);

 await u.services.users.passwordUntrusted(createdUser.id);
 const fakeOrganization = u.services.organizations.createFakeOrganization();
 await u.services.organizations.createBapiOrganization({
 ...fakeOrganization,
 createdBy: createdUser.id,
 });

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

 await u.page.getByRole('textbox', { name: 'code' }).fill('424242');

 await u.po.expect.toBeSignedIn();

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

 const newPassword = `${hash()}_testtest`;
 await u.po.sessionTask.resolveResetPasswordTask({
 newPassword: newPassword,
 confirmPassword: newPassword,
 });

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

 await u.page.signOut();
 await u.page.context().clearCookies();

 await user.deleteIfExists();
 await u.services.organizations.deleteAll();
 });
 },
);

11 changes: 11 additions & 0 deletions
packages/backend/src/api/endpoints/UserApi.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -447,4 +447,15 @@ export class UserAPI extends AbstractAPI {
 path: joinPaths(basePath, userId, 'totp'),
 });
 }

 public async __experimental_passwordUntrusted(userId: string) {
 this.requireId(userId);
 return this.request<User>({
 method: 'POST',
 path: joinPaths(basePath, userId, 'password_untrusted'),
 bodyParams: {
 revokeAllSessions: false,
 },
 });
 }
}

25 changes: 24 additions & 1 deletion
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,29 @@
 { "path": "./dist/stripe-vendors*.js", "maxSize": "1KB" },
 { "path": "./dist/query-core-vendors*.js", "maxSize": "11KB" },
 { "path": "./dist/zxcvbn-ts-core*.js", "maxSize": "12KB" },
 { "path": "./dist/zxcvbn-common*.js", "maxSize": "226KB" }
 { "path": "./dist/zxcvbn-common*.js", "maxSize": "226KB" },
 { "path": "./dist/createorganization*.js", "maxSize": "5KB" },
 { "path": "./dist/impersonationfab*.js", "maxSize": "5KB" },
 { "path": "./dist/organizationprofile*.js", "maxSize": "10KB" },
 { "path": "./dist/organizationswitcher*.js", "maxSize": "5KB" },
 { "path": "./dist/organizationlist*.js", "maxSize": "5.5KB" },
 { "path": "./dist/signin*.js", "maxSize": "18KB" },
 { "path": "./dist/signup*.js", "maxSize": "9.5KB" },
 { "path": "./dist/userbutton*.js", "maxSize": "5KB" },
 { "path": "./dist/userprofile*.js", "maxSize": "16KB" },
 { "path": "./dist/userverification*.js", "maxSize": "5KB" },
 { "path": "./dist/onetap*.js", "maxSize": "1KB" },
 { "path": "./dist/waitlist*.js", "maxSize": "1.5KB" },
 { "path": "./dist/keylessPrompt*.js", "maxSize": "6.5KB" },
 { "path": "./dist/enableOrganizationsPrompt*.js", "maxSize": "6.5KB" },
 { "path": "./dist/pricingTable*.js", "maxSize": "4.02KB" },
 { "path": "./dist/checkout*.js", "maxSize": "8.82KB" },
 { "path": "./dist/up-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/op-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/up-plans-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/op-plans-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/statement-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/payment-attempt-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/sessionTasks*.js", "maxSize": "3.0KB" }
 ]
}

3 changes: 2 additions & 1 deletion
packages/clerk-js/src/test/fixture-helpers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ const createUserFixtureHelpers = (baseClient: ClientJSON) => {
 Partial<UserJSON>,
 'email_addresses' | 'phone_numbers' | 'external_accounts' | 'organization_memberships'
 > & {
 identifier?: string;
 email_addresses?: Array<string | Partial<EmailAddressJSON>>;
 phone_numbers?: Array<string | Partial<PhoneNumberJSON>>;
 external_accounts?: Array<OAuthProvider | Partial<ExternalAccountJSON>>;
Expand All@@ -57,7 +58,7 @@ const createUserFixtureHelpers = (baseClient: ClientJSON) => {
 first_name: 'FirstName',
 last_name: 'LastName',
 image_url: '',
 identifier: 'email@test.com',
 identifier: params.identifier || 'email@test.com',
 user_id: '',
 ...params,
 } as PublicUserDataJSON;
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/ar-SA.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -858,6 +858,14 @@ export const arSA: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: undefined,
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/be-BY.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -866,6 +866,14 @@ export const beBY: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: 'Вы ўжо з’яўляецеся членам гэтай арганізацыі.',
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/bg-BG.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -862,6 +862,14 @@ export const bgBG: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: 'Вие вече сте член на тази организация.',
 captcha_invalid: undefined,
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/bn-IN.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -866,6 +866,14 @@ export const bnIN: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: '{{email}} ইতিমধ্যে সংগঠনের একজন সদস্য।',
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/ca-ES.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -861,6 +861,14 @@ export const caES: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: undefined,
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/cs-CZ.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -872,6 +872,14 @@ export const csCZ: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: '{{email}} je již členem organizace.',
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/da-DK.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -859,6 +859,14 @@ export const daDK: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: undefined,
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/de-DE.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -876,6 +876,14 @@ export const deDE: LocalizationResource = {
 actionText: 'Angemeldet als {{identifier}}',
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: 'Sie sind bereits Mitglied in dieser Organisation.',
 captcha_invalid:
Expand Down
Loading
Loading

, '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
feat(clerk-js): Introduce reset password session task (#7268)#7339

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

octoper
merged 3 commits into

from

Dec 2, 2025
 Merged


feat(clerk-js): Introduce reset password session task (#7268)
#7339
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
569acf1

feat(clerk-js): Introduce reset password session task (#7268)


octoper Nov 28, 2025
a3b19ff

fix(ui): Fix import paths and type issues


octoper Dec 1, 2025
e2d734a

chore: Remove changesets


octoper Dec 2, 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


8 changes: 8 additions & 0 deletions
integration/presets/envs.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,6 +164,13 @@ const withSessionTasks = base
 .setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-session-tasks').pk)
 .setEnvVariable('private', 'CLERK_ENCRYPTION_KEY', constants.E2E_CLERK_ENCRYPTION_KEY || 'a-key');

const withSessionTasksResetPassword = base
 .clone()
 .setId('withSessionTasksResetPassword')
 .setEnvVariable('private', 'CLERK_API_URL', 'https://api.clerkstage.dev')
 .setEnvVariable('private', 'CLERK_SECRET_KEY', instanceKeys.get('with-session-tasks-reset-password').sk)
 .setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-session-tasks-reset-password').pk);

const withBillingJwtV2 = base
 .clone()
 .setId('withBillingJwtV2')
Expand DownExpand Up@@ -217,6 +224,7 @@ export const envs = {
 withRestrictedMode,
 withReverification,
 withSessionTasks,
 withSessionTasksResetPassword,
 withSignInOrUpEmailLinksFlow,
 withSignInOrUpFlow,
 withSignInOrUpwithRestrictedModeFlow,
Expand Down

11 changes: 6 additions & 5 deletions
integration/presets/longRunningApps.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,14 +30,15 @@ export const createLongRunningApps = () => {
 { id: 'next.appRouter.withSignInOrUpFlow', config: next.appRouter, env: envs.withSignInOrUpFlow },
 { id: 'next.appRouter.withSignInOrUpEmailLinksFlow', config: next.appRouter, env: envs.withSignInOrUpEmailLinksFlow },
 { id: 'next.appRouter.withSessionTasks', config: next.appRouter, env: envs.withSessionTasks },
 { id: 'next.appRouter.withSessionTasksResetPassword', config: next.appRouter, env: envs.withSessionTasksResetPassword },
 { id: 'next.appRouter.withLegalConsent', config: next.appRouter, env: envs.withLegalConsent },

 /**
 * Quickstart apps
 */
 { id: 'quickstart.next.appRouter', config: next.appRouterQuickstart, env: envs.withEmailCodesQuickstart },

 /**
 /**
 * Billing apps
 */
 { id: 'withBillingJwtV2.next.appRouter', config: next.appRouter, env: envs.withBillingJwtV2 },
Expand All@@ -59,14 +60,14 @@ export const createLongRunningApps = () => {
 { id: 'react.vite.withEmailLinks', config: react.vite, env: envs.withEmailLinks },
 { id: 'vue.vite', config: vue.vite, env: envs.withCustomRoles },

 /**
 /**
 * Tanstack apps - basic flows
 */
 { id: 'tanstack.react-start', config: tanstack.reactStart, env: envs.withEmailCodes },

 /**
 * Various apps - basic flows
 */
 */
 { id: 'withBilling.astro.node', config: astro.node, env: envs.withBilling },
 { id: 'astro.node.withCustomRoles', config: astro.node, env: envs.withCustomRoles },
 { id: 'astro.static.withCustomRoles', config: astro.static, env: envs.withCustomRoles },
Expand All@@ -78,7 +79,7 @@ export const createLongRunningApps = () => {

 const apps = configs.map(longRunningApplication);

 return {
 return {
 getByPattern: (patterns: Array<string | (typeof configs)[number]['id']>) => {
 const res = new Set(patterns.map(pattern => apps.filter(app => idMatchesPattern(app.id, pattern))).flat());
 if (!res.size) {
Expand Down

9 changes: 9 additions & 0 deletions
integration/testUtils/organizationsService.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ export type FakeOrganization = Pick<Organization, 'slug' | 'name'>;
export type OrganizationService = {
 deleteAll: () => Promise<void>;
 createFakeOrganization: () => FakeOrganization;
 createBapiOrganization: (fakeOrganization: FakeOrganization & { createdBy: string }) => Promise<Organization>;
};

export const createOrganizationsService = (clerkClient: ClerkClient) => {
Expand All@@ -19,6 +20,14 @@ export const createOrganizationsService = (clerkClient: ClerkClient) => {
 const bulkDeletionPromises = organizations.data.map(({ id }) => clerkClient.organizations.deleteOrganization(id));
 await Promise.all(bulkDeletionPromises);
 },
 createBapiOrganization: async (fakeOrganization: FakeOrganization & { createdBy: string }) => {
 const organization = await clerkClient.organizations.createOrganization({
 name: fakeOrganization.name,
 slug: fakeOrganization.slug,
 createdBy: fakeOrganization.createdBy,
 });
 return organization;
 },
 };

 return self;
Expand Down

4 changes: 4 additions & 0 deletions
integration/testUtils/usersService.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ export type UserService = {
 createFakeOrganization: (userId: string) => Promise<FakeOrganization>;
 getUser: (opts: { id?: string; email?: string }) => Promise<User | undefined>;
 createFakeAPIKey: (userId: string) => Promise<FakeAPIKey>;
 passwordUntrusted: (userId: string) => Promise<void>;
};

/**
Expand DownExpand Up@@ -210,6 +211,9 @@ export const createUserService = (clerkClient: ClerkClient) => {
 revoke: () => clerkClient.apiKeys.revoke({ apiKeyId: apiKey.id, revocationReason: 'For testing purposes' }),
 } satisfies FakeAPIKey;
 },
 passwordUntrusted: async (userId: string) => {
 await clerkClient.users.__experimental_passwordUntrusted(userId);
 },
 };

 return self;
Expand Down

99 changes: 99 additions & 0 deletions
integration/tests/session-tasks-sign-in-reset-password.test.ts

View file


Open in desktop

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

import { hash } from '../models/helpers';
import { appConfigs } from '../presets';
import { createTestUtils, testAgainstRunningApps } from '../testUtils';

testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasksResetPassword] })(
 'session tasks after sign-in reset password flow @nextjs',
 ({ app }) => {
 test.describe.configure({ mode: 'parallel' });

 test.afterAll(async () => {
 await app.teardown();
 });

 test('resolve both reset password and organization selection tasks after sign-in', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });

 const user = u.services.users.createFakeUser();
 const createdUser = await u.services.users.createBapiUser(user);

 await u.services.users.passwordUntrusted(createdUser.id);

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

 await u.page.getByRole('textbox', { name: 'code' }).click();
 await u.page.keyboard.type('424242', { delay: 100 });

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

 const newPassword = `${hash()}_testtest`;
 await u.po.sessionTask.resolveResetPasswordTask({
 newPassword: newPassword,
 confirmPassword: newPassword,
 });

 await u.po.sessionTask.resolveForceOrganizationSelectionTask({
 name: 'Test Organization',
 });

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

 await u.page.signOut();
 await u.page.context().clearCookies();

 await user.deleteIfExists();
 await u.services.organizations.deleteAll();
 });

 test('sign-in with email and resolve the reset password task', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });
 const user = u.services.users.createFakeUser();
 const createdUser = await u.services.users.createBapiUser(user);

 await u.services.users.passwordUntrusted(createdUser.id);
 const fakeOrganization = u.services.organizations.createFakeOrganization();
 await u.services.organizations.createBapiOrganization({
 ...fakeOrganization,
 createdBy: createdUser.id,
 });

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

 await u.page.getByRole('textbox', { name: 'code' }).fill('424242');

 await u.po.expect.toBeSignedIn();

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

 const newPassword = `${hash()}_testtest`;
 await u.po.sessionTask.resolveResetPasswordTask({
 newPassword: newPassword,
 confirmPassword: newPassword,
 });

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

 await u.page.signOut();
 await u.page.context().clearCookies();

 await user.deleteIfExists();
 await u.services.organizations.deleteAll();
 });
 },
);

11 changes: 11 additions & 0 deletions
packages/backend/src/api/endpoints/UserApi.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -447,4 +447,15 @@ export class UserAPI extends AbstractAPI {
 path: joinPaths(basePath, userId, 'totp'),
 });
 }

 public async __experimental_passwordUntrusted(userId: string) {
 this.requireId(userId);
 return this.request<User>({
 method: 'POST',
 path: joinPaths(basePath, userId, 'password_untrusted'),
 bodyParams: {
 revokeAllSessions: false,
 },
 });
 }
}

25 changes: 24 additions & 1 deletion
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,29 @@
 { "path": "./dist/stripe-vendors*.js", "maxSize": "1KB" },
 { "path": "./dist/query-core-vendors*.js", "maxSize": "11KB" },
 { "path": "./dist/zxcvbn-ts-core*.js", "maxSize": "12KB" },
 { "path": "./dist/zxcvbn-common*.js", "maxSize": "226KB" }
 { "path": "./dist/zxcvbn-common*.js", "maxSize": "226KB" },
 { "path": "./dist/createorganization*.js", "maxSize": "5KB" },
 { "path": "./dist/impersonationfab*.js", "maxSize": "5KB" },
 { "path": "./dist/organizationprofile*.js", "maxSize": "10KB" },
 { "path": "./dist/organizationswitcher*.js", "maxSize": "5KB" },
 { "path": "./dist/organizationlist*.js", "maxSize": "5.5KB" },
 { "path": "./dist/signin*.js", "maxSize": "18KB" },
 { "path": "./dist/signup*.js", "maxSize": "9.5KB" },
 { "path": "./dist/userbutton*.js", "maxSize": "5KB" },
 { "path": "./dist/userprofile*.js", "maxSize": "16KB" },
 { "path": "./dist/userverification*.js", "maxSize": "5KB" },
 { "path": "./dist/onetap*.js", "maxSize": "1KB" },
 { "path": "./dist/waitlist*.js", "maxSize": "1.5KB" },
 { "path": "./dist/keylessPrompt*.js", "maxSize": "6.5KB" },
 { "path": "./dist/enableOrganizationsPrompt*.js", "maxSize": "6.5KB" },
 { "path": "./dist/pricingTable*.js", "maxSize": "4.02KB" },
 { "path": "./dist/checkout*.js", "maxSize": "8.82KB" },
 { "path": "./dist/up-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/op-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/up-plans-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/op-plans-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/statement-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/payment-attempt-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/sessionTasks*.js", "maxSize": "3.0KB" }
 ]
}

3 changes: 2 additions & 1 deletion
packages/clerk-js/src/test/fixture-helpers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ const createUserFixtureHelpers = (baseClient: ClientJSON) => {
 Partial<UserJSON>,
 'email_addresses' | 'phone_numbers' | 'external_accounts' | 'organization_memberships'
 > & {
 identifier?: string;
 email_addresses?: Array<string | Partial<EmailAddressJSON>>;
 phone_numbers?: Array<string | Partial<PhoneNumberJSON>>;
 external_accounts?: Array<OAuthProvider | Partial<ExternalAccountJSON>>;
Expand All@@ -57,7 +58,7 @@ const createUserFixtureHelpers = (baseClient: ClientJSON) => {
 first_name: 'FirstName',
 last_name: 'LastName',
 image_url: '',
 identifier: 'email@test.com',
 identifier: params.identifier || 'email@test.com',
 user_id: '',
 ...params,
 } as PublicUserDataJSON;
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/ar-SA.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -858,6 +858,14 @@ export const arSA: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: undefined,
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/be-BY.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -866,6 +866,14 @@ export const beBY: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: 'Вы ўжо з’яўляецеся членам гэтай арганізацыі.',
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/bg-BG.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -862,6 +862,14 @@ export const bgBG: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: 'Вие вече сте член на тази организация.',
 captcha_invalid: undefined,
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/bn-IN.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -866,6 +866,14 @@ export const bnIN: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: '{{email}} ইতিমধ্যে সংগঠনের একজন সদস্য।',
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/ca-ES.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -861,6 +861,14 @@ export const caES: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: undefined,
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/cs-CZ.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -872,6 +872,14 @@ export const csCZ: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: '{{email}} je již členem organizace.',
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/da-DK.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -859,6 +859,14 @@ export const daDK: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: undefined,
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/de-DE.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -876,6 +876,14 @@ export const deDE: LocalizationResource = {
 actionText: 'Angemeldet als {{identifier}}',
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: 'Sie sind bereits Mitglied in dieser Organisation.',
 captcha_invalid:
Expand Down
Loading
Loading

, '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
feat(clerk-js): Introduce reset password session task (#7268)#7339

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

octoper
merged 3 commits into

from

Dec 2, 2025
 Merged


feat(clerk-js): Introduce reset password session task (#7268)
#7339
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
569acf1

feat(clerk-js): Introduce reset password session task (#7268)


octoper Nov 28, 2025
a3b19ff

fix(ui): Fix import paths and type issues


octoper Dec 1, 2025
e2d734a

chore: Remove changesets


octoper Dec 2, 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


8 changes: 8 additions & 0 deletions
integration/presets/envs.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,6 +164,13 @@ const withSessionTasks = base
 .setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-session-tasks').pk)
 .setEnvVariable('private', 'CLERK_ENCRYPTION_KEY', constants.E2E_CLERK_ENCRYPTION_KEY || 'a-key');

const withSessionTasksResetPassword = base
 .clone()
 .setId('withSessionTasksResetPassword')
 .setEnvVariable('private', 'CLERK_API_URL', 'https://api.clerkstage.dev')
 .setEnvVariable('private', 'CLERK_SECRET_KEY', instanceKeys.get('with-session-tasks-reset-password').sk)
 .setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-session-tasks-reset-password').pk);

const withBillingJwtV2 = base
 .clone()
 .setId('withBillingJwtV2')
Expand DownExpand Up@@ -217,6 +224,7 @@ export const envs = {
 withRestrictedMode,
 withReverification,
 withSessionTasks,
 withSessionTasksResetPassword,
 withSignInOrUpEmailLinksFlow,
 withSignInOrUpFlow,
 withSignInOrUpwithRestrictedModeFlow,
Expand Down

11 changes: 6 additions & 5 deletions
integration/presets/longRunningApps.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,14 +30,15 @@ export const createLongRunningApps = () => {
 { id: 'next.appRouter.withSignInOrUpFlow', config: next.appRouter, env: envs.withSignInOrUpFlow },
 { id: 'next.appRouter.withSignInOrUpEmailLinksFlow', config: next.appRouter, env: envs.withSignInOrUpEmailLinksFlow },
 { id: 'next.appRouter.withSessionTasks', config: next.appRouter, env: envs.withSessionTasks },
 { id: 'next.appRouter.withSessionTasksResetPassword', config: next.appRouter, env: envs.withSessionTasksResetPassword },
 { id: 'next.appRouter.withLegalConsent', config: next.appRouter, env: envs.withLegalConsent },

 /**
 * Quickstart apps
 */
 { id: 'quickstart.next.appRouter', config: next.appRouterQuickstart, env: envs.withEmailCodesQuickstart },

 /**
 /**
 * Billing apps
 */
 { id: 'withBillingJwtV2.next.appRouter', config: next.appRouter, env: envs.withBillingJwtV2 },
Expand All@@ -59,14 +60,14 @@ export const createLongRunningApps = () => {
 { id: 'react.vite.withEmailLinks', config: react.vite, env: envs.withEmailLinks },
 { id: 'vue.vite', config: vue.vite, env: envs.withCustomRoles },

 /**
 /**
 * Tanstack apps - basic flows
 */
 { id: 'tanstack.react-start', config: tanstack.reactStart, env: envs.withEmailCodes },

 /**
 * Various apps - basic flows
 */
 */
 { id: 'withBilling.astro.node', config: astro.node, env: envs.withBilling },
 { id: 'astro.node.withCustomRoles', config: astro.node, env: envs.withCustomRoles },
 { id: 'astro.static.withCustomRoles', config: astro.static, env: envs.withCustomRoles },
Expand All@@ -78,7 +79,7 @@ export const createLongRunningApps = () => {

 const apps = configs.map(longRunningApplication);

 return {
 return {
 getByPattern: (patterns: Array<string | (typeof configs)[number]['id']>) => {
 const res = new Set(patterns.map(pattern => apps.filter(app => idMatchesPattern(app.id, pattern))).flat());
 if (!res.size) {
Expand Down

9 changes: 9 additions & 0 deletions
integration/testUtils/organizationsService.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ export type FakeOrganization = Pick<Organization, 'slug' | 'name'>;
export type OrganizationService = {
 deleteAll: () => Promise<void>;
 createFakeOrganization: () => FakeOrganization;
 createBapiOrganization: (fakeOrganization: FakeOrganization & { createdBy: string }) => Promise<Organization>;
};

export const createOrganizationsService = (clerkClient: ClerkClient) => {
Expand All@@ -19,6 +20,14 @@ export const createOrganizationsService = (clerkClient: ClerkClient) => {
 const bulkDeletionPromises = organizations.data.map(({ id }) => clerkClient.organizations.deleteOrganization(id));
 await Promise.all(bulkDeletionPromises);
 },
 createBapiOrganization: async (fakeOrganization: FakeOrganization & { createdBy: string }) => {
 const organization = await clerkClient.organizations.createOrganization({
 name: fakeOrganization.name,
 slug: fakeOrganization.slug,
 createdBy: fakeOrganization.createdBy,
 });
 return organization;
 },
 };

 return self;
Expand Down

4 changes: 4 additions & 0 deletions
integration/testUtils/usersService.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ export type UserService = {
 createFakeOrganization: (userId: string) => Promise<FakeOrganization>;
 getUser: (opts: { id?: string; email?: string }) => Promise<User | undefined>;
 createFakeAPIKey: (userId: string) => Promise<FakeAPIKey>;
 passwordUntrusted: (userId: string) => Promise<void>;
};

/**
Expand DownExpand Up@@ -210,6 +211,9 @@ export const createUserService = (clerkClient: ClerkClient) => {
 revoke: () => clerkClient.apiKeys.revoke({ apiKeyId: apiKey.id, revocationReason: 'For testing purposes' }),
 } satisfies FakeAPIKey;
 },
 passwordUntrusted: async (userId: string) => {
 await clerkClient.users.__experimental_passwordUntrusted(userId);
 },
 };

 return self;
Expand Down

99 changes: 99 additions & 0 deletions
integration/tests/session-tasks-sign-in-reset-password.test.ts

View file


Open in desktop

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

import { hash } from '../models/helpers';
import { appConfigs } from '../presets';
import { createTestUtils, testAgainstRunningApps } from '../testUtils';

testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasksResetPassword] })(
 'session tasks after sign-in reset password flow @nextjs',
 ({ app }) => {
 test.describe.configure({ mode: 'parallel' });

 test.afterAll(async () => {
 await app.teardown();
 });

 test('resolve both reset password and organization selection tasks after sign-in', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });

 const user = u.services.users.createFakeUser();
 const createdUser = await u.services.users.createBapiUser(user);

 await u.services.users.passwordUntrusted(createdUser.id);

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

 await u.page.getByRole('textbox', { name: 'code' }).click();
 await u.page.keyboard.type('424242', { delay: 100 });

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

 const newPassword = `${hash()}_testtest`;
 await u.po.sessionTask.resolveResetPasswordTask({
 newPassword: newPassword,
 confirmPassword: newPassword,
 });

 await u.po.sessionTask.resolveForceOrganizationSelectionTask({
 name: 'Test Organization',
 });

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

 await u.page.signOut();
 await u.page.context().clearCookies();

 await user.deleteIfExists();
 await u.services.organizations.deleteAll();
 });

 test('sign-in with email and resolve the reset password task', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });
 const user = u.services.users.createFakeUser();
 const createdUser = await u.services.users.createBapiUser(user);

 await u.services.users.passwordUntrusted(createdUser.id);
 const fakeOrganization = u.services.organizations.createFakeOrganization();
 await u.services.organizations.createBapiOrganization({
 ...fakeOrganization,
 createdBy: createdUser.id,
 });

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

 await u.page.getByRole('textbox', { name: 'code' }).fill('424242');

 await u.po.expect.toBeSignedIn();

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

 const newPassword = `${hash()}_testtest`;
 await u.po.sessionTask.resolveResetPasswordTask({
 newPassword: newPassword,
 confirmPassword: newPassword,
 });

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

 await u.page.signOut();
 await u.page.context().clearCookies();

 await user.deleteIfExists();
 await u.services.organizations.deleteAll();
 });
 },
);

11 changes: 11 additions & 0 deletions
packages/backend/src/api/endpoints/UserApi.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -447,4 +447,15 @@ export class UserAPI extends AbstractAPI {
 path: joinPaths(basePath, userId, 'totp'),
 });
 }

 public async __experimental_passwordUntrusted(userId: string) {
 this.requireId(userId);
 return this.request<User>({
 method: 'POST',
 path: joinPaths(basePath, userId, 'password_untrusted'),
 bodyParams: {
 revokeAllSessions: false,
 },
 });
 }
}

25 changes: 24 additions & 1 deletion
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,29 @@
 { "path": "./dist/stripe-vendors*.js", "maxSize": "1KB" },
 { "path": "./dist/query-core-vendors*.js", "maxSize": "11KB" },
 { "path": "./dist/zxcvbn-ts-core*.js", "maxSize": "12KB" },
 { "path": "./dist/zxcvbn-common*.js", "maxSize": "226KB" }
 { "path": "./dist/zxcvbn-common*.js", "maxSize": "226KB" },
 { "path": "./dist/createorganization*.js", "maxSize": "5KB" },
 { "path": "./dist/impersonationfab*.js", "maxSize": "5KB" },
 { "path": "./dist/organizationprofile*.js", "maxSize": "10KB" },
 { "path": "./dist/organizationswitcher*.js", "maxSize": "5KB" },
 { "path": "./dist/organizationlist*.js", "maxSize": "5.5KB" },
 { "path": "./dist/signin*.js", "maxSize": "18KB" },
 { "path": "./dist/signup*.js", "maxSize": "9.5KB" },
 { "path": "./dist/userbutton*.js", "maxSize": "5KB" },
 { "path": "./dist/userprofile*.js", "maxSize": "16KB" },
 { "path": "./dist/userverification*.js", "maxSize": "5KB" },
 { "path": "./dist/onetap*.js", "maxSize": "1KB" },
 { "path": "./dist/waitlist*.js", "maxSize": "1.5KB" },
 { "path": "./dist/keylessPrompt*.js", "maxSize": "6.5KB" },
 { "path": "./dist/enableOrganizationsPrompt*.js", "maxSize": "6.5KB" },
 { "path": "./dist/pricingTable*.js", "maxSize": "4.02KB" },
 { "path": "./dist/checkout*.js", "maxSize": "8.82KB" },
 { "path": "./dist/up-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/op-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/up-plans-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/op-plans-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/statement-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/payment-attempt-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/sessionTasks*.js", "maxSize": "3.0KB" }
 ]
}

3 changes: 2 additions & 1 deletion
packages/clerk-js/src/test/fixture-helpers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ const createUserFixtureHelpers = (baseClient: ClientJSON) => {
 Partial<UserJSON>,
 'email_addresses' | 'phone_numbers' | 'external_accounts' | 'organization_memberships'
 > & {
 identifier?: string;
 email_addresses?: Array<string | Partial<EmailAddressJSON>>;
 phone_numbers?: Array<string | Partial<PhoneNumberJSON>>;
 external_accounts?: Array<OAuthProvider | Partial<ExternalAccountJSON>>;
Expand All@@ -57,7 +58,7 @@ const createUserFixtureHelpers = (baseClient: ClientJSON) => {
 first_name: 'FirstName',
 last_name: 'LastName',
 image_url: '',
 identifier: 'email@test.com',
 identifier: params.identifier || 'email@test.com',
 user_id: '',
 ...params,
 } as PublicUserDataJSON;
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/ar-SA.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -858,6 +858,14 @@ export const arSA: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: undefined,
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/be-BY.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -866,6 +866,14 @@ export const beBY: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: 'Вы ўжо з’яўляецеся членам гэтай арганізацыі.',
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/bg-BG.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -862,6 +862,14 @@ export const bgBG: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: 'Вие вече сте член на тази организация.',
 captcha_invalid: undefined,
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/bn-IN.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -866,6 +866,14 @@ export const bnIN: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: '{{email}} ইতিমধ্যে সংগঠনের একজন সদস্য।',
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/ca-ES.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -861,6 +861,14 @@ export const caES: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: undefined,
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/cs-CZ.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -872,6 +872,14 @@ export const csCZ: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: '{{email}} je již členem organizace.',
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/da-DK.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -859,6 +859,14 @@ export const daDK: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: undefined,
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/de-DE.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -876,6 +876,14 @@ export const deDE: LocalizationResource = {
 actionText: 'Angemeldet als {{identifier}}',
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: 'Sie sind bereits Mitglied in dieser Organisation.',
 captcha_invalid:
Expand Down
Loading
Loading

, '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
feat(clerk-js): Introduce reset password session task (#7268)#7339

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

octoper
merged 3 commits into

from

Dec 2, 2025
 Merged


feat(clerk-js): Introduce reset password session task (#7268)
#7339
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
569acf1

feat(clerk-js): Introduce reset password session task (#7268)


octoper Nov 28, 2025
a3b19ff

fix(ui): Fix import paths and type issues


octoper Dec 1, 2025
e2d734a

chore: Remove changesets


octoper Dec 2, 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


8 changes: 8 additions & 0 deletions
integration/presets/envs.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,6 +164,13 @@ const withSessionTasks = base
 .setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-session-tasks').pk)
 .setEnvVariable('private', 'CLERK_ENCRYPTION_KEY', constants.E2E_CLERK_ENCRYPTION_KEY || 'a-key');

const withSessionTasksResetPassword = base
 .clone()
 .setId('withSessionTasksResetPassword')
 .setEnvVariable('private', 'CLERK_API_URL', 'https://api.clerkstage.dev')
 .setEnvVariable('private', 'CLERK_SECRET_KEY', instanceKeys.get('with-session-tasks-reset-password').sk)
 .setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-session-tasks-reset-password').pk);

const withBillingJwtV2 = base
 .clone()
 .setId('withBillingJwtV2')
Expand DownExpand Up@@ -217,6 +224,7 @@ export const envs = {
 withRestrictedMode,
 withReverification,
 withSessionTasks,
 withSessionTasksResetPassword,
 withSignInOrUpEmailLinksFlow,
 withSignInOrUpFlow,
 withSignInOrUpwithRestrictedModeFlow,
Expand Down

11 changes: 6 additions & 5 deletions
integration/presets/longRunningApps.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,14 +30,15 @@ export const createLongRunningApps = () => {
 { id: 'next.appRouter.withSignInOrUpFlow', config: next.appRouter, env: envs.withSignInOrUpFlow },
 { id: 'next.appRouter.withSignInOrUpEmailLinksFlow', config: next.appRouter, env: envs.withSignInOrUpEmailLinksFlow },
 { id: 'next.appRouter.withSessionTasks', config: next.appRouter, env: envs.withSessionTasks },
 { id: 'next.appRouter.withSessionTasksResetPassword', config: next.appRouter, env: envs.withSessionTasksResetPassword },
 { id: 'next.appRouter.withLegalConsent', config: next.appRouter, env: envs.withLegalConsent },

 /**
 * Quickstart apps
 */
 { id: 'quickstart.next.appRouter', config: next.appRouterQuickstart, env: envs.withEmailCodesQuickstart },

 /**
 /**
 * Billing apps
 */
 { id: 'withBillingJwtV2.next.appRouter', config: next.appRouter, env: envs.withBillingJwtV2 },
Expand All@@ -59,14 +60,14 @@ export const createLongRunningApps = () => {
 { id: 'react.vite.withEmailLinks', config: react.vite, env: envs.withEmailLinks },
 { id: 'vue.vite', config: vue.vite, env: envs.withCustomRoles },

 /**
 /**
 * Tanstack apps - basic flows
 */
 { id: 'tanstack.react-start', config: tanstack.reactStart, env: envs.withEmailCodes },

 /**
 * Various apps - basic flows
 */
 */
 { id: 'withBilling.astro.node', config: astro.node, env: envs.withBilling },
 { id: 'astro.node.withCustomRoles', config: astro.node, env: envs.withCustomRoles },
 { id: 'astro.static.withCustomRoles', config: astro.static, env: envs.withCustomRoles },
Expand All@@ -78,7 +79,7 @@ export const createLongRunningApps = () => {

 const apps = configs.map(longRunningApplication);

 return {
 return {
 getByPattern: (patterns: Array<string | (typeof configs)[number]['id']>) => {
 const res = new Set(patterns.map(pattern => apps.filter(app => idMatchesPattern(app.id, pattern))).flat());
 if (!res.size) {
Expand Down

9 changes: 9 additions & 0 deletions
integration/testUtils/organizationsService.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ export type FakeOrganization = Pick<Organization, 'slug' | 'name'>;
export type OrganizationService = {
 deleteAll: () => Promise<void>;
 createFakeOrganization: () => FakeOrganization;
 createBapiOrganization: (fakeOrganization: FakeOrganization & { createdBy: string }) => Promise<Organization>;
};

export const createOrganizationsService = (clerkClient: ClerkClient) => {
Expand All@@ -19,6 +20,14 @@ export const createOrganizationsService = (clerkClient: ClerkClient) => {
 const bulkDeletionPromises = organizations.data.map(({ id }) => clerkClient.organizations.deleteOrganization(id));
 await Promise.all(bulkDeletionPromises);
 },
 createBapiOrganization: async (fakeOrganization: FakeOrganization & { createdBy: string }) => {
 const organization = await clerkClient.organizations.createOrganization({
 name: fakeOrganization.name,
 slug: fakeOrganization.slug,
 createdBy: fakeOrganization.createdBy,
 });
 return organization;
 },
 };

 return self;
Expand Down

4 changes: 4 additions & 0 deletions
integration/testUtils/usersService.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ export type UserService = {
 createFakeOrganization: (userId: string) => Promise<FakeOrganization>;
 getUser: (opts: { id?: string; email?: string }) => Promise<User | undefined>;
 createFakeAPIKey: (userId: string) => Promise<FakeAPIKey>;
 passwordUntrusted: (userId: string) => Promise<void>;
};

/**
Expand DownExpand Up@@ -210,6 +211,9 @@ export const createUserService = (clerkClient: ClerkClient) => {
 revoke: () => clerkClient.apiKeys.revoke({ apiKeyId: apiKey.id, revocationReason: 'For testing purposes' }),
 } satisfies FakeAPIKey;
 },
 passwordUntrusted: async (userId: string) => {
 await clerkClient.users.__experimental_passwordUntrusted(userId);
 },
 };

 return self;
Expand Down

99 changes: 99 additions & 0 deletions
integration/tests/session-tasks-sign-in-reset-password.test.ts

View file


Open in desktop

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

import { hash } from '../models/helpers';
import { appConfigs } from '../presets';
import { createTestUtils, testAgainstRunningApps } from '../testUtils';

testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasksResetPassword] })(
 'session tasks after sign-in reset password flow @nextjs',
 ({ app }) => {
 test.describe.configure({ mode: 'parallel' });

 test.afterAll(async () => {
 await app.teardown();
 });

 test('resolve both reset password and organization selection tasks after sign-in', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });

 const user = u.services.users.createFakeUser();
 const createdUser = await u.services.users.createBapiUser(user);

 await u.services.users.passwordUntrusted(createdUser.id);

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

 await u.page.getByRole('textbox', { name: 'code' }).click();
 await u.page.keyboard.type('424242', { delay: 100 });

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

 const newPassword = `${hash()}_testtest`;
 await u.po.sessionTask.resolveResetPasswordTask({
 newPassword: newPassword,
 confirmPassword: newPassword,
 });

 await u.po.sessionTask.resolveForceOrganizationSelectionTask({
 name: 'Test Organization',
 });

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

 await u.page.signOut();
 await u.page.context().clearCookies();

 await user.deleteIfExists();
 await u.services.organizations.deleteAll();
 });

 test('sign-in with email and resolve the reset password task', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });
 const user = u.services.users.createFakeUser();
 const createdUser = await u.services.users.createBapiUser(user);

 await u.services.users.passwordUntrusted(createdUser.id);
 const fakeOrganization = u.services.organizations.createFakeOrganization();
 await u.services.organizations.createBapiOrganization({
 ...fakeOrganization,
 createdBy: createdUser.id,
 });

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

 await u.page.getByRole('textbox', { name: 'code' }).fill('424242');

 await u.po.expect.toBeSignedIn();

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

 const newPassword = `${hash()}_testtest`;
 await u.po.sessionTask.resolveResetPasswordTask({
 newPassword: newPassword,
 confirmPassword: newPassword,
 });

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

 await u.page.signOut();
 await u.page.context().clearCookies();

 await user.deleteIfExists();
 await u.services.organizations.deleteAll();
 });
 },
);

11 changes: 11 additions & 0 deletions
packages/backend/src/api/endpoints/UserApi.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -447,4 +447,15 @@ export class UserAPI extends AbstractAPI {
 path: joinPaths(basePath, userId, 'totp'),
 });
 }

 public async __experimental_passwordUntrusted(userId: string) {
 this.requireId(userId);
 return this.request<User>({
 method: 'POST',
 path: joinPaths(basePath, userId, 'password_untrusted'),
 bodyParams: {
 revokeAllSessions: false,
 },
 });
 }
}

25 changes: 24 additions & 1 deletion
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,29 @@
 { "path": "./dist/stripe-vendors*.js", "maxSize": "1KB" },
 { "path": "./dist/query-core-vendors*.js", "maxSize": "11KB" },
 { "path": "./dist/zxcvbn-ts-core*.js", "maxSize": "12KB" },
 { "path": "./dist/zxcvbn-common*.js", "maxSize": "226KB" }
 { "path": "./dist/zxcvbn-common*.js", "maxSize": "226KB" },
 { "path": "./dist/createorganization*.js", "maxSize": "5KB" },
 { "path": "./dist/impersonationfab*.js", "maxSize": "5KB" },
 { "path": "./dist/organizationprofile*.js", "maxSize": "10KB" },
 { "path": "./dist/organizationswitcher*.js", "maxSize": "5KB" },
 { "path": "./dist/organizationlist*.js", "maxSize": "5.5KB" },
 { "path": "./dist/signin*.js", "maxSize": "18KB" },
 { "path": "./dist/signup*.js", "maxSize": "9.5KB" },
 { "path": "./dist/userbutton*.js", "maxSize": "5KB" },
 { "path": "./dist/userprofile*.js", "maxSize": "16KB" },
 { "path": "./dist/userverification*.js", "maxSize": "5KB" },
 { "path": "./dist/onetap*.js", "maxSize": "1KB" },
 { "path": "./dist/waitlist*.js", "maxSize": "1.5KB" },
 { "path": "./dist/keylessPrompt*.js", "maxSize": "6.5KB" },
 { "path": "./dist/enableOrganizationsPrompt*.js", "maxSize": "6.5KB" },
 { "path": "./dist/pricingTable*.js", "maxSize": "4.02KB" },
 { "path": "./dist/checkout*.js", "maxSize": "8.82KB" },
 { "path": "./dist/up-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/op-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/up-plans-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/op-plans-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/statement-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/payment-attempt-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/sessionTasks*.js", "maxSize": "3.0KB" }
 ]
}

3 changes: 2 additions & 1 deletion
packages/clerk-js/src/test/fixture-helpers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ const createUserFixtureHelpers = (baseClient: ClientJSON) => {
 Partial<UserJSON>,
 'email_addresses' | 'phone_numbers' | 'external_accounts' | 'organization_memberships'
 > & {
 identifier?: string;
 email_addresses?: Array<string | Partial<EmailAddressJSON>>;
 phone_numbers?: Array<string | Partial<PhoneNumberJSON>>;
 external_accounts?: Array<OAuthProvider | Partial<ExternalAccountJSON>>;
Expand All@@ -57,7 +58,7 @@ const createUserFixtureHelpers = (baseClient: ClientJSON) => {
 first_name: 'FirstName',
 last_name: 'LastName',
 image_url: '',
 identifier: 'email@test.com',
 identifier: params.identifier || 'email@test.com',
 user_id: '',
 ...params,
 } as PublicUserDataJSON;
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/ar-SA.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -858,6 +858,14 @@ export const arSA: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: undefined,
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/be-BY.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -866,6 +866,14 @@ export const beBY: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: 'Вы ўжо з’яўляецеся членам гэтай арганізацыі.',
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/bg-BG.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -862,6 +862,14 @@ export const bgBG: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: 'Вие вече сте член на тази организация.',
 captcha_invalid: undefined,
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/bn-IN.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -866,6 +866,14 @@ export const bnIN: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: '{{email}} ইতিমধ্যে সংগঠনের একজন সদস্য।',
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/ca-ES.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -861,6 +861,14 @@ export const caES: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: undefined,
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/cs-CZ.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -872,6 +872,14 @@ export const csCZ: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: '{{email}} je již členem organizace.',
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/da-DK.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -859,6 +859,14 @@ export const daDK: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: undefined,
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/de-DE.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -876,6 +876,14 @@ export const deDE: LocalizationResource = {
 actionText: 'Angemeldet als {{identifier}}',
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: 'Sie sind bereits Mitglied in dieser Organisation.',
 captcha_invalid:
Expand Down
Loading
Loading

, '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
feat(clerk-js): Introduce reset password session task (#7268)#7339

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

octoper
merged 3 commits into

from

Dec 2, 2025
 Merged


feat(clerk-js): Introduce reset password session task (#7268)
#7339
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
569acf1

feat(clerk-js): Introduce reset password session task (#7268)


octoper Nov 28, 2025
a3b19ff

fix(ui): Fix import paths and type issues


octoper Dec 1, 2025
e2d734a

chore: Remove changesets


octoper Dec 2, 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


8 changes: 8 additions & 0 deletions
integration/presets/envs.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,6 +164,13 @@ const withSessionTasks = base
 .setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-session-tasks').pk)
 .setEnvVariable('private', 'CLERK_ENCRYPTION_KEY', constants.E2E_CLERK_ENCRYPTION_KEY || 'a-key');

const withSessionTasksResetPassword = base
 .clone()
 .setId('withSessionTasksResetPassword')
 .setEnvVariable('private', 'CLERK_API_URL', 'https://api.clerkstage.dev')
 .setEnvVariable('private', 'CLERK_SECRET_KEY', instanceKeys.get('with-session-tasks-reset-password').sk)
 .setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-session-tasks-reset-password').pk);

const withBillingJwtV2 = base
 .clone()
 .setId('withBillingJwtV2')
Expand DownExpand Up@@ -217,6 +224,7 @@ export const envs = {
 withRestrictedMode,
 withReverification,
 withSessionTasks,
 withSessionTasksResetPassword,
 withSignInOrUpEmailLinksFlow,
 withSignInOrUpFlow,
 withSignInOrUpwithRestrictedModeFlow,
Expand Down

11 changes: 6 additions & 5 deletions
integration/presets/longRunningApps.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,14 +30,15 @@ export const createLongRunningApps = () => {
 { id: 'next.appRouter.withSignInOrUpFlow', config: next.appRouter, env: envs.withSignInOrUpFlow },
 { id: 'next.appRouter.withSignInOrUpEmailLinksFlow', config: next.appRouter, env: envs.withSignInOrUpEmailLinksFlow },
 { id: 'next.appRouter.withSessionTasks', config: next.appRouter, env: envs.withSessionTasks },
 { id: 'next.appRouter.withSessionTasksResetPassword', config: next.appRouter, env: envs.withSessionTasksResetPassword },
 { id: 'next.appRouter.withLegalConsent', config: next.appRouter, env: envs.withLegalConsent },

 /**
 * Quickstart apps
 */
 { id: 'quickstart.next.appRouter', config: next.appRouterQuickstart, env: envs.withEmailCodesQuickstart },

 /**
 /**
 * Billing apps
 */
 { id: 'withBillingJwtV2.next.appRouter', config: next.appRouter, env: envs.withBillingJwtV2 },
Expand All@@ -59,14 +60,14 @@ export const createLongRunningApps = () => {
 { id: 'react.vite.withEmailLinks', config: react.vite, env: envs.withEmailLinks },
 { id: 'vue.vite', config: vue.vite, env: envs.withCustomRoles },

 /**
 /**
 * Tanstack apps - basic flows
 */
 { id: 'tanstack.react-start', config: tanstack.reactStart, env: envs.withEmailCodes },

 /**
 * Various apps - basic flows
 */
 */
 { id: 'withBilling.astro.node', config: astro.node, env: envs.withBilling },
 { id: 'astro.node.withCustomRoles', config: astro.node, env: envs.withCustomRoles },
 { id: 'astro.static.withCustomRoles', config: astro.static, env: envs.withCustomRoles },
Expand All@@ -78,7 +79,7 @@ export const createLongRunningApps = () => {

 const apps = configs.map(longRunningApplication);

 return {
 return {
 getByPattern: (patterns: Array<string | (typeof configs)[number]['id']>) => {
 const res = new Set(patterns.map(pattern => apps.filter(app => idMatchesPattern(app.id, pattern))).flat());
 if (!res.size) {
Expand Down

9 changes: 9 additions & 0 deletions
integration/testUtils/organizationsService.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ export type FakeOrganization = Pick<Organization, 'slug' | 'name'>;
export type OrganizationService = {
 deleteAll: () => Promise<void>;
 createFakeOrganization: () => FakeOrganization;
 createBapiOrganization: (fakeOrganization: FakeOrganization & { createdBy: string }) => Promise<Organization>;
};

export const createOrganizationsService = (clerkClient: ClerkClient) => {
Expand All@@ -19,6 +20,14 @@ export const createOrganizationsService = (clerkClient: ClerkClient) => {
 const bulkDeletionPromises = organizations.data.map(({ id }) => clerkClient.organizations.deleteOrganization(id));
 await Promise.all(bulkDeletionPromises);
 },
 createBapiOrganization: async (fakeOrganization: FakeOrganization & { createdBy: string }) => {
 const organization = await clerkClient.organizations.createOrganization({
 name: fakeOrganization.name,
 slug: fakeOrganization.slug,
 createdBy: fakeOrganization.createdBy,
 });
 return organization;
 },
 };

 return self;
Expand Down

4 changes: 4 additions & 0 deletions
integration/testUtils/usersService.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ export type UserService = {
 createFakeOrganization: (userId: string) => Promise<FakeOrganization>;
 getUser: (opts: { id?: string; email?: string }) => Promise<User | undefined>;
 createFakeAPIKey: (userId: string) => Promise<FakeAPIKey>;
 passwordUntrusted: (userId: string) => Promise<void>;
};

/**
Expand DownExpand Up@@ -210,6 +211,9 @@ export const createUserService = (clerkClient: ClerkClient) => {
 revoke: () => clerkClient.apiKeys.revoke({ apiKeyId: apiKey.id, revocationReason: 'For testing purposes' }),
 } satisfies FakeAPIKey;
 },
 passwordUntrusted: async (userId: string) => {
 await clerkClient.users.__experimental_passwordUntrusted(userId);
 },
 };

 return self;
Expand Down

99 changes: 99 additions & 0 deletions
integration/tests/session-tasks-sign-in-reset-password.test.ts

View file


Open in desktop

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

import { hash } from '../models/helpers';
import { appConfigs } from '../presets';
import { createTestUtils, testAgainstRunningApps } from '../testUtils';

testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasksResetPassword] })(
 'session tasks after sign-in reset password flow @nextjs',
 ({ app }) => {
 test.describe.configure({ mode: 'parallel' });

 test.afterAll(async () => {
 await app.teardown();
 });

 test('resolve both reset password and organization selection tasks after sign-in', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });

 const user = u.services.users.createFakeUser();
 const createdUser = await u.services.users.createBapiUser(user);

 await u.services.users.passwordUntrusted(createdUser.id);

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

 await u.page.getByRole('textbox', { name: 'code' }).click();
 await u.page.keyboard.type('424242', { delay: 100 });

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

 const newPassword = `${hash()}_testtest`;
 await u.po.sessionTask.resolveResetPasswordTask({
 newPassword: newPassword,
 confirmPassword: newPassword,
 });

 await u.po.sessionTask.resolveForceOrganizationSelectionTask({
 name: 'Test Organization',
 });

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

 await u.page.signOut();
 await u.page.context().clearCookies();

 await user.deleteIfExists();
 await u.services.organizations.deleteAll();
 });

 test('sign-in with email and resolve the reset password task', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });
 const user = u.services.users.createFakeUser();
 const createdUser = await u.services.users.createBapiUser(user);

 await u.services.users.passwordUntrusted(createdUser.id);
 const fakeOrganization = u.services.organizations.createFakeOrganization();
 await u.services.organizations.createBapiOrganization({
 ...fakeOrganization,
 createdBy: createdUser.id,
 });

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

 await u.page.getByRole('textbox', { name: 'code' }).fill('424242');

 await u.po.expect.toBeSignedIn();

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

 const newPassword = `${hash()}_testtest`;
 await u.po.sessionTask.resolveResetPasswordTask({
 newPassword: newPassword,
 confirmPassword: newPassword,
 });

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

 await u.page.signOut();
 await u.page.context().clearCookies();

 await user.deleteIfExists();
 await u.services.organizations.deleteAll();
 });
 },
);

11 changes: 11 additions & 0 deletions
packages/backend/src/api/endpoints/UserApi.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -447,4 +447,15 @@ export class UserAPI extends AbstractAPI {
 path: joinPaths(basePath, userId, 'totp'),
 });
 }

 public async __experimental_passwordUntrusted(userId: string) {
 this.requireId(userId);
 return this.request<User>({
 method: 'POST',
 path: joinPaths(basePath, userId, 'password_untrusted'),
 bodyParams: {
 revokeAllSessions: false,
 },
 });
 }
}

25 changes: 24 additions & 1 deletion
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,29 @@
 { "path": "./dist/stripe-vendors*.js", "maxSize": "1KB" },
 { "path": "./dist/query-core-vendors*.js", "maxSize": "11KB" },
 { "path": "./dist/zxcvbn-ts-core*.js", "maxSize": "12KB" },
 { "path": "./dist/zxcvbn-common*.js", "maxSize": "226KB" }
 { "path": "./dist/zxcvbn-common*.js", "maxSize": "226KB" },
 { "path": "./dist/createorganization*.js", "maxSize": "5KB" },
 { "path": "./dist/impersonationfab*.js", "maxSize": "5KB" },
 { "path": "./dist/organizationprofile*.js", "maxSize": "10KB" },
 { "path": "./dist/organizationswitcher*.js", "maxSize": "5KB" },
 { "path": "./dist/organizationlist*.js", "maxSize": "5.5KB" },
 { "path": "./dist/signin*.js", "maxSize": "18KB" },
 { "path": "./dist/signup*.js", "maxSize": "9.5KB" },
 { "path": "./dist/userbutton*.js", "maxSize": "5KB" },
 { "path": "./dist/userprofile*.js", "maxSize": "16KB" },
 { "path": "./dist/userverification*.js", "maxSize": "5KB" },
 { "path": "./dist/onetap*.js", "maxSize": "1KB" },
 { "path": "./dist/waitlist*.js", "maxSize": "1.5KB" },
 { "path": "./dist/keylessPrompt*.js", "maxSize": "6.5KB" },
 { "path": "./dist/enableOrganizationsPrompt*.js", "maxSize": "6.5KB" },
 { "path": "./dist/pricingTable*.js", "maxSize": "4.02KB" },
 { "path": "./dist/checkout*.js", "maxSize": "8.82KB" },
 { "path": "./dist/up-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/op-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/up-plans-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/op-plans-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/statement-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/payment-attempt-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/sessionTasks*.js", "maxSize": "3.0KB" }
 ]
}

3 changes: 2 additions & 1 deletion
packages/clerk-js/src/test/fixture-helpers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ const createUserFixtureHelpers = (baseClient: ClientJSON) => {
 Partial<UserJSON>,
 'email_addresses' | 'phone_numbers' | 'external_accounts' | 'organization_memberships'
 > & {
 identifier?: string;
 email_addresses?: Array<string | Partial<EmailAddressJSON>>;
 phone_numbers?: Array<string | Partial<PhoneNumberJSON>>;
 external_accounts?: Array<OAuthProvider | Partial<ExternalAccountJSON>>;
Expand All@@ -57,7 +58,7 @@ const createUserFixtureHelpers = (baseClient: ClientJSON) => {
 first_name: 'FirstName',
 last_name: 'LastName',
 image_url: '',
 identifier: 'email@test.com',
 identifier: params.identifier || 'email@test.com',
 user_id: '',
 ...params,
 } as PublicUserDataJSON;
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/ar-SA.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -858,6 +858,14 @@ export const arSA: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: undefined,
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/be-BY.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -866,6 +866,14 @@ export const beBY: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: 'Вы ўжо з’яўляецеся членам гэтай арганізацыі.',
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/bg-BG.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -862,6 +862,14 @@ export const bgBG: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: 'Вие вече сте член на тази организация.',
 captcha_invalid: undefined,
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/bn-IN.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -866,6 +866,14 @@ export const bnIN: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: '{{email}} ইতিমধ্যে সংগঠনের একজন সদস্য।',
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/ca-ES.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -861,6 +861,14 @@ export const caES: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: undefined,
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/cs-CZ.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -872,6 +872,14 @@ export const csCZ: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: '{{email}} je již členem organizace.',
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/da-DK.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -859,6 +859,14 @@ export const daDK: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: undefined,
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/de-DE.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -876,6 +876,14 @@ export const deDE: LocalizationResource = {
 actionText: 'Angemeldet als {{identifier}}',
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: 'Sie sind bereits Mitglied in dieser Organisation.',
 captcha_invalid:
Expand Down
Loading
Loading

, '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
feat(clerk-js): Introduce reset password session task (#7268)#7339

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

octoper
merged 3 commits into

from

Dec 2, 2025
 Merged


feat(clerk-js): Introduce reset password session task (#7268)
#7339
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
569acf1

feat(clerk-js): Introduce reset password session task (#7268)


octoper Nov 28, 2025
a3b19ff

fix(ui): Fix import paths and type issues


octoper Dec 1, 2025
e2d734a

chore: Remove changesets


octoper Dec 2, 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


8 changes: 8 additions & 0 deletions
integration/presets/envs.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,6 +164,13 @@ const withSessionTasks = base
 .setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-session-tasks').pk)
 .setEnvVariable('private', 'CLERK_ENCRYPTION_KEY', constants.E2E_CLERK_ENCRYPTION_KEY || 'a-key');

const withSessionTasksResetPassword = base
 .clone()
 .setId('withSessionTasksResetPassword')
 .setEnvVariable('private', 'CLERK_API_URL', 'https://api.clerkstage.dev')
 .setEnvVariable('private', 'CLERK_SECRET_KEY', instanceKeys.get('with-session-tasks-reset-password').sk)
 .setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-session-tasks-reset-password').pk);

const withBillingJwtV2 = base
 .clone()
 .setId('withBillingJwtV2')
Expand DownExpand Up@@ -217,6 +224,7 @@ export const envs = {
 withRestrictedMode,
 withReverification,
 withSessionTasks,
 withSessionTasksResetPassword,
 withSignInOrUpEmailLinksFlow,
 withSignInOrUpFlow,
 withSignInOrUpwithRestrictedModeFlow,
Expand Down

11 changes: 6 additions & 5 deletions
integration/presets/longRunningApps.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,14 +30,15 @@ export const createLongRunningApps = () => {
 { id: 'next.appRouter.withSignInOrUpFlow', config: next.appRouter, env: envs.withSignInOrUpFlow },
 { id: 'next.appRouter.withSignInOrUpEmailLinksFlow', config: next.appRouter, env: envs.withSignInOrUpEmailLinksFlow },
 { id: 'next.appRouter.withSessionTasks', config: next.appRouter, env: envs.withSessionTasks },
 { id: 'next.appRouter.withSessionTasksResetPassword', config: next.appRouter, env: envs.withSessionTasksResetPassword },
 { id: 'next.appRouter.withLegalConsent', config: next.appRouter, env: envs.withLegalConsent },

 /**
 * Quickstart apps
 */
 { id: 'quickstart.next.appRouter', config: next.appRouterQuickstart, env: envs.withEmailCodesQuickstart },

 /**
 /**
 * Billing apps
 */
 { id: 'withBillingJwtV2.next.appRouter', config: next.appRouter, env: envs.withBillingJwtV2 },
Expand All@@ -59,14 +60,14 @@ export const createLongRunningApps = () => {
 { id: 'react.vite.withEmailLinks', config: react.vite, env: envs.withEmailLinks },
 { id: 'vue.vite', config: vue.vite, env: envs.withCustomRoles },

 /**
 /**
 * Tanstack apps - basic flows
 */
 { id: 'tanstack.react-start', config: tanstack.reactStart, env: envs.withEmailCodes },

 /**
 * Various apps - basic flows
 */
 */
 { id: 'withBilling.astro.node', config: astro.node, env: envs.withBilling },
 { id: 'astro.node.withCustomRoles', config: astro.node, env: envs.withCustomRoles },
 { id: 'astro.static.withCustomRoles', config: astro.static, env: envs.withCustomRoles },
Expand All@@ -78,7 +79,7 @@ export const createLongRunningApps = () => {

 const apps = configs.map(longRunningApplication);

 return {
 return {
 getByPattern: (patterns: Array<string | (typeof configs)[number]['id']>) => {
 const res = new Set(patterns.map(pattern => apps.filter(app => idMatchesPattern(app.id, pattern))).flat());
 if (!res.size) {
Expand Down

9 changes: 9 additions & 0 deletions
integration/testUtils/organizationsService.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ export type FakeOrganization = Pick<Organization, 'slug' | 'name'>;
export type OrganizationService = {
 deleteAll: () => Promise<void>;
 createFakeOrganization: () => FakeOrganization;
 createBapiOrganization: (fakeOrganization: FakeOrganization & { createdBy: string }) => Promise<Organization>;
};

export const createOrganizationsService = (clerkClient: ClerkClient) => {
Expand All@@ -19,6 +20,14 @@ export const createOrganizationsService = (clerkClient: ClerkClient) => {
 const bulkDeletionPromises = organizations.data.map(({ id }) => clerkClient.organizations.deleteOrganization(id));
 await Promise.all(bulkDeletionPromises);
 },
 createBapiOrganization: async (fakeOrganization: FakeOrganization & { createdBy: string }) => {
 const organization = await clerkClient.organizations.createOrganization({
 name: fakeOrganization.name,
 slug: fakeOrganization.slug,
 createdBy: fakeOrganization.createdBy,
 });
 return organization;
 },
 };

 return self;
Expand Down

4 changes: 4 additions & 0 deletions
integration/testUtils/usersService.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ export type UserService = {
 createFakeOrganization: (userId: string) => Promise<FakeOrganization>;
 getUser: (opts: { id?: string; email?: string }) => Promise<User | undefined>;
 createFakeAPIKey: (userId: string) => Promise<FakeAPIKey>;
 passwordUntrusted: (userId: string) => Promise<void>;
};

/**
Expand DownExpand Up@@ -210,6 +211,9 @@ export const createUserService = (clerkClient: ClerkClient) => {
 revoke: () => clerkClient.apiKeys.revoke({ apiKeyId: apiKey.id, revocationReason: 'For testing purposes' }),
 } satisfies FakeAPIKey;
 },
 passwordUntrusted: async (userId: string) => {
 await clerkClient.users.__experimental_passwordUntrusted(userId);
 },
 };

 return self;
Expand Down

99 changes: 99 additions & 0 deletions
integration/tests/session-tasks-sign-in-reset-password.test.ts

View file


Open in desktop

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

import { hash } from '../models/helpers';
import { appConfigs } from '../presets';
import { createTestUtils, testAgainstRunningApps } from '../testUtils';

testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasksResetPassword] })(
 'session tasks after sign-in reset password flow @nextjs',
 ({ app }) => {
 test.describe.configure({ mode: 'parallel' });

 test.afterAll(async () => {
 await app.teardown();
 });

 test('resolve both reset password and organization selection tasks after sign-in', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });

 const user = u.services.users.createFakeUser();
 const createdUser = await u.services.users.createBapiUser(user);

 await u.services.users.passwordUntrusted(createdUser.id);

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

 await u.page.getByRole('textbox', { name: 'code' }).click();
 await u.page.keyboard.type('424242', { delay: 100 });

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

 const newPassword = `${hash()}_testtest`;
 await u.po.sessionTask.resolveResetPasswordTask({
 newPassword: newPassword,
 confirmPassword: newPassword,
 });

 await u.po.sessionTask.resolveForceOrganizationSelectionTask({
 name: 'Test Organization',
 });

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

 await u.page.signOut();
 await u.page.context().clearCookies();

 await user.deleteIfExists();
 await u.services.organizations.deleteAll();
 });

 test('sign-in with email and resolve the reset password task', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });
 const user = u.services.users.createFakeUser();
 const createdUser = await u.services.users.createBapiUser(user);

 await u.services.users.passwordUntrusted(createdUser.id);
 const fakeOrganization = u.services.organizations.createFakeOrganization();
 await u.services.organizations.createBapiOrganization({
 ...fakeOrganization,
 createdBy: createdUser.id,
 });

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

 await u.page.getByRole('textbox', { name: 'code' }).fill('424242');

 await u.po.expect.toBeSignedIn();

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

 const newPassword = `${hash()}_testtest`;
 await u.po.sessionTask.resolveResetPasswordTask({
 newPassword: newPassword,
 confirmPassword: newPassword,
 });

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

 await u.page.signOut();
 await u.page.context().clearCookies();

 await user.deleteIfExists();
 await u.services.organizations.deleteAll();
 });
 },
);

11 changes: 11 additions & 0 deletions
packages/backend/src/api/endpoints/UserApi.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -447,4 +447,15 @@ export class UserAPI extends AbstractAPI {
 path: joinPaths(basePath, userId, 'totp'),
 });
 }

 public async __experimental_passwordUntrusted(userId: string) {
 this.requireId(userId);
 return this.request<User>({
 method: 'POST',
 path: joinPaths(basePath, userId, 'password_untrusted'),
 bodyParams: {
 revokeAllSessions: false,
 },
 });
 }
}

25 changes: 24 additions & 1 deletion
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,29 @@
 { "path": "./dist/stripe-vendors*.js", "maxSize": "1KB" },
 { "path": "./dist/query-core-vendors*.js", "maxSize": "11KB" },
 { "path": "./dist/zxcvbn-ts-core*.js", "maxSize": "12KB" },
 { "path": "./dist/zxcvbn-common*.js", "maxSize": "226KB" }
 { "path": "./dist/zxcvbn-common*.js", "maxSize": "226KB" },
 { "path": "./dist/createorganization*.js", "maxSize": "5KB" },
 { "path": "./dist/impersonationfab*.js", "maxSize": "5KB" },
 { "path": "./dist/organizationprofile*.js", "maxSize": "10KB" },
 { "path": "./dist/organizationswitcher*.js", "maxSize": "5KB" },
 { "path": "./dist/organizationlist*.js", "maxSize": "5.5KB" },
 { "path": "./dist/signin*.js", "maxSize": "18KB" },
 { "path": "./dist/signup*.js", "maxSize": "9.5KB" },
 { "path": "./dist/userbutton*.js", "maxSize": "5KB" },
 { "path": "./dist/userprofile*.js", "maxSize": "16KB" },
 { "path": "./dist/userverification*.js", "maxSize": "5KB" },
 { "path": "./dist/onetap*.js", "maxSize": "1KB" },
 { "path": "./dist/waitlist*.js", "maxSize": "1.5KB" },
 { "path": "./dist/keylessPrompt*.js", "maxSize": "6.5KB" },
 { "path": "./dist/enableOrganizationsPrompt*.js", "maxSize": "6.5KB" },
 { "path": "./dist/pricingTable*.js", "maxSize": "4.02KB" },
 { "path": "./dist/checkout*.js", "maxSize": "8.82KB" },
 { "path": "./dist/up-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/op-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/up-plans-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/op-plans-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/statement-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/payment-attempt-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/sessionTasks*.js", "maxSize": "3.0KB" }
 ]
}

3 changes: 2 additions & 1 deletion
packages/clerk-js/src/test/fixture-helpers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ const createUserFixtureHelpers = (baseClient: ClientJSON) => {
 Partial<UserJSON>,
 'email_addresses' | 'phone_numbers' | 'external_accounts' | 'organization_memberships'
 > & {
 identifier?: string;
 email_addresses?: Array<string | Partial<EmailAddressJSON>>;
 phone_numbers?: Array<string | Partial<PhoneNumberJSON>>;
 external_accounts?: Array<OAuthProvider | Partial<ExternalAccountJSON>>;
Expand All@@ -57,7 +58,7 @@ const createUserFixtureHelpers = (baseClient: ClientJSON) => {
 first_name: 'FirstName',
 last_name: 'LastName',
 image_url: '',
 identifier: 'email@test.com',
 identifier: params.identifier || 'email@test.com',
 user_id: '',
 ...params,
 } as PublicUserDataJSON;
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/ar-SA.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -858,6 +858,14 @@ export const arSA: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: undefined,
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/be-BY.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -866,6 +866,14 @@ export const beBY: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: 'Вы ўжо з’яўляецеся членам гэтай арганізацыі.',
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/bg-BG.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -862,6 +862,14 @@ export const bgBG: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: 'Вие вече сте член на тази организация.',
 captcha_invalid: undefined,
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/bn-IN.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -866,6 +866,14 @@ export const bnIN: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: '{{email}} ইতিমধ্যে সংগঠনের একজন সদস্য।',
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/ca-ES.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -861,6 +861,14 @@ export const caES: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: undefined,
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/cs-CZ.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -872,6 +872,14 @@ export const csCZ: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: '{{email}} je již členem organizace.',
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/da-DK.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -859,6 +859,14 @@ export const daDK: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: undefined,
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/de-DE.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -876,6 +876,14 @@ export const deDE: LocalizationResource = {
 actionText: 'Angemeldet als {{identifier}}',
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: 'Sie sind bereits Mitglied in dieser Organisation.',
 captcha_invalid:
Expand Down
Loading
Loading

, '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
feat(clerk-js): Introduce reset password session task (#7268)#7339

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

octoper
merged 3 commits into

from

Dec 2, 2025
 Merged


feat(clerk-js): Introduce reset password session task (#7268)
#7339
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
569acf1

feat(clerk-js): Introduce reset password session task (#7268)


octoper Nov 28, 2025
a3b19ff

fix(ui): Fix import paths and type issues


octoper Dec 1, 2025
e2d734a

chore: Remove changesets


octoper Dec 2, 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


8 changes: 8 additions & 0 deletions
integration/presets/envs.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -164,6 +164,13 @@ const withSessionTasks = base
 .setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-session-tasks').pk)
 .setEnvVariable('private', 'CLERK_ENCRYPTION_KEY', constants.E2E_CLERK_ENCRYPTION_KEY || 'a-key');

const withSessionTasksResetPassword = base
 .clone()
 .setId('withSessionTasksResetPassword')
 .setEnvVariable('private', 'CLERK_API_URL', 'https://api.clerkstage.dev')
 .setEnvVariable('private', 'CLERK_SECRET_KEY', instanceKeys.get('with-session-tasks-reset-password').sk)
 .setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-session-tasks-reset-password').pk);

const withBillingJwtV2 = base
 .clone()
 .setId('withBillingJwtV2')
Expand DownExpand Up@@ -217,6 +224,7 @@ export const envs = {
 withRestrictedMode,
 withReverification,
 withSessionTasks,
 withSessionTasksResetPassword,
 withSignInOrUpEmailLinksFlow,
 withSignInOrUpFlow,
 withSignInOrUpwithRestrictedModeFlow,
Expand Down

11 changes: 6 additions & 5 deletions
integration/presets/longRunningApps.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,14 +30,15 @@ export const createLongRunningApps = () => {
 { id: 'next.appRouter.withSignInOrUpFlow', config: next.appRouter, env: envs.withSignInOrUpFlow },
 { id: 'next.appRouter.withSignInOrUpEmailLinksFlow', config: next.appRouter, env: envs.withSignInOrUpEmailLinksFlow },
 { id: 'next.appRouter.withSessionTasks', config: next.appRouter, env: envs.withSessionTasks },
 { id: 'next.appRouter.withSessionTasksResetPassword', config: next.appRouter, env: envs.withSessionTasksResetPassword },
 { id: 'next.appRouter.withLegalConsent', config: next.appRouter, env: envs.withLegalConsent },

 /**
 * Quickstart apps
 */
 { id: 'quickstart.next.appRouter', config: next.appRouterQuickstart, env: envs.withEmailCodesQuickstart },

 /**
 /**
 * Billing apps
 */
 { id: 'withBillingJwtV2.next.appRouter', config: next.appRouter, env: envs.withBillingJwtV2 },
Expand All@@ -59,14 +60,14 @@ export const createLongRunningApps = () => {
 { id: 'react.vite.withEmailLinks', config: react.vite, env: envs.withEmailLinks },
 { id: 'vue.vite', config: vue.vite, env: envs.withCustomRoles },

 /**
 /**
 * Tanstack apps - basic flows
 */
 { id: 'tanstack.react-start', config: tanstack.reactStart, env: envs.withEmailCodes },

 /**
 * Various apps - basic flows
 */
 */
 { id: 'withBilling.astro.node', config: astro.node, env: envs.withBilling },
 { id: 'astro.node.withCustomRoles', config: astro.node, env: envs.withCustomRoles },
 { id: 'astro.static.withCustomRoles', config: astro.static, env: envs.withCustomRoles },
Expand All@@ -78,7 +79,7 @@ export const createLongRunningApps = () => {

 const apps = configs.map(longRunningApplication);

 return {
 return {
 getByPattern: (patterns: Array<string | (typeof configs)[number]['id']>) => {
 const res = new Set(patterns.map(pattern => apps.filter(app => idMatchesPattern(app.id, pattern))).flat());
 if (!res.size) {
Expand Down

9 changes: 9 additions & 0 deletions
integration/testUtils/organizationsService.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ export type FakeOrganization = Pick<Organization, 'slug' | 'name'>;
export type OrganizationService = {
 deleteAll: () => Promise<void>;
 createFakeOrganization: () => FakeOrganization;
 createBapiOrganization: (fakeOrganization: FakeOrganization & { createdBy: string }) => Promise<Organization>;
};

export const createOrganizationsService = (clerkClient: ClerkClient) => {
Expand All@@ -19,6 +20,14 @@ export const createOrganizationsService = (clerkClient: ClerkClient) => {
 const bulkDeletionPromises = organizations.data.map(({ id }) => clerkClient.organizations.deleteOrganization(id));
 await Promise.all(bulkDeletionPromises);
 },
 createBapiOrganization: async (fakeOrganization: FakeOrganization & { createdBy: string }) => {
 const organization = await clerkClient.organizations.createOrganization({
 name: fakeOrganization.name,
 slug: fakeOrganization.slug,
 createdBy: fakeOrganization.createdBy,
 });
 return organization;
 },
 };

 return self;
Expand Down

4 changes: 4 additions & 0 deletions
integration/testUtils/usersService.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ export type UserService = {
 createFakeOrganization: (userId: string) => Promise<FakeOrganization>;
 getUser: (opts: { id?: string; email?: string }) => Promise<User | undefined>;
 createFakeAPIKey: (userId: string) => Promise<FakeAPIKey>;
 passwordUntrusted: (userId: string) => Promise<void>;
};

/**
Expand DownExpand Up@@ -210,6 +211,9 @@ export const createUserService = (clerkClient: ClerkClient) => {
 revoke: () => clerkClient.apiKeys.revoke({ apiKeyId: apiKey.id, revocationReason: 'For testing purposes' }),
 } satisfies FakeAPIKey;
 },
 passwordUntrusted: async (userId: string) => {
 await clerkClient.users.__experimental_passwordUntrusted(userId);
 },
 };

 return self;
Expand Down

99 changes: 99 additions & 0 deletions
integration/tests/session-tasks-sign-in-reset-password.test.ts

View file


Open in desktop

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

import { hash } from '../models/helpers';
import { appConfigs } from '../presets';
import { createTestUtils, testAgainstRunningApps } from '../testUtils';

testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasksResetPassword] })(
 'session tasks after sign-in reset password flow @nextjs',
 ({ app }) => {
 test.describe.configure({ mode: 'parallel' });

 test.afterAll(async () => {
 await app.teardown();
 });

 test('resolve both reset password and organization selection tasks after sign-in', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });

 const user = u.services.users.createFakeUser();
 const createdUser = await u.services.users.createBapiUser(user);

 await u.services.users.passwordUntrusted(createdUser.id);

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

 await u.page.getByRole('textbox', { name: 'code' }).click();
 await u.page.keyboard.type('424242', { delay: 100 });

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

 const newPassword = `${hash()}_testtest`;
 await u.po.sessionTask.resolveResetPasswordTask({
 newPassword: newPassword,
 confirmPassword: newPassword,
 });

 await u.po.sessionTask.resolveForceOrganizationSelectionTask({
 name: 'Test Organization',
 });

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

 await u.page.signOut();
 await u.page.context().clearCookies();

 await user.deleteIfExists();
 await u.services.organizations.deleteAll();
 });

 test('sign-in with email and resolve the reset password task', async ({ page, context }) => {
 const u = createTestUtils({ app, page, context });
 const user = u.services.users.createFakeUser();
 const createdUser = await u.services.users.createBapiUser(user);

 await u.services.users.passwordUntrusted(createdUser.id);
 const fakeOrganization = u.services.organizations.createFakeOrganization();
 await u.services.organizations.createBapiOrganization({
 ...fakeOrganization,
 createdBy: createdUser.id,
 });

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

 await u.page.getByRole('textbox', { name: 'code' }).fill('424242');

 await u.po.expect.toBeSignedIn();

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

 const newPassword = `${hash()}_testtest`;
 await u.po.sessionTask.resolveResetPasswordTask({
 newPassword: newPassword,
 confirmPassword: newPassword,
 });

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

 await u.page.signOut();
 await u.page.context().clearCookies();

 await user.deleteIfExists();
 await u.services.organizations.deleteAll();
 });
 },
);

11 changes: 11 additions & 0 deletions
packages/backend/src/api/endpoints/UserApi.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -447,4 +447,15 @@ export class UserAPI extends AbstractAPI {
 path: joinPaths(basePath, userId, 'totp'),
 });
 }

 public async __experimental_passwordUntrusted(userId: string) {
 this.requireId(userId);
 return this.request<User>({
 method: 'POST',
 path: joinPaths(basePath, userId, 'password_untrusted'),
 bodyParams: {
 revokeAllSessions: false,
 },
 });
 }
}

25 changes: 24 additions & 1 deletion
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,29 @@
 { "path": "./dist/stripe-vendors*.js", "maxSize": "1KB" },
 { "path": "./dist/query-core-vendors*.js", "maxSize": "11KB" },
 { "path": "./dist/zxcvbn-ts-core*.js", "maxSize": "12KB" },
 { "path": "./dist/zxcvbn-common*.js", "maxSize": "226KB" }
 { "path": "./dist/zxcvbn-common*.js", "maxSize": "226KB" },
 { "path": "./dist/createorganization*.js", "maxSize": "5KB" },
 { "path": "./dist/impersonationfab*.js", "maxSize": "5KB" },
 { "path": "./dist/organizationprofile*.js", "maxSize": "10KB" },
 { "path": "./dist/organizationswitcher*.js", "maxSize": "5KB" },
 { "path": "./dist/organizationlist*.js", "maxSize": "5.5KB" },
 { "path": "./dist/signin*.js", "maxSize": "18KB" },
 { "path": "./dist/signup*.js", "maxSize": "9.5KB" },
 { "path": "./dist/userbutton*.js", "maxSize": "5KB" },
 { "path": "./dist/userprofile*.js", "maxSize": "16KB" },
 { "path": "./dist/userverification*.js", "maxSize": "5KB" },
 { "path": "./dist/onetap*.js", "maxSize": "1KB" },
 { "path": "./dist/waitlist*.js", "maxSize": "1.5KB" },
 { "path": "./dist/keylessPrompt*.js", "maxSize": "6.5KB" },
 { "path": "./dist/enableOrganizationsPrompt*.js", "maxSize": "6.5KB" },
 { "path": "./dist/pricingTable*.js", "maxSize": "4.02KB" },
 { "path": "./dist/checkout*.js", "maxSize": "8.82KB" },
 { "path": "./dist/up-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/op-billing-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/up-plans-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/op-plans-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/statement-page*.js", "maxSize": "1.0KB" },
 { "path": "./dist/payment-attempt-page*.js", "maxSize": "3.0KB" },
 { "path": "./dist/sessionTasks*.js", "maxSize": "3.0KB" }
 ]
}

3 changes: 2 additions & 1 deletion
packages/clerk-js/src/test/fixture-helpers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,7 @@ const createUserFixtureHelpers = (baseClient: ClientJSON) => {
 Partial<UserJSON>,
 'email_addresses' | 'phone_numbers' | 'external_accounts' | 'organization_memberships'
 > & {
 identifier?: string;
 email_addresses?: Array<string | Partial<EmailAddressJSON>>;
 phone_numbers?: Array<string | Partial<PhoneNumberJSON>>;
 external_accounts?: Array<OAuthProvider | Partial<ExternalAccountJSON>>;
Expand All@@ -57,7 +58,7 @@ const createUserFixtureHelpers = (baseClient: ClientJSON) => {
 first_name: 'FirstName',
 last_name: 'LastName',
 image_url: '',
 identifier: 'email@test.com',
 identifier: params.identifier || 'email@test.com',
 user_id: '',
 ...params,
 } as PublicUserDataJSON;
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/ar-SA.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -858,6 +858,14 @@ export const arSA: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: undefined,
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/be-BY.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -866,6 +866,14 @@ export const beBY: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: 'Вы ўжо з’яўляецеся членам гэтай арганізацыі.',
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/bg-BG.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -862,6 +862,14 @@ export const bgBG: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: 'Вие вече сте член на тази организация.',
 captcha_invalid: undefined,
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/bn-IN.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -866,6 +866,14 @@ export const bnIN: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: '{{email}} ইতিমধ্যে সংগঠনের একজন সদস্য।',
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/ca-ES.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -861,6 +861,14 @@ export const caES: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: undefined,
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/cs-CZ.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -872,6 +872,14 @@ export const csCZ: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: '{{email}} je již členem organizace.',
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/da-DK.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -859,6 +859,14 @@ export const daDK: LocalizationResource = {
 actionText: undefined,
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: undefined,
 captcha_invalid:
Expand Down

8 changes: 8 additions & 0 deletions
packages/localizations/src/de-DE.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -876,6 +876,14 @@ export const deDE: LocalizationResource = {
 actionText: 'Angemeldet als {{identifier}}',
 },
 },
 taskResetPassword: {
 formButtonPrimary: undefined,
 signOut: {
 actionLink: undefined,
 actionText: undefined,
 },
 title: undefined,
 },
 unstable__errors: {
 already_a_member_in_organization: 'Sie sind bereits Mitglied in dieser Organisation.',
 captcha_invalid:
Expand Down
Loading
Loading