-
Notifications
You must be signed in to change notification settings - Fork 460
feat(backend): support configurable Frontend API proxy URLs #9223
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| 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. |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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 () => { | ||
|
|
@@ -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'); | ||
| }); | ||
|
|
||
| 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
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 📐 Maintainability & Code Quality | 🟡 Minor | ⚡ Quick win Cover trailing-slash normalization for This only verifies an environment URL without a trailing slash. Use 🧰 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 AgentsSource: 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, | ||
|
|
@@ -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, | ||
|
|
||
| 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'); | ||
| }); | ||
| }); |
There was a problem hiding this comment.
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
fapiUrloption.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
Sources: Coding guidelines, Linked repositories