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 .changeset/evil-paws-learn.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/backend': minor
'@clerk/types': minor
---

Add support for `expiresInSeconds` parameter in session token generation. This allows setting custom expiration times for tokens both with and without templates via the backend API.

2 changes: 2 additions & 0 deletions .typedoc/__tests__/__snapshots__/file-structure.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,8 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"types/reverification-config.mdx",
"types/saml-strategy.mdx",
"types/sdk-metadata.mdx",
"types/server-get-token-options.mdx",
"types/server-get-token.mdx",
"types/session-resource.mdx",
"types/session-status-claim.mdx",
"types/session-verification-level.mdx",
Expand Down
88 changes: 88 additions & 0 deletions packages/backend/src/api/__tests__/SessionApi.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
import { http, HttpResponse } from 'msw';
import { describe, expect, it } from 'vitest';

import { server, validateHeaders } from '../../mock-server';
import { createBackendApiClient } from '../factory';

describe('SessionAPI', () => {
const apiClient = createBackendApiClient({
apiUrl: 'https://api.clerk.test',
secretKey: 'deadbeef',
});

const sessionId = 'sess_123';
const mockTokenResponse = {
object: 'token',
jwt: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.test.token',
};

describe('getToken', () => {
it('creates a session token without template', async () => {
server.use(
http.post(
`https://api.clerk.test/v1/sessions/${sessionId}/tokens`,
validateHeaders(async ({ request }) => {
const body = await request.text();
expect(body).toBe('');
return HttpResponse.json(mockTokenResponse);
}),
),
);

const response = await apiClient.sessions.getToken(sessionId, '');
expect(response.jwt).toBe(mockTokenResponse.jwt);
});

it('creates a session token with template', async () => {
const template = 'custom-template';
server.use(
http.post(
`https://api.clerk.test/v1/sessions/${sessionId}/tokens/${template}`,
validateHeaders(async ({ request }) => {
const body = await request.text();
expect(body).toBe('');
return HttpResponse.json(mockTokenResponse);
}),
),
);

const response = await apiClient.sessions.getToken(sessionId, template);
expect(response.jwt).toBe(mockTokenResponse.jwt);
});

it('creates a session token without template and with expiresInSeconds', async () => {
const expiresInSeconds = 3600;
server.use(
http.post(
`https://api.clerk.test/v1/sessions/${sessionId}/tokens`,
validateHeaders(async ({ request }) => {
const body = await request.json();
expect(body).toEqual({ expires_in_seconds: expiresInSeconds });
return HttpResponse.json(mockTokenResponse);
}),
),
);

const response = await apiClient.sessions.getToken(sessionId, '', expiresInSeconds);
expect(response.jwt).toBe(mockTokenResponse.jwt);
});

it('creates a session token with template and expiresInSeconds', async () => {
const template = 'custom-template';
const expiresInSeconds = 3600;
server.use(
http.post(
`https://api.clerk.test/v1/sessions/${sessionId}/tokens/${template}`,
validateHeaders(async ({ request }) => {
const body = await request.json();
expect(body).toEqual({ expires_in_seconds: expiresInSeconds });
return HttpResponse.json(mockTokenResponse);
}),
),
);

const response = await apiClient.sessions.getToken(sessionId, template, expiresInSeconds);
expect(response.jwt).toBe(mockTokenResponse.jwt);
});
});
});
31 changes: 27 additions & 4 deletions packages/backend/src/api/endpoints/SessionApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,12 +71,35 @@ export class SessionAPI extends AbstractAPI {
});
}

public async getToken(sessionId: string, template: string) {
/**
* Retrieves a session token or generates a JWT using a specified template.
*
* @param sessionId - The ID of the session for which to generate the token
* @param template - Optional name of the JWT template configured in the Clerk Dashboard.
* @param expiresInSeconds - Optional expiration time for the token in seconds.
* If not provided, uses the default expiration.
*
* @returns A promise that resolves to the generated token
*
* @throws {Error} When sessionId is invalid or empty
*/
public async getToken(sessionId: string, template?: string, expiresInSeconds?: number) {
this.requireId(sessionId);
return this.request<Token>({

const path = template
? joinPaths(basePath, sessionId, 'tokens', template)
: joinPaths(basePath, sessionId, 'tokens');

const requestOptions: any = {
method: 'POST',
path: joinPaths(basePath, sessionId, 'tokens', template || ''),
});
path,
};

if (expiresInSeconds !== undefined) {
requestOptions.bodyParams = { expires_in_seconds: expiresInSeconds };
}

return this.request<Token>(requestOptions);
}

public async refreshSession(sessionId: string, params: RefreshTokenParams & { format: 'token' }): Promise<Token>;
Expand Down
84 changes: 83 additions & 1 deletion packages/backend/src/tokens/__tests__/authObjects.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import type { JwtPayload } from '@clerk/types';
import { describe, expect, it } from 'vitest';
import { describe, expect, it, vi } from 'vitest';

import { createBackendApiClient } from '../../api/factory';
import { mockTokens, mockVerificationResults } from '../../fixtures/machine';
import type { AuthenticateContext } from '../authenticateContext';
import type { InvalidTokenAuthObject, UnauthenticatedMachineObject } from '../authObjects';
Expand All@@ -13,6 +14,10 @@ import {
unauthenticatedMachineObject,
} from '../authObjects';

vi.mock('../../api/factory', () => ({
createBackendApiClient: vi.fn(),
}));

describe('makeAuthObjectSerializable', () => {
it('removes non-serializable props', () => {
const authObject = signedOutAuthObject();
Expand DownExpand Up@@ -432,3 +437,80 @@ describe('getAuthObjectForAcceptedToken', () => {
expect((result as UnauthenticatedMachineObject<'machine_token'>).id).toBeNull();
});
});

describe('getToken with expiresInSeconds support', () => {
it('calls fetcher with expiresInSeconds when template is provided', async () => {
const mockGetToken = vi.fn().mockResolvedValue({ jwt: 'mocked-jwt-token' });
const mockApiClient = {
sessions: {
getToken: mockGetToken,
},
};

vi.mocked(createBackendApiClient).mockReturnValue(mockApiClient as any);

const mockAuthenticateContext = {
secretKey: 'sk_test_123',
} as AuthenticateContext;

const authObject = signedInAuthObject(mockAuthenticateContext, 'raw-session-token', {
sid: 'sess_123',
sub: 'user_123',
} as unknown as JwtPayload);

const result = await authObject.getToken({ template: 'custom-template', expiresInSeconds: 3600 });

expect(mockGetToken).toHaveBeenCalledWith('sess_123', 'custom-template', 3600);
expect(result).toBe('mocked-jwt-token');
});

it('calls fetcher without expiresInSeconds when template is provided but expiresInSeconds is undefined', async () => {
const mockGetToken = vi.fn().mockResolvedValue({ jwt: 'mocked-jwt-token' });
const mockApiClient = {
sessions: {
getToken: mockGetToken,
},
};

vi.mocked(createBackendApiClient).mockReturnValue(mockApiClient as any);

const mockAuthenticateContext = {
secretKey: 'sk_test_123',
} as AuthenticateContext;

const authObject = signedInAuthObject(mockAuthenticateContext, 'raw-session-token', {
sid: 'sess_123',
sub: 'user_123',
} as unknown as JwtPayload);

const result = await authObject.getToken({ template: 'custom-template' });

expect(mockGetToken).toHaveBeenCalledWith('sess_123', 'custom-template', undefined);
expect(result).toBe('mocked-jwt-token');
});

it('returns raw session token when no template is provided', async () => {
const mockGetToken = vi.fn();
const mockApiClient = {
sessions: {
getToken: mockGetToken,
},
};

vi.mocked(createBackendApiClient).mockReturnValue(mockApiClient as any);

const mockAuthenticateContext = {
secretKey: 'sk_test_123',
} as AuthenticateContext;

const authObject = signedInAuthObject(mockAuthenticateContext, 'raw-session-token', {
sid: 'sess_123',
sub: 'user_123',
} as unknown as JwtPayload);

const result = await authObject.getToken({});

expect(mockGetToken).not.toHaveBeenCalled();
expect(result).toBe('raw-session-token');
});
});
36 changes: 32 additions & 4 deletions packages/backend/src/tokens/authObjects.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,8 @@ export function signedInAuthObject(
const getToken = createGetToken({
sessionId,
sessionToken,
fetcher: async (...args) => (await apiClient.sessions.getToken(...args)).jwt,
fetcher: async (sessionId, template, expiresInSeconds) =>
(await apiClient.sessions.getToken(sessionId, template || '', expiresInSeconds)).jwt,
});
return {
tokenType: TokenType.SessionToken,
Expand DownExpand Up@@ -387,10 +388,37 @@ export const makeAuthObjectSerializable = <T extends Record<string, unknown>>(ob
return rest as unknown as T;
};

type TokenFetcher = (sessionId: string, template: string) => Promise<string>;
/**
* A function that fetches a session token from the Clerk API.
*
* @param sessionId - The ID of the session
* @param template - The JWT template name to use for token generation
* @param expiresInSeconds - Optional expiration time in seconds for the token
* @returns A promise that resolves to the token string
*/
type TokenFetcher = (sessionId: string, template?: string, expiresInSeconds?: number) => Promise<string>;

/**
* Factory function type that creates a getToken function for auth objects.
*
* @param params - Configuration object containing session information and token fetcher
* @returns A ServerGetToken function that can be used to retrieve tokens
*/
type CreateGetToken = (params: { sessionId: string; sessionToken: string; fetcher: TokenFetcher }) => ServerGetToken;

/**
* Creates a token retrieval function for authenticated sessions.
*
* This factory function returns a getToken function that can either return the raw session token
* or generate a JWT using a specified template with optional custom expiration.
*
* @param params - Configuration object
* @param params.sessionId - The session ID for token generation
* @param params.sessionToken - The raw session token to return when no template is specified
* @param params.fetcher - Function to fetch tokens from the Clerk API
*
* @returns A function that retrieves tokens based on the provided options
*/
const createGetToken: CreateGetToken = params => {
const { fetcher, sessionToken, sessionId } = params || {};

Expand All@@ -399,8 +427,8 @@ const createGetToken: CreateGetToken = params => {
return null;
}

if (options.template) {
return fetcher(sessionId, options.template);
if (options.template || options.expiresInSeconds !== undefined) {
return fetcher(sessionId, options.template, options.expiresInSeconds);
}

return sessionToken;
Expand Down
25 changes: 24 additions & 1 deletion packages/types/src/ssr.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,30 @@ import type { SessionResource } from './session';
import type { UserResource } from './user';
import type { Serializable } from './utils';

export type ServerGetTokenOptions = { template?: string };
/**
* Options for retrieving a session token.
*/
export type ServerGetTokenOptions = {
/**
* The name of a JWT template configured in the Clerk Dashboard.
* If provided, a JWT will be generated using the specified template.
* If not provided, the raw session token will be returned.
*/
template?: string;
/**
* The expiration time for the token in seconds.
* If provided, the token will expire after the specified number of seconds.
* Must be a positive integer.
*/
expiresInSeconds?: number;
};

/**
* A function that retrieves a session token or JWT template.
*
* @param options - Configuration options for token retrieval
* @returns A promise that resolves to the token string, or null if no session exists
*/
export type ServerGetToken = (options?: ServerGetTokenOptions) => Promise<string | null>;

export type InitialState = Serializable<{
Expand Down
, '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 .changeset/evil-paws-learn.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/backend': minor
'@clerk/types': minor
---

Add support for `expiresInSeconds` parameter in session token generation. This allows setting custom expiration times for tokens both with and without templates via the backend API.

2 changes: 2 additions & 0 deletions .typedoc/__tests__/__snapshots__/file-structure.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,8 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"types/reverification-config.mdx",
"types/saml-strategy.mdx",
"types/sdk-metadata.mdx",
"types/server-get-token-options.mdx",
"types/server-get-token.mdx",
"types/session-resource.mdx",
"types/session-status-claim.mdx",
"types/session-verification-level.mdx",
Expand Down
88 changes: 88 additions & 0 deletions packages/backend/src/api/__tests__/SessionApi.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
import { http, HttpResponse } from 'msw';
import { describe, expect, it } from 'vitest';

import { server, validateHeaders } from '../../mock-server';
import { createBackendApiClient } from '../factory';

describe('SessionAPI', () => {
const apiClient = createBackendApiClient({
apiUrl: 'https://api.clerk.test',
secretKey: 'deadbeef',
});

const sessionId = 'sess_123';
const mockTokenResponse = {
object: 'token',
jwt: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.test.token',
};

describe('getToken', () => {
it('creates a session token without template', async () => {
server.use(
http.post(
`https://api.clerk.test/v1/sessions/${sessionId}/tokens`,
validateHeaders(async ({ request }) => {
const body = await request.text();
expect(body).toBe('');
return HttpResponse.json(mockTokenResponse);
}),
),
);

const response = await apiClient.sessions.getToken(sessionId, '');
expect(response.jwt).toBe(mockTokenResponse.jwt);
});

it('creates a session token with template', async () => {
const template = 'custom-template';
server.use(
http.post(
`https://api.clerk.test/v1/sessions/${sessionId}/tokens/${template}`,
validateHeaders(async ({ request }) => {
const body = await request.text();
expect(body).toBe('');
return HttpResponse.json(mockTokenResponse);
}),
),
);

const response = await apiClient.sessions.getToken(sessionId, template);
expect(response.jwt).toBe(mockTokenResponse.jwt);
});

it('creates a session token without template and with expiresInSeconds', async () => {
const expiresInSeconds = 3600;
server.use(
http.post(
`https://api.clerk.test/v1/sessions/${sessionId}/tokens`,
validateHeaders(async ({ request }) => {
const body = await request.json();
expect(body).toEqual({ expires_in_seconds: expiresInSeconds });
return HttpResponse.json(mockTokenResponse);
}),
),
);

const response = await apiClient.sessions.getToken(sessionId, '', expiresInSeconds);
expect(response.jwt).toBe(mockTokenResponse.jwt);
});

it('creates a session token with template and expiresInSeconds', async () => {
const template = 'custom-template';
const expiresInSeconds = 3600;
server.use(
http.post(
`https://api.clerk.test/v1/sessions/${sessionId}/tokens/${template}`,
validateHeaders(async ({ request }) => {
const body = await request.json();
expect(body).toEqual({ expires_in_seconds: expiresInSeconds });
return HttpResponse.json(mockTokenResponse);
}),
),
);

const response = await apiClient.sessions.getToken(sessionId, template, expiresInSeconds);
expect(response.jwt).toBe(mockTokenResponse.jwt);
});
});
});
31 changes: 27 additions & 4 deletions packages/backend/src/api/endpoints/SessionApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,12 +71,35 @@ export class SessionAPI extends AbstractAPI {
});
}

public async getToken(sessionId: string, template: string) {
/**
* Retrieves a session token or generates a JWT using a specified template.
*
* @param sessionId - The ID of the session for which to generate the token
* @param template - Optional name of the JWT template configured in the Clerk Dashboard.
* @param expiresInSeconds - Optional expiration time for the token in seconds.
* If not provided, uses the default expiration.
*
* @returns A promise that resolves to the generated token
*
* @throws {Error} When sessionId is invalid or empty
*/
public async getToken(sessionId: string, template?: string, expiresInSeconds?: number) {
this.requireId(sessionId);
return this.request<Token>({

const path = template
? joinPaths(basePath, sessionId, 'tokens', template)
: joinPaths(basePath, sessionId, 'tokens');

const requestOptions: any = {
method: 'POST',
path: joinPaths(basePath, sessionId, 'tokens', template || ''),
});
path,
};

if (expiresInSeconds !== undefined) {
requestOptions.bodyParams = { expires_in_seconds: expiresInSeconds };
}

return this.request<Token>(requestOptions);
}

public async refreshSession(sessionId: string, params: RefreshTokenParams & { format: 'token' }): Promise<Token>;
Expand Down
84 changes: 83 additions & 1 deletion packages/backend/src/tokens/__tests__/authObjects.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import type { JwtPayload } from '@clerk/types';
import { describe, expect, it } from 'vitest';
import { describe, expect, it, vi } from 'vitest';

import { createBackendApiClient } from '../../api/factory';
import { mockTokens, mockVerificationResults } from '../../fixtures/machine';
import type { AuthenticateContext } from '../authenticateContext';
import type { InvalidTokenAuthObject, UnauthenticatedMachineObject } from '../authObjects';
Expand All@@ -13,6 +14,10 @@ import {
unauthenticatedMachineObject,
} from '../authObjects';

vi.mock('../../api/factory', () => ({
createBackendApiClient: vi.fn(),
}));

describe('makeAuthObjectSerializable', () => {
it('removes non-serializable props', () => {
const authObject = signedOutAuthObject();
Expand DownExpand Up@@ -432,3 +437,80 @@ describe('getAuthObjectForAcceptedToken', () => {
expect((result as UnauthenticatedMachineObject<'machine_token'>).id).toBeNull();
});
});

describe('getToken with expiresInSeconds support', () => {
it('calls fetcher with expiresInSeconds when template is provided', async () => {
const mockGetToken = vi.fn().mockResolvedValue({ jwt: 'mocked-jwt-token' });
const mockApiClient = {
sessions: {
getToken: mockGetToken,
},
};

vi.mocked(createBackendApiClient).mockReturnValue(mockApiClient as any);

const mockAuthenticateContext = {
secretKey: 'sk_test_123',
} as AuthenticateContext;

const authObject = signedInAuthObject(mockAuthenticateContext, 'raw-session-token', {
sid: 'sess_123',
sub: 'user_123',
} as unknown as JwtPayload);

const result = await authObject.getToken({ template: 'custom-template', expiresInSeconds: 3600 });

expect(mockGetToken).toHaveBeenCalledWith('sess_123', 'custom-template', 3600);
expect(result).toBe('mocked-jwt-token');
});

it('calls fetcher without expiresInSeconds when template is provided but expiresInSeconds is undefined', async () => {
const mockGetToken = vi.fn().mockResolvedValue({ jwt: 'mocked-jwt-token' });
const mockApiClient = {
sessions: {
getToken: mockGetToken,
},
};

vi.mocked(createBackendApiClient).mockReturnValue(mockApiClient as any);

const mockAuthenticateContext = {
secretKey: 'sk_test_123',
} as AuthenticateContext;

const authObject = signedInAuthObject(mockAuthenticateContext, 'raw-session-token', {
sid: 'sess_123',
sub: 'user_123',
} as unknown as JwtPayload);

const result = await authObject.getToken({ template: 'custom-template' });

expect(mockGetToken).toHaveBeenCalledWith('sess_123', 'custom-template', undefined);
expect(result).toBe('mocked-jwt-token');
});

it('returns raw session token when no template is provided', async () => {
const mockGetToken = vi.fn();
const mockApiClient = {
sessions: {
getToken: mockGetToken,
},
};

vi.mocked(createBackendApiClient).mockReturnValue(mockApiClient as any);

const mockAuthenticateContext = {
secretKey: 'sk_test_123',
} as AuthenticateContext;

const authObject = signedInAuthObject(mockAuthenticateContext, 'raw-session-token', {
sid: 'sess_123',
sub: 'user_123',
} as unknown as JwtPayload);

const result = await authObject.getToken({});

expect(mockGetToken).not.toHaveBeenCalled();
expect(result).toBe('raw-session-token');
});
});
36 changes: 32 additions & 4 deletions packages/backend/src/tokens/authObjects.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,8 @@ export function signedInAuthObject(
const getToken = createGetToken({
sessionId,
sessionToken,
fetcher: async (...args) => (await apiClient.sessions.getToken(...args)).jwt,
fetcher: async (sessionId, template, expiresInSeconds) =>
(await apiClient.sessions.getToken(sessionId, template || '', expiresInSeconds)).jwt,
});
return {
tokenType: TokenType.SessionToken,
Expand DownExpand Up@@ -387,10 +388,37 @@ export const makeAuthObjectSerializable = <T extends Record<string, unknown>>(ob
return rest as unknown as T;
};

type TokenFetcher = (sessionId: string, template: string) => Promise<string>;
/**
* A function that fetches a session token from the Clerk API.
*
* @param sessionId - The ID of the session
* @param template - The JWT template name to use for token generation
* @param expiresInSeconds - Optional expiration time in seconds for the token
* @returns A promise that resolves to the token string
*/
type TokenFetcher = (sessionId: string, template?: string, expiresInSeconds?: number) => Promise<string>;

/**
* Factory function type that creates a getToken function for auth objects.
*
* @param params - Configuration object containing session information and token fetcher
* @returns A ServerGetToken function that can be used to retrieve tokens
*/
type CreateGetToken = (params: { sessionId: string; sessionToken: string; fetcher: TokenFetcher }) => ServerGetToken;

/**
* Creates a token retrieval function for authenticated sessions.
*
* This factory function returns a getToken function that can either return the raw session token
* or generate a JWT using a specified template with optional custom expiration.
*
* @param params - Configuration object
* @param params.sessionId - The session ID for token generation
* @param params.sessionToken - The raw session token to return when no template is specified
* @param params.fetcher - Function to fetch tokens from the Clerk API
*
* @returns A function that retrieves tokens based on the provided options
*/
const createGetToken: CreateGetToken = params => {
const { fetcher, sessionToken, sessionId } = params || {};

Expand All@@ -399,8 +427,8 @@ const createGetToken: CreateGetToken = params => {
return null;
}

if (options.template) {
return fetcher(sessionId, options.template);
if (options.template || options.expiresInSeconds !== undefined) {
return fetcher(sessionId, options.template, options.expiresInSeconds);
}

return sessionToken;
Expand Down
25 changes: 24 additions & 1 deletion packages/types/src/ssr.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,30 @@ import type { SessionResource } from './session';
import type { UserResource } from './user';
import type { Serializable } from './utils';

export type ServerGetTokenOptions = { template?: string };
/**
* Options for retrieving a session token.
*/
export type ServerGetTokenOptions = {
/**
* The name of a JWT template configured in the Clerk Dashboard.
* If provided, a JWT will be generated using the specified template.
* If not provided, the raw session token will be returned.
*/
template?: string;
/**
* The expiration time for the token in seconds.
* If provided, the token will expire after the specified number of seconds.
* Must be a positive integer.
*/
expiresInSeconds?: number;
};

/**
* A function that retrieves a session token or JWT template.
*
* @param options - Configuration options for token retrieval
* @returns A promise that resolves to the token string, or null if no session exists
*/
export type ServerGetToken = (options?: ServerGetTokenOptions) => Promise<string | null>;

export type InitialState = Serializable<{
Expand Down
, '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 .changeset/evil-paws-learn.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/backend': minor
'@clerk/types': minor
---

Add support for `expiresInSeconds` parameter in session token generation. This allows setting custom expiration times for tokens both with and without templates via the backend API.

2 changes: 2 additions & 0 deletions .typedoc/__tests__/__snapshots__/file-structure.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,8 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"types/reverification-config.mdx",
"types/saml-strategy.mdx",
"types/sdk-metadata.mdx",
"types/server-get-token-options.mdx",
"types/server-get-token.mdx",
"types/session-resource.mdx",
"types/session-status-claim.mdx",
"types/session-verification-level.mdx",
Expand Down
88 changes: 88 additions & 0 deletions packages/backend/src/api/__tests__/SessionApi.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
import { http, HttpResponse } from 'msw';
import { describe, expect, it } from 'vitest';

import { server, validateHeaders } from '../../mock-server';
import { createBackendApiClient } from '../factory';

describe('SessionAPI', () => {
const apiClient = createBackendApiClient({
apiUrl: 'https://api.clerk.test',
secretKey: 'deadbeef',
});

const sessionId = 'sess_123';
const mockTokenResponse = {
object: 'token',
jwt: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.test.token',
};

describe('getToken', () => {
it('creates a session token without template', async () => {
server.use(
http.post(
`https://api.clerk.test/v1/sessions/${sessionId}/tokens`,
validateHeaders(async ({ request }) => {
const body = await request.text();
expect(body).toBe('');
return HttpResponse.json(mockTokenResponse);
}),
),
);

const response = await apiClient.sessions.getToken(sessionId, '');
expect(response.jwt).toBe(mockTokenResponse.jwt);
});

it('creates a session token with template', async () => {
const template = 'custom-template';
server.use(
http.post(
`https://api.clerk.test/v1/sessions/${sessionId}/tokens/${template}`,
validateHeaders(async ({ request }) => {
const body = await request.text();
expect(body).toBe('');
return HttpResponse.json(mockTokenResponse);
}),
),
);

const response = await apiClient.sessions.getToken(sessionId, template);
expect(response.jwt).toBe(mockTokenResponse.jwt);
});

it('creates a session token without template and with expiresInSeconds', async () => {
const expiresInSeconds = 3600;
server.use(
http.post(
`https://api.clerk.test/v1/sessions/${sessionId}/tokens`,
validateHeaders(async ({ request }) => {
const body = await request.json();
expect(body).toEqual({ expires_in_seconds: expiresInSeconds });
return HttpResponse.json(mockTokenResponse);
}),
),
);

const response = await apiClient.sessions.getToken(sessionId, '', expiresInSeconds);
expect(response.jwt).toBe(mockTokenResponse.jwt);
});

it('creates a session token with template and expiresInSeconds', async () => {
const template = 'custom-template';
const expiresInSeconds = 3600;
server.use(
http.post(
`https://api.clerk.test/v1/sessions/${sessionId}/tokens/${template}`,
validateHeaders(async ({ request }) => {
const body = await request.json();
expect(body).toEqual({ expires_in_seconds: expiresInSeconds });
return HttpResponse.json(mockTokenResponse);
}),
),
);

const response = await apiClient.sessions.getToken(sessionId, template, expiresInSeconds);
expect(response.jwt).toBe(mockTokenResponse.jwt);
});
});
});
31 changes: 27 additions & 4 deletions packages/backend/src/api/endpoints/SessionApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,12 +71,35 @@ export class SessionAPI extends AbstractAPI {
});
}

public async getToken(sessionId: string, template: string) {
/**
* Retrieves a session token or generates a JWT using a specified template.
*
* @param sessionId - The ID of the session for which to generate the token
* @param template - Optional name of the JWT template configured in the Clerk Dashboard.
* @param expiresInSeconds - Optional expiration time for the token in seconds.
* If not provided, uses the default expiration.
*
* @returns A promise that resolves to the generated token
*
* @throws {Error} When sessionId is invalid or empty
*/
public async getToken(sessionId: string, template?: string, expiresInSeconds?: number) {
this.requireId(sessionId);
return this.request<Token>({

const path = template
? joinPaths(basePath, sessionId, 'tokens', template)
: joinPaths(basePath, sessionId, 'tokens');

const requestOptions: any = {
method: 'POST',
path: joinPaths(basePath, sessionId, 'tokens', template || ''),
});
path,
};

if (expiresInSeconds !== undefined) {
requestOptions.bodyParams = { expires_in_seconds: expiresInSeconds };
}

return this.request<Token>(requestOptions);
}

public async refreshSession(sessionId: string, params: RefreshTokenParams & { format: 'token' }): Promise<Token>;
Expand Down
84 changes: 83 additions & 1 deletion packages/backend/src/tokens/__tests__/authObjects.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import type { JwtPayload } from '@clerk/types';
import { describe, expect, it } from 'vitest';
import { describe, expect, it, vi } from 'vitest';

import { createBackendApiClient } from '../../api/factory';
import { mockTokens, mockVerificationResults } from '../../fixtures/machine';
import type { AuthenticateContext } from '../authenticateContext';
import type { InvalidTokenAuthObject, UnauthenticatedMachineObject } from '../authObjects';
Expand All@@ -13,6 +14,10 @@ import {
unauthenticatedMachineObject,
} from '../authObjects';

vi.mock('../../api/factory', () => ({
createBackendApiClient: vi.fn(),
}));

describe('makeAuthObjectSerializable', () => {
it('removes non-serializable props', () => {
const authObject = signedOutAuthObject();
Expand DownExpand Up@@ -432,3 +437,80 @@ describe('getAuthObjectForAcceptedToken', () => {
expect((result as UnauthenticatedMachineObject<'machine_token'>).id).toBeNull();
});
});

describe('getToken with expiresInSeconds support', () => {
it('calls fetcher with expiresInSeconds when template is provided', async () => {
const mockGetToken = vi.fn().mockResolvedValue({ jwt: 'mocked-jwt-token' });
const mockApiClient = {
sessions: {
getToken: mockGetToken,
},
};

vi.mocked(createBackendApiClient).mockReturnValue(mockApiClient as any);

const mockAuthenticateContext = {
secretKey: 'sk_test_123',
} as AuthenticateContext;

const authObject = signedInAuthObject(mockAuthenticateContext, 'raw-session-token', {
sid: 'sess_123',
sub: 'user_123',
} as unknown as JwtPayload);

const result = await authObject.getToken({ template: 'custom-template', expiresInSeconds: 3600 });

expect(mockGetToken).toHaveBeenCalledWith('sess_123', 'custom-template', 3600);
expect(result).toBe('mocked-jwt-token');
});

it('calls fetcher without expiresInSeconds when template is provided but expiresInSeconds is undefined', async () => {
const mockGetToken = vi.fn().mockResolvedValue({ jwt: 'mocked-jwt-token' });
const mockApiClient = {
sessions: {
getToken: mockGetToken,
},
};

vi.mocked(createBackendApiClient).mockReturnValue(mockApiClient as any);

const mockAuthenticateContext = {
secretKey: 'sk_test_123',
} as AuthenticateContext;

const authObject = signedInAuthObject(mockAuthenticateContext, 'raw-session-token', {
sid: 'sess_123',
sub: 'user_123',
} as unknown as JwtPayload);

const result = await authObject.getToken({ template: 'custom-template' });

expect(mockGetToken).toHaveBeenCalledWith('sess_123', 'custom-template', undefined);
expect(result).toBe('mocked-jwt-token');
});

it('returns raw session token when no template is provided', async () => {
const mockGetToken = vi.fn();
const mockApiClient = {
sessions: {
getToken: mockGetToken,
},
};

vi.mocked(createBackendApiClient).mockReturnValue(mockApiClient as any);

const mockAuthenticateContext = {
secretKey: 'sk_test_123',
} as AuthenticateContext;

const authObject = signedInAuthObject(mockAuthenticateContext, 'raw-session-token', {
sid: 'sess_123',
sub: 'user_123',
} as unknown as JwtPayload);

const result = await authObject.getToken({});

expect(mockGetToken).not.toHaveBeenCalled();
expect(result).toBe('raw-session-token');
});
});
36 changes: 32 additions & 4 deletions packages/backend/src/tokens/authObjects.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,8 @@ export function signedInAuthObject(
const getToken = createGetToken({
sessionId,
sessionToken,
fetcher: async (...args) => (await apiClient.sessions.getToken(...args)).jwt,
fetcher: async (sessionId, template, expiresInSeconds) =>
(await apiClient.sessions.getToken(sessionId, template || '', expiresInSeconds)).jwt,
});
return {
tokenType: TokenType.SessionToken,
Expand DownExpand Up@@ -387,10 +388,37 @@ export const makeAuthObjectSerializable = <T extends Record<string, unknown>>(ob
return rest as unknown as T;
};

type TokenFetcher = (sessionId: string, template: string) => Promise<string>;
/**
* A function that fetches a session token from the Clerk API.
*
* @param sessionId - The ID of the session
* @param template - The JWT template name to use for token generation
* @param expiresInSeconds - Optional expiration time in seconds for the token
* @returns A promise that resolves to the token string
*/
type TokenFetcher = (sessionId: string, template?: string, expiresInSeconds?: number) => Promise<string>;

/**
* Factory function type that creates a getToken function for auth objects.
*
* @param params - Configuration object containing session information and token fetcher
* @returns A ServerGetToken function that can be used to retrieve tokens
*/
type CreateGetToken = (params: { sessionId: string; sessionToken: string; fetcher: TokenFetcher }) => ServerGetToken;

/**
* Creates a token retrieval function for authenticated sessions.
*
* This factory function returns a getToken function that can either return the raw session token
* or generate a JWT using a specified template with optional custom expiration.
*
* @param params - Configuration object
* @param params.sessionId - The session ID for token generation
* @param params.sessionToken - The raw session token to return when no template is specified
* @param params.fetcher - Function to fetch tokens from the Clerk API
*
* @returns A function that retrieves tokens based on the provided options
*/
const createGetToken: CreateGetToken = params => {
const { fetcher, sessionToken, sessionId } = params || {};

Expand All@@ -399,8 +427,8 @@ const createGetToken: CreateGetToken = params => {
return null;
}

if (options.template) {
return fetcher(sessionId, options.template);
if (options.template || options.expiresInSeconds !== undefined) {
return fetcher(sessionId, options.template, options.expiresInSeconds);
}

return sessionToken;
Expand Down
25 changes: 24 additions & 1 deletion packages/types/src/ssr.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,30 @@ import type { SessionResource } from './session';
import type { UserResource } from './user';
import type { Serializable } from './utils';

export type ServerGetTokenOptions = { template?: string };
/**
* Options for retrieving a session token.
*/
export type ServerGetTokenOptions = {
/**
* The name of a JWT template configured in the Clerk Dashboard.
* If provided, a JWT will be generated using the specified template.
* If not provided, the raw session token will be returned.
*/
template?: string;
/**
* The expiration time for the token in seconds.
* If provided, the token will expire after the specified number of seconds.
* Must be a positive integer.
*/
expiresInSeconds?: number;
};

/**
* A function that retrieves a session token or JWT template.
*
* @param options - Configuration options for token retrieval
* @returns A promise that resolves to the token string, or null if no session exists
*/
export type ServerGetToken = (options?: ServerGetTokenOptions) => Promise<string | null>;

export type InitialState = Serializable<{
Expand Down
, '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 .changeset/evil-paws-learn.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/backend': minor
'@clerk/types': minor
---

Add support for `expiresInSeconds` parameter in session token generation. This allows setting custom expiration times for tokens both with and without templates via the backend API.

2 changes: 2 additions & 0 deletions .typedoc/__tests__/__snapshots__/file-structure.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,8 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"types/reverification-config.mdx",
"types/saml-strategy.mdx",
"types/sdk-metadata.mdx",
"types/server-get-token-options.mdx",
"types/server-get-token.mdx",
"types/session-resource.mdx",
"types/session-status-claim.mdx",
"types/session-verification-level.mdx",
Expand Down
88 changes: 88 additions & 0 deletions packages/backend/src/api/__tests__/SessionApi.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
import { http, HttpResponse } from 'msw';
import { describe, expect, it } from 'vitest';

import { server, validateHeaders } from '../../mock-server';
import { createBackendApiClient } from '../factory';

describe('SessionAPI', () => {
const apiClient = createBackendApiClient({
apiUrl: 'https://api.clerk.test',
secretKey: 'deadbeef',
});

const sessionId = 'sess_123';
const mockTokenResponse = {
object: 'token',
jwt: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.test.token',
};

describe('getToken', () => {
it('creates a session token without template', async () => {
server.use(
http.post(
`https://api.clerk.test/v1/sessions/${sessionId}/tokens`,
validateHeaders(async ({ request }) => {
const body = await request.text();
expect(body).toBe('');
return HttpResponse.json(mockTokenResponse);
}),
),
);

const response = await apiClient.sessions.getToken(sessionId, '');
expect(response.jwt).toBe(mockTokenResponse.jwt);
});

it('creates a session token with template', async () => {
const template = 'custom-template';
server.use(
http.post(
`https://api.clerk.test/v1/sessions/${sessionId}/tokens/${template}`,
validateHeaders(async ({ request }) => {
const body = await request.text();
expect(body).toBe('');
return HttpResponse.json(mockTokenResponse);
}),
),
);

const response = await apiClient.sessions.getToken(sessionId, template);
expect(response.jwt).toBe(mockTokenResponse.jwt);
});

it('creates a session token without template and with expiresInSeconds', async () => {
const expiresInSeconds = 3600;
server.use(
http.post(
`https://api.clerk.test/v1/sessions/${sessionId}/tokens`,
validateHeaders(async ({ request }) => {
const body = await request.json();
expect(body).toEqual({ expires_in_seconds: expiresInSeconds });
return HttpResponse.json(mockTokenResponse);
}),
),
);

const response = await apiClient.sessions.getToken(sessionId, '', expiresInSeconds);
expect(response.jwt).toBe(mockTokenResponse.jwt);
});

it('creates a session token with template and expiresInSeconds', async () => {
const template = 'custom-template';
const expiresInSeconds = 3600;
server.use(
http.post(
`https://api.clerk.test/v1/sessions/${sessionId}/tokens/${template}`,
validateHeaders(async ({ request }) => {
const body = await request.json();
expect(body).toEqual({ expires_in_seconds: expiresInSeconds });
return HttpResponse.json(mockTokenResponse);
}),
),
);

const response = await apiClient.sessions.getToken(sessionId, template, expiresInSeconds);
expect(response.jwt).toBe(mockTokenResponse.jwt);
});
});
});
31 changes: 27 additions & 4 deletions packages/backend/src/api/endpoints/SessionApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,12 +71,35 @@ export class SessionAPI extends AbstractAPI {
});
}

public async getToken(sessionId: string, template: string) {
/**
* Retrieves a session token or generates a JWT using a specified template.
*
* @param sessionId - The ID of the session for which to generate the token
* @param template - Optional name of the JWT template configured in the Clerk Dashboard.
* @param expiresInSeconds - Optional expiration time for the token in seconds.
* If not provided, uses the default expiration.
*
* @returns A promise that resolves to the generated token
*
* @throws {Error} When sessionId is invalid or empty
*/
public async getToken(sessionId: string, template?: string, expiresInSeconds?: number) {
this.requireId(sessionId);
return this.request<Token>({

const path = template
? joinPaths(basePath, sessionId, 'tokens', template)
: joinPaths(basePath, sessionId, 'tokens');

const requestOptions: any = {
method: 'POST',
path: joinPaths(basePath, sessionId, 'tokens', template || ''),
});
path,
};

if (expiresInSeconds !== undefined) {
requestOptions.bodyParams = { expires_in_seconds: expiresInSeconds };
}

return this.request<Token>(requestOptions);
}

public async refreshSession(sessionId: string, params: RefreshTokenParams & { format: 'token' }): Promise<Token>;
Expand Down
84 changes: 83 additions & 1 deletion packages/backend/src/tokens/__tests__/authObjects.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import type { JwtPayload } from '@clerk/types';
import { describe, expect, it } from 'vitest';
import { describe, expect, it, vi } from 'vitest';

import { createBackendApiClient } from '../../api/factory';
import { mockTokens, mockVerificationResults } from '../../fixtures/machine';
import type { AuthenticateContext } from '../authenticateContext';
import type { InvalidTokenAuthObject, UnauthenticatedMachineObject } from '../authObjects';
Expand All@@ -13,6 +14,10 @@ import {
unauthenticatedMachineObject,
} from '../authObjects';

vi.mock('../../api/factory', () => ({
createBackendApiClient: vi.fn(),
}));

describe('makeAuthObjectSerializable', () => {
it('removes non-serializable props', () => {
const authObject = signedOutAuthObject();
Expand DownExpand Up@@ -432,3 +437,80 @@ describe('getAuthObjectForAcceptedToken', () => {
expect((result as UnauthenticatedMachineObject<'machine_token'>).id).toBeNull();
});
});

describe('getToken with expiresInSeconds support', () => {
it('calls fetcher with expiresInSeconds when template is provided', async () => {
const mockGetToken = vi.fn().mockResolvedValue({ jwt: 'mocked-jwt-token' });
const mockApiClient = {
sessions: {
getToken: mockGetToken,
},
};

vi.mocked(createBackendApiClient).mockReturnValue(mockApiClient as any);

const mockAuthenticateContext = {
secretKey: 'sk_test_123',
} as AuthenticateContext;

const authObject = signedInAuthObject(mockAuthenticateContext, 'raw-session-token', {
sid: 'sess_123',
sub: 'user_123',
} as unknown as JwtPayload);

const result = await authObject.getToken({ template: 'custom-template', expiresInSeconds: 3600 });

expect(mockGetToken).toHaveBeenCalledWith('sess_123', 'custom-template', 3600);
expect(result).toBe('mocked-jwt-token');
});

it('calls fetcher without expiresInSeconds when template is provided but expiresInSeconds is undefined', async () => {
const mockGetToken = vi.fn().mockResolvedValue({ jwt: 'mocked-jwt-token' });
const mockApiClient = {
sessions: {
getToken: mockGetToken,
},
};

vi.mocked(createBackendApiClient).mockReturnValue(mockApiClient as any);

const mockAuthenticateContext = {
secretKey: 'sk_test_123',
} as AuthenticateContext;

const authObject = signedInAuthObject(mockAuthenticateContext, 'raw-session-token', {
sid: 'sess_123',
sub: 'user_123',
} as unknown as JwtPayload);

const result = await authObject.getToken({ template: 'custom-template' });

expect(mockGetToken).toHaveBeenCalledWith('sess_123', 'custom-template', undefined);
expect(result).toBe('mocked-jwt-token');
});

it('returns raw session token when no template is provided', async () => {
const mockGetToken = vi.fn();
const mockApiClient = {
sessions: {
getToken: mockGetToken,
},
};

vi.mocked(createBackendApiClient).mockReturnValue(mockApiClient as any);

const mockAuthenticateContext = {
secretKey: 'sk_test_123',
} as AuthenticateContext;

const authObject = signedInAuthObject(mockAuthenticateContext, 'raw-session-token', {
sid: 'sess_123',
sub: 'user_123',
} as unknown as JwtPayload);

const result = await authObject.getToken({});

expect(mockGetToken).not.toHaveBeenCalled();
expect(result).toBe('raw-session-token');
});
});
36 changes: 32 additions & 4 deletions packages/backend/src/tokens/authObjects.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,8 @@ export function signedInAuthObject(
const getToken = createGetToken({
sessionId,
sessionToken,
fetcher: async (...args) => (await apiClient.sessions.getToken(...args)).jwt,
fetcher: async (sessionId, template, expiresInSeconds) =>
(await apiClient.sessions.getToken(sessionId, template || '', expiresInSeconds)).jwt,
});
return {
tokenType: TokenType.SessionToken,
Expand DownExpand Up@@ -387,10 +388,37 @@ export const makeAuthObjectSerializable = <T extends Record<string, unknown>>(ob
return rest as unknown as T;
};

type TokenFetcher = (sessionId: string, template: string) => Promise<string>;
/**
* A function that fetches a session token from the Clerk API.
*
* @param sessionId - The ID of the session
* @param template - The JWT template name to use for token generation
* @param expiresInSeconds - Optional expiration time in seconds for the token
* @returns A promise that resolves to the token string
*/
type TokenFetcher = (sessionId: string, template?: string, expiresInSeconds?: number) => Promise<string>;

/**
* Factory function type that creates a getToken function for auth objects.
*
* @param params - Configuration object containing session information and token fetcher
* @returns A ServerGetToken function that can be used to retrieve tokens
*/
type CreateGetToken = (params: { sessionId: string; sessionToken: string; fetcher: TokenFetcher }) => ServerGetToken;

/**
* Creates a token retrieval function for authenticated sessions.
*
* This factory function returns a getToken function that can either return the raw session token
* or generate a JWT using a specified template with optional custom expiration.
*
* @param params - Configuration object
* @param params.sessionId - The session ID for token generation
* @param params.sessionToken - The raw session token to return when no template is specified
* @param params.fetcher - Function to fetch tokens from the Clerk API
*
* @returns A function that retrieves tokens based on the provided options
*/
const createGetToken: CreateGetToken = params => {
const { fetcher, sessionToken, sessionId } = params || {};

Expand All@@ -399,8 +427,8 @@ const createGetToken: CreateGetToken = params => {
return null;
}

if (options.template) {
return fetcher(sessionId, options.template);
if (options.template || options.expiresInSeconds !== undefined) {
return fetcher(sessionId, options.template, options.expiresInSeconds);
}

return sessionToken;
Expand Down
25 changes: 24 additions & 1 deletion packages/types/src/ssr.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,30 @@ import type { SessionResource } from './session';
import type { UserResource } from './user';
import type { Serializable } from './utils';

export type ServerGetTokenOptions = { template?: string };
/**
* Options for retrieving a session token.
*/
export type ServerGetTokenOptions = {
/**
* The name of a JWT template configured in the Clerk Dashboard.
* If provided, a JWT will be generated using the specified template.
* If not provided, the raw session token will be returned.
*/
template?: string;
/**
* The expiration time for the token in seconds.
* If provided, the token will expire after the specified number of seconds.
* Must be a positive integer.
*/
expiresInSeconds?: number;
};

/**
* A function that retrieves a session token or JWT template.
*
* @param options - Configuration options for token retrieval
* @returns A promise that resolves to the token string, or null if no session exists
*/
export type ServerGetToken = (options?: ServerGetTokenOptions) => Promise<string | null>;

export type InitialState = Serializable<{
Expand Down
, '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 .changeset/evil-paws-learn.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/backend': minor
'@clerk/types': minor
---

Add support for `expiresInSeconds` parameter in session token generation. This allows setting custom expiration times for tokens both with and without templates via the backend API.

2 changes: 2 additions & 0 deletions .typedoc/__tests__/__snapshots__/file-structure.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,8 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"types/reverification-config.mdx",
"types/saml-strategy.mdx",
"types/sdk-metadata.mdx",
"types/server-get-token-options.mdx",
"types/server-get-token.mdx",
"types/session-resource.mdx",
"types/session-status-claim.mdx",
"types/session-verification-level.mdx",
Expand Down
88 changes: 88 additions & 0 deletions packages/backend/src/api/__tests__/SessionApi.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
import { http, HttpResponse } from 'msw';
import { describe, expect, it } from 'vitest';

import { server, validateHeaders } from '../../mock-server';
import { createBackendApiClient } from '../factory';

describe('SessionAPI', () => {
const apiClient = createBackendApiClient({
apiUrl: 'https://api.clerk.test',
secretKey: 'deadbeef',
});

const sessionId = 'sess_123';
const mockTokenResponse = {
object: 'token',
jwt: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.test.token',
};

describe('getToken', () => {
it('creates a session token without template', async () => {
server.use(
http.post(
`https://api.clerk.test/v1/sessions/${sessionId}/tokens`,
validateHeaders(async ({ request }) => {
const body = await request.text();
expect(body).toBe('');
return HttpResponse.json(mockTokenResponse);
}),
),
);

const response = await apiClient.sessions.getToken(sessionId, '');
expect(response.jwt).toBe(mockTokenResponse.jwt);
});

it('creates a session token with template', async () => {
const template = 'custom-template';
server.use(
http.post(
`https://api.clerk.test/v1/sessions/${sessionId}/tokens/${template}`,
validateHeaders(async ({ request }) => {
const body = await request.text();
expect(body).toBe('');
return HttpResponse.json(mockTokenResponse);
}),
),
);

const response = await apiClient.sessions.getToken(sessionId, template);
expect(response.jwt).toBe(mockTokenResponse.jwt);
});

it('creates a session token without template and with expiresInSeconds', async () => {
const expiresInSeconds = 3600;
server.use(
http.post(
`https://api.clerk.test/v1/sessions/${sessionId}/tokens`,
validateHeaders(async ({ request }) => {
const body = await request.json();
expect(body).toEqual({ expires_in_seconds: expiresInSeconds });
return HttpResponse.json(mockTokenResponse);
}),
),
);

const response = await apiClient.sessions.getToken(sessionId, '', expiresInSeconds);
expect(response.jwt).toBe(mockTokenResponse.jwt);
});

it('creates a session token with template and expiresInSeconds', async () => {
const template = 'custom-template';
const expiresInSeconds = 3600;
server.use(
http.post(
`https://api.clerk.test/v1/sessions/${sessionId}/tokens/${template}`,
validateHeaders(async ({ request }) => {
const body = await request.json();
expect(body).toEqual({ expires_in_seconds: expiresInSeconds });
return HttpResponse.json(mockTokenResponse);
}),
),
);

const response = await apiClient.sessions.getToken(sessionId, template, expiresInSeconds);
expect(response.jwt).toBe(mockTokenResponse.jwt);
});
});
});
31 changes: 27 additions & 4 deletions packages/backend/src/api/endpoints/SessionApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,12 +71,35 @@ export class SessionAPI extends AbstractAPI {
});
}

public async getToken(sessionId: string, template: string) {
/**
* Retrieves a session token or generates a JWT using a specified template.
*
* @param sessionId - The ID of the session for which to generate the token
* @param template - Optional name of the JWT template configured in the Clerk Dashboard.
* @param expiresInSeconds - Optional expiration time for the token in seconds.
* If not provided, uses the default expiration.
*
* @returns A promise that resolves to the generated token
*
* @throws {Error} When sessionId is invalid or empty
*/
public async getToken(sessionId: string, template?: string, expiresInSeconds?: number) {
this.requireId(sessionId);
return this.request<Token>({

const path = template
? joinPaths(basePath, sessionId, 'tokens', template)
: joinPaths(basePath, sessionId, 'tokens');

const requestOptions: any = {
method: 'POST',
path: joinPaths(basePath, sessionId, 'tokens', template || ''),
});
path,
};

if (expiresInSeconds !== undefined) {
requestOptions.bodyParams = { expires_in_seconds: expiresInSeconds };
}

return this.request<Token>(requestOptions);
}

public async refreshSession(sessionId: string, params: RefreshTokenParams & { format: 'token' }): Promise<Token>;
Expand Down
84 changes: 83 additions & 1 deletion packages/backend/src/tokens/__tests__/authObjects.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import type { JwtPayload } from '@clerk/types';
import { describe, expect, it } from 'vitest';
import { describe, expect, it, vi } from 'vitest';

import { createBackendApiClient } from '../../api/factory';
import { mockTokens, mockVerificationResults } from '../../fixtures/machine';
import type { AuthenticateContext } from '../authenticateContext';
import type { InvalidTokenAuthObject, UnauthenticatedMachineObject } from '../authObjects';
Expand All@@ -13,6 +14,10 @@ import {
unauthenticatedMachineObject,
} from '../authObjects';

vi.mock('../../api/factory', () => ({
createBackendApiClient: vi.fn(),
}));

describe('makeAuthObjectSerializable', () => {
it('removes non-serializable props', () => {
const authObject = signedOutAuthObject();
Expand DownExpand Up@@ -432,3 +437,80 @@ describe('getAuthObjectForAcceptedToken', () => {
expect((result as UnauthenticatedMachineObject<'machine_token'>).id).toBeNull();
});
});

describe('getToken with expiresInSeconds support', () => {
it('calls fetcher with expiresInSeconds when template is provided', async () => {
const mockGetToken = vi.fn().mockResolvedValue({ jwt: 'mocked-jwt-token' });
const mockApiClient = {
sessions: {
getToken: mockGetToken,
},
};

vi.mocked(createBackendApiClient).mockReturnValue(mockApiClient as any);

const mockAuthenticateContext = {
secretKey: 'sk_test_123',
} as AuthenticateContext;

const authObject = signedInAuthObject(mockAuthenticateContext, 'raw-session-token', {
sid: 'sess_123',
sub: 'user_123',
} as unknown as JwtPayload);

const result = await authObject.getToken({ template: 'custom-template', expiresInSeconds: 3600 });

expect(mockGetToken).toHaveBeenCalledWith('sess_123', 'custom-template', 3600);
expect(result).toBe('mocked-jwt-token');
});

it('calls fetcher without expiresInSeconds when template is provided but expiresInSeconds is undefined', async () => {
const mockGetToken = vi.fn().mockResolvedValue({ jwt: 'mocked-jwt-token' });
const mockApiClient = {
sessions: {
getToken: mockGetToken,
},
};

vi.mocked(createBackendApiClient).mockReturnValue(mockApiClient as any);

const mockAuthenticateContext = {
secretKey: 'sk_test_123',
} as AuthenticateContext;

const authObject = signedInAuthObject(mockAuthenticateContext, 'raw-session-token', {
sid: 'sess_123',
sub: 'user_123',
} as unknown as JwtPayload);

const result = await authObject.getToken({ template: 'custom-template' });

expect(mockGetToken).toHaveBeenCalledWith('sess_123', 'custom-template', undefined);
expect(result).toBe('mocked-jwt-token');
});

it('returns raw session token when no template is provided', async () => {
const mockGetToken = vi.fn();
const mockApiClient = {
sessions: {
getToken: mockGetToken,
},
};

vi.mocked(createBackendApiClient).mockReturnValue(mockApiClient as any);

const mockAuthenticateContext = {
secretKey: 'sk_test_123',
} as AuthenticateContext;

const authObject = signedInAuthObject(mockAuthenticateContext, 'raw-session-token', {
sid: 'sess_123',
sub: 'user_123',
} as unknown as JwtPayload);

const result = await authObject.getToken({});

expect(mockGetToken).not.toHaveBeenCalled();
expect(result).toBe('raw-session-token');
});
});
36 changes: 32 additions & 4 deletions packages/backend/src/tokens/authObjects.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,8 @@ export function signedInAuthObject(
const getToken = createGetToken({
sessionId,
sessionToken,
fetcher: async (...args) => (await apiClient.sessions.getToken(...args)).jwt,
fetcher: async (sessionId, template, expiresInSeconds) =>
(await apiClient.sessions.getToken(sessionId, template || '', expiresInSeconds)).jwt,
});
return {
tokenType: TokenType.SessionToken,
Expand DownExpand Up@@ -387,10 +388,37 @@ export const makeAuthObjectSerializable = <T extends Record<string, unknown>>(ob
return rest as unknown as T;
};

type TokenFetcher = (sessionId: string, template: string) => Promise<string>;
/**
* A function that fetches a session token from the Clerk API.
*
* @param sessionId - The ID of the session
* @param template - The JWT template name to use for token generation
* @param expiresInSeconds - Optional expiration time in seconds for the token
* @returns A promise that resolves to the token string
*/
type TokenFetcher = (sessionId: string, template?: string, expiresInSeconds?: number) => Promise<string>;

/**
* Factory function type that creates a getToken function for auth objects.
*
* @param params - Configuration object containing session information and token fetcher
* @returns A ServerGetToken function that can be used to retrieve tokens
*/
type CreateGetToken = (params: { sessionId: string; sessionToken: string; fetcher: TokenFetcher }) => ServerGetToken;

/**
* Creates a token retrieval function for authenticated sessions.
*
* This factory function returns a getToken function that can either return the raw session token
* or generate a JWT using a specified template with optional custom expiration.
*
* @param params - Configuration object
* @param params.sessionId - The session ID for token generation
* @param params.sessionToken - The raw session token to return when no template is specified
* @param params.fetcher - Function to fetch tokens from the Clerk API
*
* @returns A function that retrieves tokens based on the provided options
*/
const createGetToken: CreateGetToken = params => {
const { fetcher, sessionToken, sessionId } = params || {};

Expand All@@ -399,8 +427,8 @@ const createGetToken: CreateGetToken = params => {
return null;
}

if (options.template) {
return fetcher(sessionId, options.template);
if (options.template || options.expiresInSeconds !== undefined) {
return fetcher(sessionId, options.template, options.expiresInSeconds);
}

return sessionToken;
Expand Down
25 changes: 24 additions & 1 deletion packages/types/src/ssr.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,30 @@ import type { SessionResource } from './session';
import type { UserResource } from './user';
import type { Serializable } from './utils';

export type ServerGetTokenOptions = { template?: string };
/**
* Options for retrieving a session token.
*/
export type ServerGetTokenOptions = {
/**
* The name of a JWT template configured in the Clerk Dashboard.
* If provided, a JWT will be generated using the specified template.
* If not provided, the raw session token will be returned.
*/
template?: string;
/**
* The expiration time for the token in seconds.
* If provided, the token will expire after the specified number of seconds.
* Must be a positive integer.
*/
expiresInSeconds?: number;
};

/**
* A function that retrieves a session token or JWT template.
*
* @param options - Configuration options for token retrieval
* @returns A promise that resolves to the token string, or null if no session exists
*/
export type ServerGetToken = (options?: ServerGetTokenOptions) => Promise<string | null>;

export type InitialState = Serializable<{
Expand Down
, '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 .changeset/evil-paws-learn.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/backend': minor
'@clerk/types': minor
---

Add support for `expiresInSeconds` parameter in session token generation. This allows setting custom expiration times for tokens both with and without templates via the backend API.

2 changes: 2 additions & 0 deletions .typedoc/__tests__/__snapshots__/file-structure.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,8 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"types/reverification-config.mdx",
"types/saml-strategy.mdx",
"types/sdk-metadata.mdx",
"types/server-get-token-options.mdx",
"types/server-get-token.mdx",
"types/session-resource.mdx",
"types/session-status-claim.mdx",
"types/session-verification-level.mdx",
Expand Down
88 changes: 88 additions & 0 deletions packages/backend/src/api/__tests__/SessionApi.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
import { http, HttpResponse } from 'msw';
import { describe, expect, it } from 'vitest';

import { server, validateHeaders } from '../../mock-server';
import { createBackendApiClient } from '../factory';

describe('SessionAPI', () => {
const apiClient = createBackendApiClient({
apiUrl: 'https://api.clerk.test',
secretKey: 'deadbeef',
});

const sessionId = 'sess_123';
const mockTokenResponse = {
object: 'token',
jwt: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.test.token',
};

describe('getToken', () => {
it('creates a session token without template', async () => {
server.use(
http.post(
`https://api.clerk.test/v1/sessions/${sessionId}/tokens`,
validateHeaders(async ({ request }) => {
const body = await request.text();
expect(body).toBe('');
return HttpResponse.json(mockTokenResponse);
}),
),
);

const response = await apiClient.sessions.getToken(sessionId, '');
expect(response.jwt).toBe(mockTokenResponse.jwt);
});

it('creates a session token with template', async () => {
const template = 'custom-template';
server.use(
http.post(
`https://api.clerk.test/v1/sessions/${sessionId}/tokens/${template}`,
validateHeaders(async ({ request }) => {
const body = await request.text();
expect(body).toBe('');
return HttpResponse.json(mockTokenResponse);
}),
),
);

const response = await apiClient.sessions.getToken(sessionId, template);
expect(response.jwt).toBe(mockTokenResponse.jwt);
});

it('creates a session token without template and with expiresInSeconds', async () => {
const expiresInSeconds = 3600;
server.use(
http.post(
`https://api.clerk.test/v1/sessions/${sessionId}/tokens`,
validateHeaders(async ({ request }) => {
const body = await request.json();
expect(body).toEqual({ expires_in_seconds: expiresInSeconds });
return HttpResponse.json(mockTokenResponse);
}),
),
);

const response = await apiClient.sessions.getToken(sessionId, '', expiresInSeconds);
expect(response.jwt).toBe(mockTokenResponse.jwt);
});

it('creates a session token with template and expiresInSeconds', async () => {
const template = 'custom-template';
const expiresInSeconds = 3600;
server.use(
http.post(
`https://api.clerk.test/v1/sessions/${sessionId}/tokens/${template}`,
validateHeaders(async ({ request }) => {
const body = await request.json();
expect(body).toEqual({ expires_in_seconds: expiresInSeconds });
return HttpResponse.json(mockTokenResponse);
}),
),
);

const response = await apiClient.sessions.getToken(sessionId, template, expiresInSeconds);
expect(response.jwt).toBe(mockTokenResponse.jwt);
});
});
});
31 changes: 27 additions & 4 deletions packages/backend/src/api/endpoints/SessionApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,12 +71,35 @@ export class SessionAPI extends AbstractAPI {
});
}

public async getToken(sessionId: string, template: string) {
/**
* Retrieves a session token or generates a JWT using a specified template.
*
* @param sessionId - The ID of the session for which to generate the token
* @param template - Optional name of the JWT template configured in the Clerk Dashboard.
* @param expiresInSeconds - Optional expiration time for the token in seconds.
* If not provided, uses the default expiration.
*
* @returns A promise that resolves to the generated token
*
* @throws {Error} When sessionId is invalid or empty
*/
public async getToken(sessionId: string, template?: string, expiresInSeconds?: number) {
this.requireId(sessionId);
return this.request<Token>({

const path = template
? joinPaths(basePath, sessionId, 'tokens', template)
: joinPaths(basePath, sessionId, 'tokens');

const requestOptions: any = {
method: 'POST',
path: joinPaths(basePath, sessionId, 'tokens', template || ''),
});
path,
};

if (expiresInSeconds !== undefined) {
requestOptions.bodyParams = { expires_in_seconds: expiresInSeconds };
}

return this.request<Token>(requestOptions);
}

public async refreshSession(sessionId: string, params: RefreshTokenParams & { format: 'token' }): Promise<Token>;
Expand Down
84 changes: 83 additions & 1 deletion packages/backend/src/tokens/__tests__/authObjects.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import type { JwtPayload } from '@clerk/types';
import { describe, expect, it } from 'vitest';
import { describe, expect, it, vi } from 'vitest';

import { createBackendApiClient } from '../../api/factory';
import { mockTokens, mockVerificationResults } from '../../fixtures/machine';
import type { AuthenticateContext } from '../authenticateContext';
import type { InvalidTokenAuthObject, UnauthenticatedMachineObject } from '../authObjects';
Expand All@@ -13,6 +14,10 @@ import {
unauthenticatedMachineObject,
} from '../authObjects';

vi.mock('../../api/factory', () => ({
createBackendApiClient: vi.fn(),
}));

describe('makeAuthObjectSerializable', () => {
it('removes non-serializable props', () => {
const authObject = signedOutAuthObject();
Expand DownExpand Up@@ -432,3 +437,80 @@ describe('getAuthObjectForAcceptedToken', () => {
expect((result as UnauthenticatedMachineObject<'machine_token'>).id).toBeNull();
});
});

describe('getToken with expiresInSeconds support', () => {
it('calls fetcher with expiresInSeconds when template is provided', async () => {
const mockGetToken = vi.fn().mockResolvedValue({ jwt: 'mocked-jwt-token' });
const mockApiClient = {
sessions: {
getToken: mockGetToken,
},
};

vi.mocked(createBackendApiClient).mockReturnValue(mockApiClient as any);

const mockAuthenticateContext = {
secretKey: 'sk_test_123',
} as AuthenticateContext;

const authObject = signedInAuthObject(mockAuthenticateContext, 'raw-session-token', {
sid: 'sess_123',
sub: 'user_123',
} as unknown as JwtPayload);

const result = await authObject.getToken({ template: 'custom-template', expiresInSeconds: 3600 });

expect(mockGetToken).toHaveBeenCalledWith('sess_123', 'custom-template', 3600);
expect(result).toBe('mocked-jwt-token');
});

it('calls fetcher without expiresInSeconds when template is provided but expiresInSeconds is undefined', async () => {
const mockGetToken = vi.fn().mockResolvedValue({ jwt: 'mocked-jwt-token' });
const mockApiClient = {
sessions: {
getToken: mockGetToken,
},
};

vi.mocked(createBackendApiClient).mockReturnValue(mockApiClient as any);

const mockAuthenticateContext = {
secretKey: 'sk_test_123',
} as AuthenticateContext;

const authObject = signedInAuthObject(mockAuthenticateContext, 'raw-session-token', {
sid: 'sess_123',
sub: 'user_123',
} as unknown as JwtPayload);

const result = await authObject.getToken({ template: 'custom-template' });

expect(mockGetToken).toHaveBeenCalledWith('sess_123', 'custom-template', undefined);
expect(result).toBe('mocked-jwt-token');
});

it('returns raw session token when no template is provided', async () => {
const mockGetToken = vi.fn();
const mockApiClient = {
sessions: {
getToken: mockGetToken,
},
};

vi.mocked(createBackendApiClient).mockReturnValue(mockApiClient as any);

const mockAuthenticateContext = {
secretKey: 'sk_test_123',
} as AuthenticateContext;

const authObject = signedInAuthObject(mockAuthenticateContext, 'raw-session-token', {
sid: 'sess_123',
sub: 'user_123',
} as unknown as JwtPayload);

const result = await authObject.getToken({});

expect(mockGetToken).not.toHaveBeenCalled();
expect(result).toBe('raw-session-token');
});
});
36 changes: 32 additions & 4 deletions packages/backend/src/tokens/authObjects.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,8 @@ export function signedInAuthObject(
const getToken = createGetToken({
sessionId,
sessionToken,
fetcher: async (...args) => (await apiClient.sessions.getToken(...args)).jwt,
fetcher: async (sessionId, template, expiresInSeconds) =>
(await apiClient.sessions.getToken(sessionId, template || '', expiresInSeconds)).jwt,
});
return {
tokenType: TokenType.SessionToken,
Expand DownExpand Up@@ -387,10 +388,37 @@ export const makeAuthObjectSerializable = <T extends Record<string, unknown>>(ob
return rest as unknown as T;
};

type TokenFetcher = (sessionId: string, template: string) => Promise<string>;
/**
* A function that fetches a session token from the Clerk API.
*
* @param sessionId - The ID of the session
* @param template - The JWT template name to use for token generation
* @param expiresInSeconds - Optional expiration time in seconds for the token
* @returns A promise that resolves to the token string
*/
type TokenFetcher = (sessionId: string, template?: string, expiresInSeconds?: number) => Promise<string>;

/**
* Factory function type that creates a getToken function for auth objects.
*
* @param params - Configuration object containing session information and token fetcher
* @returns A ServerGetToken function that can be used to retrieve tokens
*/
type CreateGetToken = (params: { sessionId: string; sessionToken: string; fetcher: TokenFetcher }) => ServerGetToken;

/**
* Creates a token retrieval function for authenticated sessions.
*
* This factory function returns a getToken function that can either return the raw session token
* or generate a JWT using a specified template with optional custom expiration.
*
* @param params - Configuration object
* @param params.sessionId - The session ID for token generation
* @param params.sessionToken - The raw session token to return when no template is specified
* @param params.fetcher - Function to fetch tokens from the Clerk API
*
* @returns A function that retrieves tokens based on the provided options
*/
const createGetToken: CreateGetToken = params => {
const { fetcher, sessionToken, sessionId } = params || {};

Expand All@@ -399,8 +427,8 @@ const createGetToken: CreateGetToken = params => {
return null;
}

if (options.template) {
return fetcher(sessionId, options.template);
if (options.template || options.expiresInSeconds !== undefined) {
return fetcher(sessionId, options.template, options.expiresInSeconds);
}

return sessionToken;
Expand Down
25 changes: 24 additions & 1 deletion packages/types/src/ssr.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,30 @@ import type { SessionResource } from './session';
import type { UserResource } from './user';
import type { Serializable } from './utils';

export type ServerGetTokenOptions = { template?: string };
/**
* Options for retrieving a session token.
*/
export type ServerGetTokenOptions = {
/**
* The name of a JWT template configured in the Clerk Dashboard.
* If provided, a JWT will be generated using the specified template.
* If not provided, the raw session token will be returned.
*/
template?: string;
/**
* The expiration time for the token in seconds.
* If provided, the token will expire after the specified number of seconds.
* Must be a positive integer.
*/
expiresInSeconds?: number;
};

/**
* A function that retrieves a session token or JWT template.
*
* @param options - Configuration options for token retrieval
* @returns A promise that resolves to the token string, or null if no session exists
*/
export type ServerGetToken = (options?: ServerGetTokenOptions) => Promise<string | null>;

export type InitialState = Serializable<{
Expand Down
, '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 .changeset/evil-paws-learn.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/backend': minor
'@clerk/types': minor
---

Add support for `expiresInSeconds` parameter in session token generation. This allows setting custom expiration times for tokens both with and without templates via the backend API.

2 changes: 2 additions & 0 deletions .typedoc/__tests__/__snapshots__/file-structure.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,8 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"types/reverification-config.mdx",
"types/saml-strategy.mdx",
"types/sdk-metadata.mdx",
"types/server-get-token-options.mdx",
"types/server-get-token.mdx",
"types/session-resource.mdx",
"types/session-status-claim.mdx",
"types/session-verification-level.mdx",
Expand Down
88 changes: 88 additions & 0 deletions packages/backend/src/api/__tests__/SessionApi.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
import { http, HttpResponse } from 'msw';
import { describe, expect, it } from 'vitest';

import { server, validateHeaders } from '../../mock-server';
import { createBackendApiClient } from '../factory';

describe('SessionAPI', () => {
const apiClient = createBackendApiClient({
apiUrl: 'https://api.clerk.test',
secretKey: 'deadbeef',
});

const sessionId = 'sess_123';
const mockTokenResponse = {
object: 'token',
jwt: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.test.token',
};

describe('getToken', () => {
it('creates a session token without template', async () => {
server.use(
http.post(
`https://api.clerk.test/v1/sessions/${sessionId}/tokens`,
validateHeaders(async ({ request }) => {
const body = await request.text();
expect(body).toBe('');
return HttpResponse.json(mockTokenResponse);
}),
),
);

const response = await apiClient.sessions.getToken(sessionId, '');
expect(response.jwt).toBe(mockTokenResponse.jwt);
});

it('creates a session token with template', async () => {
const template = 'custom-template';
server.use(
http.post(
`https://api.clerk.test/v1/sessions/${sessionId}/tokens/${template}`,
validateHeaders(async ({ request }) => {
const body = await request.text();
expect(body).toBe('');
return HttpResponse.json(mockTokenResponse);
}),
),
);

const response = await apiClient.sessions.getToken(sessionId, template);
expect(response.jwt).toBe(mockTokenResponse.jwt);
});

it('creates a session token without template and with expiresInSeconds', async () => {
const expiresInSeconds = 3600;
server.use(
http.post(
`https://api.clerk.test/v1/sessions/${sessionId}/tokens`,
validateHeaders(async ({ request }) => {
const body = await request.json();
expect(body).toEqual({ expires_in_seconds: expiresInSeconds });
return HttpResponse.json(mockTokenResponse);
}),
),
);

const response = await apiClient.sessions.getToken(sessionId, '', expiresInSeconds);
expect(response.jwt).toBe(mockTokenResponse.jwt);
});

it('creates a session token with template and expiresInSeconds', async () => {
const template = 'custom-template';
const expiresInSeconds = 3600;
server.use(
http.post(
`https://api.clerk.test/v1/sessions/${sessionId}/tokens/${template}`,
validateHeaders(async ({ request }) => {
const body = await request.json();
expect(body).toEqual({ expires_in_seconds: expiresInSeconds });
return HttpResponse.json(mockTokenResponse);
}),
),
);

const response = await apiClient.sessions.getToken(sessionId, template, expiresInSeconds);
expect(response.jwt).toBe(mockTokenResponse.jwt);
});
});
});
31 changes: 27 additions & 4 deletions packages/backend/src/api/endpoints/SessionApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,12 +71,35 @@ export class SessionAPI extends AbstractAPI {
});
}

public async getToken(sessionId: string, template: string) {
/**
* Retrieves a session token or generates a JWT using a specified template.
*
* @param sessionId - The ID of the session for which to generate the token
* @param template - Optional name of the JWT template configured in the Clerk Dashboard.
* @param expiresInSeconds - Optional expiration time for the token in seconds.
* If not provided, uses the default expiration.
*
* @returns A promise that resolves to the generated token
*
* @throws {Error} When sessionId is invalid or empty
*/
public async getToken(sessionId: string, template?: string, expiresInSeconds?: number) {
this.requireId(sessionId);
return this.request<Token>({

const path = template
? joinPaths(basePath, sessionId, 'tokens', template)
: joinPaths(basePath, sessionId, 'tokens');

const requestOptions: any = {
method: 'POST',
path: joinPaths(basePath, sessionId, 'tokens', template || ''),
});
path,
};

if (expiresInSeconds !== undefined) {
requestOptions.bodyParams = { expires_in_seconds: expiresInSeconds };
}

return this.request<Token>(requestOptions);
}

public async refreshSession(sessionId: string, params: RefreshTokenParams & { format: 'token' }): Promise<Token>;
Expand Down
84 changes: 83 additions & 1 deletion packages/backend/src/tokens/__tests__/authObjects.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import type { JwtPayload } from '@clerk/types';
import { describe, expect, it } from 'vitest';
import { describe, expect, it, vi } from 'vitest';

import { createBackendApiClient } from '../../api/factory';
import { mockTokens, mockVerificationResults } from '../../fixtures/machine';
import type { AuthenticateContext } from '../authenticateContext';
import type { InvalidTokenAuthObject, UnauthenticatedMachineObject } from '../authObjects';
Expand All@@ -13,6 +14,10 @@ import {
unauthenticatedMachineObject,
} from '../authObjects';

vi.mock('../../api/factory', () => ({
createBackendApiClient: vi.fn(),
}));

describe('makeAuthObjectSerializable', () => {
it('removes non-serializable props', () => {
const authObject = signedOutAuthObject();
Expand DownExpand Up@@ -432,3 +437,80 @@ describe('getAuthObjectForAcceptedToken', () => {
expect((result as UnauthenticatedMachineObject<'machine_token'>).id).toBeNull();
});
});

describe('getToken with expiresInSeconds support', () => {
it('calls fetcher with expiresInSeconds when template is provided', async () => {
const mockGetToken = vi.fn().mockResolvedValue({ jwt: 'mocked-jwt-token' });
const mockApiClient = {
sessions: {
getToken: mockGetToken,
},
};

vi.mocked(createBackendApiClient).mockReturnValue(mockApiClient as any);

const mockAuthenticateContext = {
secretKey: 'sk_test_123',
} as AuthenticateContext;

const authObject = signedInAuthObject(mockAuthenticateContext, 'raw-session-token', {
sid: 'sess_123',
sub: 'user_123',
} as unknown as JwtPayload);

const result = await authObject.getToken({ template: 'custom-template', expiresInSeconds: 3600 });

expect(mockGetToken).toHaveBeenCalledWith('sess_123', 'custom-template', 3600);
expect(result).toBe('mocked-jwt-token');
});

it('calls fetcher without expiresInSeconds when template is provided but expiresInSeconds is undefined', async () => {
const mockGetToken = vi.fn().mockResolvedValue({ jwt: 'mocked-jwt-token' });
const mockApiClient = {
sessions: {
getToken: mockGetToken,
},
};

vi.mocked(createBackendApiClient).mockReturnValue(mockApiClient as any);

const mockAuthenticateContext = {
secretKey: 'sk_test_123',
} as AuthenticateContext;

const authObject = signedInAuthObject(mockAuthenticateContext, 'raw-session-token', {
sid: 'sess_123',
sub: 'user_123',
} as unknown as JwtPayload);

const result = await authObject.getToken({ template: 'custom-template' });

expect(mockGetToken).toHaveBeenCalledWith('sess_123', 'custom-template', undefined);
expect(result).toBe('mocked-jwt-token');
});

it('returns raw session token when no template is provided', async () => {
const mockGetToken = vi.fn();
const mockApiClient = {
sessions: {
getToken: mockGetToken,
},
};

vi.mocked(createBackendApiClient).mockReturnValue(mockApiClient as any);

const mockAuthenticateContext = {
secretKey: 'sk_test_123',
} as AuthenticateContext;

const authObject = signedInAuthObject(mockAuthenticateContext, 'raw-session-token', {
sid: 'sess_123',
sub: 'user_123',
} as unknown as JwtPayload);

const result = await authObject.getToken({});

expect(mockGetToken).not.toHaveBeenCalled();
expect(result).toBe('raw-session-token');
});
});
36 changes: 32 additions & 4 deletions packages/backend/src/tokens/authObjects.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,8 @@ export function signedInAuthObject(
const getToken = createGetToken({
sessionId,
sessionToken,
fetcher: async (...args) => (await apiClient.sessions.getToken(...args)).jwt,
fetcher: async (sessionId, template, expiresInSeconds) =>
(await apiClient.sessions.getToken(sessionId, template || '', expiresInSeconds)).jwt,
});
return {
tokenType: TokenType.SessionToken,
Expand DownExpand Up@@ -387,10 +388,37 @@ export const makeAuthObjectSerializable = <T extends Record<string, unknown>>(ob
return rest as unknown as T;
};

type TokenFetcher = (sessionId: string, template: string) => Promise<string>;
/**
* A function that fetches a session token from the Clerk API.
*
* @param sessionId - The ID of the session
* @param template - The JWT template name to use for token generation
* @param expiresInSeconds - Optional expiration time in seconds for the token
* @returns A promise that resolves to the token string
*/
type TokenFetcher = (sessionId: string, template?: string, expiresInSeconds?: number) => Promise<string>;

/**
* Factory function type that creates a getToken function for auth objects.
*
* @param params - Configuration object containing session information and token fetcher
* @returns A ServerGetToken function that can be used to retrieve tokens
*/
type CreateGetToken = (params: { sessionId: string; sessionToken: string; fetcher: TokenFetcher }) => ServerGetToken;

/**
* Creates a token retrieval function for authenticated sessions.
*
* This factory function returns a getToken function that can either return the raw session token
* or generate a JWT using a specified template with optional custom expiration.
*
* @param params - Configuration object
* @param params.sessionId - The session ID for token generation
* @param params.sessionToken - The raw session token to return when no template is specified
* @param params.fetcher - Function to fetch tokens from the Clerk API
*
* @returns A function that retrieves tokens based on the provided options
*/
const createGetToken: CreateGetToken = params => {
const { fetcher, sessionToken, sessionId } = params || {};

Expand All@@ -399,8 +427,8 @@ const createGetToken: CreateGetToken = params => {
return null;
}

if (options.template) {
return fetcher(sessionId, options.template);
if (options.template || options.expiresInSeconds !== undefined) {
return fetcher(sessionId, options.template, options.expiresInSeconds);
}

return sessionToken;
Expand Down
25 changes: 24 additions & 1 deletion packages/types/src/ssr.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,30 @@ import type { SessionResource } from './session';
import type { UserResource } from './user';
import type { Serializable } from './utils';

export type ServerGetTokenOptions = { template?: string };
/**
* Options for retrieving a session token.
*/
export type ServerGetTokenOptions = {
/**
* The name of a JWT template configured in the Clerk Dashboard.
* If provided, a JWT will be generated using the specified template.
* If not provided, the raw session token will be returned.
*/
template?: string;
/**
* The expiration time for the token in seconds.
* If provided, the token will expire after the specified number of seconds.
* Must be a positive integer.
*/
expiresInSeconds?: number;
};

/**
* A function that retrieves a session token or JWT template.
*
* @param options - Configuration options for token retrieval
* @returns A promise that resolves to the token string, or null if no session exists
*/
export type ServerGetToken = (options?: ServerGetTokenOptions) => Promise<string | null>;

export type InitialState = Serializable<{
Expand Down
, '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 .changeset/evil-paws-learn.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/backend': minor
'@clerk/types': minor
---

Add support for `expiresInSeconds` parameter in session token generation. This allows setting custom expiration times for tokens both with and without templates via the backend API.

2 changes: 2 additions & 0 deletions .typedoc/__tests__/__snapshots__/file-structure.test.ts.snap
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,8 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
"types/reverification-config.mdx",
"types/saml-strategy.mdx",
"types/sdk-metadata.mdx",
"types/server-get-token-options.mdx",
"types/server-get-token.mdx",
"types/session-resource.mdx",
"types/session-status-claim.mdx",
"types/session-verification-level.mdx",
Expand Down
88 changes: 88 additions & 0 deletions packages/backend/src/api/__tests__/SessionApi.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
import { http, HttpResponse } from 'msw';
import { describe, expect, it } from 'vitest';

import { server, validateHeaders } from '../../mock-server';
import { createBackendApiClient } from '../factory';

describe('SessionAPI', () => {
const apiClient = createBackendApiClient({
apiUrl: 'https://api.clerk.test',
secretKey: 'deadbeef',
});

const sessionId = 'sess_123';
const mockTokenResponse = {
object: 'token',
jwt: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.test.token',
};

describe('getToken', () => {
it('creates a session token without template', async () => {
server.use(
http.post(
`https://api.clerk.test/v1/sessions/${sessionId}/tokens`,
validateHeaders(async ({ request }) => {
const body = await request.text();
expect(body).toBe('');
return HttpResponse.json(mockTokenResponse);
}),
),
);

const response = await apiClient.sessions.getToken(sessionId, '');
expect(response.jwt).toBe(mockTokenResponse.jwt);
});

it('creates a session token with template', async () => {
const template = 'custom-template';
server.use(
http.post(
`https://api.clerk.test/v1/sessions/${sessionId}/tokens/${template}`,
validateHeaders(async ({ request }) => {
const body = await request.text();
expect(body).toBe('');
return HttpResponse.json(mockTokenResponse);
}),
),
);

const response = await apiClient.sessions.getToken(sessionId, template);
expect(response.jwt).toBe(mockTokenResponse.jwt);
});

it('creates a session token without template and with expiresInSeconds', async () => {
const expiresInSeconds = 3600;
server.use(
http.post(
`https://api.clerk.test/v1/sessions/${sessionId}/tokens`,
validateHeaders(async ({ request }) => {
const body = await request.json();
expect(body).toEqual({ expires_in_seconds: expiresInSeconds });
return HttpResponse.json(mockTokenResponse);
}),
),
);

const response = await apiClient.sessions.getToken(sessionId, '', expiresInSeconds);
expect(response.jwt).toBe(mockTokenResponse.jwt);
});

it('creates a session token with template and expiresInSeconds', async () => {
const template = 'custom-template';
const expiresInSeconds = 3600;
server.use(
http.post(
`https://api.clerk.test/v1/sessions/${sessionId}/tokens/${template}`,
validateHeaders(async ({ request }) => {
const body = await request.json();
expect(body).toEqual({ expires_in_seconds: expiresInSeconds });
return HttpResponse.json(mockTokenResponse);
}),
),
);

const response = await apiClient.sessions.getToken(sessionId, template, expiresInSeconds);
expect(response.jwt).toBe(mockTokenResponse.jwt);
});
});
});
31 changes: 27 additions & 4 deletions packages/backend/src/api/endpoints/SessionApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,12 +71,35 @@ export class SessionAPI extends AbstractAPI {
});
}

public async getToken(sessionId: string, template: string) {
/**
* Retrieves a session token or generates a JWT using a specified template.
*
* @param sessionId - The ID of the session for which to generate the token
* @param template - Optional name of the JWT template configured in the Clerk Dashboard.
* @param expiresInSeconds - Optional expiration time for the token in seconds.
* If not provided, uses the default expiration.
*
* @returns A promise that resolves to the generated token
*
* @throws {Error} When sessionId is invalid or empty
*/
public async getToken(sessionId: string, template?: string, expiresInSeconds?: number) {
this.requireId(sessionId);
return this.request<Token>({

const path = template
? joinPaths(basePath, sessionId, 'tokens', template)
: joinPaths(basePath, sessionId, 'tokens');

const requestOptions: any = {
method: 'POST',
path: joinPaths(basePath, sessionId, 'tokens', template || ''),
});
path,
};

if (expiresInSeconds !== undefined) {
requestOptions.bodyParams = { expires_in_seconds: expiresInSeconds };
}

return this.request<Token>(requestOptions);
}

public async refreshSession(sessionId: string, params: RefreshTokenParams & { format: 'token' }): Promise<Token>;
Expand Down
84 changes: 83 additions & 1 deletion packages/backend/src/tokens/__tests__/authObjects.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import type { JwtPayload } from '@clerk/types';
import { describe, expect, it } from 'vitest';
import { describe, expect, it, vi } from 'vitest';

import { createBackendApiClient } from '../../api/factory';
import { mockTokens, mockVerificationResults } from '../../fixtures/machine';
import type { AuthenticateContext } from '../authenticateContext';
import type { InvalidTokenAuthObject, UnauthenticatedMachineObject } from '../authObjects';
Expand All@@ -13,6 +14,10 @@ import {
unauthenticatedMachineObject,
} from '../authObjects';

vi.mock('../../api/factory', () => ({
createBackendApiClient: vi.fn(),
}));

describe('makeAuthObjectSerializable', () => {
it('removes non-serializable props', () => {
const authObject = signedOutAuthObject();
Expand DownExpand Up@@ -432,3 +437,80 @@ describe('getAuthObjectForAcceptedToken', () => {
expect((result as UnauthenticatedMachineObject<'machine_token'>).id).toBeNull();
});
});

describe('getToken with expiresInSeconds support', () => {
it('calls fetcher with expiresInSeconds when template is provided', async () => {
const mockGetToken = vi.fn().mockResolvedValue({ jwt: 'mocked-jwt-token' });
const mockApiClient = {
sessions: {
getToken: mockGetToken,
},
};

vi.mocked(createBackendApiClient).mockReturnValue(mockApiClient as any);

const mockAuthenticateContext = {
secretKey: 'sk_test_123',
} as AuthenticateContext;

const authObject = signedInAuthObject(mockAuthenticateContext, 'raw-session-token', {
sid: 'sess_123',
sub: 'user_123',
} as unknown as JwtPayload);

const result = await authObject.getToken({ template: 'custom-template', expiresInSeconds: 3600 });

expect(mockGetToken).toHaveBeenCalledWith('sess_123', 'custom-template', 3600);
expect(result).toBe('mocked-jwt-token');
});

it('calls fetcher without expiresInSeconds when template is provided but expiresInSeconds is undefined', async () => {
const mockGetToken = vi.fn().mockResolvedValue({ jwt: 'mocked-jwt-token' });
const mockApiClient = {
sessions: {
getToken: mockGetToken,
},
};

vi.mocked(createBackendApiClient).mockReturnValue(mockApiClient as any);

const mockAuthenticateContext = {
secretKey: 'sk_test_123',
} as AuthenticateContext;

const authObject = signedInAuthObject(mockAuthenticateContext, 'raw-session-token', {
sid: 'sess_123',
sub: 'user_123',
} as unknown as JwtPayload);

const result = await authObject.getToken({ template: 'custom-template' });

expect(mockGetToken).toHaveBeenCalledWith('sess_123', 'custom-template', undefined);
expect(result).toBe('mocked-jwt-token');
});

it('returns raw session token when no template is provided', async () => {
const mockGetToken = vi.fn();
const mockApiClient = {
sessions: {
getToken: mockGetToken,
},
};

vi.mocked(createBackendApiClient).mockReturnValue(mockApiClient as any);

const mockAuthenticateContext = {
secretKey: 'sk_test_123',
} as AuthenticateContext;

const authObject = signedInAuthObject(mockAuthenticateContext, 'raw-session-token', {
sid: 'sess_123',
sub: 'user_123',
} as unknown as JwtPayload);

const result = await authObject.getToken({});

expect(mockGetToken).not.toHaveBeenCalled();
expect(result).toBe('raw-session-token');
});
});
36 changes: 32 additions & 4 deletions packages/backend/src/tokens/authObjects.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,8 @@ export function signedInAuthObject(
const getToken = createGetToken({
sessionId,
sessionToken,
fetcher: async (...args) => (await apiClient.sessions.getToken(...args)).jwt,
fetcher: async (sessionId, template, expiresInSeconds) =>
(await apiClient.sessions.getToken(sessionId, template || '', expiresInSeconds)).jwt,
});
return {
tokenType: TokenType.SessionToken,
Expand DownExpand Up@@ -387,10 +388,37 @@ export const makeAuthObjectSerializable = <T extends Record<string, unknown>>(ob
return rest as unknown as T;
};

type TokenFetcher = (sessionId: string, template: string) => Promise<string>;
/**
* A function that fetches a session token from the Clerk API.
*
* @param sessionId - The ID of the session
* @param template - The JWT template name to use for token generation
* @param expiresInSeconds - Optional expiration time in seconds for the token
* @returns A promise that resolves to the token string
*/
type TokenFetcher = (sessionId: string, template?: string, expiresInSeconds?: number) => Promise<string>;

/**
* Factory function type that creates a getToken function for auth objects.
*
* @param params - Configuration object containing session information and token fetcher
* @returns A ServerGetToken function that can be used to retrieve tokens
*/
type CreateGetToken = (params: { sessionId: string; sessionToken: string; fetcher: TokenFetcher }) => ServerGetToken;

/**
* Creates a token retrieval function for authenticated sessions.
*
* This factory function returns a getToken function that can either return the raw session token
* or generate a JWT using a specified template with optional custom expiration.
*
* @param params - Configuration object
* @param params.sessionId - The session ID for token generation
* @param params.sessionToken - The raw session token to return when no template is specified
* @param params.fetcher - Function to fetch tokens from the Clerk API
*
* @returns A function that retrieves tokens based on the provided options
*/
const createGetToken: CreateGetToken = params => {
const { fetcher, sessionToken, sessionId } = params || {};

Expand All@@ -399,8 +427,8 @@ const createGetToken: CreateGetToken = params => {
return null;
}

if (options.template) {
return fetcher(sessionId, options.template);
if (options.template || options.expiresInSeconds !== undefined) {
return fetcher(sessionId, options.template, options.expiresInSeconds);
}

return sessionToken;
Expand Down
25 changes: 24 additions & 1 deletion packages/types/src/ssr.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,30 @@ import type { SessionResource } from './session';
import type { UserResource } from './user';
import type { Serializable } from './utils';

export type ServerGetTokenOptions = { template?: string };
/**
* Options for retrieving a session token.
*/
export type ServerGetTokenOptions = {
/**
* The name of a JWT template configured in the Clerk Dashboard.
* If provided, a JWT will be generated using the specified template.
* If not provided, the raw session token will be returned.
*/
template?: string;
/**
* The expiration time for the token in seconds.
* If provided, the token will expire after the specified number of seconds.
* Must be a positive integer.
*/
expiresInSeconds?: number;
};

/**
* A function that retrieves a session token or JWT template.
*
* @param options - Configuration options for token retrieval
* @returns A promise that resolves to the token string, or null if no session exists
*/
export type ServerGetToken = (options?: ServerGetTokenOptions) => Promise<string | null>;

export type InitialState = Serializable<{
Expand Down