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
5 changes: 5 additions & 0 deletions .changeset/session-minter-send-token.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Send previous session token on `/tokens` requests to support Session Minter edge token minting.
41 changes: 41 additions & 0 deletions integration/tests/resiliency.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -518,4 +518,45 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('resilienc
await u.po.clerk.toBeLoaded();
});
});

test.describe('token refresh with previous token in body', () => {
test('token refresh includes previous token in POST body and succeeds', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

// Sign in
await u.po.signIn.goTo();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
await u.po.expect.toBeSignedIn();

// Track token request bodies
const tokenRequestBodies: string[] = [];
await context.route('**/v1/client/sessions/*/tokens*', async route => {
const postData = route.request().postData();
if (postData) {
tokenRequestBodies.push(postData);
}
await route.continue();
});

// Force a fresh token fetch (cache miss -> hits /tokens endpoint)
const token = await page.evaluate(async () => {
const clerk = (window as any).Clerk;
await clerk.session?.clearCache();
return await clerk.session?.getToken({ skipCache: true });
});

// Token refresh should succeed (backend ignores the param for now)
expect(token).toBeTruthy();

// Verify token param is present in the POST body (form-urlencoded)
// fapiClient serializes body as form-urlencoded via qs.stringify(camelToSnake(body))
// so "token" stays "token" (no case change) and the body looks like "organization_id=&token=<jwt>"
expect(tokenRequestBodies.length).toBeGreaterThanOrEqual(1);
const lastBody = tokenRequestBodies[tokenRequestBodies.length - 1];
expect(lastBody).toContain('token=');

// User should still be signed in after refresh
await u.po.expect.toBeSignedIn();
});
});
});
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "540KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "66KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "67KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "108KB" },
{ "path": "./dist/clerk.no-rhc.js", "maxSize": "307KB" },
{ "path": "./dist/clerk.native.js", "maxSize": "66KB" },
Expand Down
3 changes: 3 additions & 0 deletions packages/clerk-js/src/core/resources/AuthConfig.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ export class AuthConfig extends BaseResource implements AuthConfigResource {
reverification: boolean = false;
singleSessionMode: boolean = false;
preferredChannels: Record<string, PhoneCodeChannel> | null = null;
sessionMinter: boolean = false;

public constructor(data: Partial<AuthConfigJSON> | null = null) {
super();
Expand All@@ -23,6 +24,7 @@ export class AuthConfig extends BaseResource implements AuthConfigResource {
this.reverification = this.withDefault(data.reverification, this.reverification);
this.singleSessionMode = this.withDefault(data.single_session_mode, this.singleSessionMode);
this.preferredChannels = this.withDefault(data.preferred_channels, this.preferredChannels);
this.sessionMinter = this.withDefault(data.session_minter, this.sessionMinter);
return this;
}

Expand All@@ -33,6 +35,7 @@ export class AuthConfig extends BaseResource implements AuthConfigResource {
object: 'auth_config',
reverification: this.reverification,
single_session_mode: this.singleSessionMode,
session_minter: this.sessionMinter,
};
}
}
8 changes: 7 additions & 1 deletion packages/clerk-js/src/core/resources/Session.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -480,7 +480,13 @@ export class Session extends BaseResource implements SessionResource {
): Promise<TokenResource> {
const path = template ? `${this.path()}/tokens/${template}` : `${this.path()}/tokens`;
// TODO: update template endpoint to accept organizationId
const params: Record<string, string | null> = template ? {} : { organizationId: organizationId ?? null };
const sessionMinterEnabled = Session.clerk?.__internal_environment?.authConfig?.sessionMinter;
const params: Record<string, string | null> = template
? {}
: {
organizationId: organizationId ?? null,
...(sessionMinterEnabled && this.lastActiveToken ? { token: this.lastActiveToken.getRawString() } : {}),
};
const lastActiveToken = this.lastActiveToken?.getRawString();

const tokenResolver = Token.create(path, params, skipCache ? { debug: 'skip_cache' } : undefined).catch(e => {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@ describe('AuthConfig', () => {
id: '',
reverification: true,
single_session_mode: true,
session_minter: false,
});
});
});
124 changes: 124 additions & 0 deletions packages/clerk-js/src/core/resources/__tests__/Session.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1522,6 +1522,130 @@ describe('Session', () => {
});
});

describe('sends previous token in /tokens request body', () => {
let dispatchSpy: ReturnType<typeof vi.spyOn>;
let fetchSpy: ReturnType<typeof vi.spyOn>;

beforeEach(() => {
dispatchSpy = vi.spyOn(eventBus, 'emit');
fetchSpy = vi.spyOn(BaseResource, '_fetch' as any);
BaseResource.clerk = clerkMock({
__internal_environment: {
authConfig: { sessionMinter: true },
},
}) as any;
});

afterEach(() => {
dispatchSpy?.mockRestore();
fetchSpy?.mockRestore();
BaseResource.clerk = null as any;
});

it('includes token in request body when lastActiveToken exists', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({}),
last_active_organization_id: null,
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

SessionTokenCache.clear();

fetchSpy.mockResolvedValueOnce({ object: 'token', jwt: mockJwt });

await session.getToken();

expect(fetchSpy).toHaveBeenCalledTimes(1);
expect(fetchSpy.mock.calls[0][0]).toMatchObject({
path: '/client/sessions/session_1/tokens',
method: 'POST',
body: { organizationId: null, token: mockJwt },
});
});

it('does not include token key in request body when lastActiveToken is null (first mint)', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({}),
last_active_organization_id: null,
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as unknown as SessionJSON);

SessionTokenCache.clear();

fetchSpy.mockResolvedValueOnce({ object: 'token', jwt: mockJwt });

await session.getToken();

expect(fetchSpy).toHaveBeenCalledTimes(1);
expect(fetchSpy.mock.calls[0][0]).toMatchObject({
path: '/client/sessions/session_1/tokens',
method: 'POST',
body: { organizationId: null },
});
expect(fetchSpy.mock.calls[0][0].body).not.toHaveProperty('token');
});

it('does not include token in request body for template token requests', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({}),
last_active_organization_id: null,
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

SessionTokenCache.clear();

fetchSpy.mockResolvedValueOnce({ object: 'token', jwt: mockJwt });

await session.getToken({ template: 'my-template' });

expect(fetchSpy).toHaveBeenCalledTimes(1);
expect(fetchSpy.mock.calls[0][0]).toMatchObject({
path: '/client/sessions/session_1/tokens/my-template',
method: 'POST',
});
expect(fetchSpy.mock.calls[0][0].body).toEqual({});
});

it('token value matches lastActiveToken.getRawString() exactly', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({}),
last_active_organization_id: null,
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

SessionTokenCache.clear();

fetchSpy.mockResolvedValueOnce({ object: 'token', jwt: mockJwt });

await session.getToken();

expect(fetchSpy.mock.calls[0][0].body.token).toBe(mockJwt);
});
});

describe('origin outage mode fallback', () => {
let dispatchSpy: ReturnType<typeof vi.spyOn>;
let fetchSpy: ReturnType<typeof vi.spyOn>;
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/types/authConfig.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,5 +21,6 @@ export interface AuthConfigResource extends ClerkResource {
* Preferred channels for phone code providers.
*/
preferredChannels: Record<string, PhoneCodeChannel> | null;
sessionMinter: boolean;
__internal_toSnapshot: () => AuthConfigJSONSnapshot;
}
1 change: 1 addition & 0 deletions packages/shared/src/types/json.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -332,6 +332,7 @@ export interface AuthConfigJSON extends ClerkResourceJSON {
claimed_at: number | null;
reverification: boolean;
preferred_channels?: Record<string, PhoneCodeChannel>;
session_minter?: boolean;
}

export interface VerificationJSON extends ClerkResourceJSON {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
feat(clerk-js): Send previous session token on /tokens requests by nikosdouvlis · Pull Request #8105 · clerk/javascript · GitHub
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
5 changes: 5 additions & 0 deletions .changeset/session-minter-send-token.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Send previous session token on `/tokens` requests to support Session Minter edge token minting.
41 changes: 41 additions & 0 deletions integration/tests/resiliency.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -518,4 +518,45 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('resilienc
await u.po.clerk.toBeLoaded();
});
});

test.describe('token refresh with previous token in body', () => {
test('token refresh includes previous token in POST body and succeeds', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

// Sign in
await u.po.signIn.goTo();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
await u.po.expect.toBeSignedIn();

// Track token request bodies
const tokenRequestBodies: string[] = [];
await context.route('**/v1/client/sessions/*/tokens*', async route => {
const postData = route.request().postData();
if (postData) {
tokenRequestBodies.push(postData);
}
await route.continue();
});

// Force a fresh token fetch (cache miss -> hits /tokens endpoint)
const token = await page.evaluate(async () => {
const clerk = (window as any).Clerk;
await clerk.session?.clearCache();
return await clerk.session?.getToken({ skipCache: true });
});

// Token refresh should succeed (backend ignores the param for now)
expect(token).toBeTruthy();

// Verify token param is present in the POST body (form-urlencoded)
// fapiClient serializes body as form-urlencoded via qs.stringify(camelToSnake(body))
// so "token" stays "token" (no case change) and the body looks like "organization_id=&token=<jwt>"
expect(tokenRequestBodies.length).toBeGreaterThanOrEqual(1);
const lastBody = tokenRequestBodies[tokenRequestBodies.length - 1];
expect(lastBody).toContain('token=');

// User should still be signed in after refresh
await u.po.expect.toBeSignedIn();
});
});
});
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "540KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "66KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "67KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "108KB" },
{ "path": "./dist/clerk.no-rhc.js", "maxSize": "307KB" },
{ "path": "./dist/clerk.native.js", "maxSize": "66KB" },
Expand Down
3 changes: 3 additions & 0 deletions packages/clerk-js/src/core/resources/AuthConfig.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ export class AuthConfig extends BaseResource implements AuthConfigResource {
reverification: boolean = false;
singleSessionMode: boolean = false;
preferredChannels: Record<string, PhoneCodeChannel> | null = null;
sessionMinter: boolean = false;

public constructor(data: Partial<AuthConfigJSON> | null = null) {
super();
Expand All@@ -23,6 +24,7 @@ export class AuthConfig extends BaseResource implements AuthConfigResource {
this.reverification = this.withDefault(data.reverification, this.reverification);
this.singleSessionMode = this.withDefault(data.single_session_mode, this.singleSessionMode);
this.preferredChannels = this.withDefault(data.preferred_channels, this.preferredChannels);
this.sessionMinter = this.withDefault(data.session_minter, this.sessionMinter);
return this;
}

Expand All@@ -33,6 +35,7 @@ export class AuthConfig extends BaseResource implements AuthConfigResource {
object: 'auth_config',
reverification: this.reverification,
single_session_mode: this.singleSessionMode,
session_minter: this.sessionMinter,
};
}
}
8 changes: 7 additions & 1 deletion packages/clerk-js/src/core/resources/Session.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -480,7 +480,13 @@ export class Session extends BaseResource implements SessionResource {
): Promise<TokenResource> {
const path = template ? `${this.path()}/tokens/${template}` : `${this.path()}/tokens`;
// TODO: update template endpoint to accept organizationId
const params: Record<string, string | null> = template ? {} : { organizationId: organizationId ?? null };
const sessionMinterEnabled = Session.clerk?.__internal_environment?.authConfig?.sessionMinter;
const params: Record<string, string | null> = template
? {}
: {
organizationId: organizationId ?? null,
...(sessionMinterEnabled && this.lastActiveToken ? { token: this.lastActiveToken.getRawString() } : {}),
};
const lastActiveToken = this.lastActiveToken?.getRawString();

const tokenResolver = Token.create(path, params, skipCache ? { debug: 'skip_cache' } : undefined).catch(e => {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@ describe('AuthConfig', () => {
id: '',
reverification: true,
single_session_mode: true,
session_minter: false,
});
});
});
124 changes: 124 additions & 0 deletions packages/clerk-js/src/core/resources/__tests__/Session.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1522,6 +1522,130 @@ describe('Session', () => {
});
});

describe('sends previous token in /tokens request body', () => {
let dispatchSpy: ReturnType<typeof vi.spyOn>;
let fetchSpy: ReturnType<typeof vi.spyOn>;

beforeEach(() => {
dispatchSpy = vi.spyOn(eventBus, 'emit');
fetchSpy = vi.spyOn(BaseResource, '_fetch' as any);
BaseResource.clerk = clerkMock({
__internal_environment: {
authConfig: { sessionMinter: true },
},
}) as any;
});

afterEach(() => {
dispatchSpy?.mockRestore();
fetchSpy?.mockRestore();
BaseResource.clerk = null as any;
});

it('includes token in request body when lastActiveToken exists', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({}),
last_active_organization_id: null,
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

SessionTokenCache.clear();

fetchSpy.mockResolvedValueOnce({ object: 'token', jwt: mockJwt });

await session.getToken();

expect(fetchSpy).toHaveBeenCalledTimes(1);
expect(fetchSpy.mock.calls[0][0]).toMatchObject({
path: '/client/sessions/session_1/tokens',
method: 'POST',
body: { organizationId: null, token: mockJwt },
});
});

it('does not include token key in request body when lastActiveToken is null (first mint)', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({}),
last_active_organization_id: null,
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as unknown as SessionJSON);

SessionTokenCache.clear();

fetchSpy.mockResolvedValueOnce({ object: 'token', jwt: mockJwt });

await session.getToken();

expect(fetchSpy).toHaveBeenCalledTimes(1);
expect(fetchSpy.mock.calls[0][0]).toMatchObject({
path: '/client/sessions/session_1/tokens',
method: 'POST',
body: { organizationId: null },
});
expect(fetchSpy.mock.calls[0][0].body).not.toHaveProperty('token');
});

it('does not include token in request body for template token requests', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({}),
last_active_organization_id: null,
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

SessionTokenCache.clear();

fetchSpy.mockResolvedValueOnce({ object: 'token', jwt: mockJwt });

await session.getToken({ template: 'my-template' });

expect(fetchSpy).toHaveBeenCalledTimes(1);
expect(fetchSpy.mock.calls[0][0]).toMatchObject({
path: '/client/sessions/session_1/tokens/my-template',
method: 'POST',
});
expect(fetchSpy.mock.calls[0][0].body).toEqual({});
});

it('token value matches lastActiveToken.getRawString() exactly', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({}),
last_active_organization_id: null,
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

SessionTokenCache.clear();

fetchSpy.mockResolvedValueOnce({ object: 'token', jwt: mockJwt });

await session.getToken();

expect(fetchSpy.mock.calls[0][0].body.token).toBe(mockJwt);
});
});

describe('origin outage mode fallback', () => {
let dispatchSpy: ReturnType<typeof vi.spyOn>;
let fetchSpy: ReturnType<typeof vi.spyOn>;
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/types/authConfig.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,5 +21,6 @@ export interface AuthConfigResource extends ClerkResource {
* Preferred channels for phone code providers.
*/
preferredChannels: Record<string, PhoneCodeChannel> | null;
sessionMinter: boolean;
__internal_toSnapshot: () => AuthConfigJSONSnapshot;
}
1 change: 1 addition & 0 deletions packages/shared/src/types/json.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -332,6 +332,7 @@ export interface AuthConfigJSON extends ClerkResourceJSON {
claimed_at: number | null;
reverification: boolean;
preferred_channels?: Record<string, PhoneCodeChannel>;
session_minter?: boolean;
}

export interface VerificationJSON extends ClerkResourceJSON {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(clerk-js): Send previous session token on /tokens requests by nikosdouvlis · Pull Request #8105 · clerk/javascript · GitHub
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
5 changes: 5 additions & 0 deletions .changeset/session-minter-send-token.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Send previous session token on `/tokens` requests to support Session Minter edge token minting.
41 changes: 41 additions & 0 deletions integration/tests/resiliency.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -518,4 +518,45 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('resilienc
await u.po.clerk.toBeLoaded();
});
});

test.describe('token refresh with previous token in body', () => {
test('token refresh includes previous token in POST body and succeeds', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

// Sign in
await u.po.signIn.goTo();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
await u.po.expect.toBeSignedIn();

// Track token request bodies
const tokenRequestBodies: string[] = [];
await context.route('**/v1/client/sessions/*/tokens*', async route => {
const postData = route.request().postData();
if (postData) {
tokenRequestBodies.push(postData);
}
await route.continue();
});

// Force a fresh token fetch (cache miss -> hits /tokens endpoint)
const token = await page.evaluate(async () => {
const clerk = (window as any).Clerk;
await clerk.session?.clearCache();
return await clerk.session?.getToken({ skipCache: true });
});

// Token refresh should succeed (backend ignores the param for now)
expect(token).toBeTruthy();

// Verify token param is present in the POST body (form-urlencoded)
// fapiClient serializes body as form-urlencoded via qs.stringify(camelToSnake(body))
// so "token" stays "token" (no case change) and the body looks like "organization_id=&token=<jwt>"
expect(tokenRequestBodies.length).toBeGreaterThanOrEqual(1);
const lastBody = tokenRequestBodies[tokenRequestBodies.length - 1];
expect(lastBody).toContain('token=');

// User should still be signed in after refresh
await u.po.expect.toBeSignedIn();
});
});
});
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "540KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "66KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "67KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "108KB" },
{ "path": "./dist/clerk.no-rhc.js", "maxSize": "307KB" },
{ "path": "./dist/clerk.native.js", "maxSize": "66KB" },
Expand Down
3 changes: 3 additions & 0 deletions packages/clerk-js/src/core/resources/AuthConfig.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ export class AuthConfig extends BaseResource implements AuthConfigResource {
reverification: boolean = false;
singleSessionMode: boolean = false;
preferredChannels: Record<string, PhoneCodeChannel> | null = null;
sessionMinter: boolean = false;

public constructor(data: Partial<AuthConfigJSON> | null = null) {
super();
Expand All@@ -23,6 +24,7 @@ export class AuthConfig extends BaseResource implements AuthConfigResource {
this.reverification = this.withDefault(data.reverification, this.reverification);
this.singleSessionMode = this.withDefault(data.single_session_mode, this.singleSessionMode);
this.preferredChannels = this.withDefault(data.preferred_channels, this.preferredChannels);
this.sessionMinter = this.withDefault(data.session_minter, this.sessionMinter);
return this;
}

Expand All@@ -33,6 +35,7 @@ export class AuthConfig extends BaseResource implements AuthConfigResource {
object: 'auth_config',
reverification: this.reverification,
single_session_mode: this.singleSessionMode,
session_minter: this.sessionMinter,
};
}
}
8 changes: 7 additions & 1 deletion packages/clerk-js/src/core/resources/Session.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -480,7 +480,13 @@ export class Session extends BaseResource implements SessionResource {
): Promise<TokenResource> {
const path = template ? `${this.path()}/tokens/${template}` : `${this.path()}/tokens`;
// TODO: update template endpoint to accept organizationId
const params: Record<string, string | null> = template ? {} : { organizationId: organizationId ?? null };
const sessionMinterEnabled = Session.clerk?.__internal_environment?.authConfig?.sessionMinter;
const params: Record<string, string | null> = template
? {}
: {
organizationId: organizationId ?? null,
...(sessionMinterEnabled && this.lastActiveToken ? { token: this.lastActiveToken.getRawString() } : {}),
};
const lastActiveToken = this.lastActiveToken?.getRawString();

const tokenResolver = Token.create(path, params, skipCache ? { debug: 'skip_cache' } : undefined).catch(e => {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@ describe('AuthConfig', () => {
id: '',
reverification: true,
single_session_mode: true,
session_minter: false,
});
});
});
124 changes: 124 additions & 0 deletions packages/clerk-js/src/core/resources/__tests__/Session.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1522,6 +1522,130 @@ describe('Session', () => {
});
});

describe('sends previous token in /tokens request body', () => {
let dispatchSpy: ReturnType<typeof vi.spyOn>;
let fetchSpy: ReturnType<typeof vi.spyOn>;

beforeEach(() => {
dispatchSpy = vi.spyOn(eventBus, 'emit');
fetchSpy = vi.spyOn(BaseResource, '_fetch' as any);
BaseResource.clerk = clerkMock({
__internal_environment: {
authConfig: { sessionMinter: true },
},
}) as any;
});

afterEach(() => {
dispatchSpy?.mockRestore();
fetchSpy?.mockRestore();
BaseResource.clerk = null as any;
});

it('includes token in request body when lastActiveToken exists', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({}),
last_active_organization_id: null,
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

SessionTokenCache.clear();

fetchSpy.mockResolvedValueOnce({ object: 'token', jwt: mockJwt });

await session.getToken();

expect(fetchSpy).toHaveBeenCalledTimes(1);
expect(fetchSpy.mock.calls[0][0]).toMatchObject({
path: '/client/sessions/session_1/tokens',
method: 'POST',
body: { organizationId: null, token: mockJwt },
});
});

it('does not include token key in request body when lastActiveToken is null (first mint)', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({}),
last_active_organization_id: null,
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as unknown as SessionJSON);

SessionTokenCache.clear();

fetchSpy.mockResolvedValueOnce({ object: 'token', jwt: mockJwt });

await session.getToken();

expect(fetchSpy).toHaveBeenCalledTimes(1);
expect(fetchSpy.mock.calls[0][0]).toMatchObject({
path: '/client/sessions/session_1/tokens',
method: 'POST',
body: { organizationId: null },
});
expect(fetchSpy.mock.calls[0][0].body).not.toHaveProperty('token');
});

it('does not include token in request body for template token requests', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({}),
last_active_organization_id: null,
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

SessionTokenCache.clear();

fetchSpy.mockResolvedValueOnce({ object: 'token', jwt: mockJwt });

await session.getToken({ template: 'my-template' });

expect(fetchSpy).toHaveBeenCalledTimes(1);
expect(fetchSpy.mock.calls[0][0]).toMatchObject({
path: '/client/sessions/session_1/tokens/my-template',
method: 'POST',
});
expect(fetchSpy.mock.calls[0][0].body).toEqual({});
});

it('token value matches lastActiveToken.getRawString() exactly', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({}),
last_active_organization_id: null,
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

SessionTokenCache.clear();

fetchSpy.mockResolvedValueOnce({ object: 'token', jwt: mockJwt });

await session.getToken();

expect(fetchSpy.mock.calls[0][0].body.token).toBe(mockJwt);
});
});

describe('origin outage mode fallback', () => {
let dispatchSpy: ReturnType<typeof vi.spyOn>;
let fetchSpy: ReturnType<typeof vi.spyOn>;
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/types/authConfig.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,5 +21,6 @@ export interface AuthConfigResource extends ClerkResource {
* Preferred channels for phone code providers.
*/
preferredChannels: Record<string, PhoneCodeChannel> | null;
sessionMinter: boolean;
__internal_toSnapshot: () => AuthConfigJSONSnapshot;
}
1 change: 1 addition & 0 deletions packages/shared/src/types/json.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -332,6 +332,7 @@ export interface AuthConfigJSON extends ClerkResourceJSON {
claimed_at: number | null;
reverification: boolean;
preferred_channels?: Record<string, PhoneCodeChannel>;
session_minter?: boolean;
}

export interface VerificationJSON extends ClerkResourceJSON {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(clerk-js): Send previous session token on /tokens requests by nikosdouvlis · Pull Request #8105 · clerk/javascript · GitHub
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
5 changes: 5 additions & 0 deletions .changeset/session-minter-send-token.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Send previous session token on `/tokens` requests to support Session Minter edge token minting.
41 changes: 41 additions & 0 deletions integration/tests/resiliency.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -518,4 +518,45 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('resilienc
await u.po.clerk.toBeLoaded();
});
});

test.describe('token refresh with previous token in body', () => {
test('token refresh includes previous token in POST body and succeeds', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

// Sign in
await u.po.signIn.goTo();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
await u.po.expect.toBeSignedIn();

// Track token request bodies
const tokenRequestBodies: string[] = [];
await context.route('**/v1/client/sessions/*/tokens*', async route => {
const postData = route.request().postData();
if (postData) {
tokenRequestBodies.push(postData);
}
await route.continue();
});

// Force a fresh token fetch (cache miss -> hits /tokens endpoint)
const token = await page.evaluate(async () => {
const clerk = (window as any).Clerk;
await clerk.session?.clearCache();
return await clerk.session?.getToken({ skipCache: true });
});

// Token refresh should succeed (backend ignores the param for now)
expect(token).toBeTruthy();

// Verify token param is present in the POST body (form-urlencoded)
// fapiClient serializes body as form-urlencoded via qs.stringify(camelToSnake(body))
// so "token" stays "token" (no case change) and the body looks like "organization_id=&token=<jwt>"
expect(tokenRequestBodies.length).toBeGreaterThanOrEqual(1);
const lastBody = tokenRequestBodies[tokenRequestBodies.length - 1];
expect(lastBody).toContain('token=');

// User should still be signed in after refresh
await u.po.expect.toBeSignedIn();
});
});
});
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "540KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "66KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "67KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "108KB" },
{ "path": "./dist/clerk.no-rhc.js", "maxSize": "307KB" },
{ "path": "./dist/clerk.native.js", "maxSize": "66KB" },
Expand Down
3 changes: 3 additions & 0 deletions packages/clerk-js/src/core/resources/AuthConfig.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ export class AuthConfig extends BaseResource implements AuthConfigResource {
reverification: boolean = false;
singleSessionMode: boolean = false;
preferredChannels: Record<string, PhoneCodeChannel> | null = null;
sessionMinter: boolean = false;

public constructor(data: Partial<AuthConfigJSON> | null = null) {
super();
Expand All@@ -23,6 +24,7 @@ export class AuthConfig extends BaseResource implements AuthConfigResource {
this.reverification = this.withDefault(data.reverification, this.reverification);
this.singleSessionMode = this.withDefault(data.single_session_mode, this.singleSessionMode);
this.preferredChannels = this.withDefault(data.preferred_channels, this.preferredChannels);
this.sessionMinter = this.withDefault(data.session_minter, this.sessionMinter);
return this;
}

Expand All@@ -33,6 +35,7 @@ export class AuthConfig extends BaseResource implements AuthConfigResource {
object: 'auth_config',
reverification: this.reverification,
single_session_mode: this.singleSessionMode,
session_minter: this.sessionMinter,
};
}
}
8 changes: 7 additions & 1 deletion packages/clerk-js/src/core/resources/Session.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -480,7 +480,13 @@ export class Session extends BaseResource implements SessionResource {
): Promise<TokenResource> {
const path = template ? `${this.path()}/tokens/${template}` : `${this.path()}/tokens`;
// TODO: update template endpoint to accept organizationId
const params: Record<string, string | null> = template ? {} : { organizationId: organizationId ?? null };
const sessionMinterEnabled = Session.clerk?.__internal_environment?.authConfig?.sessionMinter;
const params: Record<string, string | null> = template
? {}
: {
organizationId: organizationId ?? null,
...(sessionMinterEnabled && this.lastActiveToken ? { token: this.lastActiveToken.getRawString() } : {}),
};
const lastActiveToken = this.lastActiveToken?.getRawString();

const tokenResolver = Token.create(path, params, skipCache ? { debug: 'skip_cache' } : undefined).catch(e => {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@ describe('AuthConfig', () => {
id: '',
reverification: true,
single_session_mode: true,
session_minter: false,
});
});
});
124 changes: 124 additions & 0 deletions packages/clerk-js/src/core/resources/__tests__/Session.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1522,6 +1522,130 @@ describe('Session', () => {
});
});

describe('sends previous token in /tokens request body', () => {
let dispatchSpy: ReturnType<typeof vi.spyOn>;
let fetchSpy: ReturnType<typeof vi.spyOn>;

beforeEach(() => {
dispatchSpy = vi.spyOn(eventBus, 'emit');
fetchSpy = vi.spyOn(BaseResource, '_fetch' as any);
BaseResource.clerk = clerkMock({
__internal_environment: {
authConfig: { sessionMinter: true },
},
}) as any;
});

afterEach(() => {
dispatchSpy?.mockRestore();
fetchSpy?.mockRestore();
BaseResource.clerk = null as any;
});

it('includes token in request body when lastActiveToken exists', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({}),
last_active_organization_id: null,
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

SessionTokenCache.clear();

fetchSpy.mockResolvedValueOnce({ object: 'token', jwt: mockJwt });

await session.getToken();

expect(fetchSpy).toHaveBeenCalledTimes(1);
expect(fetchSpy.mock.calls[0][0]).toMatchObject({
path: '/client/sessions/session_1/tokens',
method: 'POST',
body: { organizationId: null, token: mockJwt },
});
});

it('does not include token key in request body when lastActiveToken is null (first mint)', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({}),
last_active_organization_id: null,
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as unknown as SessionJSON);

SessionTokenCache.clear();

fetchSpy.mockResolvedValueOnce({ object: 'token', jwt: mockJwt });

await session.getToken();

expect(fetchSpy).toHaveBeenCalledTimes(1);
expect(fetchSpy.mock.calls[0][0]).toMatchObject({
path: '/client/sessions/session_1/tokens',
method: 'POST',
body: { organizationId: null },
});
expect(fetchSpy.mock.calls[0][0].body).not.toHaveProperty('token');
});

it('does not include token in request body for template token requests', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({}),
last_active_organization_id: null,
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

SessionTokenCache.clear();

fetchSpy.mockResolvedValueOnce({ object: 'token', jwt: mockJwt });

await session.getToken({ template: 'my-template' });

expect(fetchSpy).toHaveBeenCalledTimes(1);
expect(fetchSpy.mock.calls[0][0]).toMatchObject({
path: '/client/sessions/session_1/tokens/my-template',
method: 'POST',
});
expect(fetchSpy.mock.calls[0][0].body).toEqual({});
});

it('token value matches lastActiveToken.getRawString() exactly', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({}),
last_active_organization_id: null,
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

SessionTokenCache.clear();

fetchSpy.mockResolvedValueOnce({ object: 'token', jwt: mockJwt });

await session.getToken();

expect(fetchSpy.mock.calls[0][0].body.token).toBe(mockJwt);
});
});

describe('origin outage mode fallback', () => {
let dispatchSpy: ReturnType<typeof vi.spyOn>;
let fetchSpy: ReturnType<typeof vi.spyOn>;
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/types/authConfig.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,5 +21,6 @@ export interface AuthConfigResource extends ClerkResource {
* Preferred channels for phone code providers.
*/
preferredChannels: Record<string, PhoneCodeChannel> | null;
sessionMinter: boolean;
__internal_toSnapshot: () => AuthConfigJSONSnapshot;
}
1 change: 1 addition & 0 deletions packages/shared/src/types/json.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -332,6 +332,7 @@ export interface AuthConfigJSON extends ClerkResourceJSON {
claimed_at: number | null;
reverification: boolean;
preferred_channels?: Record<string, PhoneCodeChannel>;
session_minter?: boolean;
}

export interface VerificationJSON extends ClerkResourceJSON {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' feat(clerk-js): Send previous session token on /tokens requests by nikosdouvlis · Pull Request #8105 · clerk/javascript · GitHub
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
5 changes: 5 additions & 0 deletions .changeset/session-minter-send-token.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Send previous session token on `/tokens` requests to support Session Minter edge token minting.
41 changes: 41 additions & 0 deletions integration/tests/resiliency.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -518,4 +518,45 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('resilienc
await u.po.clerk.toBeLoaded();
});
});

test.describe('token refresh with previous token in body', () => {
test('token refresh includes previous token in POST body and succeeds', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

// Sign in
await u.po.signIn.goTo();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
await u.po.expect.toBeSignedIn();

// Track token request bodies
const tokenRequestBodies: string[] = [];
await context.route('**/v1/client/sessions/*/tokens*', async route => {
const postData = route.request().postData();
if (postData) {
tokenRequestBodies.push(postData);
}
await route.continue();
});

// Force a fresh token fetch (cache miss -> hits /tokens endpoint)
const token = await page.evaluate(async () => {
const clerk = (window as any).Clerk;
await clerk.session?.clearCache();
return await clerk.session?.getToken({ skipCache: true });
});

// Token refresh should succeed (backend ignores the param for now)
expect(token).toBeTruthy();

// Verify token param is present in the POST body (form-urlencoded)
// fapiClient serializes body as form-urlencoded via qs.stringify(camelToSnake(body))
// so "token" stays "token" (no case change) and the body looks like "organization_id=&token=<jwt>"
expect(tokenRequestBodies.length).toBeGreaterThanOrEqual(1);
const lastBody = tokenRequestBodies[tokenRequestBodies.length - 1];
expect(lastBody).toContain('token=');

// User should still be signed in after refresh
await u.po.expect.toBeSignedIn();
});
});
});
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "540KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "66KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "67KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "108KB" },
{ "path": "./dist/clerk.no-rhc.js", "maxSize": "307KB" },
{ "path": "./dist/clerk.native.js", "maxSize": "66KB" },
Expand Down
3 changes: 3 additions & 0 deletions packages/clerk-js/src/core/resources/AuthConfig.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ export class AuthConfig extends BaseResource implements AuthConfigResource {
reverification: boolean = false;
singleSessionMode: boolean = false;
preferredChannels: Record<string, PhoneCodeChannel> | null = null;
sessionMinter: boolean = false;

public constructor(data: Partial<AuthConfigJSON> | null = null) {
super();
Expand All@@ -23,6 +24,7 @@ export class AuthConfig extends BaseResource implements AuthConfigResource {
this.reverification = this.withDefault(data.reverification, this.reverification);
this.singleSessionMode = this.withDefault(data.single_session_mode, this.singleSessionMode);
this.preferredChannels = this.withDefault(data.preferred_channels, this.preferredChannels);
this.sessionMinter = this.withDefault(data.session_minter, this.sessionMinter);
return this;
}

Expand All@@ -33,6 +35,7 @@ export class AuthConfig extends BaseResource implements AuthConfigResource {
object: 'auth_config',
reverification: this.reverification,
single_session_mode: this.singleSessionMode,
session_minter: this.sessionMinter,
};
}
}
8 changes: 7 additions & 1 deletion packages/clerk-js/src/core/resources/Session.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -480,7 +480,13 @@ export class Session extends BaseResource implements SessionResource {
): Promise<TokenResource> {
const path = template ? `${this.path()}/tokens/${template}` : `${this.path()}/tokens`;
// TODO: update template endpoint to accept organizationId
const params: Record<string, string | null> = template ? {} : { organizationId: organizationId ?? null };
const sessionMinterEnabled = Session.clerk?.__internal_environment?.authConfig?.sessionMinter;
const params: Record<string, string | null> = template
? {}
: {
organizationId: organizationId ?? null,
...(sessionMinterEnabled && this.lastActiveToken ? { token: this.lastActiveToken.getRawString() } : {}),
};
const lastActiveToken = this.lastActiveToken?.getRawString();

const tokenResolver = Token.create(path, params, skipCache ? { debug: 'skip_cache' } : undefined).catch(e => {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@ describe('AuthConfig', () => {
id: '',
reverification: true,
single_session_mode: true,
session_minter: false,
});
});
});
124 changes: 124 additions & 0 deletions packages/clerk-js/src/core/resources/__tests__/Session.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1522,6 +1522,130 @@ describe('Session', () => {
});
});

describe('sends previous token in /tokens request body', () => {
let dispatchSpy: ReturnType<typeof vi.spyOn>;
let fetchSpy: ReturnType<typeof vi.spyOn>;

beforeEach(() => {
dispatchSpy = vi.spyOn(eventBus, 'emit');
fetchSpy = vi.spyOn(BaseResource, '_fetch' as any);
BaseResource.clerk = clerkMock({
__internal_environment: {
authConfig: { sessionMinter: true },
},
}) as any;
});

afterEach(() => {
dispatchSpy?.mockRestore();
fetchSpy?.mockRestore();
BaseResource.clerk = null as any;
});

it('includes token in request body when lastActiveToken exists', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({}),
last_active_organization_id: null,
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

SessionTokenCache.clear();

fetchSpy.mockResolvedValueOnce({ object: 'token', jwt: mockJwt });

await session.getToken();

expect(fetchSpy).toHaveBeenCalledTimes(1);
expect(fetchSpy.mock.calls[0][0]).toMatchObject({
path: '/client/sessions/session_1/tokens',
method: 'POST',
body: { organizationId: null, token: mockJwt },
});
});

it('does not include token key in request body when lastActiveToken is null (first mint)', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({}),
last_active_organization_id: null,
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as unknown as SessionJSON);

SessionTokenCache.clear();

fetchSpy.mockResolvedValueOnce({ object: 'token', jwt: mockJwt });

await session.getToken();

expect(fetchSpy).toHaveBeenCalledTimes(1);
expect(fetchSpy.mock.calls[0][0]).toMatchObject({
path: '/client/sessions/session_1/tokens',
method: 'POST',
body: { organizationId: null },
});
expect(fetchSpy.mock.calls[0][0].body).not.toHaveProperty('token');
});

it('does not include token in request body for template token requests', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({}),
last_active_organization_id: null,
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

SessionTokenCache.clear();

fetchSpy.mockResolvedValueOnce({ object: 'token', jwt: mockJwt });

await session.getToken({ template: 'my-template' });

expect(fetchSpy).toHaveBeenCalledTimes(1);
expect(fetchSpy.mock.calls[0][0]).toMatchObject({
path: '/client/sessions/session_1/tokens/my-template',
method: 'POST',
});
expect(fetchSpy.mock.calls[0][0].body).toEqual({});
});

it('token value matches lastActiveToken.getRawString() exactly', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({}),
last_active_organization_id: null,
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

SessionTokenCache.clear();

fetchSpy.mockResolvedValueOnce({ object: 'token', jwt: mockJwt });

await session.getToken();

expect(fetchSpy.mock.calls[0][0].body.token).toBe(mockJwt);
});
});

describe('origin outage mode fallback', () => {
let dispatchSpy: ReturnType<typeof vi.spyOn>;
let fetchSpy: ReturnType<typeof vi.spyOn>;
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/types/authConfig.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,5 +21,6 @@ export interface AuthConfigResource extends ClerkResource {
* Preferred channels for phone code providers.
*/
preferredChannels: Record<string, PhoneCodeChannel> | null;
sessionMinter: boolean;
__internal_toSnapshot: () => AuthConfigJSONSnapshot;
}
1 change: 1 addition & 0 deletions packages/shared/src/types/json.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -332,6 +332,7 @@ export interface AuthConfigJSON extends ClerkResourceJSON {
claimed_at: number | null;
reverification: boolean;
preferred_channels?: Record<string, PhoneCodeChannel>;
session_minter?: boolean;
}

export interface VerificationJSON extends ClerkResourceJSON {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(clerk-js): Send previous session token on /tokens requests by nikosdouvlis · Pull Request #8105 · clerk/javascript · GitHub
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
5 changes: 5 additions & 0 deletions .changeset/session-minter-send-token.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Send previous session token on `/tokens` requests to support Session Minter edge token minting.
41 changes: 41 additions & 0 deletions integration/tests/resiliency.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -518,4 +518,45 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('resilienc
await u.po.clerk.toBeLoaded();
});
});

test.describe('token refresh with previous token in body', () => {
test('token refresh includes previous token in POST body and succeeds', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

// Sign in
await u.po.signIn.goTo();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
await u.po.expect.toBeSignedIn();

// Track token request bodies
const tokenRequestBodies: string[] = [];
await context.route('**/v1/client/sessions/*/tokens*', async route => {
const postData = route.request().postData();
if (postData) {
tokenRequestBodies.push(postData);
}
await route.continue();
});

// Force a fresh token fetch (cache miss -> hits /tokens endpoint)
const token = await page.evaluate(async () => {
const clerk = (window as any).Clerk;
await clerk.session?.clearCache();
return await clerk.session?.getToken({ skipCache: true });
});

// Token refresh should succeed (backend ignores the param for now)
expect(token).toBeTruthy();

// Verify token param is present in the POST body (form-urlencoded)
// fapiClient serializes body as form-urlencoded via qs.stringify(camelToSnake(body))
// so "token" stays "token" (no case change) and the body looks like "organization_id=&token=<jwt>"
expect(tokenRequestBodies.length).toBeGreaterThanOrEqual(1);
const lastBody = tokenRequestBodies[tokenRequestBodies.length - 1];
expect(lastBody).toContain('token=');

// User should still be signed in after refresh
await u.po.expect.toBeSignedIn();
});
});
});
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "540KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "66KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "67KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "108KB" },
{ "path": "./dist/clerk.no-rhc.js", "maxSize": "307KB" },
{ "path": "./dist/clerk.native.js", "maxSize": "66KB" },
Expand Down
3 changes: 3 additions & 0 deletions packages/clerk-js/src/core/resources/AuthConfig.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ export class AuthConfig extends BaseResource implements AuthConfigResource {
reverification: boolean = false;
singleSessionMode: boolean = false;
preferredChannels: Record<string, PhoneCodeChannel> | null = null;
sessionMinter: boolean = false;

public constructor(data: Partial<AuthConfigJSON> | null = null) {
super();
Expand All@@ -23,6 +24,7 @@ export class AuthConfig extends BaseResource implements AuthConfigResource {
this.reverification = this.withDefault(data.reverification, this.reverification);
this.singleSessionMode = this.withDefault(data.single_session_mode, this.singleSessionMode);
this.preferredChannels = this.withDefault(data.preferred_channels, this.preferredChannels);
this.sessionMinter = this.withDefault(data.session_minter, this.sessionMinter);
return this;
}

Expand All@@ -33,6 +35,7 @@ export class AuthConfig extends BaseResource implements AuthConfigResource {
object: 'auth_config',
reverification: this.reverification,
single_session_mode: this.singleSessionMode,
session_minter: this.sessionMinter,
};
}
}
8 changes: 7 additions & 1 deletion packages/clerk-js/src/core/resources/Session.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -480,7 +480,13 @@ export class Session extends BaseResource implements SessionResource {
): Promise<TokenResource> {
const path = template ? `${this.path()}/tokens/${template}` : `${this.path()}/tokens`;
// TODO: update template endpoint to accept organizationId
const params: Record<string, string | null> = template ? {} : { organizationId: organizationId ?? null };
const sessionMinterEnabled = Session.clerk?.__internal_environment?.authConfig?.sessionMinter;
const params: Record<string, string | null> = template
? {}
: {
organizationId: organizationId ?? null,
...(sessionMinterEnabled && this.lastActiveToken ? { token: this.lastActiveToken.getRawString() } : {}),
};
const lastActiveToken = this.lastActiveToken?.getRawString();

const tokenResolver = Token.create(path, params, skipCache ? { debug: 'skip_cache' } : undefined).catch(e => {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@ describe('AuthConfig', () => {
id: '',
reverification: true,
single_session_mode: true,
session_minter: false,
});
});
});
124 changes: 124 additions & 0 deletions packages/clerk-js/src/core/resources/__tests__/Session.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1522,6 +1522,130 @@ describe('Session', () => {
});
});

describe('sends previous token in /tokens request body', () => {
let dispatchSpy: ReturnType<typeof vi.spyOn>;
let fetchSpy: ReturnType<typeof vi.spyOn>;

beforeEach(() => {
dispatchSpy = vi.spyOn(eventBus, 'emit');
fetchSpy = vi.spyOn(BaseResource, '_fetch' as any);
BaseResource.clerk = clerkMock({
__internal_environment: {
authConfig: { sessionMinter: true },
},
}) as any;
});

afterEach(() => {
dispatchSpy?.mockRestore();
fetchSpy?.mockRestore();
BaseResource.clerk = null as any;
});

it('includes token in request body when lastActiveToken exists', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({}),
last_active_organization_id: null,
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

SessionTokenCache.clear();

fetchSpy.mockResolvedValueOnce({ object: 'token', jwt: mockJwt });

await session.getToken();

expect(fetchSpy).toHaveBeenCalledTimes(1);
expect(fetchSpy.mock.calls[0][0]).toMatchObject({
path: '/client/sessions/session_1/tokens',
method: 'POST',
body: { organizationId: null, token: mockJwt },
});
});

it('does not include token key in request body when lastActiveToken is null (first mint)', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({}),
last_active_organization_id: null,
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as unknown as SessionJSON);

SessionTokenCache.clear();

fetchSpy.mockResolvedValueOnce({ object: 'token', jwt: mockJwt });

await session.getToken();

expect(fetchSpy).toHaveBeenCalledTimes(1);
expect(fetchSpy.mock.calls[0][0]).toMatchObject({
path: '/client/sessions/session_1/tokens',
method: 'POST',
body: { organizationId: null },
});
expect(fetchSpy.mock.calls[0][0].body).not.toHaveProperty('token');
});

it('does not include token in request body for template token requests', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({}),
last_active_organization_id: null,
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

SessionTokenCache.clear();

fetchSpy.mockResolvedValueOnce({ object: 'token', jwt: mockJwt });

await session.getToken({ template: 'my-template' });

expect(fetchSpy).toHaveBeenCalledTimes(1);
expect(fetchSpy.mock.calls[0][0]).toMatchObject({
path: '/client/sessions/session_1/tokens/my-template',
method: 'POST',
});
expect(fetchSpy.mock.calls[0][0].body).toEqual({});
});

it('token value matches lastActiveToken.getRawString() exactly', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({}),
last_active_organization_id: null,
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

SessionTokenCache.clear();

fetchSpy.mockResolvedValueOnce({ object: 'token', jwt: mockJwt });

await session.getToken();

expect(fetchSpy.mock.calls[0][0].body.token).toBe(mockJwt);
});
});

describe('origin outage mode fallback', () => {
let dispatchSpy: ReturnType<typeof vi.spyOn>;
let fetchSpy: ReturnType<typeof vi.spyOn>;
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/types/authConfig.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,5 +21,6 @@ export interface AuthConfigResource extends ClerkResource {
* Preferred channels for phone code providers.
*/
preferredChannels: Record<string, PhoneCodeChannel> | null;
sessionMinter: boolean;
__internal_toSnapshot: () => AuthConfigJSONSnapshot;
}
1 change: 1 addition & 0 deletions packages/shared/src/types/json.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -332,6 +332,7 @@ export interface AuthConfigJSON extends ClerkResourceJSON {
claimed_at: number | null;
reverification: boolean;
preferred_channels?: Record<string, PhoneCodeChannel>;
session_minter?: boolean;
}

export interface VerificationJSON extends ClerkResourceJSON {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); feat(clerk-js): Send previous session token on /tokens requests by nikosdouvlis · Pull Request #8105 · clerk/javascript · GitHub
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
5 changes: 5 additions & 0 deletions .changeset/session-minter-send-token.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Send previous session token on `/tokens` requests to support Session Minter edge token minting.
41 changes: 41 additions & 0 deletions integration/tests/resiliency.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -518,4 +518,45 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withEmailCodes] })('resilienc
await u.po.clerk.toBeLoaded();
});
});

test.describe('token refresh with previous token in body', () => {
test('token refresh includes previous token in POST body and succeeds', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

// Sign in
await u.po.signIn.goTo();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
await u.po.expect.toBeSignedIn();

// Track token request bodies
const tokenRequestBodies: string[] = [];
await context.route('**/v1/client/sessions/*/tokens*', async route => {
const postData = route.request().postData();
if (postData) {
tokenRequestBodies.push(postData);
}
await route.continue();
});

// Force a fresh token fetch (cache miss -> hits /tokens endpoint)
const token = await page.evaluate(async () => {
const clerk = (window as any).Clerk;
await clerk.session?.clearCache();
return await clerk.session?.getToken({ skipCache: true });
});

// Token refresh should succeed (backend ignores the param for now)
expect(token).toBeTruthy();

// Verify token param is present in the POST body (form-urlencoded)
// fapiClient serializes body as form-urlencoded via qs.stringify(camelToSnake(body))
// so "token" stays "token" (no case change) and the body looks like "organization_id=&token=<jwt>"
expect(tokenRequestBodies.length).toBeGreaterThanOrEqual(1);
const lastBody = tokenRequestBodies[tokenRequestBodies.length - 1];
expect(lastBody).toContain('token=');

// User should still be signed in after refresh
await u.po.expect.toBeSignedIn();
});
});
});
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "540KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "66KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "67KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "108KB" },
{ "path": "./dist/clerk.no-rhc.js", "maxSize": "307KB" },
{ "path": "./dist/clerk.native.js", "maxSize": "66KB" },
Expand Down
3 changes: 3 additions & 0 deletions packages/clerk-js/src/core/resources/AuthConfig.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ export class AuthConfig extends BaseResource implements AuthConfigResource {
reverification: boolean = false;
singleSessionMode: boolean = false;
preferredChannels: Record<string, PhoneCodeChannel> | null = null;
sessionMinter: boolean = false;

public constructor(data: Partial<AuthConfigJSON> | null = null) {
super();
Expand All@@ -23,6 +24,7 @@ export class AuthConfig extends BaseResource implements AuthConfigResource {
this.reverification = this.withDefault(data.reverification, this.reverification);
this.singleSessionMode = this.withDefault(data.single_session_mode, this.singleSessionMode);
this.preferredChannels = this.withDefault(data.preferred_channels, this.preferredChannels);
this.sessionMinter = this.withDefault(data.session_minter, this.sessionMinter);
return this;
}

Expand All@@ -33,6 +35,7 @@ export class AuthConfig extends BaseResource implements AuthConfigResource {
object: 'auth_config',
reverification: this.reverification,
single_session_mode: this.singleSessionMode,
session_minter: this.sessionMinter,
};
}
}
8 changes: 7 additions & 1 deletion packages/clerk-js/src/core/resources/Session.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -480,7 +480,13 @@ export class Session extends BaseResource implements SessionResource {
): Promise<TokenResource> {
const path = template ? `${this.path()}/tokens/${template}` : `${this.path()}/tokens`;
// TODO: update template endpoint to accept organizationId
const params: Record<string, string | null> = template ? {} : { organizationId: organizationId ?? null };
const sessionMinterEnabled = Session.clerk?.__internal_environment?.authConfig?.sessionMinter;
const params: Record<string, string | null> = template
? {}
: {
organizationId: organizationId ?? null,
...(sessionMinterEnabled && this.lastActiveToken ? { token: this.lastActiveToken.getRawString() } : {}),
};
const lastActiveToken = this.lastActiveToken?.getRawString();

const tokenResolver = Token.create(path, params, skipCache ? { debug: 'skip_cache' } : undefined).catch(e => {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,7 @@ describe('AuthConfig', () => {
id: '',
reverification: true,
single_session_mode: true,
session_minter: false,
});
});
});
124 changes: 124 additions & 0 deletions packages/clerk-js/src/core/resources/__tests__/Session.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1522,6 +1522,130 @@ describe('Session', () => {
});
});

describe('sends previous token in /tokens request body', () => {
let dispatchSpy: ReturnType<typeof vi.spyOn>;
let fetchSpy: ReturnType<typeof vi.spyOn>;

beforeEach(() => {
dispatchSpy = vi.spyOn(eventBus, 'emit');
fetchSpy = vi.spyOn(BaseResource, '_fetch' as any);
BaseResource.clerk = clerkMock({
__internal_environment: {
authConfig: { sessionMinter: true },
},
}) as any;
});

afterEach(() => {
dispatchSpy?.mockRestore();
fetchSpy?.mockRestore();
BaseResource.clerk = null as any;
});

it('includes token in request body when lastActiveToken exists', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({}),
last_active_organization_id: null,
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

SessionTokenCache.clear();

fetchSpy.mockResolvedValueOnce({ object: 'token', jwt: mockJwt });

await session.getToken();

expect(fetchSpy).toHaveBeenCalledTimes(1);
expect(fetchSpy.mock.calls[0][0]).toMatchObject({
path: '/client/sessions/session_1/tokens',
method: 'POST',
body: { organizationId: null, token: mockJwt },
});
});

it('does not include token key in request body when lastActiveToken is null (first mint)', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({}),
last_active_organization_id: null,
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as unknown as SessionJSON);

SessionTokenCache.clear();

fetchSpy.mockResolvedValueOnce({ object: 'token', jwt: mockJwt });

await session.getToken();

expect(fetchSpy).toHaveBeenCalledTimes(1);
expect(fetchSpy.mock.calls[0][0]).toMatchObject({
path: '/client/sessions/session_1/tokens',
method: 'POST',
body: { organizationId: null },
});
expect(fetchSpy.mock.calls[0][0].body).not.toHaveProperty('token');
});

it('does not include token in request body for template token requests', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({}),
last_active_organization_id: null,
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

SessionTokenCache.clear();

fetchSpy.mockResolvedValueOnce({ object: 'token', jwt: mockJwt });

await session.getToken({ template: 'my-template' });

expect(fetchSpy).toHaveBeenCalledTimes(1);
expect(fetchSpy.mock.calls[0][0]).toMatchObject({
path: '/client/sessions/session_1/tokens/my-template',
method: 'POST',
});
expect(fetchSpy.mock.calls[0][0].body).toEqual({});
});

it('token value matches lastActiveToken.getRawString() exactly', async () => {
const session = new Session({
status: 'active',
id: 'session_1',
object: 'session',
user: createUser({}),
last_active_organization_id: null,
last_active_token: { object: 'token', jwt: mockJwt },
actor: null,
created_at: new Date().getTime(),
updated_at: new Date().getTime(),
} as SessionJSON);

SessionTokenCache.clear();

fetchSpy.mockResolvedValueOnce({ object: 'token', jwt: mockJwt });

await session.getToken();

expect(fetchSpy.mock.calls[0][0].body.token).toBe(mockJwt);
});
});

describe('origin outage mode fallback', () => {
let dispatchSpy: ReturnType<typeof vi.spyOn>;
let fetchSpy: ReturnType<typeof vi.spyOn>;
Expand Down
1 change: 1 addition & 0 deletions packages/shared/src/types/authConfig.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,5 +21,6 @@ export interface AuthConfigResource extends ClerkResource {
* Preferred channels for phone code providers.
*/
preferredChannels: Record<string, PhoneCodeChannel> | null;
sessionMinter: boolean;
__internal_toSnapshot: () => AuthConfigJSONSnapshot;
}
1 change: 1 addition & 0 deletions packages/shared/src/types/json.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -332,6 +332,7 @@ export interface AuthConfigJSON extends ClerkResourceJSON {
claimed_at: number | null;
reverification: boolean;
preferred_channels?: Record<string, PhoneCodeChannel>;
session_minter?: boolean;
}

export interface VerificationJSON extends ClerkResourceJSON {
Expand Down
Loading