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
7 changes: 7 additions & 0 deletions integration/testUtils/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,13 @@ import { createUserService } from './usersService';
import { createWaitlistService } from './waitlistService';

export type { FakeAPIKey, FakeOrganization, FakeUser, FakeUserWithEmail };
export type { FakeMachineNetwork, FakeOAuthApp } from './machineAuthService';
export {
createFakeMachineNetwork,
createFakeOAuthApp,
createJwtM2MToken,
obtainOAuthAccessToken,
} from './machineAuthService';

const createClerkClient = (app: Application) => {
return backendCreateClerkClient({
Expand Down
186 changes: 186 additions & 0 deletions integration/testUtils/machineAuthService.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,186 @@
import { randomBytes } from 'node:crypto';

import type { ClerkClient, M2MToken, Machine, OAuthApplication } from '@clerk/backend';
import { faker } from '@faker-js/faker';
import type { Page } from '@playwright/test';
import { expect } from '@playwright/test';

// ─── M2M ────────────────────────────────────────────────────────────────────

export type FakeMachineNetwork = {
primaryServer: Machine;
scopedSender: Machine;
unscopedSender: Machine;
scopedSenderToken: M2MToken;
unscopedSenderToken: M2MToken;
cleanup: () => Promise<void>;
};

/**
* Creates a network of three machines for M2M testing:
* - A primary API server (the "receiver")
* - A sender machine scoped to the primary (should succeed)
* - A sender machine with no scope (should fail)
*
* Each sender gets an opaque M2M token created for it.
* Call `cleanup()` to revoke tokens and delete all machines.
*/
export async function createFakeMachineNetwork(clerkClient: ClerkClient): Promise<FakeMachineNetwork> {
const fakeCompanyName = faker.company.name();

const primaryServer = await clerkClient.machines.create({
name: `${fakeCompanyName} Primary API Server`,
});

const scopedSender = await clerkClient.machines.create({
name: `${fakeCompanyName} Scoped Sender`,
scopedMachines: [primaryServer.id],
});
const scopedSenderToken = await clerkClient.m2m.createToken({
machineSecretKey: scopedSender.secretKey,
secondsUntilExpiration: 60 * 30,
});

const unscopedSender = await clerkClient.machines.create({
name: `${fakeCompanyName} Unscoped Sender`,
});
const unscopedSenderToken = await clerkClient.m2m.createToken({
machineSecretKey: unscopedSender.secretKey,
secondsUntilExpiration: 60 * 30,
});

return {
primaryServer,
scopedSender,
unscopedSender,
scopedSenderToken,
unscopedSenderToken,
cleanup: async () => {
await Promise.all([
clerkClient.m2m.revokeToken({ m2mTokenId: scopedSenderToken.id }),
clerkClient.m2m.revokeToken({ m2mTokenId: unscopedSenderToken.id }),
]);
await Promise.all([
clerkClient.machines.delete(scopedSender.id),
clerkClient.machines.delete(unscopedSender.id),
clerkClient.machines.delete(primaryServer.id),
]);
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Comment thread
wobsoriano marked this conversation as resolved.
},
};
}

/**
* Creates a JWT-format M2M token for a sender machine.
* JWT tokens are self-contained and expire via the `exp` claim (no revocation needed).
*/
export async function createJwtM2MToken(clerkClient: ClerkClient, senderSecretKey: string): Promise<M2MToken> {
return clerkClient.m2m.createToken({
machineSecretKey: senderSecretKey,
secondsUntilExpiration: 60 * 30,
tokenFormat: 'jwt',
});
}

// ─── OAuth ──────────────────────────────────────────────────────────────────

export type FakeOAuthApp = {
oAuthApp: OAuthApplication;
cleanup: () => Promise<void>;
};

/**
* Creates an OAuth application via BAPI for testing the full authorization code flow.
* Call `cleanup()` to delete the OAuth application.
*/
export async function createFakeOAuthApp(clerkClient: ClerkClient, callbackUrl: string): Promise<FakeOAuthApp> {
const oAuthApp = await clerkClient.oauthApplications.create({
name: `Integration Test OAuth App - ${Date.now()}`,
redirectUris: [callbackUrl],
scopes: 'profile email',
});

return {
oAuthApp,
cleanup: async () => {
await clerkClient.oauthApplications.delete(oAuthApp.id);
},
};
}

export type ObtainOAuthAccessTokenParams = {
page: Page;
oAuthApp: OAuthApplication;
redirectUri: string;
fakeUser: { email?: string; password: string };
signIn: {
waitForMounted: (...args: any[]) => Promise<any>;
signInWithEmailAndInstantPassword: (params: { email: string; password: string }) => Promise<any>;
};
Comment on lines +110 to +118

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🔴 Critical

🧩 Analysis chain

🏁 Script executed:

#!/bin/bashset -euo pipefail
echo"== tsconfig strictness flags =="
fd 'tsconfig*.json'|whileread -r f;doecho"--- $f ---"
python - "$f"<<'PY'import json,sysp=sys.argv[1]try: d=json.load(open(p)) c=d.get("compilerOptions",{}) print("strict:", c.get("strict"), "strictNullChecks:", c.get("strictNullChecks"))except Exception as e: print("unparseable:", e)PYdoneechoecho"== nullable flow in machineAuthService =="
rg -n -C2 "fakeUser: \{ email\?: string; password: string \}|searchParams\.get\('code'\)|code: authCode|return tokenData\.access_token" integration/testUtils/machineAuthService.ts

Repository: clerk/javascript

Length of output: 5798


🏁 Script executed:

cat -n integration/testUtils/machineAuthService.ts | sed -n '135,190p'

Repository: clerk/javascript

Length of output: 2229


🏁 Script executed:

cat -n integration/testUtils/machineAuthService.ts | sed -n '110,120p'

Repository: clerk/javascript

Length of output: 475


🏁 Script executed:

fd machineAuthService -type f

Repository: clerk/javascript

Length of output: 230


🏁 Script executed:

grep -r "machineAuthService" --include="*.ts" --include="*.js" --include="*.json"| head -20

Repository: clerk/javascript

Length of output: 230


🏁 Script executed:

cd integration/testUtils && grep -r "obtainOAuthAccessToken".&&cd - ||true

Repository: clerk/javascript

Length of output: 186


🏁 Script executed:

cat -n integration/testUtils/machineAuthService.ts | sed -n '1,20p'

Repository: clerk/javascript

Length of output: 816


Type contract violations in OAuth token helper create potential runtime failures.

The function obtainOAuthAccessToken has three type mismatches that could cause test failures:

  1. fakeUser.email is optional (email?: string, line 114) but passed to signInWithEmailAndInstantPassword which requires a non-null string (line 150-151)
  2. authCode from URLSearchParams.get('code') returns string | null (line 163) but is used directly in the token request payload (line 171) instead of being validated first
  3. Return type declares Promise<string> (line 137) but returns tokenData.access_token which is typed as optional (line 182, 185)

While runtime assertions exist at lines 164 and 183, they do not satisfy the type contracts and will only catch issues if tests actually hit them. Ensure email is required in the parameter type or validate it before use, check that authCode is not null before inclusion in the request, and verify access_token exists before returning.

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@integration/testUtils/machineAuthService.ts` around lines 110 - 118, The
obtainOAuthAccessToken function has three type-safety gaps: ensure
fakeUser.email is non-optional before calling signInWithEmailAndInstantPassword
(either make fakeUser.email required in ObtainOAuthAccessTokenParams or
check/throw if missing), read authCode via URLSearchParams.get and assert/throw
if it's null before using it in the token request so the compiler knows it's a
string, and validate that tokenData.access_token is present (throw or handle the
error) before returning so the function can keep returning Promise<string>;
reference the symbols fakeUser.email, signInWithEmailAndInstantPassword,
authCode (from URLSearchParams.get), tokenData.access_token, and the
obtainOAuthAccessToken function when making these fixes.

};

/**
* Runs the full OAuth 2.0 authorization code flow using Playwright:
* 1. Navigates to the authorize URL
* 2. Signs in with the provided user credentials
* 3. Accepts the consent screen
* 4. Extracts the authorization code from the callback
* 5. Exchanges the code for an access token
*
* Returns the access token string.
*/
export async function obtainOAuthAccessToken({
page,
oAuthApp,
redirectUri,
fakeUser,
signIn,
}: ObtainOAuthAccessTokenParams): Promise<string> {
const state = randomBytes(16).toString('hex');
const authorizeUrl = new URL(oAuthApp.authorizeUrl);
authorizeUrl.searchParams.set('client_id', oAuthApp.clientId);
authorizeUrl.searchParams.set('redirect_uri', redirectUri);
authorizeUrl.searchParams.set('response_type', 'code');
authorizeUrl.searchParams.set('scope', 'profile email');
authorizeUrl.searchParams.set('state', state);

await page.goto(authorizeUrl.toString());

// Sign in on Account Portal
await signIn.waitForMounted();
await signIn.signInWithEmailAndInstantPassword({
email: fakeUser.email,
password: fakeUser.password,
});

// Accept consent screen
const consentButton = page.getByRole('button', { name: 'Allow' });
await consentButton.waitFor({ timeout: 10000 });
await consentButton.click();

// Wait for redirect and extract authorization code
await page.waitForURL(/oauth\/callback/, { timeout: 10000 });
const callbackUrl = new URL(page.url());
const authCode = callbackUrl.searchParams.get('code');
expect(authCode).toBeTruthy();

// Exchange code for access token
expect(oAuthApp.clientSecret).toBeTruthy();
const tokenResponse = await page.request.post(oAuthApp.tokenFetchUrl, {
data: new URLSearchParams({
grant_type: 'authorization_code',
code: authCode,
redirect_uri: redirectUri,
client_id: oAuthApp.clientId,
client_secret: oAuthApp.clientSecret,
}).toString(),
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
},
});

expect(tokenResponse.status()).toBe(200);
const tokenData = (await tokenResponse.json()) as { access_token?: string };
expect(tokenData.access_token).toBeTruthy();

return tokenData.access_token;
}
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import type { Page } from '@playwright/test';
import { expect, test } from '@playwright/test';

import type { Application } from '../../models/application';
import { appConfigs } from '../../presets';
import type { FakeOrganization, FakeUser } from '../../testUtils';
import { createTestUtils } from '../../testUtils';
import type { Application } from '../models/application';
import { appConfigs } from '../presets';
import type { FakeOrganization, FakeUser } from '../testUtils';
import { createTestUtils } from '../testUtils';

const mockAPIKeysEnvironmentSettings = async (
page: Page,
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
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
7 changes: 7 additions & 0 deletions integration/testUtils/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,13 @@ import { createUserService } from './usersService';
import { createWaitlistService } from './waitlistService';

export type { FakeAPIKey, FakeOrganization, FakeUser, FakeUserWithEmail };
export type { FakeMachineNetwork, FakeOAuthApp } from './machineAuthService';
export {
createFakeMachineNetwork,
createFakeOAuthApp,
createJwtM2MToken,
obtainOAuthAccessToken,
} from './machineAuthService';

const createClerkClient = (app: Application) => {
return backendCreateClerkClient({
Expand Down
186 changes: 186 additions & 0 deletions integration/testUtils/machineAuthService.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,186 @@
import { randomBytes } from 'node:crypto';

import type { ClerkClient, M2MToken, Machine, OAuthApplication } from '@clerk/backend';
import { faker } from '@faker-js/faker';
import type { Page } from '@playwright/test';
import { expect } from '@playwright/test';

// ─── M2M ────────────────────────────────────────────────────────────────────

export type FakeMachineNetwork = {
primaryServer: Machine;
scopedSender: Machine;
unscopedSender: Machine;
scopedSenderToken: M2MToken;
unscopedSenderToken: M2MToken;
cleanup: () => Promise<void>;
};

/**
* Creates a network of three machines for M2M testing:
* - A primary API server (the "receiver")
* - A sender machine scoped to the primary (should succeed)
* - A sender machine with no scope (should fail)
*
* Each sender gets an opaque M2M token created for it.
* Call `cleanup()` to revoke tokens and delete all machines.
*/
export async function createFakeMachineNetwork(clerkClient: ClerkClient): Promise<FakeMachineNetwork> {
const fakeCompanyName = faker.company.name();

const primaryServer = await clerkClient.machines.create({
name: `${fakeCompanyName} Primary API Server`,
});

const scopedSender = await clerkClient.machines.create({
name: `${fakeCompanyName} Scoped Sender`,
scopedMachines: [primaryServer.id],
});
const scopedSenderToken = await clerkClient.m2m.createToken({
machineSecretKey: scopedSender.secretKey,
secondsUntilExpiration: 60 * 30,
});

const unscopedSender = await clerkClient.machines.create({
name: `${fakeCompanyName} Unscoped Sender`,
});
const unscopedSenderToken = await clerkClient.m2m.createToken({
machineSecretKey: unscopedSender.secretKey,
secondsUntilExpiration: 60 * 30,
});

return {
primaryServer,
scopedSender,
unscopedSender,
scopedSenderToken,
unscopedSenderToken,
cleanup: async () => {
await Promise.all([
clerkClient.m2m.revokeToken({ m2mTokenId: scopedSenderToken.id }),
clerkClient.m2m.revokeToken({ m2mTokenId: unscopedSenderToken.id }),
]);
await Promise.all([
clerkClient.machines.delete(scopedSender.id),
clerkClient.machines.delete(unscopedSender.id),
clerkClient.machines.delete(primaryServer.id),
]);
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Comment thread
wobsoriano marked this conversation as resolved.
},
};
}

/**
* Creates a JWT-format M2M token for a sender machine.
* JWT tokens are self-contained and expire via the `exp` claim (no revocation needed).
*/
export async function createJwtM2MToken(clerkClient: ClerkClient, senderSecretKey: string): Promise<M2MToken> {
return clerkClient.m2m.createToken({
machineSecretKey: senderSecretKey,
secondsUntilExpiration: 60 * 30,
tokenFormat: 'jwt',
});
}

// ─── OAuth ──────────────────────────────────────────────────────────────────

export type FakeOAuthApp = {
oAuthApp: OAuthApplication;
cleanup: () => Promise<void>;
};

/**
* Creates an OAuth application via BAPI for testing the full authorization code flow.
* Call `cleanup()` to delete the OAuth application.
*/
export async function createFakeOAuthApp(clerkClient: ClerkClient, callbackUrl: string): Promise<FakeOAuthApp> {
const oAuthApp = await clerkClient.oauthApplications.create({
name: `Integration Test OAuth App - ${Date.now()}`,
redirectUris: [callbackUrl],
scopes: 'profile email',
});

return {
oAuthApp,
cleanup: async () => {
await clerkClient.oauthApplications.delete(oAuthApp.id);
},
};
}

export type ObtainOAuthAccessTokenParams = {
page: Page;
oAuthApp: OAuthApplication;
redirectUri: string;
fakeUser: { email?: string; password: string };
signIn: {
waitForMounted: (...args: any[]) => Promise<any>;
signInWithEmailAndInstantPassword: (params: { email: string; password: string }) => Promise<any>;
};
Comment on lines +110 to +118

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🔴 Critical

🧩 Analysis chain

🏁 Script executed:

#!/bin/bashset -euo pipefail
echo"== tsconfig strictness flags =="
fd 'tsconfig*.json'|whileread -r f;doecho"--- $f ---"
python - "$f"<<'PY'import json,sysp=sys.argv[1]try: d=json.load(open(p)) c=d.get("compilerOptions",{}) print("strict:", c.get("strict"), "strictNullChecks:", c.get("strictNullChecks"))except Exception as e: print("unparseable:", e)PYdoneechoecho"== nullable flow in machineAuthService =="
rg -n -C2 "fakeUser: \{ email\?: string; password: string \}|searchParams\.get\('code'\)|code: authCode|return tokenData\.access_token" integration/testUtils/machineAuthService.ts

Repository: clerk/javascript

Length of output: 5798


🏁 Script executed:

cat -n integration/testUtils/machineAuthService.ts | sed -n '135,190p'

Repository: clerk/javascript

Length of output: 2229


🏁 Script executed:

cat -n integration/testUtils/machineAuthService.ts | sed -n '110,120p'

Repository: clerk/javascript

Length of output: 475


🏁 Script executed:

fd machineAuthService -type f

Repository: clerk/javascript

Length of output: 230


🏁 Script executed:

grep -r "machineAuthService" --include="*.ts" --include="*.js" --include="*.json"| head -20

Repository: clerk/javascript

Length of output: 230


🏁 Script executed:

cd integration/testUtils && grep -r "obtainOAuthAccessToken".&&cd - ||true

Repository: clerk/javascript

Length of output: 186


🏁 Script executed:

cat -n integration/testUtils/machineAuthService.ts | sed -n '1,20p'

Repository: clerk/javascript

Length of output: 816


Type contract violations in OAuth token helper create potential runtime failures.

The function obtainOAuthAccessToken has three type mismatches that could cause test failures:

  1. fakeUser.email is optional (email?: string, line 114) but passed to signInWithEmailAndInstantPassword which requires a non-null string (line 150-151)
  2. authCode from URLSearchParams.get('code') returns string | null (line 163) but is used directly in the token request payload (line 171) instead of being validated first
  3. Return type declares Promise<string> (line 137) but returns tokenData.access_token which is typed as optional (line 182, 185)

While runtime assertions exist at lines 164 and 183, they do not satisfy the type contracts and will only catch issues if tests actually hit them. Ensure email is required in the parameter type or validate it before use, check that authCode is not null before inclusion in the request, and verify access_token exists before returning.

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@integration/testUtils/machineAuthService.ts` around lines 110 - 118, The
obtainOAuthAccessToken function has three type-safety gaps: ensure
fakeUser.email is non-optional before calling signInWithEmailAndInstantPassword
(either make fakeUser.email required in ObtainOAuthAccessTokenParams or
check/throw if missing), read authCode via URLSearchParams.get and assert/throw
if it's null before using it in the token request so the compiler knows it's a
string, and validate that tokenData.access_token is present (throw or handle the
error) before returning so the function can keep returning Promise<string>;
reference the symbols fakeUser.email, signInWithEmailAndInstantPassword,
authCode (from URLSearchParams.get), tokenData.access_token, and the
obtainOAuthAccessToken function when making these fixes.

};

/**
* Runs the full OAuth 2.0 authorization code flow using Playwright:
* 1. Navigates to the authorize URL
* 2. Signs in with the provided user credentials
* 3. Accepts the consent screen
* 4. Extracts the authorization code from the callback
* 5. Exchanges the code for an access token
*
* Returns the access token string.
*/
export async function obtainOAuthAccessToken({
page,
oAuthApp,
redirectUri,
fakeUser,
signIn,
}: ObtainOAuthAccessTokenParams): Promise<string> {
const state = randomBytes(16).toString('hex');
const authorizeUrl = new URL(oAuthApp.authorizeUrl);
authorizeUrl.searchParams.set('client_id', oAuthApp.clientId);
authorizeUrl.searchParams.set('redirect_uri', redirectUri);
authorizeUrl.searchParams.set('response_type', 'code');
authorizeUrl.searchParams.set('scope', 'profile email');
authorizeUrl.searchParams.set('state', state);

await page.goto(authorizeUrl.toString());

// Sign in on Account Portal
await signIn.waitForMounted();
await signIn.signInWithEmailAndInstantPassword({
email: fakeUser.email,
password: fakeUser.password,
});

// Accept consent screen
const consentButton = page.getByRole('button', { name: 'Allow' });
await consentButton.waitFor({ timeout: 10000 });
await consentButton.click();

// Wait for redirect and extract authorization code
await page.waitForURL(/oauth\/callback/, { timeout: 10000 });
const callbackUrl = new URL(page.url());
const authCode = callbackUrl.searchParams.get('code');
expect(authCode).toBeTruthy();

// Exchange code for access token
expect(oAuthApp.clientSecret).toBeTruthy();
const tokenResponse = await page.request.post(oAuthApp.tokenFetchUrl, {
data: new URLSearchParams({
grant_type: 'authorization_code',
code: authCode,
redirect_uri: redirectUri,
client_id: oAuthApp.clientId,
client_secret: oAuthApp.clientSecret,
}).toString(),
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
},
});

expect(tokenResponse.status()).toBe(200);
const tokenData = (await tokenResponse.json()) as { access_token?: string };
expect(tokenData.access_token).toBeTruthy();

return tokenData.access_token;
}
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import type { Page } from '@playwright/test';
import { expect, test } from '@playwright/test';

import type { Application } from '../../models/application';
import { appConfigs } from '../../presets';
import type { FakeOrganization, FakeUser } from '../../testUtils';
import { createTestUtils } from '../../testUtils';
import type { Application } from '../models/application';
import { appConfigs } from '../presets';
import type { FakeOrganization, FakeUser } from '../testUtils';
import { createTestUtils } from '../testUtils';

const mockAPIKeysEnvironmentSettings = async (
page: Page,
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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
7 changes: 7 additions & 0 deletions integration/testUtils/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,13 @@ import { createUserService } from './usersService';
import { createWaitlistService } from './waitlistService';

export type { FakeAPIKey, FakeOrganization, FakeUser, FakeUserWithEmail };
export type { FakeMachineNetwork, FakeOAuthApp } from './machineAuthService';
export {
createFakeMachineNetwork,
createFakeOAuthApp,
createJwtM2MToken,
obtainOAuthAccessToken,
} from './machineAuthService';

const createClerkClient = (app: Application) => {
return backendCreateClerkClient({
Expand Down
186 changes: 186 additions & 0 deletions integration/testUtils/machineAuthService.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,186 @@
import { randomBytes } from 'node:crypto';

import type { ClerkClient, M2MToken, Machine, OAuthApplication } from '@clerk/backend';
import { faker } from '@faker-js/faker';
import type { Page } from '@playwright/test';
import { expect } from '@playwright/test';

// ─── M2M ────────────────────────────────────────────────────────────────────

export type FakeMachineNetwork = {
primaryServer: Machine;
scopedSender: Machine;
unscopedSender: Machine;
scopedSenderToken: M2MToken;
unscopedSenderToken: M2MToken;
cleanup: () => Promise<void>;
};

/**
* Creates a network of three machines for M2M testing:
* - A primary API server (the "receiver")
* - A sender machine scoped to the primary (should succeed)
* - A sender machine with no scope (should fail)
*
* Each sender gets an opaque M2M token created for it.
* Call `cleanup()` to revoke tokens and delete all machines.
*/
export async function createFakeMachineNetwork(clerkClient: ClerkClient): Promise<FakeMachineNetwork> {
const fakeCompanyName = faker.company.name();

const primaryServer = await clerkClient.machines.create({
name: `${fakeCompanyName} Primary API Server`,
});

const scopedSender = await clerkClient.machines.create({
name: `${fakeCompanyName} Scoped Sender`,
scopedMachines: [primaryServer.id],
});
const scopedSenderToken = await clerkClient.m2m.createToken({
machineSecretKey: scopedSender.secretKey,
secondsUntilExpiration: 60 * 30,
});

const unscopedSender = await clerkClient.machines.create({
name: `${fakeCompanyName} Unscoped Sender`,
});
const unscopedSenderToken = await clerkClient.m2m.createToken({
machineSecretKey: unscopedSender.secretKey,
secondsUntilExpiration: 60 * 30,
});

return {
primaryServer,
scopedSender,
unscopedSender,
scopedSenderToken,
unscopedSenderToken,
cleanup: async () => {
await Promise.all([
clerkClient.m2m.revokeToken({ m2mTokenId: scopedSenderToken.id }),
clerkClient.m2m.revokeToken({ m2mTokenId: unscopedSenderToken.id }),
]);
await Promise.all([
clerkClient.machines.delete(scopedSender.id),
clerkClient.machines.delete(unscopedSender.id),
clerkClient.machines.delete(primaryServer.id),
]);
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Comment thread
wobsoriano marked this conversation as resolved.
},
};
}

/**
* Creates a JWT-format M2M token for a sender machine.
* JWT tokens are self-contained and expire via the `exp` claim (no revocation needed).
*/
export async function createJwtM2MToken(clerkClient: ClerkClient, senderSecretKey: string): Promise<M2MToken> {
return clerkClient.m2m.createToken({
machineSecretKey: senderSecretKey,
secondsUntilExpiration: 60 * 30,
tokenFormat: 'jwt',
});
}

// ─── OAuth ──────────────────────────────────────────────────────────────────

export type FakeOAuthApp = {
oAuthApp: OAuthApplication;
cleanup: () => Promise<void>;
};

/**
* Creates an OAuth application via BAPI for testing the full authorization code flow.
* Call `cleanup()` to delete the OAuth application.
*/
export async function createFakeOAuthApp(clerkClient: ClerkClient, callbackUrl: string): Promise<FakeOAuthApp> {
const oAuthApp = await clerkClient.oauthApplications.create({
name: `Integration Test OAuth App - ${Date.now()}`,
redirectUris: [callbackUrl],
scopes: 'profile email',
});

return {
oAuthApp,
cleanup: async () => {
await clerkClient.oauthApplications.delete(oAuthApp.id);
},
};
}

export type ObtainOAuthAccessTokenParams = {
page: Page;
oAuthApp: OAuthApplication;
redirectUri: string;
fakeUser: { email?: string; password: string };
signIn: {
waitForMounted: (...args: any[]) => Promise<any>;
signInWithEmailAndInstantPassword: (params: { email: string; password: string }) => Promise<any>;
};
Comment on lines +110 to +118

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🔴 Critical

🧩 Analysis chain

🏁 Script executed:

#!/bin/bashset -euo pipefail
echo"== tsconfig strictness flags =="
fd 'tsconfig*.json'|whileread -r f;doecho"--- $f ---"
python - "$f"<<'PY'import json,sysp=sys.argv[1]try: d=json.load(open(p)) c=d.get("compilerOptions",{}) print("strict:", c.get("strict"), "strictNullChecks:", c.get("strictNullChecks"))except Exception as e: print("unparseable:", e)PYdoneechoecho"== nullable flow in machineAuthService =="
rg -n -C2 "fakeUser: \{ email\?: string; password: string \}|searchParams\.get\('code'\)|code: authCode|return tokenData\.access_token" integration/testUtils/machineAuthService.ts

Repository: clerk/javascript

Length of output: 5798


🏁 Script executed:

cat -n integration/testUtils/machineAuthService.ts | sed -n '135,190p'

Repository: clerk/javascript

Length of output: 2229


🏁 Script executed:

cat -n integration/testUtils/machineAuthService.ts | sed -n '110,120p'

Repository: clerk/javascript

Length of output: 475


🏁 Script executed:

fd machineAuthService -type f

Repository: clerk/javascript

Length of output: 230


🏁 Script executed:

grep -r "machineAuthService" --include="*.ts" --include="*.js" --include="*.json"| head -20

Repository: clerk/javascript

Length of output: 230


🏁 Script executed:

cd integration/testUtils && grep -r "obtainOAuthAccessToken".&&cd - ||true

Repository: clerk/javascript

Length of output: 186


🏁 Script executed:

cat -n integration/testUtils/machineAuthService.ts | sed -n '1,20p'

Repository: clerk/javascript

Length of output: 816


Type contract violations in OAuth token helper create potential runtime failures.

The function obtainOAuthAccessToken has three type mismatches that could cause test failures:

  1. fakeUser.email is optional (email?: string, line 114) but passed to signInWithEmailAndInstantPassword which requires a non-null string (line 150-151)
  2. authCode from URLSearchParams.get('code') returns string | null (line 163) but is used directly in the token request payload (line 171) instead of being validated first
  3. Return type declares Promise<string> (line 137) but returns tokenData.access_token which is typed as optional (line 182, 185)

While runtime assertions exist at lines 164 and 183, they do not satisfy the type contracts and will only catch issues if tests actually hit them. Ensure email is required in the parameter type or validate it before use, check that authCode is not null before inclusion in the request, and verify access_token exists before returning.

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@integration/testUtils/machineAuthService.ts` around lines 110 - 118, The
obtainOAuthAccessToken function has three type-safety gaps: ensure
fakeUser.email is non-optional before calling signInWithEmailAndInstantPassword
(either make fakeUser.email required in ObtainOAuthAccessTokenParams or
check/throw if missing), read authCode via URLSearchParams.get and assert/throw
if it's null before using it in the token request so the compiler knows it's a
string, and validate that tokenData.access_token is present (throw or handle the
error) before returning so the function can keep returning Promise<string>;
reference the symbols fakeUser.email, signInWithEmailAndInstantPassword,
authCode (from URLSearchParams.get), tokenData.access_token, and the
obtainOAuthAccessToken function when making these fixes.

};

/**
* Runs the full OAuth 2.0 authorization code flow using Playwright:
* 1. Navigates to the authorize URL
* 2. Signs in with the provided user credentials
* 3. Accepts the consent screen
* 4. Extracts the authorization code from the callback
* 5. Exchanges the code for an access token
*
* Returns the access token string.
*/
export async function obtainOAuthAccessToken({
page,
oAuthApp,
redirectUri,
fakeUser,
signIn,
}: ObtainOAuthAccessTokenParams): Promise<string> {
const state = randomBytes(16).toString('hex');
const authorizeUrl = new URL(oAuthApp.authorizeUrl);
authorizeUrl.searchParams.set('client_id', oAuthApp.clientId);
authorizeUrl.searchParams.set('redirect_uri', redirectUri);
authorizeUrl.searchParams.set('response_type', 'code');
authorizeUrl.searchParams.set('scope', 'profile email');
authorizeUrl.searchParams.set('state', state);

await page.goto(authorizeUrl.toString());

// Sign in on Account Portal
await signIn.waitForMounted();
await signIn.signInWithEmailAndInstantPassword({
email: fakeUser.email,
password: fakeUser.password,
});

// Accept consent screen
const consentButton = page.getByRole('button', { name: 'Allow' });
await consentButton.waitFor({ timeout: 10000 });
await consentButton.click();

// Wait for redirect and extract authorization code
await page.waitForURL(/oauth\/callback/, { timeout: 10000 });
const callbackUrl = new URL(page.url());
const authCode = callbackUrl.searchParams.get('code');
expect(authCode).toBeTruthy();

// Exchange code for access token
expect(oAuthApp.clientSecret).toBeTruthy();
const tokenResponse = await page.request.post(oAuthApp.tokenFetchUrl, {
data: new URLSearchParams({
grant_type: 'authorization_code',
code: authCode,
redirect_uri: redirectUri,
client_id: oAuthApp.clientId,
client_secret: oAuthApp.clientSecret,
}).toString(),
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
},
});

expect(tokenResponse.status()).toBe(200);
const tokenData = (await tokenResponse.json()) as { access_token?: string };
expect(tokenData.access_token).toBeTruthy();

return tokenData.access_token;
}
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import type { Page } from '@playwright/test';
import { expect, test } from '@playwright/test';

import type { Application } from '../../models/application';
import { appConfigs } from '../../presets';
import type { FakeOrganization, FakeUser } from '../../testUtils';
import { createTestUtils } from '../../testUtils';
import type { Application } from '../models/application';
import { appConfigs } from '../presets';
import type { FakeOrganization, FakeUser } from '../testUtils';
import { createTestUtils } from '../testUtils';

const mockAPIKeysEnvironmentSettings = async (
page: Page,
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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
7 changes: 7 additions & 0 deletions integration/testUtils/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,13 @@ import { createUserService } from './usersService';
import { createWaitlistService } from './waitlistService';

export type { FakeAPIKey, FakeOrganization, FakeUser, FakeUserWithEmail };
export type { FakeMachineNetwork, FakeOAuthApp } from './machineAuthService';
export {
createFakeMachineNetwork,
createFakeOAuthApp,
createJwtM2MToken,
obtainOAuthAccessToken,
} from './machineAuthService';

const createClerkClient = (app: Application) => {
return backendCreateClerkClient({
Expand Down
186 changes: 186 additions & 0 deletions integration/testUtils/machineAuthService.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,186 @@
import { randomBytes } from 'node:crypto';

import type { ClerkClient, M2MToken, Machine, OAuthApplication } from '@clerk/backend';
import { faker } from '@faker-js/faker';
import type { Page } from '@playwright/test';
import { expect } from '@playwright/test';

// ─── M2M ────────────────────────────────────────────────────────────────────

export type FakeMachineNetwork = {
primaryServer: Machine;
scopedSender: Machine;
unscopedSender: Machine;
scopedSenderToken: M2MToken;
unscopedSenderToken: M2MToken;
cleanup: () => Promise<void>;
};

/**
* Creates a network of three machines for M2M testing:
* - A primary API server (the "receiver")
* - A sender machine scoped to the primary (should succeed)
* - A sender machine with no scope (should fail)
*
* Each sender gets an opaque M2M token created for it.
* Call `cleanup()` to revoke tokens and delete all machines.
*/
export async function createFakeMachineNetwork(clerkClient: ClerkClient): Promise<FakeMachineNetwork> {
const fakeCompanyName = faker.company.name();

const primaryServer = await clerkClient.machines.create({
name: `${fakeCompanyName} Primary API Server`,
});

const scopedSender = await clerkClient.machines.create({
name: `${fakeCompanyName} Scoped Sender`,
scopedMachines: [primaryServer.id],
});
const scopedSenderToken = await clerkClient.m2m.createToken({
machineSecretKey: scopedSender.secretKey,
secondsUntilExpiration: 60 * 30,
});

const unscopedSender = await clerkClient.machines.create({
name: `${fakeCompanyName} Unscoped Sender`,
});
const unscopedSenderToken = await clerkClient.m2m.createToken({
machineSecretKey: unscopedSender.secretKey,
secondsUntilExpiration: 60 * 30,
});

return {
primaryServer,
scopedSender,
unscopedSender,
scopedSenderToken,
unscopedSenderToken,
cleanup: async () => {
await Promise.all([
clerkClient.m2m.revokeToken({ m2mTokenId: scopedSenderToken.id }),
clerkClient.m2m.revokeToken({ m2mTokenId: unscopedSenderToken.id }),
]);
await Promise.all([
clerkClient.machines.delete(scopedSender.id),
clerkClient.machines.delete(unscopedSender.id),
clerkClient.machines.delete(primaryServer.id),
]);
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Comment thread
wobsoriano marked this conversation as resolved.
},
};
}

/**
* Creates a JWT-format M2M token for a sender machine.
* JWT tokens are self-contained and expire via the `exp` claim (no revocation needed).
*/
export async function createJwtM2MToken(clerkClient: ClerkClient, senderSecretKey: string): Promise<M2MToken> {
return clerkClient.m2m.createToken({
machineSecretKey: senderSecretKey,
secondsUntilExpiration: 60 * 30,
tokenFormat: 'jwt',
});
}

// ─── OAuth ──────────────────────────────────────────────────────────────────

export type FakeOAuthApp = {
oAuthApp: OAuthApplication;
cleanup: () => Promise<void>;
};

/**
* Creates an OAuth application via BAPI for testing the full authorization code flow.
* Call `cleanup()` to delete the OAuth application.
*/
export async function createFakeOAuthApp(clerkClient: ClerkClient, callbackUrl: string): Promise<FakeOAuthApp> {
const oAuthApp = await clerkClient.oauthApplications.create({
name: `Integration Test OAuth App - ${Date.now()}`,
redirectUris: [callbackUrl],
scopes: 'profile email',
});

return {
oAuthApp,
cleanup: async () => {
await clerkClient.oauthApplications.delete(oAuthApp.id);
},
};
}

export type ObtainOAuthAccessTokenParams = {
page: Page;
oAuthApp: OAuthApplication;
redirectUri: string;
fakeUser: { email?: string; password: string };
signIn: {
waitForMounted: (...args: any[]) => Promise<any>;
signInWithEmailAndInstantPassword: (params: { email: string; password: string }) => Promise<any>;
};
Comment on lines +110 to +118

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🔴 Critical

🧩 Analysis chain

🏁 Script executed:

#!/bin/bashset -euo pipefail
echo"== tsconfig strictness flags =="
fd 'tsconfig*.json'|whileread -r f;doecho"--- $f ---"
python - "$f"<<'PY'import json,sysp=sys.argv[1]try: d=json.load(open(p)) c=d.get("compilerOptions",{}) print("strict:", c.get("strict"), "strictNullChecks:", c.get("strictNullChecks"))except Exception as e: print("unparseable:", e)PYdoneechoecho"== nullable flow in machineAuthService =="
rg -n -C2 "fakeUser: \{ email\?: string; password: string \}|searchParams\.get\('code'\)|code: authCode|return tokenData\.access_token" integration/testUtils/machineAuthService.ts

Repository: clerk/javascript

Length of output: 5798


🏁 Script executed:

cat -n integration/testUtils/machineAuthService.ts | sed -n '135,190p'

Repository: clerk/javascript

Length of output: 2229


🏁 Script executed:

cat -n integration/testUtils/machineAuthService.ts | sed -n '110,120p'

Repository: clerk/javascript

Length of output: 475


🏁 Script executed:

fd machineAuthService -type f

Repository: clerk/javascript

Length of output: 230


🏁 Script executed:

grep -r "machineAuthService" --include="*.ts" --include="*.js" --include="*.json"| head -20

Repository: clerk/javascript

Length of output: 230


🏁 Script executed:

cd integration/testUtils && grep -r "obtainOAuthAccessToken".&&cd - ||true

Repository: clerk/javascript

Length of output: 186


🏁 Script executed:

cat -n integration/testUtils/machineAuthService.ts | sed -n '1,20p'

Repository: clerk/javascript

Length of output: 816


Type contract violations in OAuth token helper create potential runtime failures.

The function obtainOAuthAccessToken has three type mismatches that could cause test failures:

  1. fakeUser.email is optional (email?: string, line 114) but passed to signInWithEmailAndInstantPassword which requires a non-null string (line 150-151)
  2. authCode from URLSearchParams.get('code') returns string | null (line 163) but is used directly in the token request payload (line 171) instead of being validated first
  3. Return type declares Promise<string> (line 137) but returns tokenData.access_token which is typed as optional (line 182, 185)

While runtime assertions exist at lines 164 and 183, they do not satisfy the type contracts and will only catch issues if tests actually hit them. Ensure email is required in the parameter type or validate it before use, check that authCode is not null before inclusion in the request, and verify access_token exists before returning.

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@integration/testUtils/machineAuthService.ts` around lines 110 - 118, The
obtainOAuthAccessToken function has three type-safety gaps: ensure
fakeUser.email is non-optional before calling signInWithEmailAndInstantPassword
(either make fakeUser.email required in ObtainOAuthAccessTokenParams or
check/throw if missing), read authCode via URLSearchParams.get and assert/throw
if it's null before using it in the token request so the compiler knows it's a
string, and validate that tokenData.access_token is present (throw or handle the
error) before returning so the function can keep returning Promise<string>;
reference the symbols fakeUser.email, signInWithEmailAndInstantPassword,
authCode (from URLSearchParams.get), tokenData.access_token, and the
obtainOAuthAccessToken function when making these fixes.

};

/**
* Runs the full OAuth 2.0 authorization code flow using Playwright:
* 1. Navigates to the authorize URL
* 2. Signs in with the provided user credentials
* 3. Accepts the consent screen
* 4. Extracts the authorization code from the callback
* 5. Exchanges the code for an access token
*
* Returns the access token string.
*/
export async function obtainOAuthAccessToken({
page,
oAuthApp,
redirectUri,
fakeUser,
signIn,
}: ObtainOAuthAccessTokenParams): Promise<string> {
const state = randomBytes(16).toString('hex');
const authorizeUrl = new URL(oAuthApp.authorizeUrl);
authorizeUrl.searchParams.set('client_id', oAuthApp.clientId);
authorizeUrl.searchParams.set('redirect_uri', redirectUri);
authorizeUrl.searchParams.set('response_type', 'code');
authorizeUrl.searchParams.set('scope', 'profile email');
authorizeUrl.searchParams.set('state', state);

await page.goto(authorizeUrl.toString());

// Sign in on Account Portal
await signIn.waitForMounted();
await signIn.signInWithEmailAndInstantPassword({
email: fakeUser.email,
password: fakeUser.password,
});

// Accept consent screen
const consentButton = page.getByRole('button', { name: 'Allow' });
await consentButton.waitFor({ timeout: 10000 });
await consentButton.click();

// Wait for redirect and extract authorization code
await page.waitForURL(/oauth\/callback/, { timeout: 10000 });
const callbackUrl = new URL(page.url());
const authCode = callbackUrl.searchParams.get('code');
expect(authCode).toBeTruthy();

// Exchange code for access token
expect(oAuthApp.clientSecret).toBeTruthy();
const tokenResponse = await page.request.post(oAuthApp.tokenFetchUrl, {
data: new URLSearchParams({
grant_type: 'authorization_code',
code: authCode,
redirect_uri: redirectUri,
client_id: oAuthApp.clientId,
client_secret: oAuthApp.clientSecret,
}).toString(),
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
},
});

expect(tokenResponse.status()).toBe(200);
const tokenData = (await tokenResponse.json()) as { access_token?: string };
expect(tokenData.access_token).toBeTruthy();

return tokenData.access_token;
}
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import type { Page } from '@playwright/test';
import { expect, test } from '@playwright/test';

import type { Application } from '../../models/application';
import { appConfigs } from '../../presets';
import type { FakeOrganization, FakeUser } from '../../testUtils';
import { createTestUtils } from '../../testUtils';
import type { Application } from '../models/application';
import { appConfigs } from '../presets';
import type { FakeOrganization, FakeUser } from '../testUtils';
import { createTestUtils } from '../testUtils';

const mockAPIKeysEnvironmentSettings = async (
page: Page,
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
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
7 changes: 7 additions & 0 deletions integration/testUtils/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,13 @@ import { createUserService } from './usersService';
import { createWaitlistService } from './waitlistService';

export type { FakeAPIKey, FakeOrganization, FakeUser, FakeUserWithEmail };
export type { FakeMachineNetwork, FakeOAuthApp } from './machineAuthService';
export {
createFakeMachineNetwork,
createFakeOAuthApp,
createJwtM2MToken,
obtainOAuthAccessToken,
} from './machineAuthService';

const createClerkClient = (app: Application) => {
return backendCreateClerkClient({
Expand Down
186 changes: 186 additions & 0 deletions integration/testUtils/machineAuthService.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,186 @@
import { randomBytes } from 'node:crypto';

import type { ClerkClient, M2MToken, Machine, OAuthApplication } from '@clerk/backend';
import { faker } from '@faker-js/faker';
import type { Page } from '@playwright/test';
import { expect } from '@playwright/test';

// ─── M2M ────────────────────────────────────────────────────────────────────

export type FakeMachineNetwork = {
primaryServer: Machine;
scopedSender: Machine;
unscopedSender: Machine;
scopedSenderToken: M2MToken;
unscopedSenderToken: M2MToken;
cleanup: () => Promise<void>;
};

/**
* Creates a network of three machines for M2M testing:
* - A primary API server (the "receiver")
* - A sender machine scoped to the primary (should succeed)
* - A sender machine with no scope (should fail)
*
* Each sender gets an opaque M2M token created for it.
* Call `cleanup()` to revoke tokens and delete all machines.
*/
export async function createFakeMachineNetwork(clerkClient: ClerkClient): Promise<FakeMachineNetwork> {
const fakeCompanyName = faker.company.name();

const primaryServer = await clerkClient.machines.create({
name: `${fakeCompanyName} Primary API Server`,
});

const scopedSender = await clerkClient.machines.create({
name: `${fakeCompanyName} Scoped Sender`,
scopedMachines: [primaryServer.id],
});
const scopedSenderToken = await clerkClient.m2m.createToken({
machineSecretKey: scopedSender.secretKey,
secondsUntilExpiration: 60 * 30,
});

const unscopedSender = await clerkClient.machines.create({
name: `${fakeCompanyName} Unscoped Sender`,
});
const unscopedSenderToken = await clerkClient.m2m.createToken({
machineSecretKey: unscopedSender.secretKey,
secondsUntilExpiration: 60 * 30,
});

return {
primaryServer,
scopedSender,
unscopedSender,
scopedSenderToken,
unscopedSenderToken,
cleanup: async () => {
await Promise.all([
clerkClient.m2m.revokeToken({ m2mTokenId: scopedSenderToken.id }),
clerkClient.m2m.revokeToken({ m2mTokenId: unscopedSenderToken.id }),
]);
await Promise.all([
clerkClient.machines.delete(scopedSender.id),
clerkClient.machines.delete(unscopedSender.id),
clerkClient.machines.delete(primaryServer.id),
]);
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Comment thread
wobsoriano marked this conversation as resolved.
},
};
}

/**
* Creates a JWT-format M2M token for a sender machine.
* JWT tokens are self-contained and expire via the `exp` claim (no revocation needed).
*/
export async function createJwtM2MToken(clerkClient: ClerkClient, senderSecretKey: string): Promise<M2MToken> {
return clerkClient.m2m.createToken({
machineSecretKey: senderSecretKey,
secondsUntilExpiration: 60 * 30,
tokenFormat: 'jwt',
});
}

// ─── OAuth ──────────────────────────────────────────────────────────────────

export type FakeOAuthApp = {
oAuthApp: OAuthApplication;
cleanup: () => Promise<void>;
};

/**
* Creates an OAuth application via BAPI for testing the full authorization code flow.
* Call `cleanup()` to delete the OAuth application.
*/
export async function createFakeOAuthApp(clerkClient: ClerkClient, callbackUrl: string): Promise<FakeOAuthApp> {
const oAuthApp = await clerkClient.oauthApplications.create({
name: `Integration Test OAuth App - ${Date.now()}`,
redirectUris: [callbackUrl],
scopes: 'profile email',
});

return {
oAuthApp,
cleanup: async () => {
await clerkClient.oauthApplications.delete(oAuthApp.id);
},
};
}

export type ObtainOAuthAccessTokenParams = {
page: Page;
oAuthApp: OAuthApplication;
redirectUri: string;
fakeUser: { email?: string; password: string };
signIn: {
waitForMounted: (...args: any[]) => Promise<any>;
signInWithEmailAndInstantPassword: (params: { email: string; password: string }) => Promise<any>;
};
Comment on lines +110 to +118

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🔴 Critical

🧩 Analysis chain

🏁 Script executed:

#!/bin/bashset -euo pipefail
echo"== tsconfig strictness flags =="
fd 'tsconfig*.json'|whileread -r f;doecho"--- $f ---"
python - "$f"<<'PY'import json,sysp=sys.argv[1]try: d=json.load(open(p)) c=d.get("compilerOptions",{}) print("strict:", c.get("strict"), "strictNullChecks:", c.get("strictNullChecks"))except Exception as e: print("unparseable:", e)PYdoneechoecho"== nullable flow in machineAuthService =="
rg -n -C2 "fakeUser: \{ email\?: string; password: string \}|searchParams\.get\('code'\)|code: authCode|return tokenData\.access_token" integration/testUtils/machineAuthService.ts

Repository: clerk/javascript

Length of output: 5798


🏁 Script executed:

cat -n integration/testUtils/machineAuthService.ts | sed -n '135,190p'

Repository: clerk/javascript

Length of output: 2229


🏁 Script executed:

cat -n integration/testUtils/machineAuthService.ts | sed -n '110,120p'

Repository: clerk/javascript

Length of output: 475


🏁 Script executed:

fd machineAuthService -type f

Repository: clerk/javascript

Length of output: 230


🏁 Script executed:

grep -r "machineAuthService" --include="*.ts" --include="*.js" --include="*.json"| head -20

Repository: clerk/javascript

Length of output: 230


🏁 Script executed:

cd integration/testUtils && grep -r "obtainOAuthAccessToken".&&cd - ||true

Repository: clerk/javascript

Length of output: 186


🏁 Script executed:

cat -n integration/testUtils/machineAuthService.ts | sed -n '1,20p'

Repository: clerk/javascript

Length of output: 816


Type contract violations in OAuth token helper create potential runtime failures.

The function obtainOAuthAccessToken has three type mismatches that could cause test failures:

  1. fakeUser.email is optional (email?: string, line 114) but passed to signInWithEmailAndInstantPassword which requires a non-null string (line 150-151)
  2. authCode from URLSearchParams.get('code') returns string | null (line 163) but is used directly in the token request payload (line 171) instead of being validated first
  3. Return type declares Promise<string> (line 137) but returns tokenData.access_token which is typed as optional (line 182, 185)

While runtime assertions exist at lines 164 and 183, they do not satisfy the type contracts and will only catch issues if tests actually hit them. Ensure email is required in the parameter type or validate it before use, check that authCode is not null before inclusion in the request, and verify access_token exists before returning.

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@integration/testUtils/machineAuthService.ts` around lines 110 - 118, The
obtainOAuthAccessToken function has three type-safety gaps: ensure
fakeUser.email is non-optional before calling signInWithEmailAndInstantPassword
(either make fakeUser.email required in ObtainOAuthAccessTokenParams or
check/throw if missing), read authCode via URLSearchParams.get and assert/throw
if it's null before using it in the token request so the compiler knows it's a
string, and validate that tokenData.access_token is present (throw or handle the
error) before returning so the function can keep returning Promise<string>;
reference the symbols fakeUser.email, signInWithEmailAndInstantPassword,
authCode (from URLSearchParams.get), tokenData.access_token, and the
obtainOAuthAccessToken function when making these fixes.

};

/**
* Runs the full OAuth 2.0 authorization code flow using Playwright:
* 1. Navigates to the authorize URL
* 2. Signs in with the provided user credentials
* 3. Accepts the consent screen
* 4. Extracts the authorization code from the callback
* 5. Exchanges the code for an access token
*
* Returns the access token string.
*/
export async function obtainOAuthAccessToken({
page,
oAuthApp,
redirectUri,
fakeUser,
signIn,
}: ObtainOAuthAccessTokenParams): Promise<string> {
const state = randomBytes(16).toString('hex');
const authorizeUrl = new URL(oAuthApp.authorizeUrl);
authorizeUrl.searchParams.set('client_id', oAuthApp.clientId);
authorizeUrl.searchParams.set('redirect_uri', redirectUri);
authorizeUrl.searchParams.set('response_type', 'code');
authorizeUrl.searchParams.set('scope', 'profile email');
authorizeUrl.searchParams.set('state', state);

await page.goto(authorizeUrl.toString());

// Sign in on Account Portal
await signIn.waitForMounted();
await signIn.signInWithEmailAndInstantPassword({
email: fakeUser.email,
password: fakeUser.password,
});

// Accept consent screen
const consentButton = page.getByRole('button', { name: 'Allow' });
await consentButton.waitFor({ timeout: 10000 });
await consentButton.click();

// Wait for redirect and extract authorization code
await page.waitForURL(/oauth\/callback/, { timeout: 10000 });
const callbackUrl = new URL(page.url());
const authCode = callbackUrl.searchParams.get('code');
expect(authCode).toBeTruthy();

// Exchange code for access token
expect(oAuthApp.clientSecret).toBeTruthy();
const tokenResponse = await page.request.post(oAuthApp.tokenFetchUrl, {
data: new URLSearchParams({
grant_type: 'authorization_code',
code: authCode,
redirect_uri: redirectUri,
client_id: oAuthApp.clientId,
client_secret: oAuthApp.clientSecret,
}).toString(),
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
},
});

expect(tokenResponse.status()).toBe(200);
const tokenData = (await tokenResponse.json()) as { access_token?: string };
expect(tokenData.access_token).toBeTruthy();

return tokenData.access_token;
}
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import type { Page } from '@playwright/test';
import { expect, test } from '@playwright/test';

import type { Application } from '../../models/application';
import { appConfigs } from '../../presets';
import type { FakeOrganization, FakeUser } from '../../testUtils';
import { createTestUtils } from '../../testUtils';
import type { Application } from '../models/application';
import { appConfigs } from '../presets';
import type { FakeOrganization, FakeUser } from '../testUtils';
import { createTestUtils } from '../testUtils';

const mockAPIKeysEnvironmentSettings = async (
page: Page,
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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
7 changes: 7 additions & 0 deletions integration/testUtils/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,13 @@ import { createUserService } from './usersService';
import { createWaitlistService } from './waitlistService';

export type { FakeAPIKey, FakeOrganization, FakeUser, FakeUserWithEmail };
export type { FakeMachineNetwork, FakeOAuthApp } from './machineAuthService';
export {
createFakeMachineNetwork,
createFakeOAuthApp,
createJwtM2MToken,
obtainOAuthAccessToken,
} from './machineAuthService';

const createClerkClient = (app: Application) => {
return backendCreateClerkClient({
Expand Down
186 changes: 186 additions & 0 deletions integration/testUtils/machineAuthService.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,186 @@
import { randomBytes } from 'node:crypto';

import type { ClerkClient, M2MToken, Machine, OAuthApplication } from '@clerk/backend';
import { faker } from '@faker-js/faker';
import type { Page } from '@playwright/test';
import { expect } from '@playwright/test';

// ─── M2M ────────────────────────────────────────────────────────────────────

export type FakeMachineNetwork = {
primaryServer: Machine;
scopedSender: Machine;
unscopedSender: Machine;
scopedSenderToken: M2MToken;
unscopedSenderToken: M2MToken;
cleanup: () => Promise<void>;
};

/**
* Creates a network of three machines for M2M testing:
* - A primary API server (the "receiver")
* - A sender machine scoped to the primary (should succeed)
* - A sender machine with no scope (should fail)
*
* Each sender gets an opaque M2M token created for it.
* Call `cleanup()` to revoke tokens and delete all machines.
*/
export async function createFakeMachineNetwork(clerkClient: ClerkClient): Promise<FakeMachineNetwork> {
const fakeCompanyName = faker.company.name();

const primaryServer = await clerkClient.machines.create({
name: `${fakeCompanyName} Primary API Server`,
});

const scopedSender = await clerkClient.machines.create({
name: `${fakeCompanyName} Scoped Sender`,
scopedMachines: [primaryServer.id],
});
const scopedSenderToken = await clerkClient.m2m.createToken({
machineSecretKey: scopedSender.secretKey,
secondsUntilExpiration: 60 * 30,
});

const unscopedSender = await clerkClient.machines.create({
name: `${fakeCompanyName} Unscoped Sender`,
});
const unscopedSenderToken = await clerkClient.m2m.createToken({
machineSecretKey: unscopedSender.secretKey,
secondsUntilExpiration: 60 * 30,
});

return {
primaryServer,
scopedSender,
unscopedSender,
scopedSenderToken,
unscopedSenderToken,
cleanup: async () => {
await Promise.all([
clerkClient.m2m.revokeToken({ m2mTokenId: scopedSenderToken.id }),
clerkClient.m2m.revokeToken({ m2mTokenId: unscopedSenderToken.id }),
]);
await Promise.all([
clerkClient.machines.delete(scopedSender.id),
clerkClient.machines.delete(unscopedSender.id),
clerkClient.machines.delete(primaryServer.id),
]);
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Comment thread
wobsoriano marked this conversation as resolved.
},
};
}

/**
* Creates a JWT-format M2M token for a sender machine.
* JWT tokens are self-contained and expire via the `exp` claim (no revocation needed).
*/
export async function createJwtM2MToken(clerkClient: ClerkClient, senderSecretKey: string): Promise<M2MToken> {
return clerkClient.m2m.createToken({
machineSecretKey: senderSecretKey,
secondsUntilExpiration: 60 * 30,
tokenFormat: 'jwt',
});
}

// ─── OAuth ──────────────────────────────────────────────────────────────────

export type FakeOAuthApp = {
oAuthApp: OAuthApplication;
cleanup: () => Promise<void>;
};

/**
* Creates an OAuth application via BAPI for testing the full authorization code flow.
* Call `cleanup()` to delete the OAuth application.
*/
export async function createFakeOAuthApp(clerkClient: ClerkClient, callbackUrl: string): Promise<FakeOAuthApp> {
const oAuthApp = await clerkClient.oauthApplications.create({
name: `Integration Test OAuth App - ${Date.now()}`,
redirectUris: [callbackUrl],
scopes: 'profile email',
});

return {
oAuthApp,
cleanup: async () => {
await clerkClient.oauthApplications.delete(oAuthApp.id);
},
};
}

export type ObtainOAuthAccessTokenParams = {
page: Page;
oAuthApp: OAuthApplication;
redirectUri: string;
fakeUser: { email?: string; password: string };
signIn: {
waitForMounted: (...args: any[]) => Promise<any>;
signInWithEmailAndInstantPassword: (params: { email: string; password: string }) => Promise<any>;
};
Comment on lines +110 to +118

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🔴 Critical

🧩 Analysis chain

🏁 Script executed:

#!/bin/bashset -euo pipefail
echo"== tsconfig strictness flags =="
fd 'tsconfig*.json'|whileread -r f;doecho"--- $f ---"
python - "$f"<<'PY'import json,sysp=sys.argv[1]try: d=json.load(open(p)) c=d.get("compilerOptions",{}) print("strict:", c.get("strict"), "strictNullChecks:", c.get("strictNullChecks"))except Exception as e: print("unparseable:", e)PYdoneechoecho"== nullable flow in machineAuthService =="
rg -n -C2 "fakeUser: \{ email\?: string; password: string \}|searchParams\.get\('code'\)|code: authCode|return tokenData\.access_token" integration/testUtils/machineAuthService.ts

Repository: clerk/javascript

Length of output: 5798


🏁 Script executed:

cat -n integration/testUtils/machineAuthService.ts | sed -n '135,190p'

Repository: clerk/javascript

Length of output: 2229


🏁 Script executed:

cat -n integration/testUtils/machineAuthService.ts | sed -n '110,120p'

Repository: clerk/javascript

Length of output: 475


🏁 Script executed:

fd machineAuthService -type f

Repository: clerk/javascript

Length of output: 230


🏁 Script executed:

grep -r "machineAuthService" --include="*.ts" --include="*.js" --include="*.json"| head -20

Repository: clerk/javascript

Length of output: 230


🏁 Script executed:

cd integration/testUtils && grep -r "obtainOAuthAccessToken".&&cd - ||true

Repository: clerk/javascript

Length of output: 186


🏁 Script executed:

cat -n integration/testUtils/machineAuthService.ts | sed -n '1,20p'

Repository: clerk/javascript

Length of output: 816


Type contract violations in OAuth token helper create potential runtime failures.

The function obtainOAuthAccessToken has three type mismatches that could cause test failures:

  1. fakeUser.email is optional (email?: string, line 114) but passed to signInWithEmailAndInstantPassword which requires a non-null string (line 150-151)
  2. authCode from URLSearchParams.get('code') returns string | null (line 163) but is used directly in the token request payload (line 171) instead of being validated first
  3. Return type declares Promise<string> (line 137) but returns tokenData.access_token which is typed as optional (line 182, 185)

While runtime assertions exist at lines 164 and 183, they do not satisfy the type contracts and will only catch issues if tests actually hit them. Ensure email is required in the parameter type or validate it before use, check that authCode is not null before inclusion in the request, and verify access_token exists before returning.

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@integration/testUtils/machineAuthService.ts` around lines 110 - 118, The
obtainOAuthAccessToken function has three type-safety gaps: ensure
fakeUser.email is non-optional before calling signInWithEmailAndInstantPassword
(either make fakeUser.email required in ObtainOAuthAccessTokenParams or
check/throw if missing), read authCode via URLSearchParams.get and assert/throw
if it's null before using it in the token request so the compiler knows it's a
string, and validate that tokenData.access_token is present (throw or handle the
error) before returning so the function can keep returning Promise<string>;
reference the symbols fakeUser.email, signInWithEmailAndInstantPassword,
authCode (from URLSearchParams.get), tokenData.access_token, and the
obtainOAuthAccessToken function when making these fixes.

};

/**
* Runs the full OAuth 2.0 authorization code flow using Playwright:
* 1. Navigates to the authorize URL
* 2. Signs in with the provided user credentials
* 3. Accepts the consent screen
* 4. Extracts the authorization code from the callback
* 5. Exchanges the code for an access token
*
* Returns the access token string.
*/
export async function obtainOAuthAccessToken({
page,
oAuthApp,
redirectUri,
fakeUser,
signIn,
}: ObtainOAuthAccessTokenParams): Promise<string> {
const state = randomBytes(16).toString('hex');
const authorizeUrl = new URL(oAuthApp.authorizeUrl);
authorizeUrl.searchParams.set('client_id', oAuthApp.clientId);
authorizeUrl.searchParams.set('redirect_uri', redirectUri);
authorizeUrl.searchParams.set('response_type', 'code');
authorizeUrl.searchParams.set('scope', 'profile email');
authorizeUrl.searchParams.set('state', state);

await page.goto(authorizeUrl.toString());

// Sign in on Account Portal
await signIn.waitForMounted();
await signIn.signInWithEmailAndInstantPassword({
email: fakeUser.email,
password: fakeUser.password,
});

// Accept consent screen
const consentButton = page.getByRole('button', { name: 'Allow' });
await consentButton.waitFor({ timeout: 10000 });
await consentButton.click();

// Wait for redirect and extract authorization code
await page.waitForURL(/oauth\/callback/, { timeout: 10000 });
const callbackUrl = new URL(page.url());
const authCode = callbackUrl.searchParams.get('code');
expect(authCode).toBeTruthy();

// Exchange code for access token
expect(oAuthApp.clientSecret).toBeTruthy();
const tokenResponse = await page.request.post(oAuthApp.tokenFetchUrl, {
data: new URLSearchParams({
grant_type: 'authorization_code',
code: authCode,
redirect_uri: redirectUri,
client_id: oAuthApp.clientId,
client_secret: oAuthApp.clientSecret,
}).toString(),
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
},
});

expect(tokenResponse.status()).toBe(200);
const tokenData = (await tokenResponse.json()) as { access_token?: string };
expect(tokenData.access_token).toBeTruthy();

return tokenData.access_token;
}
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import type { Page } from '@playwright/test';
import { expect, test } from '@playwright/test';

import type { Application } from '../../models/application';
import { appConfigs } from '../../presets';
import type { FakeOrganization, FakeUser } from '../../testUtils';
import { createTestUtils } from '../../testUtils';
import type { Application } from '../models/application';
import { appConfigs } from '../presets';
import type { FakeOrganization, FakeUser } from '../testUtils';
import { createTestUtils } from '../testUtils';

const mockAPIKeysEnvironmentSettings = async (
page: Page,
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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
7 changes: 7 additions & 0 deletions integration/testUtils/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,13 @@ import { createUserService } from './usersService';
import { createWaitlistService } from './waitlistService';

export type { FakeAPIKey, FakeOrganization, FakeUser, FakeUserWithEmail };
export type { FakeMachineNetwork, FakeOAuthApp } from './machineAuthService';
export {
createFakeMachineNetwork,
createFakeOAuthApp,
createJwtM2MToken,
obtainOAuthAccessToken,
} from './machineAuthService';

const createClerkClient = (app: Application) => {
return backendCreateClerkClient({
Expand Down
186 changes: 186 additions & 0 deletions integration/testUtils/machineAuthService.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,186 @@
import { randomBytes } from 'node:crypto';

import type { ClerkClient, M2MToken, Machine, OAuthApplication } from '@clerk/backend';
import { faker } from '@faker-js/faker';
import type { Page } from '@playwright/test';
import { expect } from '@playwright/test';

// ─── M2M ────────────────────────────────────────────────────────────────────

export type FakeMachineNetwork = {
primaryServer: Machine;
scopedSender: Machine;
unscopedSender: Machine;
scopedSenderToken: M2MToken;
unscopedSenderToken: M2MToken;
cleanup: () => Promise<void>;
};

/**
* Creates a network of three machines for M2M testing:
* - A primary API server (the "receiver")
* - A sender machine scoped to the primary (should succeed)
* - A sender machine with no scope (should fail)
*
* Each sender gets an opaque M2M token created for it.
* Call `cleanup()` to revoke tokens and delete all machines.
*/
export async function createFakeMachineNetwork(clerkClient: ClerkClient): Promise<FakeMachineNetwork> {
const fakeCompanyName = faker.company.name();

const primaryServer = await clerkClient.machines.create({
name: `${fakeCompanyName} Primary API Server`,
});

const scopedSender = await clerkClient.machines.create({
name: `${fakeCompanyName} Scoped Sender`,
scopedMachines: [primaryServer.id],
});
const scopedSenderToken = await clerkClient.m2m.createToken({
machineSecretKey: scopedSender.secretKey,
secondsUntilExpiration: 60 * 30,
});

const unscopedSender = await clerkClient.machines.create({
name: `${fakeCompanyName} Unscoped Sender`,
});
const unscopedSenderToken = await clerkClient.m2m.createToken({
machineSecretKey: unscopedSender.secretKey,
secondsUntilExpiration: 60 * 30,
});

return {
primaryServer,
scopedSender,
unscopedSender,
scopedSenderToken,
unscopedSenderToken,
cleanup: async () => {
await Promise.all([
clerkClient.m2m.revokeToken({ m2mTokenId: scopedSenderToken.id }),
clerkClient.m2m.revokeToken({ m2mTokenId: unscopedSenderToken.id }),
]);
await Promise.all([
clerkClient.machines.delete(scopedSender.id),
clerkClient.machines.delete(unscopedSender.id),
clerkClient.machines.delete(primaryServer.id),
]);
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Comment thread
wobsoriano marked this conversation as resolved.
},
};
}

/**
* Creates a JWT-format M2M token for a sender machine.
* JWT tokens are self-contained and expire via the `exp` claim (no revocation needed).
*/
export async function createJwtM2MToken(clerkClient: ClerkClient, senderSecretKey: string): Promise<M2MToken> {
return clerkClient.m2m.createToken({
machineSecretKey: senderSecretKey,
secondsUntilExpiration: 60 * 30,
tokenFormat: 'jwt',
});
}

// ─── OAuth ──────────────────────────────────────────────────────────────────

export type FakeOAuthApp = {
oAuthApp: OAuthApplication;
cleanup: () => Promise<void>;
};

/**
* Creates an OAuth application via BAPI for testing the full authorization code flow.
* Call `cleanup()` to delete the OAuth application.
*/
export async function createFakeOAuthApp(clerkClient: ClerkClient, callbackUrl: string): Promise<FakeOAuthApp> {
const oAuthApp = await clerkClient.oauthApplications.create({
name: `Integration Test OAuth App - ${Date.now()}`,
redirectUris: [callbackUrl],
scopes: 'profile email',
});

return {
oAuthApp,
cleanup: async () => {
await clerkClient.oauthApplications.delete(oAuthApp.id);
},
};
}

export type ObtainOAuthAccessTokenParams = {
page: Page;
oAuthApp: OAuthApplication;
redirectUri: string;
fakeUser: { email?: string; password: string };
signIn: {
waitForMounted: (...args: any[]) => Promise<any>;
signInWithEmailAndInstantPassword: (params: { email: string; password: string }) => Promise<any>;
};
Comment on lines +110 to +118

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🔴 Critical

🧩 Analysis chain

🏁 Script executed:

#!/bin/bashset -euo pipefail
echo"== tsconfig strictness flags =="
fd 'tsconfig*.json'|whileread -r f;doecho"--- $f ---"
python - "$f"<<'PY'import json,sysp=sys.argv[1]try: d=json.load(open(p)) c=d.get("compilerOptions",{}) print("strict:", c.get("strict"), "strictNullChecks:", c.get("strictNullChecks"))except Exception as e: print("unparseable:", e)PYdoneechoecho"== nullable flow in machineAuthService =="
rg -n -C2 "fakeUser: \{ email\?: string; password: string \}|searchParams\.get\('code'\)|code: authCode|return tokenData\.access_token" integration/testUtils/machineAuthService.ts

Repository: clerk/javascript

Length of output: 5798


🏁 Script executed:

cat -n integration/testUtils/machineAuthService.ts | sed -n '135,190p'

Repository: clerk/javascript

Length of output: 2229


🏁 Script executed:

cat -n integration/testUtils/machineAuthService.ts | sed -n '110,120p'

Repository: clerk/javascript

Length of output: 475


🏁 Script executed:

fd machineAuthService -type f

Repository: clerk/javascript

Length of output: 230


🏁 Script executed:

grep -r "machineAuthService" --include="*.ts" --include="*.js" --include="*.json"| head -20

Repository: clerk/javascript

Length of output: 230


🏁 Script executed:

cd integration/testUtils && grep -r "obtainOAuthAccessToken".&&cd - ||true

Repository: clerk/javascript

Length of output: 186


🏁 Script executed:

cat -n integration/testUtils/machineAuthService.ts | sed -n '1,20p'

Repository: clerk/javascript

Length of output: 816


Type contract violations in OAuth token helper create potential runtime failures.

The function obtainOAuthAccessToken has three type mismatches that could cause test failures:

  1. fakeUser.email is optional (email?: string, line 114) but passed to signInWithEmailAndInstantPassword which requires a non-null string (line 150-151)
  2. authCode from URLSearchParams.get('code') returns string | null (line 163) but is used directly in the token request payload (line 171) instead of being validated first
  3. Return type declares Promise<string> (line 137) but returns tokenData.access_token which is typed as optional (line 182, 185)

While runtime assertions exist at lines 164 and 183, they do not satisfy the type contracts and will only catch issues if tests actually hit them. Ensure email is required in the parameter type or validate it before use, check that authCode is not null before inclusion in the request, and verify access_token exists before returning.

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@integration/testUtils/machineAuthService.ts` around lines 110 - 118, The
obtainOAuthAccessToken function has three type-safety gaps: ensure
fakeUser.email is non-optional before calling signInWithEmailAndInstantPassword
(either make fakeUser.email required in ObtainOAuthAccessTokenParams or
check/throw if missing), read authCode via URLSearchParams.get and assert/throw
if it's null before using it in the token request so the compiler knows it's a
string, and validate that tokenData.access_token is present (throw or handle the
error) before returning so the function can keep returning Promise<string>;
reference the symbols fakeUser.email, signInWithEmailAndInstantPassword,
authCode (from URLSearchParams.get), tokenData.access_token, and the
obtainOAuthAccessToken function when making these fixes.

};

/**
* Runs the full OAuth 2.0 authorization code flow using Playwright:
* 1. Navigates to the authorize URL
* 2. Signs in with the provided user credentials
* 3. Accepts the consent screen
* 4. Extracts the authorization code from the callback
* 5. Exchanges the code for an access token
*
* Returns the access token string.
*/
export async function obtainOAuthAccessToken({
page,
oAuthApp,
redirectUri,
fakeUser,
signIn,
}: ObtainOAuthAccessTokenParams): Promise<string> {
const state = randomBytes(16).toString('hex');
const authorizeUrl = new URL(oAuthApp.authorizeUrl);
authorizeUrl.searchParams.set('client_id', oAuthApp.clientId);
authorizeUrl.searchParams.set('redirect_uri', redirectUri);
authorizeUrl.searchParams.set('response_type', 'code');
authorizeUrl.searchParams.set('scope', 'profile email');
authorizeUrl.searchParams.set('state', state);

await page.goto(authorizeUrl.toString());

// Sign in on Account Portal
await signIn.waitForMounted();
await signIn.signInWithEmailAndInstantPassword({
email: fakeUser.email,
password: fakeUser.password,
});

// Accept consent screen
const consentButton = page.getByRole('button', { name: 'Allow' });
await consentButton.waitFor({ timeout: 10000 });
await consentButton.click();

// Wait for redirect and extract authorization code
await page.waitForURL(/oauth\/callback/, { timeout: 10000 });
const callbackUrl = new URL(page.url());
const authCode = callbackUrl.searchParams.get('code');
expect(authCode).toBeTruthy();

// Exchange code for access token
expect(oAuthApp.clientSecret).toBeTruthy();
const tokenResponse = await page.request.post(oAuthApp.tokenFetchUrl, {
data: new URLSearchParams({
grant_type: 'authorization_code',
code: authCode,
redirect_uri: redirectUri,
client_id: oAuthApp.clientId,
client_secret: oAuthApp.clientSecret,
}).toString(),
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
},
});

expect(tokenResponse.status()).toBe(200);
const tokenData = (await tokenResponse.json()) as { access_token?: string };
expect(tokenData.access_token).toBeTruthy();

return tokenData.access_token;
}
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import type { Page } from '@playwright/test';
import { expect, test } from '@playwright/test';

import type { Application } from '../../models/application';
import { appConfigs } from '../../presets';
import type { FakeOrganization, FakeUser } from '../../testUtils';
import { createTestUtils } from '../../testUtils';
import type { Application } from '../models/application';
import { appConfigs } from '../presets';
import type { FakeOrganization, FakeUser } from '../testUtils';
import { createTestUtils } from '../testUtils';

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

export type { FakeAPIKey, FakeOrganization, FakeUser, FakeUserWithEmail };
export type { FakeMachineNetwork, FakeOAuthApp } from './machineAuthService';
export {
createFakeMachineNetwork,
createFakeOAuthApp,
createJwtM2MToken,
obtainOAuthAccessToken,
} from './machineAuthService';

const createClerkClient = (app: Application) => {
return backendCreateClerkClient({
Expand Down
186 changes: 186 additions & 0 deletions integration/testUtils/machineAuthService.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,186 @@
import { randomBytes } from 'node:crypto';

import type { ClerkClient, M2MToken, Machine, OAuthApplication } from '@clerk/backend';
import { faker } from '@faker-js/faker';
import type { Page } from '@playwright/test';
import { expect } from '@playwright/test';

// ─── M2M ────────────────────────────────────────────────────────────────────

export type FakeMachineNetwork = {
primaryServer: Machine;
scopedSender: Machine;
unscopedSender: Machine;
scopedSenderToken: M2MToken;
unscopedSenderToken: M2MToken;
cleanup: () => Promise<void>;
};

/**
* Creates a network of three machines for M2M testing:
* - A primary API server (the "receiver")
* - A sender machine scoped to the primary (should succeed)
* - A sender machine with no scope (should fail)
*
* Each sender gets an opaque M2M token created for it.
* Call `cleanup()` to revoke tokens and delete all machines.
*/
export async function createFakeMachineNetwork(clerkClient: ClerkClient): Promise<FakeMachineNetwork> {
const fakeCompanyName = faker.company.name();

const primaryServer = await clerkClient.machines.create({
name: `${fakeCompanyName} Primary API Server`,
});

const scopedSender = await clerkClient.machines.create({
name: `${fakeCompanyName} Scoped Sender`,
scopedMachines: [primaryServer.id],
});
const scopedSenderToken = await clerkClient.m2m.createToken({
machineSecretKey: scopedSender.secretKey,
secondsUntilExpiration: 60 * 30,
});

const unscopedSender = await clerkClient.machines.create({
name: `${fakeCompanyName} Unscoped Sender`,
});
const unscopedSenderToken = await clerkClient.m2m.createToken({
machineSecretKey: unscopedSender.secretKey,
secondsUntilExpiration: 60 * 30,
});

return {
primaryServer,
scopedSender,
unscopedSender,
scopedSenderToken,
unscopedSenderToken,
cleanup: async () => {
await Promise.all([
clerkClient.m2m.revokeToken({ m2mTokenId: scopedSenderToken.id }),
clerkClient.m2m.revokeToken({ m2mTokenId: unscopedSenderToken.id }),
]);
await Promise.all([
clerkClient.machines.delete(scopedSender.id),
clerkClient.machines.delete(unscopedSender.id),
clerkClient.machines.delete(primaryServer.id),
]);
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Comment thread
wobsoriano marked this conversation as resolved.
},
};
}

/**
* Creates a JWT-format M2M token for a sender machine.
* JWT tokens are self-contained and expire via the `exp` claim (no revocation needed).
*/
export async function createJwtM2MToken(clerkClient: ClerkClient, senderSecretKey: string): Promise<M2MToken> {
return clerkClient.m2m.createToken({
machineSecretKey: senderSecretKey,
secondsUntilExpiration: 60 * 30,
tokenFormat: 'jwt',
});
}

// ─── OAuth ──────────────────────────────────────────────────────────────────

export type FakeOAuthApp = {
oAuthApp: OAuthApplication;
cleanup: () => Promise<void>;
};

/**
* Creates an OAuth application via BAPI for testing the full authorization code flow.
* Call `cleanup()` to delete the OAuth application.
*/
export async function createFakeOAuthApp(clerkClient: ClerkClient, callbackUrl: string): Promise<FakeOAuthApp> {
const oAuthApp = await clerkClient.oauthApplications.create({
name: `Integration Test OAuth App - ${Date.now()}`,
redirectUris: [callbackUrl],
scopes: 'profile email',
});

return {
oAuthApp,
cleanup: async () => {
await clerkClient.oauthApplications.delete(oAuthApp.id);
},
};
}

export type ObtainOAuthAccessTokenParams = {
page: Page;
oAuthApp: OAuthApplication;
redirectUri: string;
fakeUser: { email?: string; password: string };
signIn: {
waitForMounted: (...args: any[]) => Promise<any>;
signInWithEmailAndInstantPassword: (params: { email: string; password: string }) => Promise<any>;
};
Comment on lines +110 to +118

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🔴 Critical

🧩 Analysis chain

🏁 Script executed:

#!/bin/bashset -euo pipefail
echo"== tsconfig strictness flags =="
fd 'tsconfig*.json'|whileread -r f;doecho"--- $f ---"
python - "$f"<<'PY'import json,sysp=sys.argv[1]try: d=json.load(open(p)) c=d.get("compilerOptions",{}) print("strict:", c.get("strict"), "strictNullChecks:", c.get("strictNullChecks"))except Exception as e: print("unparseable:", e)PYdoneechoecho"== nullable flow in machineAuthService =="
rg -n -C2 "fakeUser: \{ email\?: string; password: string \}|searchParams\.get\('code'\)|code: authCode|return tokenData\.access_token" integration/testUtils/machineAuthService.ts

Repository: clerk/javascript

Length of output: 5798


🏁 Script executed:

cat -n integration/testUtils/machineAuthService.ts | sed -n '135,190p'

Repository: clerk/javascript

Length of output: 2229


🏁 Script executed:

cat -n integration/testUtils/machineAuthService.ts | sed -n '110,120p'

Repository: clerk/javascript

Length of output: 475


🏁 Script executed:

fd machineAuthService -type f

Repository: clerk/javascript

Length of output: 230


🏁 Script executed:

grep -r "machineAuthService" --include="*.ts" --include="*.js" --include="*.json"| head -20

Repository: clerk/javascript

Length of output: 230


🏁 Script executed:

cd integration/testUtils && grep -r "obtainOAuthAccessToken".&&cd - ||true

Repository: clerk/javascript

Length of output: 186


🏁 Script executed:

cat -n integration/testUtils/machineAuthService.ts | sed -n '1,20p'

Repository: clerk/javascript

Length of output: 816


Type contract violations in OAuth token helper create potential runtime failures.

The function obtainOAuthAccessToken has three type mismatches that could cause test failures:

  1. fakeUser.email is optional (email?: string, line 114) but passed to signInWithEmailAndInstantPassword which requires a non-null string (line 150-151)
  2. authCode from URLSearchParams.get('code') returns string | null (line 163) but is used directly in the token request payload (line 171) instead of being validated first
  3. Return type declares Promise<string> (line 137) but returns tokenData.access_token which is typed as optional (line 182, 185)

While runtime assertions exist at lines 164 and 183, they do not satisfy the type contracts and will only catch issues if tests actually hit them. Ensure email is required in the parameter type or validate it before use, check that authCode is not null before inclusion in the request, and verify access_token exists before returning.

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@integration/testUtils/machineAuthService.ts` around lines 110 - 118, The
obtainOAuthAccessToken function has three type-safety gaps: ensure
fakeUser.email is non-optional before calling signInWithEmailAndInstantPassword
(either make fakeUser.email required in ObtainOAuthAccessTokenParams or
check/throw if missing), read authCode via URLSearchParams.get and assert/throw
if it's null before using it in the token request so the compiler knows it's a
string, and validate that tokenData.access_token is present (throw or handle the
error) before returning so the function can keep returning Promise<string>;
reference the symbols fakeUser.email, signInWithEmailAndInstantPassword,
authCode (from URLSearchParams.get), tokenData.access_token, and the
obtainOAuthAccessToken function when making these fixes.

};

/**
* Runs the full OAuth 2.0 authorization code flow using Playwright:
* 1. Navigates to the authorize URL
* 2. Signs in with the provided user credentials
* 3. Accepts the consent screen
* 4. Extracts the authorization code from the callback
* 5. Exchanges the code for an access token
*
* Returns the access token string.
*/
export async function obtainOAuthAccessToken({
page,
oAuthApp,
redirectUri,
fakeUser,
signIn,
}: ObtainOAuthAccessTokenParams): Promise<string> {
const state = randomBytes(16).toString('hex');
const authorizeUrl = new URL(oAuthApp.authorizeUrl);
authorizeUrl.searchParams.set('client_id', oAuthApp.clientId);
authorizeUrl.searchParams.set('redirect_uri', redirectUri);
authorizeUrl.searchParams.set('response_type', 'code');
authorizeUrl.searchParams.set('scope', 'profile email');
authorizeUrl.searchParams.set('state', state);

await page.goto(authorizeUrl.toString());

// Sign in on Account Portal
await signIn.waitForMounted();
await signIn.signInWithEmailAndInstantPassword({
email: fakeUser.email,
password: fakeUser.password,
});

// Accept consent screen
const consentButton = page.getByRole('button', { name: 'Allow' });
await consentButton.waitFor({ timeout: 10000 });
await consentButton.click();

// Wait for redirect and extract authorization code
await page.waitForURL(/oauth\/callback/, { timeout: 10000 });
const callbackUrl = new URL(page.url());
const authCode = callbackUrl.searchParams.get('code');
expect(authCode).toBeTruthy();

// Exchange code for access token
expect(oAuthApp.clientSecret).toBeTruthy();
const tokenResponse = await page.request.post(oAuthApp.tokenFetchUrl, {
data: new URLSearchParams({
grant_type: 'authorization_code',
code: authCode,
redirect_uri: redirectUri,
client_id: oAuthApp.clientId,
client_secret: oAuthApp.clientSecret,
}).toString(),
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
},
});

expect(tokenResponse.status()).toBe(200);
const tokenData = (await tokenResponse.json()) as { access_token?: string };
expect(tokenData.access_token).toBeTruthy();

return tokenData.access_token;
}
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
import type { Page } from '@playwright/test';
import { expect, test } from '@playwright/test';

import type { Application } from '../../models/application';
import { appConfigs } from '../../presets';
import type { FakeOrganization, FakeUser } from '../../testUtils';
import { createTestUtils } from '../../testUtils';
import type { Application } from '../models/application';
import { appConfigs } from '../presets';
import type { FakeOrganization, FakeUser } from '../testUtils';
import { createTestUtils } from '../testUtils';

const mockAPIKeysEnvironmentSettings = async (
page: Page,
Expand Down
Loading
Loading