Skip to content

Commit 1ae7c8a

Browse files
committed
fix(chrome-extension): initialize native API mode on the first production request
1 parent 045c301 commit 1ae7c8a

4 files changed

Lines changed: 41 additions & 4 deletions

File tree

‎.changeset/chrome-extension-protect-loader.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@
44
---
55

66
Prevent Chrome extensions from loading Device Intelligence scripts from remote URLs.
7+
8+
Initialize production Chrome extension authentication without requiring a previously stored client token.

‎integration/tests/chrome-extension/auth-flows.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ for (const environmentType of ['development', 'production'] as const) {
1717
});
1818

1919
test.describe(`chrome extension ${environmentType} auth @chrome-extension`, () => {
20-
test.describe.configure({ mode: 'serial' });
20+
test.describe.configure({ mode: 'default', timeout: 90_000 });
2121

2222
let services: { clerk: ClerkClient; users: UserService };
2323
let user: FakeUser;
@@ -77,10 +77,10 @@ for (const environmentType of ['development', 'production'] as const) {
7777
await signUp.signUpWithEmailAndPassword({ email: user.email, password: user.password });
7878

7979
if (environmentType === 'development') {
80-
await signUp.enterTestOtpCode();
80+
await signUp.enterTestOtpCode({ awaitPrepare: false });
8181
} else {
8282
const code = await createEmailService().getCodeForEmailAddress(user.email!);
83-
await signUp.enterOtpCode(code);
83+
await signUp.enterOtpCode(code, { awaitPrepare: false });
8484
}
8585

8686
await expect(extensionPage.getByTestId('user-id')).toHaveText(/^user_/);
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
import { describe, expect, it, vi } from 'vitest';
2+
3+
import type { JWTHandler } from '../jwt-handler';
4+
import { requestHandler } from '../request-handler';
5+
6+
describe('requestHandler', () => {
7+
it.each([
8+
{ isProd: true, jwt: undefined },
9+
{ isProd: true, jwt: 'client-jwt' },
10+
{ isProd: false, jwt: undefined },
11+
{ isProd: false, jwt: 'development-jwt' },
12+
])('sets request credentials for isProd=$isProd and jwt=$jwt', async ({ isProd, jwt }) => {
13+
const jwtHandler: JWTHandler = {
14+
get: vi.fn().mockResolvedValue(jwt),
15+
set: vi.fn(),
16+
remove: vi.fn(),
17+
listener: vi.fn(),
18+
};
19+
const request = {
20+
url: new URL('https://example.com/v1/client'),
21+
headers: new Headers(),
22+
credentials: 'include' as RequestCredentials,
23+
};
24+
25+
await requestHandler(jwtHandler, { isProd })(request);
26+
27+
expect(request.credentials).toBe('omit');
28+
expect(request.url.searchParams.getAll('_is_native')).toEqual(isProd ? ['1'] : []);
29+
expect(request.url.searchParams.get('__clerk_db_jwt')).toBe(!isProd && jwt ? jwt : null);
30+
expect(request.headers.get('Authorization')).toBe(isProd && jwt ? `Bearer ${jwt}` : null);
31+
});
32+
});

‎packages/chrome-extension/src/internal/utils/request-handler.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ export function requestHandler(jwtHandler: JWTHandler, { isProd }: { isProd: boo
1111
const handler: Handler = async requestInit => {
1212
requestInit.credentials = 'omit';
1313

14+
if (isProd) {
15+
requestInit.url?.searchParams.append('_is_native', '1');
16+
}
17+
1418
const currentJWT = await jwtHandler.get();
1519

1620
if (!currentJWT) {
@@ -34,6 +38,5 @@ function devHandler(requestInit: Req, jwt: string) {
3438

3539
/** Append the JWT to the FAPI request, per production instances */
3640
function prodHandler(requestInit: Req, jwt: string) {
37-
requestInit.url?.searchParams.append('_is_native', '1');
3841
(requestInit.headers as Headers).set(AUTH_HEADER.PRODUCTION, `Bearer ${jwt}`);
3942
}

0 commit comments

Comments
 (0)