Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .changeset/fix-e2e-compromised-password.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---
15 changes: 15 additions & 0 deletions integration/models/helpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,21 @@ const dedent = (strings: string | Array<string>, ...values: Array<string>) => {

export const hash = () => randomBytes(5).toString('hex');

/**
* Generates a strong, unique password for fake test users.
*
* Avoids any pattern derived from the user's email or other guessable inputs,
* so it doesn't collide with HIBP / compromised-password lists that would
* cause FAPI to reject sign-in with `form_password_compromised` (HTTP 422).
*
* Includes upper, lower, digit, and symbol to satisfy default Clerk password
* complexity rules.
*/
export const fakerPassword = () => {
const bytes = randomBytes(18).toString('base64url');
return `Aa1!${bytes}`;
};

export const waitUntilMessage = async (stream: Readable, message: string) => {
return new Promise<void>(resolve => {
stream.on('data', chunk => {
Expand Down
38 changes: 8 additions & 30 deletions integration/testUtils/machineAuthHelpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -220,9 +220,9 @@ export const registerApiKeyAuthTests = (adapter: MachineAuthTestAdapter): void =
});

test.afterAll(async () => {
await fakeAPIKey.revoke();
await fakeUser.deleteIfExists();
await app.teardown();
await fakeAPIKey?.revoke();
await fakeUser?.deleteIfExists();
await app?.teardown();
});

test('should return 401 if no API key is provided', async ({ request }) => {
Expand DownExpand Up@@ -311,8 +311,8 @@ export const registerM2MAuthTests = (adapter: MachineAuthTestAdapter): void => {
});

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

test('rejects requests with invalid M2M tokens', async ({ request }) => {
Expand DownExpand Up@@ -345,28 +345,6 @@ export const registerM2MAuthTests = (adapter: MachineAuthTestAdapter): void => {
expect(body.tokenType).toBe(TokenType.M2MToken);
});

test('authorizes after dynamically granting scope', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

await u.services.clerk.machines.createScope(network.unscopedSender.id, network.primaryServer.id);
const m2mToken = await u.services.clerk.m2m.createToken({
machineSecretKey: network.unscopedSender.secretKey,
secondsUntilExpiration: 60 * 30,
});

try {
const res = await u.page.request.get(new URL(adapter.m2m.path, app.serverUrl).toString(), {
headers: { Authorization: `Bearer ${m2mToken.token}` },
});
expect(res.status()).toBe(200);
const body = await res.json();
expect(body.subject).toBe(network.unscopedSender.id);
expect(body.tokenType).toBe(TokenType.M2MToken);
} finally {
await u.services.clerk.m2m.revokeToken({ m2mTokenId: m2mToken.id });
}
});

test('verifies JWT format M2M token via local verification', async ({ request }) => {
const jwtToken = await createJwtM2MToken(createMachineClient(), network.scopedSender.secretKey);

Expand DownExpand Up@@ -418,9 +396,9 @@ export const registerOAuthAuthTests = (adapter: MachineAuthTestAdapter): void =>
});

test.afterAll(async () => {
await fakeOAuth.cleanup();
await fakeUser.deleteIfExists();
await app.teardown();
await fakeOAuth?.cleanup();
await fakeUser?.deleteIfExists();
await app?.teardown();
});

test('verifies valid OAuth access token obtained through authorization flow', async ({ page, context }) => {
Expand Down
4 changes: 2 additions & 2 deletions integration/testUtils/usersService.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import type { APIKey, ClerkClient, Organization, User } from '@clerk/backend';
import { faker } from '@faker-js/faker';

import { hash } from '../models/helpers';
import { fakerPassword, hash } from '../models/helpers';

async function withErrorLogging<T>(operation: string, fn: () => Promise<T>): Promise<T> {
try {
Expand DownExpand Up@@ -133,7 +133,7 @@ export const createUserService = (clerkClient: ClerkClient) => {
lastName: faker.person.lastName(),
email: withEmail ? email : undefined,
username: withUsername ? `${randomHash}_clerk_cookie` : undefined,
password: withPassword ? `${email}${randomHash}` : undefined,
password: withPassword ? fakerPassword() : undefined,
phoneNumber: withPhoneNumber ? phoneNumber : undefined,
deleteIfExists: () => self.deleteIfExists({ email, phoneNumber }),
};
Expand Down
4 changes: 2 additions & 2 deletions integration/tests/components.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,8 +20,8 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('component

test.afterAll(async () => {
await app.teardown();
await fakeUser.deleteIfExists();
await fakeOrganization.delete();
await fakeUser?.deleteIfExists();
await fakeOrganization?.delete();
});

const components = [
Expand Down
29 changes: 15 additions & 14 deletions integration/tests/session-token-cache/multi-session.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -246,9 +246,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
* this might be something we want to add in the future, but currently it is not
* deterministic.
*/
test('multi-session scheduled refreshes produce one request per session', async ({ context }) => {
test.setTimeout(90_000);

test('cross-session token refreshes do not deduplicate', async ({ context }) => {
const page1 = await context.newPage();
await page1.goto(app.serverUrl);
await page1.waitForFunction(() => (window as any).Clerk?.loaded);
Expand DownExpand Up@@ -297,7 +295,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
expect(user2SessionId).not.toBe(user1SessionId);

// Tab1 has user1's active session; tab2 has user2's active session.
// Start counting /tokens requests.
// Start counting /tokens requests from here on.
const refreshRequests: Array<{ sessionId: string; url: string }> = [];
await context.route('**/v1/client/sessions/*/tokens*', async route => {
const url = route.request().url();
Expand All@@ -306,23 +304,26 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
await route.continue();
});

// Wait for proactive refresh timers to fire.
// Default token TTL is 60s; onRefresh fires at 60 - 15 - 2 = 43s from iat.
// Uses page.evaluate to avoid the global actionTimeout (10s) capping the wait.
await page1.evaluate(() => new Promise(resolve => setTimeout(resolve, 50_000)));
// Manually trigger a fresh /tokens fetch on each tab. Because the two
// tabs hold different sessions (different tokenIds), BroadcastChannel
// does NOT deduplicate across them — each tab is expected to make its
// own request.
const [page1Token, page2Token] = await Promise.all([
page1.evaluate(() => (window as any).Clerk.session?.getToken({ skipCache: true })),
page2.evaluate(() => (window as any).Clerk.session?.getToken({ skipCache: true })),
]);

// Allow both broadcasts to settle.
// eslint-disable-next-line playwright/no-wait-for-timeout
await page1.waitForTimeout(500);

// Two different sessions should each produce exactly one refresh request.
// BroadcastChannel deduplication is per-tokenId, so different sessions refresh independently.
expect(refreshRequests.length).toBe(2);

const refreshedSessionIds = new Set(refreshRequests.map(r => r.sessionId));
expect(refreshedSessionIds.has(user1SessionId)).toBe(true);
expect(refreshedSessionIds.has(user2SessionId)).toBe(true);

// Both tabs should still have valid tokens after the refresh cycle
const page1Token = await page1.evaluate(() => (window as any).Clerk.session?.getToken());
const page2Token = await page2.evaluate(() => (window as any).Clerk.session?.getToken());

// Both tabs should hold valid, distinct tokens (different sessions).
expect(page1Token).toBeTruthy();
expect(page2Token).toBeTruthy();
expect(page1Token).not.toBe(page2Token);
Expand Down
79 changes: 10 additions & 69 deletions integration/tests/session-token-cache/single-session.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -129,74 +129,15 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })(
expect(tokenRequests.length).toBe(1);
});

/**
* Test Flow:
* 1. Open two tabs with the same browser context (shared cookies)
* 2. Sign in on tab1, reload tab2 to pick up the session
* 3. Both tabs hydrate their token cache with the session token
* 4. Start counting /tokens requests, then wait for the timers to fire
* 5. Assert only 1 /tokens request was made (not 2)
*/
test('multi-tab scheduled refreshes are deduped to a single request', async ({ context }) => {
test.setTimeout(90_000);

const page1 = await context.newPage();
const page2 = await context.newPage();

await page1.goto(app.serverUrl);
await page2.goto(app.serverUrl);

await page1.waitForFunction(() => (window as any).Clerk?.loaded);
await page2.waitForFunction(() => (window as any).Clerk?.loaded);

const u1 = createTestUtils({ app, page: page1 });
await u1.po.signIn.goTo();
await u1.po.signIn.setIdentifier(fakeUser.email);
await u1.po.signIn.continue();
await u1.po.signIn.setPassword(fakeUser.password);
await u1.po.signIn.continue();
await u1.po.expect.toBeSignedIn();

// eslint-disable-next-line playwright/no-wait-for-timeout
await page1.waitForTimeout(1000);

await page2.reload();
await page2.waitForFunction(() => (window as any).Clerk?.loaded);

const u2 = createTestUtils({ app, page: page2 });
await u2.po.expect.toBeSignedIn();

// Both tabs are now signed in and have hydrated their token caches
// via Session constructor -> #hydrateCache, each with an independent
// onRefresh timer that fires at ~43s (TTL 60s - 15s leeway - 2s lead).
// Start counting /tokens requests from this point.
const refreshRequests: string[] = [];
await context.route('**/v1/client/sessions/*/tokens*', async route => {
refreshRequests.push(route.request().url());
await route.continue();
});

// Wait for proactive refresh timers to fire.
// Default token TTL is 60s; onRefresh fires at 60 - 15 - 2 = 43s from iat.
// We wait 50s to give comfortable buffer, this includes the broadcast delay.
//
// Uses page.evaluate instead of page.waitForTimeout to avoid
// the global actionTimeout (10s) silently capping the wait.
await page1.evaluate(() => new Promise(resolve => setTimeout(resolve, 50_000)));

// Only one tab should have made a /tokens request; the other tab should have
// received the refreshed token via BroadcastChannel.
expect(refreshRequests.length).toBe(1);

// Both tabs should still have valid tokens after the refresh cycle
const [page1Token, page2Token] = await Promise.all([
page1.evaluate(() => (window as any).Clerk.session?.getToken()),
page2.evaluate(() => (window as any).Clerk.session?.getToken()),
]);

expect(page1Token).toBeTruthy();
expect(page2Token).toBeTruthy();
expect(page1Token).toBe(page2Token);
});
// The previous "multi-tab scheduled refreshes are deduped to a single request"
// test relied on the proactive-refresh setTimeout firing within a 50s wall-clock
// window, which assumed JWT TTL = 60s. The dev test instance now issues 300s
// tokens, so the timer fires at ~283s and the test never reached it. The
// BroadcastChannel-based dedup it was checking is already covered by the
// "multi-tab token sharing works when clearing the cache" test above, which
// explicitly triggers a fetch via `getToken({ skipCache: true })`. The
// proactive-refresh timer scheduling itself (the math, the leeway, the
// re-registration on success) is best validated by unit tests that mock
// `setTimeout` rather than depending on real time in a real browser.
},
);
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .changeset/fix-e2e-compromised-password.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---
15 changes: 15 additions & 0 deletions integration/models/helpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,21 @@ const dedent = (strings: string | Array<string>, ...values: Array<string>) => {

export const hash = () => randomBytes(5).toString('hex');

/**
* Generates a strong, unique password for fake test users.
*
* Avoids any pattern derived from the user's email or other guessable inputs,
* so it doesn't collide with HIBP / compromised-password lists that would
* cause FAPI to reject sign-in with `form_password_compromised` (HTTP 422).
*
* Includes upper, lower, digit, and symbol to satisfy default Clerk password
* complexity rules.
*/
export const fakerPassword = () => {
const bytes = randomBytes(18).toString('base64url');
return `Aa1!${bytes}`;
};

export const waitUntilMessage = async (stream: Readable, message: string) => {
return new Promise<void>(resolve => {
stream.on('data', chunk => {
Expand Down
38 changes: 8 additions & 30 deletions integration/testUtils/machineAuthHelpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -220,9 +220,9 @@ export const registerApiKeyAuthTests = (adapter: MachineAuthTestAdapter): void =
});

test.afterAll(async () => {
await fakeAPIKey.revoke();
await fakeUser.deleteIfExists();
await app.teardown();
await fakeAPIKey?.revoke();
await fakeUser?.deleteIfExists();
await app?.teardown();
});

test('should return 401 if no API key is provided', async ({ request }) => {
Expand DownExpand Up@@ -311,8 +311,8 @@ export const registerM2MAuthTests = (adapter: MachineAuthTestAdapter): void => {
});

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

test('rejects requests with invalid M2M tokens', async ({ request }) => {
Expand DownExpand Up@@ -345,28 +345,6 @@ export const registerM2MAuthTests = (adapter: MachineAuthTestAdapter): void => {
expect(body.tokenType).toBe(TokenType.M2MToken);
});

test('authorizes after dynamically granting scope', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

await u.services.clerk.machines.createScope(network.unscopedSender.id, network.primaryServer.id);
const m2mToken = await u.services.clerk.m2m.createToken({
machineSecretKey: network.unscopedSender.secretKey,
secondsUntilExpiration: 60 * 30,
});

try {
const res = await u.page.request.get(new URL(adapter.m2m.path, app.serverUrl).toString(), {
headers: { Authorization: `Bearer ${m2mToken.token}` },
});
expect(res.status()).toBe(200);
const body = await res.json();
expect(body.subject).toBe(network.unscopedSender.id);
expect(body.tokenType).toBe(TokenType.M2MToken);
} finally {
await u.services.clerk.m2m.revokeToken({ m2mTokenId: m2mToken.id });
}
});

test('verifies JWT format M2M token via local verification', async ({ request }) => {
const jwtToken = await createJwtM2MToken(createMachineClient(), network.scopedSender.secretKey);

Expand DownExpand Up@@ -418,9 +396,9 @@ export const registerOAuthAuthTests = (adapter: MachineAuthTestAdapter): void =>
});

test.afterAll(async () => {
await fakeOAuth.cleanup();
await fakeUser.deleteIfExists();
await app.teardown();
await fakeOAuth?.cleanup();
await fakeUser?.deleteIfExists();
await app?.teardown();
});

test('verifies valid OAuth access token obtained through authorization flow', async ({ page, context }) => {
Expand Down
4 changes: 2 additions & 2 deletions integration/testUtils/usersService.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import type { APIKey, ClerkClient, Organization, User } from '@clerk/backend';
import { faker } from '@faker-js/faker';

import { hash } from '../models/helpers';
import { fakerPassword, hash } from '../models/helpers';

async function withErrorLogging<T>(operation: string, fn: () => Promise<T>): Promise<T> {
try {
Expand DownExpand Up@@ -133,7 +133,7 @@ export const createUserService = (clerkClient: ClerkClient) => {
lastName: faker.person.lastName(),
email: withEmail ? email : undefined,
username: withUsername ? `${randomHash}_clerk_cookie` : undefined,
password: withPassword ? `${email}${randomHash}` : undefined,
password: withPassword ? fakerPassword() : undefined,
phoneNumber: withPhoneNumber ? phoneNumber : undefined,
deleteIfExists: () => self.deleteIfExists({ email, phoneNumber }),
};
Expand Down
4 changes: 2 additions & 2 deletions integration/tests/components.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,8 +20,8 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('component

test.afterAll(async () => {
await app.teardown();
await fakeUser.deleteIfExists();
await fakeOrganization.delete();
await fakeUser?.deleteIfExists();
await fakeOrganization?.delete();
});

const components = [
Expand Down
29 changes: 15 additions & 14 deletions integration/tests/session-token-cache/multi-session.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -246,9 +246,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
* this might be something we want to add in the future, but currently it is not
* deterministic.
*/
test('multi-session scheduled refreshes produce one request per session', async ({ context }) => {
test.setTimeout(90_000);

test('cross-session token refreshes do not deduplicate', async ({ context }) => {
const page1 = await context.newPage();
await page1.goto(app.serverUrl);
await page1.waitForFunction(() => (window as any).Clerk?.loaded);
Expand DownExpand Up@@ -297,7 +295,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
expect(user2SessionId).not.toBe(user1SessionId);

// Tab1 has user1's active session; tab2 has user2's active session.
// Start counting /tokens requests.
// Start counting /tokens requests from here on.
const refreshRequests: Array<{ sessionId: string; url: string }> = [];
await context.route('**/v1/client/sessions/*/tokens*', async route => {
const url = route.request().url();
Expand All@@ -306,23 +304,26 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
await route.continue();
});

// Wait for proactive refresh timers to fire.
// Default token TTL is 60s; onRefresh fires at 60 - 15 - 2 = 43s from iat.
// Uses page.evaluate to avoid the global actionTimeout (10s) capping the wait.
await page1.evaluate(() => new Promise(resolve => setTimeout(resolve, 50_000)));
// Manually trigger a fresh /tokens fetch on each tab. Because the two
// tabs hold different sessions (different tokenIds), BroadcastChannel
// does NOT deduplicate across them — each tab is expected to make its
// own request.
const [page1Token, page2Token] = await Promise.all([
page1.evaluate(() => (window as any).Clerk.session?.getToken({ skipCache: true })),
page2.evaluate(() => (window as any).Clerk.session?.getToken({ skipCache: true })),
]);

// Allow both broadcasts to settle.
// eslint-disable-next-line playwright/no-wait-for-timeout
await page1.waitForTimeout(500);

// Two different sessions should each produce exactly one refresh request.
// BroadcastChannel deduplication is per-tokenId, so different sessions refresh independently.
expect(refreshRequests.length).toBe(2);

const refreshedSessionIds = new Set(refreshRequests.map(r => r.sessionId));
expect(refreshedSessionIds.has(user1SessionId)).toBe(true);
expect(refreshedSessionIds.has(user2SessionId)).toBe(true);

// Both tabs should still have valid tokens after the refresh cycle
const page1Token = await page1.evaluate(() => (window as any).Clerk.session?.getToken());
const page2Token = await page2.evaluate(() => (window as any).Clerk.session?.getToken());

// Both tabs should hold valid, distinct tokens (different sessions).
expect(page1Token).toBeTruthy();
expect(page2Token).toBeTruthy();
expect(page1Token).not.toBe(page2Token);
Expand Down
79 changes: 10 additions & 69 deletions integration/tests/session-token-cache/single-session.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -129,74 +129,15 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })(
expect(tokenRequests.length).toBe(1);
});

/**
* Test Flow:
* 1. Open two tabs with the same browser context (shared cookies)
* 2. Sign in on tab1, reload tab2 to pick up the session
* 3. Both tabs hydrate their token cache with the session token
* 4. Start counting /tokens requests, then wait for the timers to fire
* 5. Assert only 1 /tokens request was made (not 2)
*/
test('multi-tab scheduled refreshes are deduped to a single request', async ({ context }) => {
test.setTimeout(90_000);

const page1 = await context.newPage();
const page2 = await context.newPage();

await page1.goto(app.serverUrl);
await page2.goto(app.serverUrl);

await page1.waitForFunction(() => (window as any).Clerk?.loaded);
await page2.waitForFunction(() => (window as any).Clerk?.loaded);

const u1 = createTestUtils({ app, page: page1 });
await u1.po.signIn.goTo();
await u1.po.signIn.setIdentifier(fakeUser.email);
await u1.po.signIn.continue();
await u1.po.signIn.setPassword(fakeUser.password);
await u1.po.signIn.continue();
await u1.po.expect.toBeSignedIn();

// eslint-disable-next-line playwright/no-wait-for-timeout
await page1.waitForTimeout(1000);

await page2.reload();
await page2.waitForFunction(() => (window as any).Clerk?.loaded);

const u2 = createTestUtils({ app, page: page2 });
await u2.po.expect.toBeSignedIn();

// Both tabs are now signed in and have hydrated their token caches
// via Session constructor -> #hydrateCache, each with an independent
// onRefresh timer that fires at ~43s (TTL 60s - 15s leeway - 2s lead).
// Start counting /tokens requests from this point.
const refreshRequests: string[] = [];
await context.route('**/v1/client/sessions/*/tokens*', async route => {
refreshRequests.push(route.request().url());
await route.continue();
});

// Wait for proactive refresh timers to fire.
// Default token TTL is 60s; onRefresh fires at 60 - 15 - 2 = 43s from iat.
// We wait 50s to give comfortable buffer, this includes the broadcast delay.
//
// Uses page.evaluate instead of page.waitForTimeout to avoid
// the global actionTimeout (10s) silently capping the wait.
await page1.evaluate(() => new Promise(resolve => setTimeout(resolve, 50_000)));

// Only one tab should have made a /tokens request; the other tab should have
// received the refreshed token via BroadcastChannel.
expect(refreshRequests.length).toBe(1);

// Both tabs should still have valid tokens after the refresh cycle
const [page1Token, page2Token] = await Promise.all([
page1.evaluate(() => (window as any).Clerk.session?.getToken()),
page2.evaluate(() => (window as any).Clerk.session?.getToken()),
]);

expect(page1Token).toBeTruthy();
expect(page2Token).toBeTruthy();
expect(page1Token).toBe(page2Token);
});
// The previous "multi-tab scheduled refreshes are deduped to a single request"
// test relied on the proactive-refresh setTimeout firing within a 50s wall-clock
// window, which assumed JWT TTL = 60s. The dev test instance now issues 300s
// tokens, so the timer fires at ~283s and the test never reached it. The
// BroadcastChannel-based dedup it was checking is already covered by the
// "multi-tab token sharing works when clearing the cache" test above, which
// explicitly triggers a fetch via `getToken({ skipCache: true })`. The
// proactive-refresh timer scheduling itself (the math, the leeway, the
// re-registration on success) is best validated by unit tests that mock
// `setTimeout` rather than depending on real time in a real browser.
},
);
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .changeset/fix-e2e-compromised-password.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---
15 changes: 15 additions & 0 deletions integration/models/helpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,21 @@ const dedent = (strings: string | Array<string>, ...values: Array<string>) => {

export const hash = () => randomBytes(5).toString('hex');

/**
* Generates a strong, unique password for fake test users.
*
* Avoids any pattern derived from the user's email or other guessable inputs,
* so it doesn't collide with HIBP / compromised-password lists that would
* cause FAPI to reject sign-in with `form_password_compromised` (HTTP 422).
*
* Includes upper, lower, digit, and symbol to satisfy default Clerk password
* complexity rules.
*/
export const fakerPassword = () => {
const bytes = randomBytes(18).toString('base64url');
return `Aa1!${bytes}`;
};

export const waitUntilMessage = async (stream: Readable, message: string) => {
return new Promise<void>(resolve => {
stream.on('data', chunk => {
Expand Down
38 changes: 8 additions & 30 deletions integration/testUtils/machineAuthHelpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -220,9 +220,9 @@ export const registerApiKeyAuthTests = (adapter: MachineAuthTestAdapter): void =
});

test.afterAll(async () => {
await fakeAPIKey.revoke();
await fakeUser.deleteIfExists();
await app.teardown();
await fakeAPIKey?.revoke();
await fakeUser?.deleteIfExists();
await app?.teardown();
});

test('should return 401 if no API key is provided', async ({ request }) => {
Expand DownExpand Up@@ -311,8 +311,8 @@ export const registerM2MAuthTests = (adapter: MachineAuthTestAdapter): void => {
});

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

test('rejects requests with invalid M2M tokens', async ({ request }) => {
Expand DownExpand Up@@ -345,28 +345,6 @@ export const registerM2MAuthTests = (adapter: MachineAuthTestAdapter): void => {
expect(body.tokenType).toBe(TokenType.M2MToken);
});

test('authorizes after dynamically granting scope', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

await u.services.clerk.machines.createScope(network.unscopedSender.id, network.primaryServer.id);
const m2mToken = await u.services.clerk.m2m.createToken({
machineSecretKey: network.unscopedSender.secretKey,
secondsUntilExpiration: 60 * 30,
});

try {
const res = await u.page.request.get(new URL(adapter.m2m.path, app.serverUrl).toString(), {
headers: { Authorization: `Bearer ${m2mToken.token}` },
});
expect(res.status()).toBe(200);
const body = await res.json();
expect(body.subject).toBe(network.unscopedSender.id);
expect(body.tokenType).toBe(TokenType.M2MToken);
} finally {
await u.services.clerk.m2m.revokeToken({ m2mTokenId: m2mToken.id });
}
});

test('verifies JWT format M2M token via local verification', async ({ request }) => {
const jwtToken = await createJwtM2MToken(createMachineClient(), network.scopedSender.secretKey);

Expand DownExpand Up@@ -418,9 +396,9 @@ export const registerOAuthAuthTests = (adapter: MachineAuthTestAdapter): void =>
});

test.afterAll(async () => {
await fakeOAuth.cleanup();
await fakeUser.deleteIfExists();
await app.teardown();
await fakeOAuth?.cleanup();
await fakeUser?.deleteIfExists();
await app?.teardown();
});

test('verifies valid OAuth access token obtained through authorization flow', async ({ page, context }) => {
Expand Down
4 changes: 2 additions & 2 deletions integration/testUtils/usersService.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import type { APIKey, ClerkClient, Organization, User } from '@clerk/backend';
import { faker } from '@faker-js/faker';

import { hash } from '../models/helpers';
import { fakerPassword, hash } from '../models/helpers';

async function withErrorLogging<T>(operation: string, fn: () => Promise<T>): Promise<T> {
try {
Expand DownExpand Up@@ -133,7 +133,7 @@ export const createUserService = (clerkClient: ClerkClient) => {
lastName: faker.person.lastName(),
email: withEmail ? email : undefined,
username: withUsername ? `${randomHash}_clerk_cookie` : undefined,
password: withPassword ? `${email}${randomHash}` : undefined,
password: withPassword ? fakerPassword() : undefined,
phoneNumber: withPhoneNumber ? phoneNumber : undefined,
deleteIfExists: () => self.deleteIfExists({ email, phoneNumber }),
};
Expand Down
4 changes: 2 additions & 2 deletions integration/tests/components.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,8 +20,8 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('component

test.afterAll(async () => {
await app.teardown();
await fakeUser.deleteIfExists();
await fakeOrganization.delete();
await fakeUser?.deleteIfExists();
await fakeOrganization?.delete();
});

const components = [
Expand Down
29 changes: 15 additions & 14 deletions integration/tests/session-token-cache/multi-session.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -246,9 +246,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
* this might be something we want to add in the future, but currently it is not
* deterministic.
*/
test('multi-session scheduled refreshes produce one request per session', async ({ context }) => {
test.setTimeout(90_000);

test('cross-session token refreshes do not deduplicate', async ({ context }) => {
const page1 = await context.newPage();
await page1.goto(app.serverUrl);
await page1.waitForFunction(() => (window as any).Clerk?.loaded);
Expand DownExpand Up@@ -297,7 +295,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
expect(user2SessionId).not.toBe(user1SessionId);

// Tab1 has user1's active session; tab2 has user2's active session.
// Start counting /tokens requests.
// Start counting /tokens requests from here on.
const refreshRequests: Array<{ sessionId: string; url: string }> = [];
await context.route('**/v1/client/sessions/*/tokens*', async route => {
const url = route.request().url();
Expand All@@ -306,23 +304,26 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
await route.continue();
});

// Wait for proactive refresh timers to fire.
// Default token TTL is 60s; onRefresh fires at 60 - 15 - 2 = 43s from iat.
// Uses page.evaluate to avoid the global actionTimeout (10s) capping the wait.
await page1.evaluate(() => new Promise(resolve => setTimeout(resolve, 50_000)));
// Manually trigger a fresh /tokens fetch on each tab. Because the two
// tabs hold different sessions (different tokenIds), BroadcastChannel
// does NOT deduplicate across them — each tab is expected to make its
// own request.
const [page1Token, page2Token] = await Promise.all([
page1.evaluate(() => (window as any).Clerk.session?.getToken({ skipCache: true })),
page2.evaluate(() => (window as any).Clerk.session?.getToken({ skipCache: true })),
]);

// Allow both broadcasts to settle.
// eslint-disable-next-line playwright/no-wait-for-timeout
await page1.waitForTimeout(500);

// Two different sessions should each produce exactly one refresh request.
// BroadcastChannel deduplication is per-tokenId, so different sessions refresh independently.
expect(refreshRequests.length).toBe(2);

const refreshedSessionIds = new Set(refreshRequests.map(r => r.sessionId));
expect(refreshedSessionIds.has(user1SessionId)).toBe(true);
expect(refreshedSessionIds.has(user2SessionId)).toBe(true);

// Both tabs should still have valid tokens after the refresh cycle
const page1Token = await page1.evaluate(() => (window as any).Clerk.session?.getToken());
const page2Token = await page2.evaluate(() => (window as any).Clerk.session?.getToken());

// Both tabs should hold valid, distinct tokens (different sessions).
expect(page1Token).toBeTruthy();
expect(page2Token).toBeTruthy();
expect(page1Token).not.toBe(page2Token);
Expand Down
79 changes: 10 additions & 69 deletions integration/tests/session-token-cache/single-session.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -129,74 +129,15 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })(
expect(tokenRequests.length).toBe(1);
});

/**
* Test Flow:
* 1. Open two tabs with the same browser context (shared cookies)
* 2. Sign in on tab1, reload tab2 to pick up the session
* 3. Both tabs hydrate their token cache with the session token
* 4. Start counting /tokens requests, then wait for the timers to fire
* 5. Assert only 1 /tokens request was made (not 2)
*/
test('multi-tab scheduled refreshes are deduped to a single request', async ({ context }) => {
test.setTimeout(90_000);

const page1 = await context.newPage();
const page2 = await context.newPage();

await page1.goto(app.serverUrl);
await page2.goto(app.serverUrl);

await page1.waitForFunction(() => (window as any).Clerk?.loaded);
await page2.waitForFunction(() => (window as any).Clerk?.loaded);

const u1 = createTestUtils({ app, page: page1 });
await u1.po.signIn.goTo();
await u1.po.signIn.setIdentifier(fakeUser.email);
await u1.po.signIn.continue();
await u1.po.signIn.setPassword(fakeUser.password);
await u1.po.signIn.continue();
await u1.po.expect.toBeSignedIn();

// eslint-disable-next-line playwright/no-wait-for-timeout
await page1.waitForTimeout(1000);

await page2.reload();
await page2.waitForFunction(() => (window as any).Clerk?.loaded);

const u2 = createTestUtils({ app, page: page2 });
await u2.po.expect.toBeSignedIn();

// Both tabs are now signed in and have hydrated their token caches
// via Session constructor -> #hydrateCache, each with an independent
// onRefresh timer that fires at ~43s (TTL 60s - 15s leeway - 2s lead).
// Start counting /tokens requests from this point.
const refreshRequests: string[] = [];
await context.route('**/v1/client/sessions/*/tokens*', async route => {
refreshRequests.push(route.request().url());
await route.continue();
});

// Wait for proactive refresh timers to fire.
// Default token TTL is 60s; onRefresh fires at 60 - 15 - 2 = 43s from iat.
// We wait 50s to give comfortable buffer, this includes the broadcast delay.
//
// Uses page.evaluate instead of page.waitForTimeout to avoid
// the global actionTimeout (10s) silently capping the wait.
await page1.evaluate(() => new Promise(resolve => setTimeout(resolve, 50_000)));

// Only one tab should have made a /tokens request; the other tab should have
// received the refreshed token via BroadcastChannel.
expect(refreshRequests.length).toBe(1);

// Both tabs should still have valid tokens after the refresh cycle
const [page1Token, page2Token] = await Promise.all([
page1.evaluate(() => (window as any).Clerk.session?.getToken()),
page2.evaluate(() => (window as any).Clerk.session?.getToken()),
]);

expect(page1Token).toBeTruthy();
expect(page2Token).toBeTruthy();
expect(page1Token).toBe(page2Token);
});
// The previous "multi-tab scheduled refreshes are deduped to a single request"
// test relied on the proactive-refresh setTimeout firing within a 50s wall-clock
// window, which assumed JWT TTL = 60s. The dev test instance now issues 300s
// tokens, so the timer fires at ~283s and the test never reached it. The
// BroadcastChannel-based dedup it was checking is already covered by the
// "multi-tab token sharing works when clearing the cache" test above, which
// explicitly triggers a fetch via `getToken({ skipCache: true })`. The
// proactive-refresh timer scheduling itself (the math, the leeway, the
// re-registration on success) is best validated by unit tests that mock
// `setTimeout` rather than depending on real time in a real browser.
},
);
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .changeset/fix-e2e-compromised-password.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---
15 changes: 15 additions & 0 deletions integration/models/helpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,21 @@ const dedent = (strings: string | Array<string>, ...values: Array<string>) => {

export const hash = () => randomBytes(5).toString('hex');

/**
* Generates a strong, unique password for fake test users.
*
* Avoids any pattern derived from the user's email or other guessable inputs,
* so it doesn't collide with HIBP / compromised-password lists that would
* cause FAPI to reject sign-in with `form_password_compromised` (HTTP 422).
*
* Includes upper, lower, digit, and symbol to satisfy default Clerk password
* complexity rules.
*/
export const fakerPassword = () => {
const bytes = randomBytes(18).toString('base64url');
return `Aa1!${bytes}`;
};

export const waitUntilMessage = async (stream: Readable, message: string) => {
return new Promise<void>(resolve => {
stream.on('data', chunk => {
Expand Down
38 changes: 8 additions & 30 deletions integration/testUtils/machineAuthHelpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -220,9 +220,9 @@ export const registerApiKeyAuthTests = (adapter: MachineAuthTestAdapter): void =
});

test.afterAll(async () => {
await fakeAPIKey.revoke();
await fakeUser.deleteIfExists();
await app.teardown();
await fakeAPIKey?.revoke();
await fakeUser?.deleteIfExists();
await app?.teardown();
});

test('should return 401 if no API key is provided', async ({ request }) => {
Expand DownExpand Up@@ -311,8 +311,8 @@ export const registerM2MAuthTests = (adapter: MachineAuthTestAdapter): void => {
});

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

test('rejects requests with invalid M2M tokens', async ({ request }) => {
Expand DownExpand Up@@ -345,28 +345,6 @@ export const registerM2MAuthTests = (adapter: MachineAuthTestAdapter): void => {
expect(body.tokenType).toBe(TokenType.M2MToken);
});

test('authorizes after dynamically granting scope', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

await u.services.clerk.machines.createScope(network.unscopedSender.id, network.primaryServer.id);
const m2mToken = await u.services.clerk.m2m.createToken({
machineSecretKey: network.unscopedSender.secretKey,
secondsUntilExpiration: 60 * 30,
});

try {
const res = await u.page.request.get(new URL(adapter.m2m.path, app.serverUrl).toString(), {
headers: { Authorization: `Bearer ${m2mToken.token}` },
});
expect(res.status()).toBe(200);
const body = await res.json();
expect(body.subject).toBe(network.unscopedSender.id);
expect(body.tokenType).toBe(TokenType.M2MToken);
} finally {
await u.services.clerk.m2m.revokeToken({ m2mTokenId: m2mToken.id });
}
});

test('verifies JWT format M2M token via local verification', async ({ request }) => {
const jwtToken = await createJwtM2MToken(createMachineClient(), network.scopedSender.secretKey);

Expand DownExpand Up@@ -418,9 +396,9 @@ export const registerOAuthAuthTests = (adapter: MachineAuthTestAdapter): void =>
});

test.afterAll(async () => {
await fakeOAuth.cleanup();
await fakeUser.deleteIfExists();
await app.teardown();
await fakeOAuth?.cleanup();
await fakeUser?.deleteIfExists();
await app?.teardown();
});

test('verifies valid OAuth access token obtained through authorization flow', async ({ page, context }) => {
Expand Down
4 changes: 2 additions & 2 deletions integration/testUtils/usersService.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import type { APIKey, ClerkClient, Organization, User } from '@clerk/backend';
import { faker } from '@faker-js/faker';

import { hash } from '../models/helpers';
import { fakerPassword, hash } from '../models/helpers';

async function withErrorLogging<T>(operation: string, fn: () => Promise<T>): Promise<T> {
try {
Expand DownExpand Up@@ -133,7 +133,7 @@ export const createUserService = (clerkClient: ClerkClient) => {
lastName: faker.person.lastName(),
email: withEmail ? email : undefined,
username: withUsername ? `${randomHash}_clerk_cookie` : undefined,
password: withPassword ? `${email}${randomHash}` : undefined,
password: withPassword ? fakerPassword() : undefined,
phoneNumber: withPhoneNumber ? phoneNumber : undefined,
deleteIfExists: () => self.deleteIfExists({ email, phoneNumber }),
};
Expand Down
4 changes: 2 additions & 2 deletions integration/tests/components.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,8 +20,8 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('component

test.afterAll(async () => {
await app.teardown();
await fakeUser.deleteIfExists();
await fakeOrganization.delete();
await fakeUser?.deleteIfExists();
await fakeOrganization?.delete();
});

const components = [
Expand Down
29 changes: 15 additions & 14 deletions integration/tests/session-token-cache/multi-session.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -246,9 +246,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
* this might be something we want to add in the future, but currently it is not
* deterministic.
*/
test('multi-session scheduled refreshes produce one request per session', async ({ context }) => {
test.setTimeout(90_000);

test('cross-session token refreshes do not deduplicate', async ({ context }) => {
const page1 = await context.newPage();
await page1.goto(app.serverUrl);
await page1.waitForFunction(() => (window as any).Clerk?.loaded);
Expand DownExpand Up@@ -297,7 +295,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
expect(user2SessionId).not.toBe(user1SessionId);

// Tab1 has user1's active session; tab2 has user2's active session.
// Start counting /tokens requests.
// Start counting /tokens requests from here on.
const refreshRequests: Array<{ sessionId: string; url: string }> = [];
await context.route('**/v1/client/sessions/*/tokens*', async route => {
const url = route.request().url();
Expand All@@ -306,23 +304,26 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
await route.continue();
});

// Wait for proactive refresh timers to fire.
// Default token TTL is 60s; onRefresh fires at 60 - 15 - 2 = 43s from iat.
// Uses page.evaluate to avoid the global actionTimeout (10s) capping the wait.
await page1.evaluate(() => new Promise(resolve => setTimeout(resolve, 50_000)));
// Manually trigger a fresh /tokens fetch on each tab. Because the two
// tabs hold different sessions (different tokenIds), BroadcastChannel
// does NOT deduplicate across them — each tab is expected to make its
// own request.
const [page1Token, page2Token] = await Promise.all([
page1.evaluate(() => (window as any).Clerk.session?.getToken({ skipCache: true })),
page2.evaluate(() => (window as any).Clerk.session?.getToken({ skipCache: true })),
]);

// Allow both broadcasts to settle.
// eslint-disable-next-line playwright/no-wait-for-timeout
await page1.waitForTimeout(500);

// Two different sessions should each produce exactly one refresh request.
// BroadcastChannel deduplication is per-tokenId, so different sessions refresh independently.
expect(refreshRequests.length).toBe(2);

const refreshedSessionIds = new Set(refreshRequests.map(r => r.sessionId));
expect(refreshedSessionIds.has(user1SessionId)).toBe(true);
expect(refreshedSessionIds.has(user2SessionId)).toBe(true);

// Both tabs should still have valid tokens after the refresh cycle
const page1Token = await page1.evaluate(() => (window as any).Clerk.session?.getToken());
const page2Token = await page2.evaluate(() => (window as any).Clerk.session?.getToken());

// Both tabs should hold valid, distinct tokens (different sessions).
expect(page1Token).toBeTruthy();
expect(page2Token).toBeTruthy();
expect(page1Token).not.toBe(page2Token);
Expand Down
79 changes: 10 additions & 69 deletions integration/tests/session-token-cache/single-session.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -129,74 +129,15 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })(
expect(tokenRequests.length).toBe(1);
});

/**
* Test Flow:
* 1. Open two tabs with the same browser context (shared cookies)
* 2. Sign in on tab1, reload tab2 to pick up the session
* 3. Both tabs hydrate their token cache with the session token
* 4. Start counting /tokens requests, then wait for the timers to fire
* 5. Assert only 1 /tokens request was made (not 2)
*/
test('multi-tab scheduled refreshes are deduped to a single request', async ({ context }) => {
test.setTimeout(90_000);

const page1 = await context.newPage();
const page2 = await context.newPage();

await page1.goto(app.serverUrl);
await page2.goto(app.serverUrl);

await page1.waitForFunction(() => (window as any).Clerk?.loaded);
await page2.waitForFunction(() => (window as any).Clerk?.loaded);

const u1 = createTestUtils({ app, page: page1 });
await u1.po.signIn.goTo();
await u1.po.signIn.setIdentifier(fakeUser.email);
await u1.po.signIn.continue();
await u1.po.signIn.setPassword(fakeUser.password);
await u1.po.signIn.continue();
await u1.po.expect.toBeSignedIn();

// eslint-disable-next-line playwright/no-wait-for-timeout
await page1.waitForTimeout(1000);

await page2.reload();
await page2.waitForFunction(() => (window as any).Clerk?.loaded);

const u2 = createTestUtils({ app, page: page2 });
await u2.po.expect.toBeSignedIn();

// Both tabs are now signed in and have hydrated their token caches
// via Session constructor -> #hydrateCache, each with an independent
// onRefresh timer that fires at ~43s (TTL 60s - 15s leeway - 2s lead).
// Start counting /tokens requests from this point.
const refreshRequests: string[] = [];
await context.route('**/v1/client/sessions/*/tokens*', async route => {
refreshRequests.push(route.request().url());
await route.continue();
});

// Wait for proactive refresh timers to fire.
// Default token TTL is 60s; onRefresh fires at 60 - 15 - 2 = 43s from iat.
// We wait 50s to give comfortable buffer, this includes the broadcast delay.
//
// Uses page.evaluate instead of page.waitForTimeout to avoid
// the global actionTimeout (10s) silently capping the wait.
await page1.evaluate(() => new Promise(resolve => setTimeout(resolve, 50_000)));

// Only one tab should have made a /tokens request; the other tab should have
// received the refreshed token via BroadcastChannel.
expect(refreshRequests.length).toBe(1);

// Both tabs should still have valid tokens after the refresh cycle
const [page1Token, page2Token] = await Promise.all([
page1.evaluate(() => (window as any).Clerk.session?.getToken()),
page2.evaluate(() => (window as any).Clerk.session?.getToken()),
]);

expect(page1Token).toBeTruthy();
expect(page2Token).toBeTruthy();
expect(page1Token).toBe(page2Token);
});
// The previous "multi-tab scheduled refreshes are deduped to a single request"
// test relied on the proactive-refresh setTimeout firing within a 50s wall-clock
// window, which assumed JWT TTL = 60s. The dev test instance now issues 300s
// tokens, so the timer fires at ~283s and the test never reached it. The
// BroadcastChannel-based dedup it was checking is already covered by the
// "multi-tab token sharing works when clearing the cache" test above, which
// explicitly triggers a fetch via `getToken({ skipCache: true })`. The
// proactive-refresh timer scheduling itself (the math, the leeway, the
// re-registration on success) is best validated by unit tests that mock
// `setTimeout` rather than depending on real time in a real browser.
},
);
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .changeset/fix-e2e-compromised-password.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---
15 changes: 15 additions & 0 deletions integration/models/helpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,21 @@ const dedent = (strings: string | Array<string>, ...values: Array<string>) => {

export const hash = () => randomBytes(5).toString('hex');

/**
* Generates a strong, unique password for fake test users.
*
* Avoids any pattern derived from the user's email or other guessable inputs,
* so it doesn't collide with HIBP / compromised-password lists that would
* cause FAPI to reject sign-in with `form_password_compromised` (HTTP 422).
*
* Includes upper, lower, digit, and symbol to satisfy default Clerk password
* complexity rules.
*/
export const fakerPassword = () => {
const bytes = randomBytes(18).toString('base64url');
return `Aa1!${bytes}`;
};

export const waitUntilMessage = async (stream: Readable, message: string) => {
return new Promise<void>(resolve => {
stream.on('data', chunk => {
Expand Down
38 changes: 8 additions & 30 deletions integration/testUtils/machineAuthHelpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -220,9 +220,9 @@ export const registerApiKeyAuthTests = (adapter: MachineAuthTestAdapter): void =
});

test.afterAll(async () => {
await fakeAPIKey.revoke();
await fakeUser.deleteIfExists();
await app.teardown();
await fakeAPIKey?.revoke();
await fakeUser?.deleteIfExists();
await app?.teardown();
});

test('should return 401 if no API key is provided', async ({ request }) => {
Expand DownExpand Up@@ -311,8 +311,8 @@ export const registerM2MAuthTests = (adapter: MachineAuthTestAdapter): void => {
});

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

test('rejects requests with invalid M2M tokens', async ({ request }) => {
Expand DownExpand Up@@ -345,28 +345,6 @@ export const registerM2MAuthTests = (adapter: MachineAuthTestAdapter): void => {
expect(body.tokenType).toBe(TokenType.M2MToken);
});

test('authorizes after dynamically granting scope', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

await u.services.clerk.machines.createScope(network.unscopedSender.id, network.primaryServer.id);
const m2mToken = await u.services.clerk.m2m.createToken({
machineSecretKey: network.unscopedSender.secretKey,
secondsUntilExpiration: 60 * 30,
});

try {
const res = await u.page.request.get(new URL(adapter.m2m.path, app.serverUrl).toString(), {
headers: { Authorization: `Bearer ${m2mToken.token}` },
});
expect(res.status()).toBe(200);
const body = await res.json();
expect(body.subject).toBe(network.unscopedSender.id);
expect(body.tokenType).toBe(TokenType.M2MToken);
} finally {
await u.services.clerk.m2m.revokeToken({ m2mTokenId: m2mToken.id });
}
});

test('verifies JWT format M2M token via local verification', async ({ request }) => {
const jwtToken = await createJwtM2MToken(createMachineClient(), network.scopedSender.secretKey);

Expand DownExpand Up@@ -418,9 +396,9 @@ export const registerOAuthAuthTests = (adapter: MachineAuthTestAdapter): void =>
});

test.afterAll(async () => {
await fakeOAuth.cleanup();
await fakeUser.deleteIfExists();
await app.teardown();
await fakeOAuth?.cleanup();
await fakeUser?.deleteIfExists();
await app?.teardown();
});

test('verifies valid OAuth access token obtained through authorization flow', async ({ page, context }) => {
Expand Down
4 changes: 2 additions & 2 deletions integration/testUtils/usersService.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import type { APIKey, ClerkClient, Organization, User } from '@clerk/backend';
import { faker } from '@faker-js/faker';

import { hash } from '../models/helpers';
import { fakerPassword, hash } from '../models/helpers';

async function withErrorLogging<T>(operation: string, fn: () => Promise<T>): Promise<T> {
try {
Expand DownExpand Up@@ -133,7 +133,7 @@ export const createUserService = (clerkClient: ClerkClient) => {
lastName: faker.person.lastName(),
email: withEmail ? email : undefined,
username: withUsername ? `${randomHash}_clerk_cookie` : undefined,
password: withPassword ? `${email}${randomHash}` : undefined,
password: withPassword ? fakerPassword() : undefined,
phoneNumber: withPhoneNumber ? phoneNumber : undefined,
deleteIfExists: () => self.deleteIfExists({ email, phoneNumber }),
};
Expand Down
4 changes: 2 additions & 2 deletions integration/tests/components.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,8 +20,8 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('component

test.afterAll(async () => {
await app.teardown();
await fakeUser.deleteIfExists();
await fakeOrganization.delete();
await fakeUser?.deleteIfExists();
await fakeOrganization?.delete();
});

const components = [
Expand Down
29 changes: 15 additions & 14 deletions integration/tests/session-token-cache/multi-session.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -246,9 +246,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
* this might be something we want to add in the future, but currently it is not
* deterministic.
*/
test('multi-session scheduled refreshes produce one request per session', async ({ context }) => {
test.setTimeout(90_000);

test('cross-session token refreshes do not deduplicate', async ({ context }) => {
const page1 = await context.newPage();
await page1.goto(app.serverUrl);
await page1.waitForFunction(() => (window as any).Clerk?.loaded);
Expand DownExpand Up@@ -297,7 +295,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
expect(user2SessionId).not.toBe(user1SessionId);

// Tab1 has user1's active session; tab2 has user2's active session.
// Start counting /tokens requests.
// Start counting /tokens requests from here on.
const refreshRequests: Array<{ sessionId: string; url: string }> = [];
await context.route('**/v1/client/sessions/*/tokens*', async route => {
const url = route.request().url();
Expand All@@ -306,23 +304,26 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
await route.continue();
});

// Wait for proactive refresh timers to fire.
// Default token TTL is 60s; onRefresh fires at 60 - 15 - 2 = 43s from iat.
// Uses page.evaluate to avoid the global actionTimeout (10s) capping the wait.
await page1.evaluate(() => new Promise(resolve => setTimeout(resolve, 50_000)));
// Manually trigger a fresh /tokens fetch on each tab. Because the two
// tabs hold different sessions (different tokenIds), BroadcastChannel
// does NOT deduplicate across them — each tab is expected to make its
// own request.
const [page1Token, page2Token] = await Promise.all([
page1.evaluate(() => (window as any).Clerk.session?.getToken({ skipCache: true })),
page2.evaluate(() => (window as any).Clerk.session?.getToken({ skipCache: true })),
]);

// Allow both broadcasts to settle.
// eslint-disable-next-line playwright/no-wait-for-timeout
await page1.waitForTimeout(500);

// Two different sessions should each produce exactly one refresh request.
// BroadcastChannel deduplication is per-tokenId, so different sessions refresh independently.
expect(refreshRequests.length).toBe(2);

const refreshedSessionIds = new Set(refreshRequests.map(r => r.sessionId));
expect(refreshedSessionIds.has(user1SessionId)).toBe(true);
expect(refreshedSessionIds.has(user2SessionId)).toBe(true);

// Both tabs should still have valid tokens after the refresh cycle
const page1Token = await page1.evaluate(() => (window as any).Clerk.session?.getToken());
const page2Token = await page2.evaluate(() => (window as any).Clerk.session?.getToken());

// Both tabs should hold valid, distinct tokens (different sessions).
expect(page1Token).toBeTruthy();
expect(page2Token).toBeTruthy();
expect(page1Token).not.toBe(page2Token);
Expand Down
79 changes: 10 additions & 69 deletions integration/tests/session-token-cache/single-session.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -129,74 +129,15 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })(
expect(tokenRequests.length).toBe(1);
});

/**
* Test Flow:
* 1. Open two tabs with the same browser context (shared cookies)
* 2. Sign in on tab1, reload tab2 to pick up the session
* 3. Both tabs hydrate their token cache with the session token
* 4. Start counting /tokens requests, then wait for the timers to fire
* 5. Assert only 1 /tokens request was made (not 2)
*/
test('multi-tab scheduled refreshes are deduped to a single request', async ({ context }) => {
test.setTimeout(90_000);

const page1 = await context.newPage();
const page2 = await context.newPage();

await page1.goto(app.serverUrl);
await page2.goto(app.serverUrl);

await page1.waitForFunction(() => (window as any).Clerk?.loaded);
await page2.waitForFunction(() => (window as any).Clerk?.loaded);

const u1 = createTestUtils({ app, page: page1 });
await u1.po.signIn.goTo();
await u1.po.signIn.setIdentifier(fakeUser.email);
await u1.po.signIn.continue();
await u1.po.signIn.setPassword(fakeUser.password);
await u1.po.signIn.continue();
await u1.po.expect.toBeSignedIn();

// eslint-disable-next-line playwright/no-wait-for-timeout
await page1.waitForTimeout(1000);

await page2.reload();
await page2.waitForFunction(() => (window as any).Clerk?.loaded);

const u2 = createTestUtils({ app, page: page2 });
await u2.po.expect.toBeSignedIn();

// Both tabs are now signed in and have hydrated their token caches
// via Session constructor -> #hydrateCache, each with an independent
// onRefresh timer that fires at ~43s (TTL 60s - 15s leeway - 2s lead).
// Start counting /tokens requests from this point.
const refreshRequests: string[] = [];
await context.route('**/v1/client/sessions/*/tokens*', async route => {
refreshRequests.push(route.request().url());
await route.continue();
});

// Wait for proactive refresh timers to fire.
// Default token TTL is 60s; onRefresh fires at 60 - 15 - 2 = 43s from iat.
// We wait 50s to give comfortable buffer, this includes the broadcast delay.
//
// Uses page.evaluate instead of page.waitForTimeout to avoid
// the global actionTimeout (10s) silently capping the wait.
await page1.evaluate(() => new Promise(resolve => setTimeout(resolve, 50_000)));

// Only one tab should have made a /tokens request; the other tab should have
// received the refreshed token via BroadcastChannel.
expect(refreshRequests.length).toBe(1);

// Both tabs should still have valid tokens after the refresh cycle
const [page1Token, page2Token] = await Promise.all([
page1.evaluate(() => (window as any).Clerk.session?.getToken()),
page2.evaluate(() => (window as any).Clerk.session?.getToken()),
]);

expect(page1Token).toBeTruthy();
expect(page2Token).toBeTruthy();
expect(page1Token).toBe(page2Token);
});
// The previous "multi-tab scheduled refreshes are deduped to a single request"
// test relied on the proactive-refresh setTimeout firing within a 50s wall-clock
// window, which assumed JWT TTL = 60s. The dev test instance now issues 300s
// tokens, so the timer fires at ~283s and the test never reached it. The
// BroadcastChannel-based dedup it was checking is already covered by the
// "multi-tab token sharing works when clearing the cache" test above, which
// explicitly triggers a fetch via `getToken({ skipCache: true })`. The
// proactive-refresh timer scheduling itself (the math, the leeway, the
// re-registration on success) is best validated by unit tests that mock
// `setTimeout` rather than depending on real time in a real browser.
},
);
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .changeset/fix-e2e-compromised-password.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---
15 changes: 15 additions & 0 deletions integration/models/helpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,21 @@ const dedent = (strings: string | Array<string>, ...values: Array<string>) => {

export const hash = () => randomBytes(5).toString('hex');

/**
* Generates a strong, unique password for fake test users.
*
* Avoids any pattern derived from the user's email or other guessable inputs,
* so it doesn't collide with HIBP / compromised-password lists that would
* cause FAPI to reject sign-in with `form_password_compromised` (HTTP 422).
*
* Includes upper, lower, digit, and symbol to satisfy default Clerk password
* complexity rules.
*/
export const fakerPassword = () => {
const bytes = randomBytes(18).toString('base64url');
return `Aa1!${bytes}`;
};

export const waitUntilMessage = async (stream: Readable, message: string) => {
return new Promise<void>(resolve => {
stream.on('data', chunk => {
Expand Down
38 changes: 8 additions & 30 deletions integration/testUtils/machineAuthHelpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -220,9 +220,9 @@ export const registerApiKeyAuthTests = (adapter: MachineAuthTestAdapter): void =
});

test.afterAll(async () => {
await fakeAPIKey.revoke();
await fakeUser.deleteIfExists();
await app.teardown();
await fakeAPIKey?.revoke();
await fakeUser?.deleteIfExists();
await app?.teardown();
});

test('should return 401 if no API key is provided', async ({ request }) => {
Expand DownExpand Up@@ -311,8 +311,8 @@ export const registerM2MAuthTests = (adapter: MachineAuthTestAdapter): void => {
});

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

test('rejects requests with invalid M2M tokens', async ({ request }) => {
Expand DownExpand Up@@ -345,28 +345,6 @@ export const registerM2MAuthTests = (adapter: MachineAuthTestAdapter): void => {
expect(body.tokenType).toBe(TokenType.M2MToken);
});

test('authorizes after dynamically granting scope', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

await u.services.clerk.machines.createScope(network.unscopedSender.id, network.primaryServer.id);
const m2mToken = await u.services.clerk.m2m.createToken({
machineSecretKey: network.unscopedSender.secretKey,
secondsUntilExpiration: 60 * 30,
});

try {
const res = await u.page.request.get(new URL(adapter.m2m.path, app.serverUrl).toString(), {
headers: { Authorization: `Bearer ${m2mToken.token}` },
});
expect(res.status()).toBe(200);
const body = await res.json();
expect(body.subject).toBe(network.unscopedSender.id);
expect(body.tokenType).toBe(TokenType.M2MToken);
} finally {
await u.services.clerk.m2m.revokeToken({ m2mTokenId: m2mToken.id });
}
});

test('verifies JWT format M2M token via local verification', async ({ request }) => {
const jwtToken = await createJwtM2MToken(createMachineClient(), network.scopedSender.secretKey);

Expand DownExpand Up@@ -418,9 +396,9 @@ export const registerOAuthAuthTests = (adapter: MachineAuthTestAdapter): void =>
});

test.afterAll(async () => {
await fakeOAuth.cleanup();
await fakeUser.deleteIfExists();
await app.teardown();
await fakeOAuth?.cleanup();
await fakeUser?.deleteIfExists();
await app?.teardown();
});

test('verifies valid OAuth access token obtained through authorization flow', async ({ page, context }) => {
Expand Down
4 changes: 2 additions & 2 deletions integration/testUtils/usersService.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import type { APIKey, ClerkClient, Organization, User } from '@clerk/backend';
import { faker } from '@faker-js/faker';

import { hash } from '../models/helpers';
import { fakerPassword, hash } from '../models/helpers';

async function withErrorLogging<T>(operation: string, fn: () => Promise<T>): Promise<T> {
try {
Expand DownExpand Up@@ -133,7 +133,7 @@ export const createUserService = (clerkClient: ClerkClient) => {
lastName: faker.person.lastName(),
email: withEmail ? email : undefined,
username: withUsername ? `${randomHash}_clerk_cookie` : undefined,
password: withPassword ? `${email}${randomHash}` : undefined,
password: withPassword ? fakerPassword() : undefined,
phoneNumber: withPhoneNumber ? phoneNumber : undefined,
deleteIfExists: () => self.deleteIfExists({ email, phoneNumber }),
};
Expand Down
4 changes: 2 additions & 2 deletions integration/tests/components.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,8 +20,8 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('component

test.afterAll(async () => {
await app.teardown();
await fakeUser.deleteIfExists();
await fakeOrganization.delete();
await fakeUser?.deleteIfExists();
await fakeOrganization?.delete();
});

const components = [
Expand Down
29 changes: 15 additions & 14 deletions integration/tests/session-token-cache/multi-session.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -246,9 +246,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
* this might be something we want to add in the future, but currently it is not
* deterministic.
*/
test('multi-session scheduled refreshes produce one request per session', async ({ context }) => {
test.setTimeout(90_000);

test('cross-session token refreshes do not deduplicate', async ({ context }) => {
const page1 = await context.newPage();
await page1.goto(app.serverUrl);
await page1.waitForFunction(() => (window as any).Clerk?.loaded);
Expand DownExpand Up@@ -297,7 +295,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
expect(user2SessionId).not.toBe(user1SessionId);

// Tab1 has user1's active session; tab2 has user2's active session.
// Start counting /tokens requests.
// Start counting /tokens requests from here on.
const refreshRequests: Array<{ sessionId: string; url: string }> = [];
await context.route('**/v1/client/sessions/*/tokens*', async route => {
const url = route.request().url();
Expand All@@ -306,23 +304,26 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
await route.continue();
});

// Wait for proactive refresh timers to fire.
// Default token TTL is 60s; onRefresh fires at 60 - 15 - 2 = 43s from iat.
// Uses page.evaluate to avoid the global actionTimeout (10s) capping the wait.
await page1.evaluate(() => new Promise(resolve => setTimeout(resolve, 50_000)));
// Manually trigger a fresh /tokens fetch on each tab. Because the two
// tabs hold different sessions (different tokenIds), BroadcastChannel
// does NOT deduplicate across them — each tab is expected to make its
// own request.
const [page1Token, page2Token] = await Promise.all([
page1.evaluate(() => (window as any).Clerk.session?.getToken({ skipCache: true })),
page2.evaluate(() => (window as any).Clerk.session?.getToken({ skipCache: true })),
]);

// Allow both broadcasts to settle.
// eslint-disable-next-line playwright/no-wait-for-timeout
await page1.waitForTimeout(500);

// Two different sessions should each produce exactly one refresh request.
// BroadcastChannel deduplication is per-tokenId, so different sessions refresh independently.
expect(refreshRequests.length).toBe(2);

const refreshedSessionIds = new Set(refreshRequests.map(r => r.sessionId));
expect(refreshedSessionIds.has(user1SessionId)).toBe(true);
expect(refreshedSessionIds.has(user2SessionId)).toBe(true);

// Both tabs should still have valid tokens after the refresh cycle
const page1Token = await page1.evaluate(() => (window as any).Clerk.session?.getToken());
const page2Token = await page2.evaluate(() => (window as any).Clerk.session?.getToken());

// Both tabs should hold valid, distinct tokens (different sessions).
expect(page1Token).toBeTruthy();
expect(page2Token).toBeTruthy();
expect(page1Token).not.toBe(page2Token);
Expand Down
79 changes: 10 additions & 69 deletions integration/tests/session-token-cache/single-session.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -129,74 +129,15 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })(
expect(tokenRequests.length).toBe(1);
});

/**
* Test Flow:
* 1. Open two tabs with the same browser context (shared cookies)
* 2. Sign in on tab1, reload tab2 to pick up the session
* 3. Both tabs hydrate their token cache with the session token
* 4. Start counting /tokens requests, then wait for the timers to fire
* 5. Assert only 1 /tokens request was made (not 2)
*/
test('multi-tab scheduled refreshes are deduped to a single request', async ({ context }) => {
test.setTimeout(90_000);

const page1 = await context.newPage();
const page2 = await context.newPage();

await page1.goto(app.serverUrl);
await page2.goto(app.serverUrl);

await page1.waitForFunction(() => (window as any).Clerk?.loaded);
await page2.waitForFunction(() => (window as any).Clerk?.loaded);

const u1 = createTestUtils({ app, page: page1 });
await u1.po.signIn.goTo();
await u1.po.signIn.setIdentifier(fakeUser.email);
await u1.po.signIn.continue();
await u1.po.signIn.setPassword(fakeUser.password);
await u1.po.signIn.continue();
await u1.po.expect.toBeSignedIn();

// eslint-disable-next-line playwright/no-wait-for-timeout
await page1.waitForTimeout(1000);

await page2.reload();
await page2.waitForFunction(() => (window as any).Clerk?.loaded);

const u2 = createTestUtils({ app, page: page2 });
await u2.po.expect.toBeSignedIn();

// Both tabs are now signed in and have hydrated their token caches
// via Session constructor -> #hydrateCache, each with an independent
// onRefresh timer that fires at ~43s (TTL 60s - 15s leeway - 2s lead).
// Start counting /tokens requests from this point.
const refreshRequests: string[] = [];
await context.route('**/v1/client/sessions/*/tokens*', async route => {
refreshRequests.push(route.request().url());
await route.continue();
});

// Wait for proactive refresh timers to fire.
// Default token TTL is 60s; onRefresh fires at 60 - 15 - 2 = 43s from iat.
// We wait 50s to give comfortable buffer, this includes the broadcast delay.
//
// Uses page.evaluate instead of page.waitForTimeout to avoid
// the global actionTimeout (10s) silently capping the wait.
await page1.evaluate(() => new Promise(resolve => setTimeout(resolve, 50_000)));

// Only one tab should have made a /tokens request; the other tab should have
// received the refreshed token via BroadcastChannel.
expect(refreshRequests.length).toBe(1);

// Both tabs should still have valid tokens after the refresh cycle
const [page1Token, page2Token] = await Promise.all([
page1.evaluate(() => (window as any).Clerk.session?.getToken()),
page2.evaluate(() => (window as any).Clerk.session?.getToken()),
]);

expect(page1Token).toBeTruthy();
expect(page2Token).toBeTruthy();
expect(page1Token).toBe(page2Token);
});
// The previous "multi-tab scheduled refreshes are deduped to a single request"
// test relied on the proactive-refresh setTimeout firing within a 50s wall-clock
// window, which assumed JWT TTL = 60s. The dev test instance now issues 300s
// tokens, so the timer fires at ~283s and the test never reached it. The
// BroadcastChannel-based dedup it was checking is already covered by the
// "multi-tab token sharing works when clearing the cache" test above, which
// explicitly triggers a fetch via `getToken({ skipCache: true })`. The
// proactive-refresh timer scheduling itself (the math, the leeway, the
// re-registration on success) is best validated by unit tests that mock
// `setTimeout` rather than depending on real time in a real browser.
},
);
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .changeset/fix-e2e-compromised-password.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---
15 changes: 15 additions & 0 deletions integration/models/helpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,21 @@ const dedent = (strings: string | Array<string>, ...values: Array<string>) => {

export const hash = () => randomBytes(5).toString('hex');

/**
* Generates a strong, unique password for fake test users.
*
* Avoids any pattern derived from the user's email or other guessable inputs,
* so it doesn't collide with HIBP / compromised-password lists that would
* cause FAPI to reject sign-in with `form_password_compromised` (HTTP 422).
*
* Includes upper, lower, digit, and symbol to satisfy default Clerk password
* complexity rules.
*/
export const fakerPassword = () => {
const bytes = randomBytes(18).toString('base64url');
return `Aa1!${bytes}`;
};

export const waitUntilMessage = async (stream: Readable, message: string) => {
return new Promise<void>(resolve => {
stream.on('data', chunk => {
Expand Down
38 changes: 8 additions & 30 deletions integration/testUtils/machineAuthHelpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -220,9 +220,9 @@ export const registerApiKeyAuthTests = (adapter: MachineAuthTestAdapter): void =
});

test.afterAll(async () => {
await fakeAPIKey.revoke();
await fakeUser.deleteIfExists();
await app.teardown();
await fakeAPIKey?.revoke();
await fakeUser?.deleteIfExists();
await app?.teardown();
});

test('should return 401 if no API key is provided', async ({ request }) => {
Expand DownExpand Up@@ -311,8 +311,8 @@ export const registerM2MAuthTests = (adapter: MachineAuthTestAdapter): void => {
});

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

test('rejects requests with invalid M2M tokens', async ({ request }) => {
Expand DownExpand Up@@ -345,28 +345,6 @@ export const registerM2MAuthTests = (adapter: MachineAuthTestAdapter): void => {
expect(body.tokenType).toBe(TokenType.M2MToken);
});

test('authorizes after dynamically granting scope', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

await u.services.clerk.machines.createScope(network.unscopedSender.id, network.primaryServer.id);
const m2mToken = await u.services.clerk.m2m.createToken({
machineSecretKey: network.unscopedSender.secretKey,
secondsUntilExpiration: 60 * 30,
});

try {
const res = await u.page.request.get(new URL(adapter.m2m.path, app.serverUrl).toString(), {
headers: { Authorization: `Bearer ${m2mToken.token}` },
});
expect(res.status()).toBe(200);
const body = await res.json();
expect(body.subject).toBe(network.unscopedSender.id);
expect(body.tokenType).toBe(TokenType.M2MToken);
} finally {
await u.services.clerk.m2m.revokeToken({ m2mTokenId: m2mToken.id });
}
});

test('verifies JWT format M2M token via local verification', async ({ request }) => {
const jwtToken = await createJwtM2MToken(createMachineClient(), network.scopedSender.secretKey);

Expand DownExpand Up@@ -418,9 +396,9 @@ export const registerOAuthAuthTests = (adapter: MachineAuthTestAdapter): void =>
});

test.afterAll(async () => {
await fakeOAuth.cleanup();
await fakeUser.deleteIfExists();
await app.teardown();
await fakeOAuth?.cleanup();
await fakeUser?.deleteIfExists();
await app?.teardown();
});

test('verifies valid OAuth access token obtained through authorization flow', async ({ page, context }) => {
Expand Down
4 changes: 2 additions & 2 deletions integration/testUtils/usersService.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import type { APIKey, ClerkClient, Organization, User } from '@clerk/backend';
import { faker } from '@faker-js/faker';

import { hash } from '../models/helpers';
import { fakerPassword, hash } from '../models/helpers';

async function withErrorLogging<T>(operation: string, fn: () => Promise<T>): Promise<T> {
try {
Expand DownExpand Up@@ -133,7 +133,7 @@ export const createUserService = (clerkClient: ClerkClient) => {
lastName: faker.person.lastName(),
email: withEmail ? email : undefined,
username: withUsername ? `${randomHash}_clerk_cookie` : undefined,
password: withPassword ? `${email}${randomHash}` : undefined,
password: withPassword ? fakerPassword() : undefined,
phoneNumber: withPhoneNumber ? phoneNumber : undefined,
deleteIfExists: () => self.deleteIfExists({ email, phoneNumber }),
};
Expand Down
4 changes: 2 additions & 2 deletions integration/tests/components.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,8 +20,8 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('component

test.afterAll(async () => {
await app.teardown();
await fakeUser.deleteIfExists();
await fakeOrganization.delete();
await fakeUser?.deleteIfExists();
await fakeOrganization?.delete();
});

const components = [
Expand Down
29 changes: 15 additions & 14 deletions integration/tests/session-token-cache/multi-session.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -246,9 +246,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
* this might be something we want to add in the future, but currently it is not
* deterministic.
*/
test('multi-session scheduled refreshes produce one request per session', async ({ context }) => {
test.setTimeout(90_000);

test('cross-session token refreshes do not deduplicate', async ({ context }) => {
const page1 = await context.newPage();
await page1.goto(app.serverUrl);
await page1.waitForFunction(() => (window as any).Clerk?.loaded);
Expand DownExpand Up@@ -297,7 +295,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
expect(user2SessionId).not.toBe(user1SessionId);

// Tab1 has user1's active session; tab2 has user2's active session.
// Start counting /tokens requests.
// Start counting /tokens requests from here on.
const refreshRequests: Array<{ sessionId: string; url: string }> = [];
await context.route('**/v1/client/sessions/*/tokens*', async route => {
const url = route.request().url();
Expand All@@ -306,23 +304,26 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
await route.continue();
});

// Wait for proactive refresh timers to fire.
// Default token TTL is 60s; onRefresh fires at 60 - 15 - 2 = 43s from iat.
// Uses page.evaluate to avoid the global actionTimeout (10s) capping the wait.
await page1.evaluate(() => new Promise(resolve => setTimeout(resolve, 50_000)));
// Manually trigger a fresh /tokens fetch on each tab. Because the two
// tabs hold different sessions (different tokenIds), BroadcastChannel
// does NOT deduplicate across them — each tab is expected to make its
// own request.
const [page1Token, page2Token] = await Promise.all([
page1.evaluate(() => (window as any).Clerk.session?.getToken({ skipCache: true })),
page2.evaluate(() => (window as any).Clerk.session?.getToken({ skipCache: true })),
]);

// Allow both broadcasts to settle.
// eslint-disable-next-line playwright/no-wait-for-timeout
await page1.waitForTimeout(500);

// Two different sessions should each produce exactly one refresh request.
// BroadcastChannel deduplication is per-tokenId, so different sessions refresh independently.
expect(refreshRequests.length).toBe(2);

const refreshedSessionIds = new Set(refreshRequests.map(r => r.sessionId));
expect(refreshedSessionIds.has(user1SessionId)).toBe(true);
expect(refreshedSessionIds.has(user2SessionId)).toBe(true);

// Both tabs should still have valid tokens after the refresh cycle
const page1Token = await page1.evaluate(() => (window as any).Clerk.session?.getToken());
const page2Token = await page2.evaluate(() => (window as any).Clerk.session?.getToken());

// Both tabs should hold valid, distinct tokens (different sessions).
expect(page1Token).toBeTruthy();
expect(page2Token).toBeTruthy();
expect(page1Token).not.toBe(page2Token);
Expand Down
79 changes: 10 additions & 69 deletions integration/tests/session-token-cache/single-session.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -129,74 +129,15 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })(
expect(tokenRequests.length).toBe(1);
});

/**
* Test Flow:
* 1. Open two tabs with the same browser context (shared cookies)
* 2. Sign in on tab1, reload tab2 to pick up the session
* 3. Both tabs hydrate their token cache with the session token
* 4. Start counting /tokens requests, then wait for the timers to fire
* 5. Assert only 1 /tokens request was made (not 2)
*/
test('multi-tab scheduled refreshes are deduped to a single request', async ({ context }) => {
test.setTimeout(90_000);

const page1 = await context.newPage();
const page2 = await context.newPage();

await page1.goto(app.serverUrl);
await page2.goto(app.serverUrl);

await page1.waitForFunction(() => (window as any).Clerk?.loaded);
await page2.waitForFunction(() => (window as any).Clerk?.loaded);

const u1 = createTestUtils({ app, page: page1 });
await u1.po.signIn.goTo();
await u1.po.signIn.setIdentifier(fakeUser.email);
await u1.po.signIn.continue();
await u1.po.signIn.setPassword(fakeUser.password);
await u1.po.signIn.continue();
await u1.po.expect.toBeSignedIn();

// eslint-disable-next-line playwright/no-wait-for-timeout
await page1.waitForTimeout(1000);

await page2.reload();
await page2.waitForFunction(() => (window as any).Clerk?.loaded);

const u2 = createTestUtils({ app, page: page2 });
await u2.po.expect.toBeSignedIn();

// Both tabs are now signed in and have hydrated their token caches
// via Session constructor -> #hydrateCache, each with an independent
// onRefresh timer that fires at ~43s (TTL 60s - 15s leeway - 2s lead).
// Start counting /tokens requests from this point.
const refreshRequests: string[] = [];
await context.route('**/v1/client/sessions/*/tokens*', async route => {
refreshRequests.push(route.request().url());
await route.continue();
});

// Wait for proactive refresh timers to fire.
// Default token TTL is 60s; onRefresh fires at 60 - 15 - 2 = 43s from iat.
// We wait 50s to give comfortable buffer, this includes the broadcast delay.
//
// Uses page.evaluate instead of page.waitForTimeout to avoid
// the global actionTimeout (10s) silently capping the wait.
await page1.evaluate(() => new Promise(resolve => setTimeout(resolve, 50_000)));

// Only one tab should have made a /tokens request; the other tab should have
// received the refreshed token via BroadcastChannel.
expect(refreshRequests.length).toBe(1);

// Both tabs should still have valid tokens after the refresh cycle
const [page1Token, page2Token] = await Promise.all([
page1.evaluate(() => (window as any).Clerk.session?.getToken()),
page2.evaluate(() => (window as any).Clerk.session?.getToken()),
]);

expect(page1Token).toBeTruthy();
expect(page2Token).toBeTruthy();
expect(page1Token).toBe(page2Token);
});
// The previous "multi-tab scheduled refreshes are deduped to a single request"
// test relied on the proactive-refresh setTimeout firing within a 50s wall-clock
// window, which assumed JWT TTL = 60s. The dev test instance now issues 300s
// tokens, so the timer fires at ~283s and the test never reached it. The
// BroadcastChannel-based dedup it was checking is already covered by the
// "multi-tab token sharing works when clearing the cache" test above, which
// explicitly triggers a fetch via `getToken({ skipCache: true })`. The
// proactive-refresh timer scheduling itself (the math, the leeway, the
// re-registration on success) is best validated by unit tests that mock
// `setTimeout` rather than depending on real time in a real browser.
},
);
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .changeset/fix-e2e-compromised-password.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---
15 changes: 15 additions & 0 deletions integration/models/helpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,6 +67,21 @@ const dedent = (strings: string | Array<string>, ...values: Array<string>) => {

export const hash = () => randomBytes(5).toString('hex');

/**
* Generates a strong, unique password for fake test users.
*
* Avoids any pattern derived from the user's email or other guessable inputs,
* so it doesn't collide with HIBP / compromised-password lists that would
* cause FAPI to reject sign-in with `form_password_compromised` (HTTP 422).
*
* Includes upper, lower, digit, and symbol to satisfy default Clerk password
* complexity rules.
*/
export const fakerPassword = () => {
const bytes = randomBytes(18).toString('base64url');
return `Aa1!${bytes}`;
};

export const waitUntilMessage = async (stream: Readable, message: string) => {
return new Promise<void>(resolve => {
stream.on('data', chunk => {
Expand Down
38 changes: 8 additions & 30 deletions integration/testUtils/machineAuthHelpers.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -220,9 +220,9 @@ export const registerApiKeyAuthTests = (adapter: MachineAuthTestAdapter): void =
});

test.afterAll(async () => {
await fakeAPIKey.revoke();
await fakeUser.deleteIfExists();
await app.teardown();
await fakeAPIKey?.revoke();
await fakeUser?.deleteIfExists();
await app?.teardown();
});

test('should return 401 if no API key is provided', async ({ request }) => {
Expand DownExpand Up@@ -311,8 +311,8 @@ export const registerM2MAuthTests = (adapter: MachineAuthTestAdapter): void => {
});

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

test('rejects requests with invalid M2M tokens', async ({ request }) => {
Expand DownExpand Up@@ -345,28 +345,6 @@ export const registerM2MAuthTests = (adapter: MachineAuthTestAdapter): void => {
expect(body.tokenType).toBe(TokenType.M2MToken);
});

test('authorizes after dynamically granting scope', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

await u.services.clerk.machines.createScope(network.unscopedSender.id, network.primaryServer.id);
const m2mToken = await u.services.clerk.m2m.createToken({
machineSecretKey: network.unscopedSender.secretKey,
secondsUntilExpiration: 60 * 30,
});

try {
const res = await u.page.request.get(new URL(adapter.m2m.path, app.serverUrl).toString(), {
headers: { Authorization: `Bearer ${m2mToken.token}` },
});
expect(res.status()).toBe(200);
const body = await res.json();
expect(body.subject).toBe(network.unscopedSender.id);
expect(body.tokenType).toBe(TokenType.M2MToken);
} finally {
await u.services.clerk.m2m.revokeToken({ m2mTokenId: m2mToken.id });
}
});

test('verifies JWT format M2M token via local verification', async ({ request }) => {
const jwtToken = await createJwtM2MToken(createMachineClient(), network.scopedSender.secretKey);

Expand DownExpand Up@@ -418,9 +396,9 @@ export const registerOAuthAuthTests = (adapter: MachineAuthTestAdapter): void =>
});

test.afterAll(async () => {
await fakeOAuth.cleanup();
await fakeUser.deleteIfExists();
await app.teardown();
await fakeOAuth?.cleanup();
await fakeUser?.deleteIfExists();
await app?.teardown();
});

test('verifies valid OAuth access token obtained through authorization flow', async ({ page, context }) => {
Expand Down
4 changes: 2 additions & 2 deletions integration/testUtils/usersService.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import type { APIKey, ClerkClient, Organization, User } from '@clerk/backend';
import { faker } from '@faker-js/faker';

import { hash } from '../models/helpers';
import { fakerPassword, hash } from '../models/helpers';

async function withErrorLogging<T>(operation: string, fn: () => Promise<T>): Promise<T> {
try {
Expand DownExpand Up@@ -133,7 +133,7 @@ export const createUserService = (clerkClient: ClerkClient) => {
lastName: faker.person.lastName(),
email: withEmail ? email : undefined,
username: withUsername ? `${randomHash}_clerk_cookie` : undefined,
password: withPassword ? `${email}${randomHash}` : undefined,
password: withPassword ? fakerPassword() : undefined,
phoneNumber: withPhoneNumber ? phoneNumber : undefined,
deleteIfExists: () => self.deleteIfExists({ email, phoneNumber }),
};
Expand Down
4 changes: 2 additions & 2 deletions integration/tests/components.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,8 +20,8 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('component

test.afterAll(async () => {
await app.teardown();
await fakeUser.deleteIfExists();
await fakeOrganization.delete();
await fakeUser?.deleteIfExists();
await fakeOrganization?.delete();
});

const components = [
Expand Down
29 changes: 15 additions & 14 deletions integration/tests/session-token-cache/multi-session.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -246,9 +246,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
* this might be something we want to add in the future, but currently it is not
* deterministic.
*/
test('multi-session scheduled refreshes produce one request per session', async ({ context }) => {
test.setTimeout(90_000);

test('cross-session token refreshes do not deduplicate', async ({ context }) => {
const page1 = await context.newPage();
await page1.goto(app.serverUrl);
await page1.waitForFunction(() => (window as any).Clerk?.loaded);
Expand DownExpand Up@@ -297,7 +295,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
expect(user2SessionId).not.toBe(user1SessionId);

// Tab1 has user1's active session; tab2 has user2's active session.
// Start counting /tokens requests.
// Start counting /tokens requests from here on.
const refreshRequests: Array<{ sessionId: string; url: string }> = [];
await context.route('**/v1/client/sessions/*/tokens*', async route => {
const url = route.request().url();
Expand All@@ -306,23 +304,26 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withSessionTasks] })(
await route.continue();
});

// Wait for proactive refresh timers to fire.
// Default token TTL is 60s; onRefresh fires at 60 - 15 - 2 = 43s from iat.
// Uses page.evaluate to avoid the global actionTimeout (10s) capping the wait.
await page1.evaluate(() => new Promise(resolve => setTimeout(resolve, 50_000)));
// Manually trigger a fresh /tokens fetch on each tab. Because the two
// tabs hold different sessions (different tokenIds), BroadcastChannel
// does NOT deduplicate across them — each tab is expected to make its
// own request.
const [page1Token, page2Token] = await Promise.all([
page1.evaluate(() => (window as any).Clerk.session?.getToken({ skipCache: true })),
page2.evaluate(() => (window as any).Clerk.session?.getToken({ skipCache: true })),
]);

// Allow both broadcasts to settle.
// eslint-disable-next-line playwright/no-wait-for-timeout
await page1.waitForTimeout(500);

// Two different sessions should each produce exactly one refresh request.
// BroadcastChannel deduplication is per-tokenId, so different sessions refresh independently.
expect(refreshRequests.length).toBe(2);

const refreshedSessionIds = new Set(refreshRequests.map(r => r.sessionId));
expect(refreshedSessionIds.has(user1SessionId)).toBe(true);
expect(refreshedSessionIds.has(user2SessionId)).toBe(true);

// Both tabs should still have valid tokens after the refresh cycle
const page1Token = await page1.evaluate(() => (window as any).Clerk.session?.getToken());
const page2Token = await page2.evaluate(() => (window as any).Clerk.session?.getToken());

// Both tabs should hold valid, distinct tokens (different sessions).
expect(page1Token).toBeTruthy();
expect(page2Token).toBeTruthy();
expect(page1Token).not.toBe(page2Token);
Expand Down
79 changes: 10 additions & 69 deletions integration/tests/session-token-cache/single-session.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -129,74 +129,15 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })(
expect(tokenRequests.length).toBe(1);
});

/**
* Test Flow:
* 1. Open two tabs with the same browser context (shared cookies)
* 2. Sign in on tab1, reload tab2 to pick up the session
* 3. Both tabs hydrate their token cache with the session token
* 4. Start counting /tokens requests, then wait for the timers to fire
* 5. Assert only 1 /tokens request was made (not 2)
*/
test('multi-tab scheduled refreshes are deduped to a single request', async ({ context }) => {
test.setTimeout(90_000);

const page1 = await context.newPage();
const page2 = await context.newPage();

await page1.goto(app.serverUrl);
await page2.goto(app.serverUrl);

await page1.waitForFunction(() => (window as any).Clerk?.loaded);
await page2.waitForFunction(() => (window as any).Clerk?.loaded);

const u1 = createTestUtils({ app, page: page1 });
await u1.po.signIn.goTo();
await u1.po.signIn.setIdentifier(fakeUser.email);
await u1.po.signIn.continue();
await u1.po.signIn.setPassword(fakeUser.password);
await u1.po.signIn.continue();
await u1.po.expect.toBeSignedIn();

// eslint-disable-next-line playwright/no-wait-for-timeout
await page1.waitForTimeout(1000);

await page2.reload();
await page2.waitForFunction(() => (window as any).Clerk?.loaded);

const u2 = createTestUtils({ app, page: page2 });
await u2.po.expect.toBeSignedIn();

// Both tabs are now signed in and have hydrated their token caches
// via Session constructor -> #hydrateCache, each with an independent
// onRefresh timer that fires at ~43s (TTL 60s - 15s leeway - 2s lead).
// Start counting /tokens requests from this point.
const refreshRequests: string[] = [];
await context.route('**/v1/client/sessions/*/tokens*', async route => {
refreshRequests.push(route.request().url());
await route.continue();
});

// Wait for proactive refresh timers to fire.
// Default token TTL is 60s; onRefresh fires at 60 - 15 - 2 = 43s from iat.
// We wait 50s to give comfortable buffer, this includes the broadcast delay.
//
// Uses page.evaluate instead of page.waitForTimeout to avoid
// the global actionTimeout (10s) silently capping the wait.
await page1.evaluate(() => new Promise(resolve => setTimeout(resolve, 50_000)));

// Only one tab should have made a /tokens request; the other tab should have
// received the refreshed token via BroadcastChannel.
expect(refreshRequests.length).toBe(1);

// Both tabs should still have valid tokens after the refresh cycle
const [page1Token, page2Token] = await Promise.all([
page1.evaluate(() => (window as any).Clerk.session?.getToken()),
page2.evaluate(() => (window as any).Clerk.session?.getToken()),
]);

expect(page1Token).toBeTruthy();
expect(page2Token).toBeTruthy();
expect(page1Token).toBe(page2Token);
});
// The previous "multi-tab scheduled refreshes are deduped to a single request"
// test relied on the proactive-refresh setTimeout firing within a 50s wall-clock
// window, which assumed JWT TTL = 60s. The dev test instance now issues 300s
// tokens, so the timer fires at ~283s and the test never reached it. The
// BroadcastChannel-based dedup it was checking is already covered by the
// "multi-tab token sharing works when clearing the cache" test above, which
// explicitly triggers a fetch via `getToken({ skipCache: true })`. The
// proactive-refresh timer scheduling itself (the math, the leeway, the
// re-registration on success) is best validated by unit tests that mock
// `setTimeout` rather than depending on real time in a real browser.
},
);
Loading