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
6 changes: 6 additions & 0 deletions .changeset/bright-pandas-proxy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@clerk/backend": minor
"@clerk/nextjs": minor
---

Add an `fapiUrl` option to Frontend API proxy helpers so requests can target a custom Clerk Frontend API URL.
99 changes: 99 additions & 0 deletions packages/backend/src/__tests__/proxy.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,21 @@ describe('proxy', () => {
describe('clerkFrontendApiProxy', () => {
const mockFetch = vi.fn();
const originalFetch = global.fetch;
const originalFapiUrl = process.env.CLERK_FAPI_URL;

beforeEach(() => {
global.fetch = mockFetch;
mockFetch.mockReset();
delete process.env.CLERK_FAPI_URL;
});

afterEach(() => {
global.fetch = originalFetch;
if (originalFapiUrl === undefined) {
delete process.env.CLERK_FAPI_URL;
} else {
process.env.CLERK_FAPI_URL = originalFapiUrl;
}
});

it('returns error when publishableKey is missing', async () => {
Expand Down Expand Up @@ -197,6 +204,77 @@ describe('proxy', () => {
expect(response.status).toBe(200);
});

it('uses the configured FAPI URL over CLERK_FAPI_URL and the publishable key', async () => {
process.env.CLERK_FAPI_URL = 'https://frontend-api.clerkstage.dev';
mockFetch.mockResolvedValue(new Response(JSON.stringify({ client: {} }), { status: 200 }));

const request = new Request('https://example.com/__clerk/v1/client');

await clerkFrontendApiProxy(request, {
publishableKey: 'pk_test_Y2xlcmsuZXhhbXBsZS5jb20k',
secretKey: 'sk_test_xxx',
fapiUrl: 'http://localhost:8001/',
});

const [url, options] = mockFetch.mock.calls[0];
expect(url).toBe('http://localhost:8001/v1/client');
expect(options.headers.get('Host')).toBe('localhost:8001');
});
Comment on lines +207 to +222

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

📐 Maintainability & Code Quality | 🟡 Minor | ⚡ Quick win

Document the new public fapiUrl option.

The linked Next.js middleware options table and delegated proxy-properties partial do not expose fapiUrl, leaving the new supported configuration undiscoverable. Update those docs alongside this API addition. As per coding guidelines, “Update documentation for API changes.”

🧰 Tools
🪛 Betterleaks (1.6.1)

[high] 214-214: Detected a Generic API Key, potentially exposing access to various services and sensitive operations.

(generic-api-key)

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@packages/backend/src/__tests__/proxy.test.ts` around lines 207 - 222, Update
the public Next.js middleware options documentation and delegated
proxy-properties partial to include the new fapiUrl option, describing its
purpose and configuration behavior consistently with clerkFrontendApiProxy and
its existing options. Ensure the option appears in both documented locations so
the supported API is discoverable.

Sources: Coding guidelines, Linked repositories


it('uses CLERK_FAPI_URL when no FAPI URL is configured', async () => {
process.env.CLERK_FAPI_URL = 'https://frontend-api.clerkstage.dev';
mockFetch.mockResolvedValue(new Response(JSON.stringify({ client: {} }), { status: 200 }));

const request = new Request('https://example.com/__clerk/v1/client');

await clerkFrontendApiProxy(request, {
publishableKey: 'pk_test_Y2xlcmsuZXhhbXBsZS5jb20k',
secretKey: 'sk_test_xxx',
});

expect(mockFetch.mock.calls[0][0]).toBe('https://frontend-api.clerkstage.dev/v1/client');
});
Comment on lines +224 to +236

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

📐 Maintainability & Code Quality | 🟡 Minor | ⚡ Quick win

Cover trailing-slash normalization for CLERK_FAPI_URL.

This only verifies an environment URL without a trailing slash. Use https://frontend-api.clerkstage.dev/ here and retain the no-double-slash assertion, so the environment fallback contract is protected independently of the direct fapiUrl path.

🧰 Tools
🪛 Betterleaks (1.6.1)

[high] 231-231: Detected a Generic API Key, potentially exposing access to various services and sensitive operations.

(generic-api-key)

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@packages/backend/src/__tests__/proxy.test.ts` around lines 224 - 236, Update
the test “uses CLERK_FAPI_URL when no FAPI URL is configured” to set
CLERK_FAPI_URL with a trailing slash, while retaining the expected fetch URL
without a double slash. Keep the test focused on the environment fallback path
and leave the direct fapiUrl behavior unchanged.

Source: Coding guidelines


it.each([
['unsupported scheme', 'ftp://frontend-api.clerk.dev', undefined, 'FAPI URL must use http or https'],
[
'credentials',
'https://user:password@frontend-api.clerk.dev',
undefined,
'FAPI URL must not include credentials, a query string, or a hash',
],
[
'query string',
'https://frontend-api.clerk.dev?env=staging',
undefined,
'FAPI URL must not include credentials, a query string, or a hash',
],
[
'fragment',
'https://frontend-api.clerk.dev#staging',
undefined,
'FAPI URL must not include credentials, a query string, or a hash',
],
['invalid environment value', undefined, 'not-a-url', 'Invalid URL'],
])('returns a configuration error for an invalid FAPI URL with %s', async (_case, fapiUrl, envFapiUrl, message) => {
if (envFapiUrl) {
process.env.CLERK_FAPI_URL = envFapiUrl;
}
const request = new Request('https://example.com/__clerk/v1/client');

const response = await clerkFrontendApiProxy(request, {
publishableKey: 'pk_test_Y2xlcmsuZXhhbXBsZS5jb20k',
secretKey: 'sk_test_xxx',
...(fapiUrl ? { fapiUrl } : {}),
});

expect(response.status).toBe(500);
expect(mockFetch).not.toHaveBeenCalled();
await expect(response.json()).resolves.toMatchObject({
errors: [{ code: 'proxy_configuration_error', message }],
});
});

it('forwards POST request with body', async () => {
const mockResponse = new Response(JSON.stringify({ success: true }), {
status: 200,
Expand Down Expand Up @@ -477,6 +555,27 @@ describe('proxy', () => {
expect(response.headers.get('Location')).toBe('https://example.com/__clerk/v1/oauth/callback?code=123');
});

it('rewrites redirects from a configured FAPI URL', async () => {
const mockResponse = new Response(null, {
status: 302,
headers: {
Location: 'http://localhost:8001/v1/oauth/callback?code=123',
},
});
mockFetch.mockResolvedValue(mockResponse);

const request = new Request('https://example.com/__clerk/v1/oauth/authorize');

const response = await clerkFrontendApiProxy(request, {
publishableKey: 'pk_test_Y2xlcmsuZXhhbXBsZS5jb20k',
secretKey: 'sk_test_xxx',
fapiUrl: 'http://localhost:8001',
});

expect(response.status).toBe(302);
expect(response.headers.get('Location')).toBe('https://example.com/__clerk/v1/oauth/callback?code=123');
});

it('does not rewrite Location header for external redirects', async () => {
const mockResponse = new Response(null, {
status: 302,
Expand Down
36 changes: 34 additions & 2 deletions packages/backend/src/proxy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ export interface FrontendApiProxyOptions {
* The Clerk secret key. Falls back to CLERK_SECRET_KEY env var.
*/
secretKey?: string;
/**
* The Clerk Frontend API URL. Falls back to the CLERK_FAPI_URL environment variable.
* If not provided, the URL is derived from the publishable key.
*/
fapiUrl?: string;
}

/**
Expand Down Expand Up @@ -111,6 +116,20 @@ export function stripTrailingSlashes(str: string): string {
return str;
}

function normalizeFapiUrl(fapiUrl: string): string {
const url = new URL(fapiUrl);

if (url.protocol !== 'http:' && url.protocol !== 'https:') {
throw new Error('FAPI URL must use http or https');
}

if (url.username || url.password || url.search || url.hash) {
throw new Error('FAPI URL must not include credentials, a query string, or a hash');
}

return stripTrailingSlashes(url.toString());
}

/**
* Checks if a request path matches the proxy path.
* @param request - The incoming request
Expand Down Expand Up @@ -233,10 +252,23 @@ export async function clerkFrontendApiProxy(request: Request, options?: Frontend
);
}

// Derive the FAPI URL and construct the target URL.
// Resolve the FAPI URL and construct the target URL.
// Use string concatenation instead of `new URL(path, base)` to avoid
// protocol-relative resolution (e.g., "//evil.com" resolving to a different host).
const fapiBaseUrl = fapiUrlFromPublishableKey(publishableKey);
let fapiBaseUrl: string;
try {
fapiBaseUrl = normalizeFapiUrl(
options?.fapiUrl ||
(typeof process !== 'undefined' ? process.env?.CLERK_FAPI_URL : undefined) ||
fapiUrlFromPublishableKey(publishableKey),
);
} catch (error) {
return createErrorResponse(
'proxy_configuration_error',
error instanceof Error ? error.message : 'Invalid FAPI URL',
500,
);
}
const fapiHost = new URL(fapiBaseUrl).host;
const targetPath = requestUrl.pathname.slice(proxyPath.length) || '/';
const targetUrl = new URL(`${fapiBaseUrl}${targetPath}`);
Expand Down
31 changes: 31 additions & 0 deletions packages/nextjs/src/server/__tests__/proxy.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

import { createFrontendApiProxyHandlers } from '../proxy';

describe('createFrontendApiProxyHandlers', () => {
const mockFetch = vi.fn();
const originalFetch = global.fetch;

beforeEach(() => {
global.fetch = mockFetch;
mockFetch.mockReset();
});

afterEach(() => {
global.fetch = originalFetch;
});

it('forwards fapiUrl to the backend proxy', async () => {
mockFetch.mockResolvedValue(new Response(JSON.stringify({ client: {} }), { status: 200 }));
const request = new Request('https://example.com/__clerk/v1/client');
const handlers = createFrontendApiProxyHandlers({
publishableKey: 'pk_test_Y2xlcmsuZXhhbXBsZS5jb20k',
secretKey: 'sk_test_xxx',
fapiUrl: 'http://localhost:8001',
});

await handlers.GET(request);

expect(mockFetch.mock.calls[0][0]).toBe('http://localhost:8001/v1/client');
});
});
1 change: 1 addition & 0 deletions packages/nextjs/src/server/proxy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ export async function clerkFrontendApiProxy(
proxyPath: options?.proxyPath || DEFAULT_PROXY_PATH,
publishableKey: options?.publishableKey || PUBLISHABLE_KEY,
secretKey: options?.secretKey || SECRET_KEY,
fapiUrl: options?.fapiUrl,
});
}

Expand Down
Loading