Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/eighty-frogs-return.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/nextjs": minor
---

Fix `auth.protect()` unauthorized error propagation within middleware
5 changes: 5 additions & 0 deletions .changeset/weak-adults-clean.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/backend": minor
---

Introduce API keys Backend SDK methods
4 changes: 4 additions & 0 deletions integration/.keys.json.sample
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,5 +54,9 @@
"with-whatsapp-phone-code": {
"pk": "",
"sk": ""
},
"with-api-keys": {
"pk": "",
"sk": ""
}
}
7 changes: 7 additions & 0 deletions integration/presets/envs.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -163,6 +163,12 @@ const withWhatsappPhoneCode = base
.setEnvVariable('private', 'CLERK_SECRET_KEY', instanceKeys.get('with-whatsapp-phone-code').sk)
.setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-whatsapp-phone-code').pk);

const withAPIKeys = base
.clone()
.setId('withAPIKeys')
.setEnvVariable('private', 'CLERK_SECRET_KEY', instanceKeys.get('with-api-keys').sk)
.setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-api-keys').pk);

export const envs = {
base,
withKeyless,
Expand All@@ -187,4 +193,5 @@ export const envs = {
withBillingStaging,
withBilling,
withWhatsappPhoneCode,
withAPIKeys,
} as const;
1 change: 1 addition & 0 deletions integration/presets/longRunningApps.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ export const createLongRunningApps = () => {
config: next.appRouter,
env: envs.withSessionTasks,
},
{ id: 'next.appRouter.withAPIKeys', config: next.appRouter, env: envs.withAPIKeys },
{ id: 'withBillingStaging.next.appRouter', config: next.appRouter, env: envs.withBillingStaging },
{ id: 'withBilling.next.appRouter', config: next.appRouter, env: envs.withBilling },
{ id: 'withBillingStaging.vue.vite', config: vue.vite, env: envs.withBillingStaging },
Expand Down
4 changes: 2 additions & 2 deletions integration/testUtils/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,10 @@ import type { Application } from '../models/application';
import { createEmailService } from './emailService';
import { createInvitationService } from './invitationsService';
import { createOrganizationsService } from './organizationsService';
import type { FakeOrganization, FakeUser } from './usersService';
import type { FakeAPIKey, FakeOrganization, FakeUser } from './usersService';
import { createUserService } from './usersService';

export type { FakeUser, FakeOrganization };
export type { FakeUser, FakeOrganization, FakeAPIKey };
const createClerkClient = (app: Application) => {
return backendCreateClerkClient({
apiUrl: app.env.privateVariables.get('CLERK_API_URL'),
Expand Down
26 changes: 25 additions & 1 deletion integration/testUtils/usersService.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { ClerkClient, Organization, User } from '@clerk/backend';
import type { APIKey, ClerkClient, Organization, User } from '@clerk/backend';
import { faker } from '@faker-js/faker';

import { hash } from '../models/helpers';
Expand DownExpand Up@@ -57,6 +57,12 @@ export type FakeOrganization = {
delete: () => Promise<Organization>;
};

export type FakeAPIKey = {
apiKey: APIKey;
secret: string;
revoke: () => Promise<APIKey>;
};

export type UserService = {
createFakeUser: (options?: FakeUserOptions) => FakeUser;
createBapiUser: (fakeUser: FakeUser) => Promise<User>;
Expand All@@ -67,6 +73,7 @@ export type UserService = {
deleteIfExists: (opts: { id?: string; email?: string; phoneNumber?: string }) => Promise<void>;
createFakeOrganization: (userId: string) => Promise<FakeOrganization>;
getUser: (opts: { id?: string; email?: string }) => Promise<User | undefined>;
createFakeAPIKey: (userId: string) => Promise<FakeAPIKey>;
};

/**
Expand DownExpand Up@@ -175,6 +182,23 @@ export const createUserService = (clerkClient: ClerkClient) => {
delete: () => clerkClient.organizations.deleteOrganization(organization.id),
} satisfies FakeOrganization;
},
createFakeAPIKey: async (userId: string) => {
const TWENTY_MINUTES = 20 * 60;

const apiKey = await clerkClient.apiKeys.create({
subject: userId,
name: `Integration Test - ${userId}`,
secondsUntilExpiration: TWENTY_MINUTES,
});

const { secret } = await clerkClient.apiKeys.getSecret(apiKey.id);

return {
apiKey,
secret,
revoke: () => clerkClient.apiKeys.revoke({ apiKeyId: apiKey.id, revocationReason: 'For testing purposes' }),
} satisfies FakeAPIKey;
},
};

return self;
Expand Down
214 changes: 214 additions & 0 deletions integration/tests/machine-auth/api-keys.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,214 @@
import type { User } from '@clerk/backend';
import { TokenType } from '@clerk/backend/internal';
import { expect, test } from '@playwright/test';

import type { Application } from '../../models/application';
import { appConfigs } from '../../presets';
import type { FakeAPIKey, FakeUser } from '../../testUtils';
import { createTestUtils } from '../../testUtils';

test.describe('Next.js API key auth within clerkMiddleware() @nextjs', () => {
test.describe.configure({ mode: 'parallel' });
let app: Application;
let fakeUser: FakeUser;
let fakeBapiUser: User;
let fakeAPIKey: FakeAPIKey;

test.beforeAll(async () => {
app = await appConfigs.next.appRouter
.clone()
.addFile(
`src/middleware.ts`,
() => `
import { clerkMiddleware, createRouteMatcher } from '@clerk/nextjs/server';

const isProtectedRoute = createRouteMatcher(['/api(.*)']);

export default clerkMiddleware(async (auth, req) => {
if (isProtectedRoute(req)) {
await auth.protect({ token: 'api_key' });
}
});

export const config = {
matcher: [
'/((?!.*\\..*|_next).*)', // Don't run middleware on static files
'/', // Run middleware on index page
'/(api|trpc)(.*)',
], // Run middleware on API routes
};
`,
)
.addFile(
'src/app/api/me/route.ts',
() => `
import { auth } from '@clerk/nextjs/server';

export async function GET() {
const { userId, tokenType } = await auth({ acceptsToken: 'api_key' });

return Response.json({ userId, tokenType });
}
`,
)
.commit();

await app.setup();
await app.withEnv(appConfigs.envs.withAPIKeys);
await app.dev();

const u = createTestUtils({ app });
fakeUser = u.services.users.createFakeUser();
fakeBapiUser = await u.services.users.createBapiUser(fakeUser);
fakeAPIKey = await u.services.users.createFakeAPIKey(fakeBapiUser.id);
});

test.afterAll(async () => {
await fakeAPIKey.revoke();
await fakeUser.deleteIfExists();
await app.teardown();
});

test('should return 401 if no API key is provided', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString());
expect(res.status()).toBe(401);
});

test('should return 401 if API key is invalid', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString(), {
headers: { Authorization: 'Bearer invalid_key' },
});
expect(res.status()).toBe(401);
});

test('should return 200 with auth object if API key is valid', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString(), {
headers: {
Authorization: `Bearer ${fakeAPIKey.secret}`,
},
});
const apiKeyData = await res.json();
expect(res.status()).toBe(200);
expect(apiKeyData.userId).toBe(fakeBapiUser.id);
expect(apiKeyData.tokenType).toBe(TokenType.ApiKey);
});
});

test.describe('Next.js API key auth within routes @nextjs', () => {
test.describe.configure({ mode: 'parallel' });
let app: Application;
let fakeUser: FakeUser;
let fakeBapiUser: User;
let fakeAPIKey: FakeAPIKey;

test.beforeAll(async () => {
app = await appConfigs.next.appRouter
.clone()
.addFile(
'src/app/api/me/route.ts',
() => `
import { auth } from '@clerk/nextjs/server';

export async function GET() {
const { userId, tokenType } = await auth({ acceptsToken: 'api_key' });

if (!userId) {
return Response.json({ error: 'Unauthorized' }, { status: 401 });
}

return Response.json({ userId, tokenType });
}

export async function POST() {
const authObject = await auth({ acceptsToken: ['api_key', 'session_token'] });

if (!authObject.isAuthenticated) {
return Response.json({ error: 'Unauthorized' }, { status: 401 });
}

return Response.json({ userId: authObject.userId, tokenType: authObject.tokenType });
}
`,
)
.commit();

await app.setup();
await app.withEnv(appConfigs.envs.withAPIKeys);
await app.dev();

const u = createTestUtils({ app });
fakeUser = u.services.users.createFakeUser();
fakeBapiUser = await u.services.users.createBapiUser(fakeUser);
fakeAPIKey = await u.services.users.createFakeAPIKey(fakeBapiUser.id);
});

test.afterAll(async () => {
await fakeAPIKey.revoke();
await fakeUser.deleteIfExists();
await app.teardown();
});

test('should return 401 if no API key is provided', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString());
expect(res.status()).toBe(401);
});

test('should return 401 if API key is invalid', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString(), {
headers: { Authorization: 'Bearer invalid_key' },
});
expect(res.status()).toBe(401);
});

test('should return 200 with auth object if API key is valid', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString(), {
headers: {
Authorization: `Bearer ${fakeAPIKey.secret}`,
},
});
const apiKeyData = await res.json();
expect(res.status()).toBe(200);
expect(apiKeyData.userId).toBe(fakeBapiUser.id);
expect(apiKeyData.tokenType).toBe(TokenType.ApiKey);
});

test('should handle multiple token types', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
const url = new URL('/api/me', app.serverUrl);

// Sign in to get a session token
await u.po.signIn.goTo();
await u.po.signIn.waitForMounted();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
await u.po.expect.toBeSignedIn();

// GET endpoint (only accepts api_key)
const getRes = await u.page.request.get(url.toString());
expect(getRes.status()).toBe(401);

// POST endpoint (accepts both api_key and session_token)
// Test with session token
const postWithSessionRes = await u.page.request.post(url.toString());
const sessionData = await postWithSessionRes.json();
expect(postWithSessionRes.status()).toBe(200);
expect(sessionData.userId).toBe(fakeBapiUser.id);
expect(sessionData.tokenType).toBe(TokenType.SessionToken);

// Test with API key
const postWithApiKeyRes = await u.page.request.post(url.toString(), {
headers: {
Authorization: `Bearer ${fakeAPIKey.secret}`,
},
});
const apiKeyData = await postWithApiKeyRes.json();
expect(postWithApiKeyRes.status()).toBe(200);
expect(apiKeyData.userId).toBe(fakeBapiUser.id);
expect(apiKeyData.tokenType).toBe(TokenType.ApiKey);
});
});
60 changes: 60 additions & 0 deletions packages/backend/src/api/endpoints/APIKeysApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,67 @@ import { AbstractAPI } from './AbstractApi';

const basePath = '/api_keys';

type CreateAPIKeyParams = {
type?: 'api_key';
/**
* API key name
*/
name: string;
/**
* user or organization ID the API key is associated with
*/
subject: string;
/**
* API key description
*/
description?: string | null;
claims?: Record<string, any> | null;
scopes?: string[];
createdBy?: string | null;
secondsUntilExpiration?: number | null;
};

type RevokeAPIKeyParams = {
/**
* API key ID
*/
apiKeyId: string;
/**
* Reason for revocation
*/
revocationReason?: string | null;
};

export class APIKeysAPI extends AbstractAPI {
async create(params: CreateAPIKeyParams) {
return this.request<APIKey>({
method: 'POST',
path: basePath,
bodyParams: params,
});
}

async revoke(params: RevokeAPIKeyParams) {
const { apiKeyId, ...bodyParams } = params;

this.requireId(apiKeyId);

return this.request<APIKey>({
method: 'POST',
path: joinPaths(basePath, apiKeyId, 'revoke'),
bodyParams,
});
}

async getSecret(apiKeyId: string) {
this.requireId(apiKeyId);

return this.request<{ secret: string }>({
method: 'GET',
path: joinPaths(basePath, apiKeyId, 'secret'),
});
}

async verifySecret(secret: string) {
return this.request<APIKey>({
method: 'POST',
Expand Down
Loading
, '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
5 changes: 5 additions & 0 deletions .changeset/eighty-frogs-return.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/nextjs": minor
---

Fix `auth.protect()` unauthorized error propagation within middleware
5 changes: 5 additions & 0 deletions .changeset/weak-adults-clean.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/backend": minor
---

Introduce API keys Backend SDK methods
4 changes: 4 additions & 0 deletions integration/.keys.json.sample
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,5 +54,9 @@
"with-whatsapp-phone-code": {
"pk": "",
"sk": ""
},
"with-api-keys": {
"pk": "",
"sk": ""
}
}
7 changes: 7 additions & 0 deletions integration/presets/envs.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -163,6 +163,12 @@ const withWhatsappPhoneCode = base
.setEnvVariable('private', 'CLERK_SECRET_KEY', instanceKeys.get('with-whatsapp-phone-code').sk)
.setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-whatsapp-phone-code').pk);

const withAPIKeys = base
.clone()
.setId('withAPIKeys')
.setEnvVariable('private', 'CLERK_SECRET_KEY', instanceKeys.get('with-api-keys').sk)
.setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-api-keys').pk);

export const envs = {
base,
withKeyless,
Expand All@@ -187,4 +193,5 @@ export const envs = {
withBillingStaging,
withBilling,
withWhatsappPhoneCode,
withAPIKeys,
} as const;
1 change: 1 addition & 0 deletions integration/presets/longRunningApps.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ export const createLongRunningApps = () => {
config: next.appRouter,
env: envs.withSessionTasks,
},
{ id: 'next.appRouter.withAPIKeys', config: next.appRouter, env: envs.withAPIKeys },
{ id: 'withBillingStaging.next.appRouter', config: next.appRouter, env: envs.withBillingStaging },
{ id: 'withBilling.next.appRouter', config: next.appRouter, env: envs.withBilling },
{ id: 'withBillingStaging.vue.vite', config: vue.vite, env: envs.withBillingStaging },
Expand Down
4 changes: 2 additions & 2 deletions integration/testUtils/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,10 @@ import type { Application } from '../models/application';
import { createEmailService } from './emailService';
import { createInvitationService } from './invitationsService';
import { createOrganizationsService } from './organizationsService';
import type { FakeOrganization, FakeUser } from './usersService';
import type { FakeAPIKey, FakeOrganization, FakeUser } from './usersService';
import { createUserService } from './usersService';

export type { FakeUser, FakeOrganization };
export type { FakeUser, FakeOrganization, FakeAPIKey };
const createClerkClient = (app: Application) => {
return backendCreateClerkClient({
apiUrl: app.env.privateVariables.get('CLERK_API_URL'),
Expand Down
26 changes: 25 additions & 1 deletion integration/testUtils/usersService.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { ClerkClient, Organization, User } from '@clerk/backend';
import type { APIKey, ClerkClient, Organization, User } from '@clerk/backend';
import { faker } from '@faker-js/faker';

import { hash } from '../models/helpers';
Expand DownExpand Up@@ -57,6 +57,12 @@ export type FakeOrganization = {
delete: () => Promise<Organization>;
};

export type FakeAPIKey = {
apiKey: APIKey;
secret: string;
revoke: () => Promise<APIKey>;
};

export type UserService = {
createFakeUser: (options?: FakeUserOptions) => FakeUser;
createBapiUser: (fakeUser: FakeUser) => Promise<User>;
Expand All@@ -67,6 +73,7 @@ export type UserService = {
deleteIfExists: (opts: { id?: string; email?: string; phoneNumber?: string }) => Promise<void>;
createFakeOrganization: (userId: string) => Promise<FakeOrganization>;
getUser: (opts: { id?: string; email?: string }) => Promise<User | undefined>;
createFakeAPIKey: (userId: string) => Promise<FakeAPIKey>;
};

/**
Expand DownExpand Up@@ -175,6 +182,23 @@ export const createUserService = (clerkClient: ClerkClient) => {
delete: () => clerkClient.organizations.deleteOrganization(organization.id),
} satisfies FakeOrganization;
},
createFakeAPIKey: async (userId: string) => {
const TWENTY_MINUTES = 20 * 60;

const apiKey = await clerkClient.apiKeys.create({
subject: userId,
name: `Integration Test - ${userId}`,
secondsUntilExpiration: TWENTY_MINUTES,
});

const { secret } = await clerkClient.apiKeys.getSecret(apiKey.id);

return {
apiKey,
secret,
revoke: () => clerkClient.apiKeys.revoke({ apiKeyId: apiKey.id, revocationReason: 'For testing purposes' }),
} satisfies FakeAPIKey;
},
};

return self;
Expand Down
214 changes: 214 additions & 0 deletions integration/tests/machine-auth/api-keys.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,214 @@
import type { User } from '@clerk/backend';
import { TokenType } from '@clerk/backend/internal';
import { expect, test } from '@playwright/test';

import type { Application } from '../../models/application';
import { appConfigs } from '../../presets';
import type { FakeAPIKey, FakeUser } from '../../testUtils';
import { createTestUtils } from '../../testUtils';

test.describe('Next.js API key auth within clerkMiddleware() @nextjs', () => {
test.describe.configure({ mode: 'parallel' });
let app: Application;
let fakeUser: FakeUser;
let fakeBapiUser: User;
let fakeAPIKey: FakeAPIKey;

test.beforeAll(async () => {
app = await appConfigs.next.appRouter
.clone()
.addFile(
`src/middleware.ts`,
() => `
import { clerkMiddleware, createRouteMatcher } from '@clerk/nextjs/server';

const isProtectedRoute = createRouteMatcher(['/api(.*)']);

export default clerkMiddleware(async (auth, req) => {
if (isProtectedRoute(req)) {
await auth.protect({ token: 'api_key' });
}
});

export const config = {
matcher: [
'/((?!.*\\..*|_next).*)', // Don't run middleware on static files
'/', // Run middleware on index page
'/(api|trpc)(.*)',
], // Run middleware on API routes
};
`,
)
.addFile(
'src/app/api/me/route.ts',
() => `
import { auth } from '@clerk/nextjs/server';

export async function GET() {
const { userId, tokenType } = await auth({ acceptsToken: 'api_key' });

return Response.json({ userId, tokenType });
}
`,
)
.commit();

await app.setup();
await app.withEnv(appConfigs.envs.withAPIKeys);
await app.dev();

const u = createTestUtils({ app });
fakeUser = u.services.users.createFakeUser();
fakeBapiUser = await u.services.users.createBapiUser(fakeUser);
fakeAPIKey = await u.services.users.createFakeAPIKey(fakeBapiUser.id);
});

test.afterAll(async () => {
await fakeAPIKey.revoke();
await fakeUser.deleteIfExists();
await app.teardown();
});

test('should return 401 if no API key is provided', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString());
expect(res.status()).toBe(401);
});

test('should return 401 if API key is invalid', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString(), {
headers: { Authorization: 'Bearer invalid_key' },
});
expect(res.status()).toBe(401);
});

test('should return 200 with auth object if API key is valid', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString(), {
headers: {
Authorization: `Bearer ${fakeAPIKey.secret}`,
},
});
const apiKeyData = await res.json();
expect(res.status()).toBe(200);
expect(apiKeyData.userId).toBe(fakeBapiUser.id);
expect(apiKeyData.tokenType).toBe(TokenType.ApiKey);
});
});

test.describe('Next.js API key auth within routes @nextjs', () => {
test.describe.configure({ mode: 'parallel' });
let app: Application;
let fakeUser: FakeUser;
let fakeBapiUser: User;
let fakeAPIKey: FakeAPIKey;

test.beforeAll(async () => {
app = await appConfigs.next.appRouter
.clone()
.addFile(
'src/app/api/me/route.ts',
() => `
import { auth } from '@clerk/nextjs/server';

export async function GET() {
const { userId, tokenType } = await auth({ acceptsToken: 'api_key' });

if (!userId) {
return Response.json({ error: 'Unauthorized' }, { status: 401 });
}

return Response.json({ userId, tokenType });
}

export async function POST() {
const authObject = await auth({ acceptsToken: ['api_key', 'session_token'] });

if (!authObject.isAuthenticated) {
return Response.json({ error: 'Unauthorized' }, { status: 401 });
}

return Response.json({ userId: authObject.userId, tokenType: authObject.tokenType });
}
`,
)
.commit();

await app.setup();
await app.withEnv(appConfigs.envs.withAPIKeys);
await app.dev();

const u = createTestUtils({ app });
fakeUser = u.services.users.createFakeUser();
fakeBapiUser = await u.services.users.createBapiUser(fakeUser);
fakeAPIKey = await u.services.users.createFakeAPIKey(fakeBapiUser.id);
});

test.afterAll(async () => {
await fakeAPIKey.revoke();
await fakeUser.deleteIfExists();
await app.teardown();
});

test('should return 401 if no API key is provided', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString());
expect(res.status()).toBe(401);
});

test('should return 401 if API key is invalid', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString(), {
headers: { Authorization: 'Bearer invalid_key' },
});
expect(res.status()).toBe(401);
});

test('should return 200 with auth object if API key is valid', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString(), {
headers: {
Authorization: `Bearer ${fakeAPIKey.secret}`,
},
});
const apiKeyData = await res.json();
expect(res.status()).toBe(200);
expect(apiKeyData.userId).toBe(fakeBapiUser.id);
expect(apiKeyData.tokenType).toBe(TokenType.ApiKey);
});

test('should handle multiple token types', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
const url = new URL('/api/me', app.serverUrl);

// Sign in to get a session token
await u.po.signIn.goTo();
await u.po.signIn.waitForMounted();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
await u.po.expect.toBeSignedIn();

// GET endpoint (only accepts api_key)
const getRes = await u.page.request.get(url.toString());
expect(getRes.status()).toBe(401);

// POST endpoint (accepts both api_key and session_token)
// Test with session token
const postWithSessionRes = await u.page.request.post(url.toString());
const sessionData = await postWithSessionRes.json();
expect(postWithSessionRes.status()).toBe(200);
expect(sessionData.userId).toBe(fakeBapiUser.id);
expect(sessionData.tokenType).toBe(TokenType.SessionToken);

// Test with API key
const postWithApiKeyRes = await u.page.request.post(url.toString(), {
headers: {
Authorization: `Bearer ${fakeAPIKey.secret}`,
},
});
const apiKeyData = await postWithApiKeyRes.json();
expect(postWithApiKeyRes.status()).toBe(200);
expect(apiKeyData.userId).toBe(fakeBapiUser.id);
expect(apiKeyData.tokenType).toBe(TokenType.ApiKey);
});
});
60 changes: 60 additions & 0 deletions packages/backend/src/api/endpoints/APIKeysApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,67 @@ import { AbstractAPI } from './AbstractApi';

const basePath = '/api_keys';

type CreateAPIKeyParams = {
type?: 'api_key';
/**
* API key name
*/
name: string;
/**
* user or organization ID the API key is associated with
*/
subject: string;
/**
* API key description
*/
description?: string | null;
claims?: Record<string, any> | null;
scopes?: string[];
createdBy?: string | null;
secondsUntilExpiration?: number | null;
};

type RevokeAPIKeyParams = {
/**
* API key ID
*/
apiKeyId: string;
/**
* Reason for revocation
*/
revocationReason?: string | null;
};

export class APIKeysAPI extends AbstractAPI {
async create(params: CreateAPIKeyParams) {
return this.request<APIKey>({
method: 'POST',
path: basePath,
bodyParams: params,
});
}

async revoke(params: RevokeAPIKeyParams) {
const { apiKeyId, ...bodyParams } = params;

this.requireId(apiKeyId);

return this.request<APIKey>({
method: 'POST',
path: joinPaths(basePath, apiKeyId, 'revoke'),
bodyParams,
});
}

async getSecret(apiKeyId: string) {
this.requireId(apiKeyId);

return this.request<{ secret: string }>({
method: 'GET',
path: joinPaths(basePath, apiKeyId, 'secret'),
});
}

async verifySecret(secret: string) {
return this.request<APIKey>({
method: 'POST',
Expand Down
Loading
, '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
5 changes: 5 additions & 0 deletions .changeset/eighty-frogs-return.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/nextjs": minor
---

Fix `auth.protect()` unauthorized error propagation within middleware
5 changes: 5 additions & 0 deletions .changeset/weak-adults-clean.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/backend": minor
---

Introduce API keys Backend SDK methods
4 changes: 4 additions & 0 deletions integration/.keys.json.sample
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,5 +54,9 @@
"with-whatsapp-phone-code": {
"pk": "",
"sk": ""
},
"with-api-keys": {
"pk": "",
"sk": ""
}
}
7 changes: 7 additions & 0 deletions integration/presets/envs.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -163,6 +163,12 @@ const withWhatsappPhoneCode = base
.setEnvVariable('private', 'CLERK_SECRET_KEY', instanceKeys.get('with-whatsapp-phone-code').sk)
.setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-whatsapp-phone-code').pk);

const withAPIKeys = base
.clone()
.setId('withAPIKeys')
.setEnvVariable('private', 'CLERK_SECRET_KEY', instanceKeys.get('with-api-keys').sk)
.setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-api-keys').pk);

export const envs = {
base,
withKeyless,
Expand All@@ -187,4 +193,5 @@ export const envs = {
withBillingStaging,
withBilling,
withWhatsappPhoneCode,
withAPIKeys,
} as const;
1 change: 1 addition & 0 deletions integration/presets/longRunningApps.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ export const createLongRunningApps = () => {
config: next.appRouter,
env: envs.withSessionTasks,
},
{ id: 'next.appRouter.withAPIKeys', config: next.appRouter, env: envs.withAPIKeys },
{ id: 'withBillingStaging.next.appRouter', config: next.appRouter, env: envs.withBillingStaging },
{ id: 'withBilling.next.appRouter', config: next.appRouter, env: envs.withBilling },
{ id: 'withBillingStaging.vue.vite', config: vue.vite, env: envs.withBillingStaging },
Expand Down
4 changes: 2 additions & 2 deletions integration/testUtils/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,10 @@ import type { Application } from '../models/application';
import { createEmailService } from './emailService';
import { createInvitationService } from './invitationsService';
import { createOrganizationsService } from './organizationsService';
import type { FakeOrganization, FakeUser } from './usersService';
import type { FakeAPIKey, FakeOrganization, FakeUser } from './usersService';
import { createUserService } from './usersService';

export type { FakeUser, FakeOrganization };
export type { FakeUser, FakeOrganization, FakeAPIKey };
const createClerkClient = (app: Application) => {
return backendCreateClerkClient({
apiUrl: app.env.privateVariables.get('CLERK_API_URL'),
Expand Down
26 changes: 25 additions & 1 deletion integration/testUtils/usersService.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { ClerkClient, Organization, User } from '@clerk/backend';
import type { APIKey, ClerkClient, Organization, User } from '@clerk/backend';
import { faker } from '@faker-js/faker';

import { hash } from '../models/helpers';
Expand DownExpand Up@@ -57,6 +57,12 @@ export type FakeOrganization = {
delete: () => Promise<Organization>;
};

export type FakeAPIKey = {
apiKey: APIKey;
secret: string;
revoke: () => Promise<APIKey>;
};

export type UserService = {
createFakeUser: (options?: FakeUserOptions) => FakeUser;
createBapiUser: (fakeUser: FakeUser) => Promise<User>;
Expand All@@ -67,6 +73,7 @@ export type UserService = {
deleteIfExists: (opts: { id?: string; email?: string; phoneNumber?: string }) => Promise<void>;
createFakeOrganization: (userId: string) => Promise<FakeOrganization>;
getUser: (opts: { id?: string; email?: string }) => Promise<User | undefined>;
createFakeAPIKey: (userId: string) => Promise<FakeAPIKey>;
};

/**
Expand DownExpand Up@@ -175,6 +182,23 @@ export const createUserService = (clerkClient: ClerkClient) => {
delete: () => clerkClient.organizations.deleteOrganization(organization.id),
} satisfies FakeOrganization;
},
createFakeAPIKey: async (userId: string) => {
const TWENTY_MINUTES = 20 * 60;

const apiKey = await clerkClient.apiKeys.create({
subject: userId,
name: `Integration Test - ${userId}`,
secondsUntilExpiration: TWENTY_MINUTES,
});

const { secret } = await clerkClient.apiKeys.getSecret(apiKey.id);

return {
apiKey,
secret,
revoke: () => clerkClient.apiKeys.revoke({ apiKeyId: apiKey.id, revocationReason: 'For testing purposes' }),
} satisfies FakeAPIKey;
},
};

return self;
Expand Down
214 changes: 214 additions & 0 deletions integration/tests/machine-auth/api-keys.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,214 @@
import type { User } from '@clerk/backend';
import { TokenType } from '@clerk/backend/internal';
import { expect, test } from '@playwright/test';

import type { Application } from '../../models/application';
import { appConfigs } from '../../presets';
import type { FakeAPIKey, FakeUser } from '../../testUtils';
import { createTestUtils } from '../../testUtils';

test.describe('Next.js API key auth within clerkMiddleware() @nextjs', () => {
test.describe.configure({ mode: 'parallel' });
let app: Application;
let fakeUser: FakeUser;
let fakeBapiUser: User;
let fakeAPIKey: FakeAPIKey;

test.beforeAll(async () => {
app = await appConfigs.next.appRouter
.clone()
.addFile(
`src/middleware.ts`,
() => `
import { clerkMiddleware, createRouteMatcher } from '@clerk/nextjs/server';

const isProtectedRoute = createRouteMatcher(['/api(.*)']);

export default clerkMiddleware(async (auth, req) => {
if (isProtectedRoute(req)) {
await auth.protect({ token: 'api_key' });
}
});

export const config = {
matcher: [
'/((?!.*\\..*|_next).*)', // Don't run middleware on static files
'/', // Run middleware on index page
'/(api|trpc)(.*)',
], // Run middleware on API routes
};
`,
)
.addFile(
'src/app/api/me/route.ts',
() => `
import { auth } from '@clerk/nextjs/server';

export async function GET() {
const { userId, tokenType } = await auth({ acceptsToken: 'api_key' });

return Response.json({ userId, tokenType });
}
`,
)
.commit();

await app.setup();
await app.withEnv(appConfigs.envs.withAPIKeys);
await app.dev();

const u = createTestUtils({ app });
fakeUser = u.services.users.createFakeUser();
fakeBapiUser = await u.services.users.createBapiUser(fakeUser);
fakeAPIKey = await u.services.users.createFakeAPIKey(fakeBapiUser.id);
});

test.afterAll(async () => {
await fakeAPIKey.revoke();
await fakeUser.deleteIfExists();
await app.teardown();
});

test('should return 401 if no API key is provided', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString());
expect(res.status()).toBe(401);
});

test('should return 401 if API key is invalid', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString(), {
headers: { Authorization: 'Bearer invalid_key' },
});
expect(res.status()).toBe(401);
});

test('should return 200 with auth object if API key is valid', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString(), {
headers: {
Authorization: `Bearer ${fakeAPIKey.secret}`,
},
});
const apiKeyData = await res.json();
expect(res.status()).toBe(200);
expect(apiKeyData.userId).toBe(fakeBapiUser.id);
expect(apiKeyData.tokenType).toBe(TokenType.ApiKey);
});
});

test.describe('Next.js API key auth within routes @nextjs', () => {
test.describe.configure({ mode: 'parallel' });
let app: Application;
let fakeUser: FakeUser;
let fakeBapiUser: User;
let fakeAPIKey: FakeAPIKey;

test.beforeAll(async () => {
app = await appConfigs.next.appRouter
.clone()
.addFile(
'src/app/api/me/route.ts',
() => `
import { auth } from '@clerk/nextjs/server';

export async function GET() {
const { userId, tokenType } = await auth({ acceptsToken: 'api_key' });

if (!userId) {
return Response.json({ error: 'Unauthorized' }, { status: 401 });
}

return Response.json({ userId, tokenType });
}

export async function POST() {
const authObject = await auth({ acceptsToken: ['api_key', 'session_token'] });

if (!authObject.isAuthenticated) {
return Response.json({ error: 'Unauthorized' }, { status: 401 });
}

return Response.json({ userId: authObject.userId, tokenType: authObject.tokenType });
}
`,
)
.commit();

await app.setup();
await app.withEnv(appConfigs.envs.withAPIKeys);
await app.dev();

const u = createTestUtils({ app });
fakeUser = u.services.users.createFakeUser();
fakeBapiUser = await u.services.users.createBapiUser(fakeUser);
fakeAPIKey = await u.services.users.createFakeAPIKey(fakeBapiUser.id);
});

test.afterAll(async () => {
await fakeAPIKey.revoke();
await fakeUser.deleteIfExists();
await app.teardown();
});

test('should return 401 if no API key is provided', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString());
expect(res.status()).toBe(401);
});

test('should return 401 if API key is invalid', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString(), {
headers: { Authorization: 'Bearer invalid_key' },
});
expect(res.status()).toBe(401);
});

test('should return 200 with auth object if API key is valid', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString(), {
headers: {
Authorization: `Bearer ${fakeAPIKey.secret}`,
},
});
const apiKeyData = await res.json();
expect(res.status()).toBe(200);
expect(apiKeyData.userId).toBe(fakeBapiUser.id);
expect(apiKeyData.tokenType).toBe(TokenType.ApiKey);
});

test('should handle multiple token types', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
const url = new URL('/api/me', app.serverUrl);

// Sign in to get a session token
await u.po.signIn.goTo();
await u.po.signIn.waitForMounted();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
await u.po.expect.toBeSignedIn();

// GET endpoint (only accepts api_key)
const getRes = await u.page.request.get(url.toString());
expect(getRes.status()).toBe(401);

// POST endpoint (accepts both api_key and session_token)
// Test with session token
const postWithSessionRes = await u.page.request.post(url.toString());
const sessionData = await postWithSessionRes.json();
expect(postWithSessionRes.status()).toBe(200);
expect(sessionData.userId).toBe(fakeBapiUser.id);
expect(sessionData.tokenType).toBe(TokenType.SessionToken);

// Test with API key
const postWithApiKeyRes = await u.page.request.post(url.toString(), {
headers: {
Authorization: `Bearer ${fakeAPIKey.secret}`,
},
});
const apiKeyData = await postWithApiKeyRes.json();
expect(postWithApiKeyRes.status()).toBe(200);
expect(apiKeyData.userId).toBe(fakeBapiUser.id);
expect(apiKeyData.tokenType).toBe(TokenType.ApiKey);
});
});
60 changes: 60 additions & 0 deletions packages/backend/src/api/endpoints/APIKeysApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,67 @@ import { AbstractAPI } from './AbstractApi';

const basePath = '/api_keys';

type CreateAPIKeyParams = {
type?: 'api_key';
/**
* API key name
*/
name: string;
/**
* user or organization ID the API key is associated with
*/
subject: string;
/**
* API key description
*/
description?: string | null;
claims?: Record<string, any> | null;
scopes?: string[];
createdBy?: string | null;
secondsUntilExpiration?: number | null;
};

type RevokeAPIKeyParams = {
/**
* API key ID
*/
apiKeyId: string;
/**
* Reason for revocation
*/
revocationReason?: string | null;
};

export class APIKeysAPI extends AbstractAPI {
async create(params: CreateAPIKeyParams) {
return this.request<APIKey>({
method: 'POST',
path: basePath,
bodyParams: params,
});
}

async revoke(params: RevokeAPIKeyParams) {
const { apiKeyId, ...bodyParams } = params;

this.requireId(apiKeyId);

return this.request<APIKey>({
method: 'POST',
path: joinPaths(basePath, apiKeyId, 'revoke'),
bodyParams,
});
}

async getSecret(apiKeyId: string) {
this.requireId(apiKeyId);

return this.request<{ secret: string }>({
method: 'GET',
path: joinPaths(basePath, apiKeyId, 'secret'),
});
}

async verifySecret(secret: string) {
return this.request<APIKey>({
method: 'POST',
Expand Down
Loading
, '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
5 changes: 5 additions & 0 deletions .changeset/eighty-frogs-return.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/nextjs": minor
---

Fix `auth.protect()` unauthorized error propagation within middleware
5 changes: 5 additions & 0 deletions .changeset/weak-adults-clean.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/backend": minor
---

Introduce API keys Backend SDK methods
4 changes: 4 additions & 0 deletions integration/.keys.json.sample
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,5 +54,9 @@
"with-whatsapp-phone-code": {
"pk": "",
"sk": ""
},
"with-api-keys": {
"pk": "",
"sk": ""
}
}
7 changes: 7 additions & 0 deletions integration/presets/envs.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -163,6 +163,12 @@ const withWhatsappPhoneCode = base
.setEnvVariable('private', 'CLERK_SECRET_KEY', instanceKeys.get('with-whatsapp-phone-code').sk)
.setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-whatsapp-phone-code').pk);

const withAPIKeys = base
.clone()
.setId('withAPIKeys')
.setEnvVariable('private', 'CLERK_SECRET_KEY', instanceKeys.get('with-api-keys').sk)
.setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-api-keys').pk);

export const envs = {
base,
withKeyless,
Expand All@@ -187,4 +193,5 @@ export const envs = {
withBillingStaging,
withBilling,
withWhatsappPhoneCode,
withAPIKeys,
} as const;
1 change: 1 addition & 0 deletions integration/presets/longRunningApps.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ export const createLongRunningApps = () => {
config: next.appRouter,
env: envs.withSessionTasks,
},
{ id: 'next.appRouter.withAPIKeys', config: next.appRouter, env: envs.withAPIKeys },
{ id: 'withBillingStaging.next.appRouter', config: next.appRouter, env: envs.withBillingStaging },
{ id: 'withBilling.next.appRouter', config: next.appRouter, env: envs.withBilling },
{ id: 'withBillingStaging.vue.vite', config: vue.vite, env: envs.withBillingStaging },
Expand Down
4 changes: 2 additions & 2 deletions integration/testUtils/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,10 @@ import type { Application } from '../models/application';
import { createEmailService } from './emailService';
import { createInvitationService } from './invitationsService';
import { createOrganizationsService } from './organizationsService';
import type { FakeOrganization, FakeUser } from './usersService';
import type { FakeAPIKey, FakeOrganization, FakeUser } from './usersService';
import { createUserService } from './usersService';

export type { FakeUser, FakeOrganization };
export type { FakeUser, FakeOrganization, FakeAPIKey };
const createClerkClient = (app: Application) => {
return backendCreateClerkClient({
apiUrl: app.env.privateVariables.get('CLERK_API_URL'),
Expand Down
26 changes: 25 additions & 1 deletion integration/testUtils/usersService.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { ClerkClient, Organization, User } from '@clerk/backend';
import type { APIKey, ClerkClient, Organization, User } from '@clerk/backend';
import { faker } from '@faker-js/faker';

import { hash } from '../models/helpers';
Expand DownExpand Up@@ -57,6 +57,12 @@ export type FakeOrganization = {
delete: () => Promise<Organization>;
};

export type FakeAPIKey = {
apiKey: APIKey;
secret: string;
revoke: () => Promise<APIKey>;
};

export type UserService = {
createFakeUser: (options?: FakeUserOptions) => FakeUser;
createBapiUser: (fakeUser: FakeUser) => Promise<User>;
Expand All@@ -67,6 +73,7 @@ export type UserService = {
deleteIfExists: (opts: { id?: string; email?: string; phoneNumber?: string }) => Promise<void>;
createFakeOrganization: (userId: string) => Promise<FakeOrganization>;
getUser: (opts: { id?: string; email?: string }) => Promise<User | undefined>;
createFakeAPIKey: (userId: string) => Promise<FakeAPIKey>;
};

/**
Expand DownExpand Up@@ -175,6 +182,23 @@ export const createUserService = (clerkClient: ClerkClient) => {
delete: () => clerkClient.organizations.deleteOrganization(organization.id),
} satisfies FakeOrganization;
},
createFakeAPIKey: async (userId: string) => {
const TWENTY_MINUTES = 20 * 60;

const apiKey = await clerkClient.apiKeys.create({
subject: userId,
name: `Integration Test - ${userId}`,
secondsUntilExpiration: TWENTY_MINUTES,
});

const { secret } = await clerkClient.apiKeys.getSecret(apiKey.id);

return {
apiKey,
secret,
revoke: () => clerkClient.apiKeys.revoke({ apiKeyId: apiKey.id, revocationReason: 'For testing purposes' }),
} satisfies FakeAPIKey;
},
};

return self;
Expand Down
214 changes: 214 additions & 0 deletions integration/tests/machine-auth/api-keys.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,214 @@
import type { User } from '@clerk/backend';
import { TokenType } from '@clerk/backend/internal';
import { expect, test } from '@playwright/test';

import type { Application } from '../../models/application';
import { appConfigs } from '../../presets';
import type { FakeAPIKey, FakeUser } from '../../testUtils';
import { createTestUtils } from '../../testUtils';

test.describe('Next.js API key auth within clerkMiddleware() @nextjs', () => {
test.describe.configure({ mode: 'parallel' });
let app: Application;
let fakeUser: FakeUser;
let fakeBapiUser: User;
let fakeAPIKey: FakeAPIKey;

test.beforeAll(async () => {
app = await appConfigs.next.appRouter
.clone()
.addFile(
`src/middleware.ts`,
() => `
import { clerkMiddleware, createRouteMatcher } from '@clerk/nextjs/server';

const isProtectedRoute = createRouteMatcher(['/api(.*)']);

export default clerkMiddleware(async (auth, req) => {
if (isProtectedRoute(req)) {
await auth.protect({ token: 'api_key' });
}
});

export const config = {
matcher: [
'/((?!.*\\..*|_next).*)', // Don't run middleware on static files
'/', // Run middleware on index page
'/(api|trpc)(.*)',
], // Run middleware on API routes
};
`,
)
.addFile(
'src/app/api/me/route.ts',
() => `
import { auth } from '@clerk/nextjs/server';

export async function GET() {
const { userId, tokenType } = await auth({ acceptsToken: 'api_key' });

return Response.json({ userId, tokenType });
}
`,
)
.commit();

await app.setup();
await app.withEnv(appConfigs.envs.withAPIKeys);
await app.dev();

const u = createTestUtils({ app });
fakeUser = u.services.users.createFakeUser();
fakeBapiUser = await u.services.users.createBapiUser(fakeUser);
fakeAPIKey = await u.services.users.createFakeAPIKey(fakeBapiUser.id);
});

test.afterAll(async () => {
await fakeAPIKey.revoke();
await fakeUser.deleteIfExists();
await app.teardown();
});

test('should return 401 if no API key is provided', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString());
expect(res.status()).toBe(401);
});

test('should return 401 if API key is invalid', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString(), {
headers: { Authorization: 'Bearer invalid_key' },
});
expect(res.status()).toBe(401);
});

test('should return 200 with auth object if API key is valid', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString(), {
headers: {
Authorization: `Bearer ${fakeAPIKey.secret}`,
},
});
const apiKeyData = await res.json();
expect(res.status()).toBe(200);
expect(apiKeyData.userId).toBe(fakeBapiUser.id);
expect(apiKeyData.tokenType).toBe(TokenType.ApiKey);
});
});

test.describe('Next.js API key auth within routes @nextjs', () => {
test.describe.configure({ mode: 'parallel' });
let app: Application;
let fakeUser: FakeUser;
let fakeBapiUser: User;
let fakeAPIKey: FakeAPIKey;

test.beforeAll(async () => {
app = await appConfigs.next.appRouter
.clone()
.addFile(
'src/app/api/me/route.ts',
() => `
import { auth } from '@clerk/nextjs/server';

export async function GET() {
const { userId, tokenType } = await auth({ acceptsToken: 'api_key' });

if (!userId) {
return Response.json({ error: 'Unauthorized' }, { status: 401 });
}

return Response.json({ userId, tokenType });
}

export async function POST() {
const authObject = await auth({ acceptsToken: ['api_key', 'session_token'] });

if (!authObject.isAuthenticated) {
return Response.json({ error: 'Unauthorized' }, { status: 401 });
}

return Response.json({ userId: authObject.userId, tokenType: authObject.tokenType });
}
`,
)
.commit();

await app.setup();
await app.withEnv(appConfigs.envs.withAPIKeys);
await app.dev();

const u = createTestUtils({ app });
fakeUser = u.services.users.createFakeUser();
fakeBapiUser = await u.services.users.createBapiUser(fakeUser);
fakeAPIKey = await u.services.users.createFakeAPIKey(fakeBapiUser.id);
});

test.afterAll(async () => {
await fakeAPIKey.revoke();
await fakeUser.deleteIfExists();
await app.teardown();
});

test('should return 401 if no API key is provided', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString());
expect(res.status()).toBe(401);
});

test('should return 401 if API key is invalid', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString(), {
headers: { Authorization: 'Bearer invalid_key' },
});
expect(res.status()).toBe(401);
});

test('should return 200 with auth object if API key is valid', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString(), {
headers: {
Authorization: `Bearer ${fakeAPIKey.secret}`,
},
});
const apiKeyData = await res.json();
expect(res.status()).toBe(200);
expect(apiKeyData.userId).toBe(fakeBapiUser.id);
expect(apiKeyData.tokenType).toBe(TokenType.ApiKey);
});

test('should handle multiple token types', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
const url = new URL('/api/me', app.serverUrl);

// Sign in to get a session token
await u.po.signIn.goTo();
await u.po.signIn.waitForMounted();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
await u.po.expect.toBeSignedIn();

// GET endpoint (only accepts api_key)
const getRes = await u.page.request.get(url.toString());
expect(getRes.status()).toBe(401);

// POST endpoint (accepts both api_key and session_token)
// Test with session token
const postWithSessionRes = await u.page.request.post(url.toString());
const sessionData = await postWithSessionRes.json();
expect(postWithSessionRes.status()).toBe(200);
expect(sessionData.userId).toBe(fakeBapiUser.id);
expect(sessionData.tokenType).toBe(TokenType.SessionToken);

// Test with API key
const postWithApiKeyRes = await u.page.request.post(url.toString(), {
headers: {
Authorization: `Bearer ${fakeAPIKey.secret}`,
},
});
const apiKeyData = await postWithApiKeyRes.json();
expect(postWithApiKeyRes.status()).toBe(200);
expect(apiKeyData.userId).toBe(fakeBapiUser.id);
expect(apiKeyData.tokenType).toBe(TokenType.ApiKey);
});
});
60 changes: 60 additions & 0 deletions packages/backend/src/api/endpoints/APIKeysApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,67 @@ import { AbstractAPI } from './AbstractApi';

const basePath = '/api_keys';

type CreateAPIKeyParams = {
type?: 'api_key';
/**
* API key name
*/
name: string;
/**
* user or organization ID the API key is associated with
*/
subject: string;
/**
* API key description
*/
description?: string | null;
claims?: Record<string, any> | null;
scopes?: string[];
createdBy?: string | null;
secondsUntilExpiration?: number | null;
};

type RevokeAPIKeyParams = {
/**
* API key ID
*/
apiKeyId: string;
/**
* Reason for revocation
*/
revocationReason?: string | null;
};

export class APIKeysAPI extends AbstractAPI {
async create(params: CreateAPIKeyParams) {
return this.request<APIKey>({
method: 'POST',
path: basePath,
bodyParams: params,
});
}

async revoke(params: RevokeAPIKeyParams) {
const { apiKeyId, ...bodyParams } = params;

this.requireId(apiKeyId);

return this.request<APIKey>({
method: 'POST',
path: joinPaths(basePath, apiKeyId, 'revoke'),
bodyParams,
});
}

async getSecret(apiKeyId: string) {
this.requireId(apiKeyId);

return this.request<{ secret: string }>({
method: 'GET',
path: joinPaths(basePath, apiKeyId, 'secret'),
});
}

async verifySecret(secret: string) {
return this.request<APIKey>({
method: 'POST',
Expand Down
Loading
, '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
5 changes: 5 additions & 0 deletions .changeset/eighty-frogs-return.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/nextjs": minor
---

Fix `auth.protect()` unauthorized error propagation within middleware
5 changes: 5 additions & 0 deletions .changeset/weak-adults-clean.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/backend": minor
---

Introduce API keys Backend SDK methods
4 changes: 4 additions & 0 deletions integration/.keys.json.sample
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,5 +54,9 @@
"with-whatsapp-phone-code": {
"pk": "",
"sk": ""
},
"with-api-keys": {
"pk": "",
"sk": ""
}
}
7 changes: 7 additions & 0 deletions integration/presets/envs.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -163,6 +163,12 @@ const withWhatsappPhoneCode = base
.setEnvVariable('private', 'CLERK_SECRET_KEY', instanceKeys.get('with-whatsapp-phone-code').sk)
.setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-whatsapp-phone-code').pk);

const withAPIKeys = base
.clone()
.setId('withAPIKeys')
.setEnvVariable('private', 'CLERK_SECRET_KEY', instanceKeys.get('with-api-keys').sk)
.setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-api-keys').pk);

export const envs = {
base,
withKeyless,
Expand All@@ -187,4 +193,5 @@ export const envs = {
withBillingStaging,
withBilling,
withWhatsappPhoneCode,
withAPIKeys,
} as const;
1 change: 1 addition & 0 deletions integration/presets/longRunningApps.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ export const createLongRunningApps = () => {
config: next.appRouter,
env: envs.withSessionTasks,
},
{ id: 'next.appRouter.withAPIKeys', config: next.appRouter, env: envs.withAPIKeys },
{ id: 'withBillingStaging.next.appRouter', config: next.appRouter, env: envs.withBillingStaging },
{ id: 'withBilling.next.appRouter', config: next.appRouter, env: envs.withBilling },
{ id: 'withBillingStaging.vue.vite', config: vue.vite, env: envs.withBillingStaging },
Expand Down
4 changes: 2 additions & 2 deletions integration/testUtils/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,10 @@ import type { Application } from '../models/application';
import { createEmailService } from './emailService';
import { createInvitationService } from './invitationsService';
import { createOrganizationsService } from './organizationsService';
import type { FakeOrganization, FakeUser } from './usersService';
import type { FakeAPIKey, FakeOrganization, FakeUser } from './usersService';
import { createUserService } from './usersService';

export type { FakeUser, FakeOrganization };
export type { FakeUser, FakeOrganization, FakeAPIKey };
const createClerkClient = (app: Application) => {
return backendCreateClerkClient({
apiUrl: app.env.privateVariables.get('CLERK_API_URL'),
Expand Down
26 changes: 25 additions & 1 deletion integration/testUtils/usersService.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { ClerkClient, Organization, User } from '@clerk/backend';
import type { APIKey, ClerkClient, Organization, User } from '@clerk/backend';
import { faker } from '@faker-js/faker';

import { hash } from '../models/helpers';
Expand DownExpand Up@@ -57,6 +57,12 @@ export type FakeOrganization = {
delete: () => Promise<Organization>;
};

export type FakeAPIKey = {
apiKey: APIKey;
secret: string;
revoke: () => Promise<APIKey>;
};

export type UserService = {
createFakeUser: (options?: FakeUserOptions) => FakeUser;
createBapiUser: (fakeUser: FakeUser) => Promise<User>;
Expand All@@ -67,6 +73,7 @@ export type UserService = {
deleteIfExists: (opts: { id?: string; email?: string; phoneNumber?: string }) => Promise<void>;
createFakeOrganization: (userId: string) => Promise<FakeOrganization>;
getUser: (opts: { id?: string; email?: string }) => Promise<User | undefined>;
createFakeAPIKey: (userId: string) => Promise<FakeAPIKey>;
};

/**
Expand DownExpand Up@@ -175,6 +182,23 @@ export const createUserService = (clerkClient: ClerkClient) => {
delete: () => clerkClient.organizations.deleteOrganization(organization.id),
} satisfies FakeOrganization;
},
createFakeAPIKey: async (userId: string) => {
const TWENTY_MINUTES = 20 * 60;

const apiKey = await clerkClient.apiKeys.create({
subject: userId,
name: `Integration Test - ${userId}`,
secondsUntilExpiration: TWENTY_MINUTES,
});

const { secret } = await clerkClient.apiKeys.getSecret(apiKey.id);

return {
apiKey,
secret,
revoke: () => clerkClient.apiKeys.revoke({ apiKeyId: apiKey.id, revocationReason: 'For testing purposes' }),
} satisfies FakeAPIKey;
},
};

return self;
Expand Down
214 changes: 214 additions & 0 deletions integration/tests/machine-auth/api-keys.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,214 @@
import type { User } from '@clerk/backend';
import { TokenType } from '@clerk/backend/internal';
import { expect, test } from '@playwright/test';

import type { Application } from '../../models/application';
import { appConfigs } from '../../presets';
import type { FakeAPIKey, FakeUser } from '../../testUtils';
import { createTestUtils } from '../../testUtils';

test.describe('Next.js API key auth within clerkMiddleware() @nextjs', () => {
test.describe.configure({ mode: 'parallel' });
let app: Application;
let fakeUser: FakeUser;
let fakeBapiUser: User;
let fakeAPIKey: FakeAPIKey;

test.beforeAll(async () => {
app = await appConfigs.next.appRouter
.clone()
.addFile(
`src/middleware.ts`,
() => `
import { clerkMiddleware, createRouteMatcher } from '@clerk/nextjs/server';

const isProtectedRoute = createRouteMatcher(['/api(.*)']);

export default clerkMiddleware(async (auth, req) => {
if (isProtectedRoute(req)) {
await auth.protect({ token: 'api_key' });
}
});

export const config = {
matcher: [
'/((?!.*\\..*|_next).*)', // Don't run middleware on static files
'/', // Run middleware on index page
'/(api|trpc)(.*)',
], // Run middleware on API routes
};
`,
)
.addFile(
'src/app/api/me/route.ts',
() => `
import { auth } from '@clerk/nextjs/server';

export async function GET() {
const { userId, tokenType } = await auth({ acceptsToken: 'api_key' });

return Response.json({ userId, tokenType });
}
`,
)
.commit();

await app.setup();
await app.withEnv(appConfigs.envs.withAPIKeys);
await app.dev();

const u = createTestUtils({ app });
fakeUser = u.services.users.createFakeUser();
fakeBapiUser = await u.services.users.createBapiUser(fakeUser);
fakeAPIKey = await u.services.users.createFakeAPIKey(fakeBapiUser.id);
});

test.afterAll(async () => {
await fakeAPIKey.revoke();
await fakeUser.deleteIfExists();
await app.teardown();
});

test('should return 401 if no API key is provided', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString());
expect(res.status()).toBe(401);
});

test('should return 401 if API key is invalid', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString(), {
headers: { Authorization: 'Bearer invalid_key' },
});
expect(res.status()).toBe(401);
});

test('should return 200 with auth object if API key is valid', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString(), {
headers: {
Authorization: `Bearer ${fakeAPIKey.secret}`,
},
});
const apiKeyData = await res.json();
expect(res.status()).toBe(200);
expect(apiKeyData.userId).toBe(fakeBapiUser.id);
expect(apiKeyData.tokenType).toBe(TokenType.ApiKey);
});
});

test.describe('Next.js API key auth within routes @nextjs', () => {
test.describe.configure({ mode: 'parallel' });
let app: Application;
let fakeUser: FakeUser;
let fakeBapiUser: User;
let fakeAPIKey: FakeAPIKey;

test.beforeAll(async () => {
app = await appConfigs.next.appRouter
.clone()
.addFile(
'src/app/api/me/route.ts',
() => `
import { auth } from '@clerk/nextjs/server';

export async function GET() {
const { userId, tokenType } = await auth({ acceptsToken: 'api_key' });

if (!userId) {
return Response.json({ error: 'Unauthorized' }, { status: 401 });
}

return Response.json({ userId, tokenType });
}

export async function POST() {
const authObject = await auth({ acceptsToken: ['api_key', 'session_token'] });

if (!authObject.isAuthenticated) {
return Response.json({ error: 'Unauthorized' }, { status: 401 });
}

return Response.json({ userId: authObject.userId, tokenType: authObject.tokenType });
}
`,
)
.commit();

await app.setup();
await app.withEnv(appConfigs.envs.withAPIKeys);
await app.dev();

const u = createTestUtils({ app });
fakeUser = u.services.users.createFakeUser();
fakeBapiUser = await u.services.users.createBapiUser(fakeUser);
fakeAPIKey = await u.services.users.createFakeAPIKey(fakeBapiUser.id);
});

test.afterAll(async () => {
await fakeAPIKey.revoke();
await fakeUser.deleteIfExists();
await app.teardown();
});

test('should return 401 if no API key is provided', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString());
expect(res.status()).toBe(401);
});

test('should return 401 if API key is invalid', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString(), {
headers: { Authorization: 'Bearer invalid_key' },
});
expect(res.status()).toBe(401);
});

test('should return 200 with auth object if API key is valid', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString(), {
headers: {
Authorization: `Bearer ${fakeAPIKey.secret}`,
},
});
const apiKeyData = await res.json();
expect(res.status()).toBe(200);
expect(apiKeyData.userId).toBe(fakeBapiUser.id);
expect(apiKeyData.tokenType).toBe(TokenType.ApiKey);
});

test('should handle multiple token types', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
const url = new URL('/api/me', app.serverUrl);

// Sign in to get a session token
await u.po.signIn.goTo();
await u.po.signIn.waitForMounted();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
await u.po.expect.toBeSignedIn();

// GET endpoint (only accepts api_key)
const getRes = await u.page.request.get(url.toString());
expect(getRes.status()).toBe(401);

// POST endpoint (accepts both api_key and session_token)
// Test with session token
const postWithSessionRes = await u.page.request.post(url.toString());
const sessionData = await postWithSessionRes.json();
expect(postWithSessionRes.status()).toBe(200);
expect(sessionData.userId).toBe(fakeBapiUser.id);
expect(sessionData.tokenType).toBe(TokenType.SessionToken);

// Test with API key
const postWithApiKeyRes = await u.page.request.post(url.toString(), {
headers: {
Authorization: `Bearer ${fakeAPIKey.secret}`,
},
});
const apiKeyData = await postWithApiKeyRes.json();
expect(postWithApiKeyRes.status()).toBe(200);
expect(apiKeyData.userId).toBe(fakeBapiUser.id);
expect(apiKeyData.tokenType).toBe(TokenType.ApiKey);
});
});
60 changes: 60 additions & 0 deletions packages/backend/src/api/endpoints/APIKeysApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,67 @@ import { AbstractAPI } from './AbstractApi';

const basePath = '/api_keys';

type CreateAPIKeyParams = {
type?: 'api_key';
/**
* API key name
*/
name: string;
/**
* user or organization ID the API key is associated with
*/
subject: string;
/**
* API key description
*/
description?: string | null;
claims?: Record<string, any> | null;
scopes?: string[];
createdBy?: string | null;
secondsUntilExpiration?: number | null;
};

type RevokeAPIKeyParams = {
/**
* API key ID
*/
apiKeyId: string;
/**
* Reason for revocation
*/
revocationReason?: string | null;
};

export class APIKeysAPI extends AbstractAPI {
async create(params: CreateAPIKeyParams) {
return this.request<APIKey>({
method: 'POST',
path: basePath,
bodyParams: params,
});
}

async revoke(params: RevokeAPIKeyParams) {
const { apiKeyId, ...bodyParams } = params;

this.requireId(apiKeyId);

return this.request<APIKey>({
method: 'POST',
path: joinPaths(basePath, apiKeyId, 'revoke'),
bodyParams,
});
}

async getSecret(apiKeyId: string) {
this.requireId(apiKeyId);

return this.request<{ secret: string }>({
method: 'GET',
path: joinPaths(basePath, apiKeyId, 'secret'),
});
}

async verifySecret(secret: string) {
return this.request<APIKey>({
method: 'POST',
Expand Down
Loading
, '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
5 changes: 5 additions & 0 deletions .changeset/eighty-frogs-return.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/nextjs": minor
---

Fix `auth.protect()` unauthorized error propagation within middleware
5 changes: 5 additions & 0 deletions .changeset/weak-adults-clean.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/backend": minor
---

Introduce API keys Backend SDK methods
4 changes: 4 additions & 0 deletions integration/.keys.json.sample
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,5 +54,9 @@
"with-whatsapp-phone-code": {
"pk": "",
"sk": ""
},
"with-api-keys": {
"pk": "",
"sk": ""
}
}
7 changes: 7 additions & 0 deletions integration/presets/envs.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -163,6 +163,12 @@ const withWhatsappPhoneCode = base
.setEnvVariable('private', 'CLERK_SECRET_KEY', instanceKeys.get('with-whatsapp-phone-code').sk)
.setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-whatsapp-phone-code').pk);

const withAPIKeys = base
.clone()
.setId('withAPIKeys')
.setEnvVariable('private', 'CLERK_SECRET_KEY', instanceKeys.get('with-api-keys').sk)
.setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-api-keys').pk);

export const envs = {
base,
withKeyless,
Expand All@@ -187,4 +193,5 @@ export const envs = {
withBillingStaging,
withBilling,
withWhatsappPhoneCode,
withAPIKeys,
} as const;
1 change: 1 addition & 0 deletions integration/presets/longRunningApps.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ export const createLongRunningApps = () => {
config: next.appRouter,
env: envs.withSessionTasks,
},
{ id: 'next.appRouter.withAPIKeys', config: next.appRouter, env: envs.withAPIKeys },
{ id: 'withBillingStaging.next.appRouter', config: next.appRouter, env: envs.withBillingStaging },
{ id: 'withBilling.next.appRouter', config: next.appRouter, env: envs.withBilling },
{ id: 'withBillingStaging.vue.vite', config: vue.vite, env: envs.withBillingStaging },
Expand Down
4 changes: 2 additions & 2 deletions integration/testUtils/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,10 @@ import type { Application } from '../models/application';
import { createEmailService } from './emailService';
import { createInvitationService } from './invitationsService';
import { createOrganizationsService } from './organizationsService';
import type { FakeOrganization, FakeUser } from './usersService';
import type { FakeAPIKey, FakeOrganization, FakeUser } from './usersService';
import { createUserService } from './usersService';

export type { FakeUser, FakeOrganization };
export type { FakeUser, FakeOrganization, FakeAPIKey };
const createClerkClient = (app: Application) => {
return backendCreateClerkClient({
apiUrl: app.env.privateVariables.get('CLERK_API_URL'),
Expand Down
26 changes: 25 additions & 1 deletion integration/testUtils/usersService.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { ClerkClient, Organization, User } from '@clerk/backend';
import type { APIKey, ClerkClient, Organization, User } from '@clerk/backend';
import { faker } from '@faker-js/faker';

import { hash } from '../models/helpers';
Expand DownExpand Up@@ -57,6 +57,12 @@ export type FakeOrganization = {
delete: () => Promise<Organization>;
};

export type FakeAPIKey = {
apiKey: APIKey;
secret: string;
revoke: () => Promise<APIKey>;
};

export type UserService = {
createFakeUser: (options?: FakeUserOptions) => FakeUser;
createBapiUser: (fakeUser: FakeUser) => Promise<User>;
Expand All@@ -67,6 +73,7 @@ export type UserService = {
deleteIfExists: (opts: { id?: string; email?: string; phoneNumber?: string }) => Promise<void>;
createFakeOrganization: (userId: string) => Promise<FakeOrganization>;
getUser: (opts: { id?: string; email?: string }) => Promise<User | undefined>;
createFakeAPIKey: (userId: string) => Promise<FakeAPIKey>;
};

/**
Expand DownExpand Up@@ -175,6 +182,23 @@ export const createUserService = (clerkClient: ClerkClient) => {
delete: () => clerkClient.organizations.deleteOrganization(organization.id),
} satisfies FakeOrganization;
},
createFakeAPIKey: async (userId: string) => {
const TWENTY_MINUTES = 20 * 60;

const apiKey = await clerkClient.apiKeys.create({
subject: userId,
name: `Integration Test - ${userId}`,
secondsUntilExpiration: TWENTY_MINUTES,
});

const { secret } = await clerkClient.apiKeys.getSecret(apiKey.id);

return {
apiKey,
secret,
revoke: () => clerkClient.apiKeys.revoke({ apiKeyId: apiKey.id, revocationReason: 'For testing purposes' }),
} satisfies FakeAPIKey;
},
};

return self;
Expand Down
214 changes: 214 additions & 0 deletions integration/tests/machine-auth/api-keys.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,214 @@
import type { User } from '@clerk/backend';
import { TokenType } from '@clerk/backend/internal';
import { expect, test } from '@playwright/test';

import type { Application } from '../../models/application';
import { appConfigs } from '../../presets';
import type { FakeAPIKey, FakeUser } from '../../testUtils';
import { createTestUtils } from '../../testUtils';

test.describe('Next.js API key auth within clerkMiddleware() @nextjs', () => {
test.describe.configure({ mode: 'parallel' });
let app: Application;
let fakeUser: FakeUser;
let fakeBapiUser: User;
let fakeAPIKey: FakeAPIKey;

test.beforeAll(async () => {
app = await appConfigs.next.appRouter
.clone()
.addFile(
`src/middleware.ts`,
() => `
import { clerkMiddleware, createRouteMatcher } from '@clerk/nextjs/server';

const isProtectedRoute = createRouteMatcher(['/api(.*)']);

export default clerkMiddleware(async (auth, req) => {
if (isProtectedRoute(req)) {
await auth.protect({ token: 'api_key' });
}
});

export const config = {
matcher: [
'/((?!.*\\..*|_next).*)', // Don't run middleware on static files
'/', // Run middleware on index page
'/(api|trpc)(.*)',
], // Run middleware on API routes
};
`,
)
.addFile(
'src/app/api/me/route.ts',
() => `
import { auth } from '@clerk/nextjs/server';

export async function GET() {
const { userId, tokenType } = await auth({ acceptsToken: 'api_key' });

return Response.json({ userId, tokenType });
}
`,
)
.commit();

await app.setup();
await app.withEnv(appConfigs.envs.withAPIKeys);
await app.dev();

const u = createTestUtils({ app });
fakeUser = u.services.users.createFakeUser();
fakeBapiUser = await u.services.users.createBapiUser(fakeUser);
fakeAPIKey = await u.services.users.createFakeAPIKey(fakeBapiUser.id);
});

test.afterAll(async () => {
await fakeAPIKey.revoke();
await fakeUser.deleteIfExists();
await app.teardown();
});

test('should return 401 if no API key is provided', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString());
expect(res.status()).toBe(401);
});

test('should return 401 if API key is invalid', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString(), {
headers: { Authorization: 'Bearer invalid_key' },
});
expect(res.status()).toBe(401);
});

test('should return 200 with auth object if API key is valid', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString(), {
headers: {
Authorization: `Bearer ${fakeAPIKey.secret}`,
},
});
const apiKeyData = await res.json();
expect(res.status()).toBe(200);
expect(apiKeyData.userId).toBe(fakeBapiUser.id);
expect(apiKeyData.tokenType).toBe(TokenType.ApiKey);
});
});

test.describe('Next.js API key auth within routes @nextjs', () => {
test.describe.configure({ mode: 'parallel' });
let app: Application;
let fakeUser: FakeUser;
let fakeBapiUser: User;
let fakeAPIKey: FakeAPIKey;

test.beforeAll(async () => {
app = await appConfigs.next.appRouter
.clone()
.addFile(
'src/app/api/me/route.ts',
() => `
import { auth } from '@clerk/nextjs/server';

export async function GET() {
const { userId, tokenType } = await auth({ acceptsToken: 'api_key' });

if (!userId) {
return Response.json({ error: 'Unauthorized' }, { status: 401 });
}

return Response.json({ userId, tokenType });
}

export async function POST() {
const authObject = await auth({ acceptsToken: ['api_key', 'session_token'] });

if (!authObject.isAuthenticated) {
return Response.json({ error: 'Unauthorized' }, { status: 401 });
}

return Response.json({ userId: authObject.userId, tokenType: authObject.tokenType });
}
`,
)
.commit();

await app.setup();
await app.withEnv(appConfigs.envs.withAPIKeys);
await app.dev();

const u = createTestUtils({ app });
fakeUser = u.services.users.createFakeUser();
fakeBapiUser = await u.services.users.createBapiUser(fakeUser);
fakeAPIKey = await u.services.users.createFakeAPIKey(fakeBapiUser.id);
});

test.afterAll(async () => {
await fakeAPIKey.revoke();
await fakeUser.deleteIfExists();
await app.teardown();
});

test('should return 401 if no API key is provided', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString());
expect(res.status()).toBe(401);
});

test('should return 401 if API key is invalid', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString(), {
headers: { Authorization: 'Bearer invalid_key' },
});
expect(res.status()).toBe(401);
});

test('should return 200 with auth object if API key is valid', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString(), {
headers: {
Authorization: `Bearer ${fakeAPIKey.secret}`,
},
});
const apiKeyData = await res.json();
expect(res.status()).toBe(200);
expect(apiKeyData.userId).toBe(fakeBapiUser.id);
expect(apiKeyData.tokenType).toBe(TokenType.ApiKey);
});

test('should handle multiple token types', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
const url = new URL('/api/me', app.serverUrl);

// Sign in to get a session token
await u.po.signIn.goTo();
await u.po.signIn.waitForMounted();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
await u.po.expect.toBeSignedIn();

// GET endpoint (only accepts api_key)
const getRes = await u.page.request.get(url.toString());
expect(getRes.status()).toBe(401);

// POST endpoint (accepts both api_key and session_token)
// Test with session token
const postWithSessionRes = await u.page.request.post(url.toString());
const sessionData = await postWithSessionRes.json();
expect(postWithSessionRes.status()).toBe(200);
expect(sessionData.userId).toBe(fakeBapiUser.id);
expect(sessionData.tokenType).toBe(TokenType.SessionToken);

// Test with API key
const postWithApiKeyRes = await u.page.request.post(url.toString(), {
headers: {
Authorization: `Bearer ${fakeAPIKey.secret}`,
},
});
const apiKeyData = await postWithApiKeyRes.json();
expect(postWithApiKeyRes.status()).toBe(200);
expect(apiKeyData.userId).toBe(fakeBapiUser.id);
expect(apiKeyData.tokenType).toBe(TokenType.ApiKey);
});
});
60 changes: 60 additions & 0 deletions packages/backend/src/api/endpoints/APIKeysApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,67 @@ import { AbstractAPI } from './AbstractApi';

const basePath = '/api_keys';

type CreateAPIKeyParams = {
type?: 'api_key';
/**
* API key name
*/
name: string;
/**
* user or organization ID the API key is associated with
*/
subject: string;
/**
* API key description
*/
description?: string | null;
claims?: Record<string, any> | null;
scopes?: string[];
createdBy?: string | null;
secondsUntilExpiration?: number | null;
};

type RevokeAPIKeyParams = {
/**
* API key ID
*/
apiKeyId: string;
/**
* Reason for revocation
*/
revocationReason?: string | null;
};

export class APIKeysAPI extends AbstractAPI {
async create(params: CreateAPIKeyParams) {
return this.request<APIKey>({
method: 'POST',
path: basePath,
bodyParams: params,
});
}

async revoke(params: RevokeAPIKeyParams) {
const { apiKeyId, ...bodyParams } = params;

this.requireId(apiKeyId);

return this.request<APIKey>({
method: 'POST',
path: joinPaths(basePath, apiKeyId, 'revoke'),
bodyParams,
});
}

async getSecret(apiKeyId: string) {
this.requireId(apiKeyId);

return this.request<{ secret: string }>({
method: 'GET',
path: joinPaths(basePath, apiKeyId, 'secret'),
});
}

async verifySecret(secret: string) {
return this.request<APIKey>({
method: 'POST',
Expand Down
Loading
, '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
5 changes: 5 additions & 0 deletions .changeset/eighty-frogs-return.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/nextjs": minor
---

Fix `auth.protect()` unauthorized error propagation within middleware
5 changes: 5 additions & 0 deletions .changeset/weak-adults-clean.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/backend": minor
---

Introduce API keys Backend SDK methods
4 changes: 4 additions & 0 deletions integration/.keys.json.sample
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,5 +54,9 @@
"with-whatsapp-phone-code": {
"pk": "",
"sk": ""
},
"with-api-keys": {
"pk": "",
"sk": ""
}
}
7 changes: 7 additions & 0 deletions integration/presets/envs.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -163,6 +163,12 @@ const withWhatsappPhoneCode = base
.setEnvVariable('private', 'CLERK_SECRET_KEY', instanceKeys.get('with-whatsapp-phone-code').sk)
.setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-whatsapp-phone-code').pk);

const withAPIKeys = base
.clone()
.setId('withAPIKeys')
.setEnvVariable('private', 'CLERK_SECRET_KEY', instanceKeys.get('with-api-keys').sk)
.setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-api-keys').pk);

export const envs = {
base,
withKeyless,
Expand All@@ -187,4 +193,5 @@ export const envs = {
withBillingStaging,
withBilling,
withWhatsappPhoneCode,
withAPIKeys,
} as const;
1 change: 1 addition & 0 deletions integration/presets/longRunningApps.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ export const createLongRunningApps = () => {
config: next.appRouter,
env: envs.withSessionTasks,
},
{ id: 'next.appRouter.withAPIKeys', config: next.appRouter, env: envs.withAPIKeys },
{ id: 'withBillingStaging.next.appRouter', config: next.appRouter, env: envs.withBillingStaging },
{ id: 'withBilling.next.appRouter', config: next.appRouter, env: envs.withBilling },
{ id: 'withBillingStaging.vue.vite', config: vue.vite, env: envs.withBillingStaging },
Expand Down
4 changes: 2 additions & 2 deletions integration/testUtils/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,10 @@ import type { Application } from '../models/application';
import { createEmailService } from './emailService';
import { createInvitationService } from './invitationsService';
import { createOrganizationsService } from './organizationsService';
import type { FakeOrganization, FakeUser } from './usersService';
import type { FakeAPIKey, FakeOrganization, FakeUser } from './usersService';
import { createUserService } from './usersService';

export type { FakeUser, FakeOrganization };
export type { FakeUser, FakeOrganization, FakeAPIKey };
const createClerkClient = (app: Application) => {
return backendCreateClerkClient({
apiUrl: app.env.privateVariables.get('CLERK_API_URL'),
Expand Down
26 changes: 25 additions & 1 deletion integration/testUtils/usersService.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { ClerkClient, Organization, User } from '@clerk/backend';
import type { APIKey, ClerkClient, Organization, User } from '@clerk/backend';
import { faker } from '@faker-js/faker';

import { hash } from '../models/helpers';
Expand DownExpand Up@@ -57,6 +57,12 @@ export type FakeOrganization = {
delete: () => Promise<Organization>;
};

export type FakeAPIKey = {
apiKey: APIKey;
secret: string;
revoke: () => Promise<APIKey>;
};

export type UserService = {
createFakeUser: (options?: FakeUserOptions) => FakeUser;
createBapiUser: (fakeUser: FakeUser) => Promise<User>;
Expand All@@ -67,6 +73,7 @@ export type UserService = {
deleteIfExists: (opts: { id?: string; email?: string; phoneNumber?: string }) => Promise<void>;
createFakeOrganization: (userId: string) => Promise<FakeOrganization>;
getUser: (opts: { id?: string; email?: string }) => Promise<User | undefined>;
createFakeAPIKey: (userId: string) => Promise<FakeAPIKey>;
};

/**
Expand DownExpand Up@@ -175,6 +182,23 @@ export const createUserService = (clerkClient: ClerkClient) => {
delete: () => clerkClient.organizations.deleteOrganization(organization.id),
} satisfies FakeOrganization;
},
createFakeAPIKey: async (userId: string) => {
const TWENTY_MINUTES = 20 * 60;

const apiKey = await clerkClient.apiKeys.create({
subject: userId,
name: `Integration Test - ${userId}`,
secondsUntilExpiration: TWENTY_MINUTES,
});

const { secret } = await clerkClient.apiKeys.getSecret(apiKey.id);

return {
apiKey,
secret,
revoke: () => clerkClient.apiKeys.revoke({ apiKeyId: apiKey.id, revocationReason: 'For testing purposes' }),
} satisfies FakeAPIKey;
},
};

return self;
Expand Down
214 changes: 214 additions & 0 deletions integration/tests/machine-auth/api-keys.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,214 @@
import type { User } from '@clerk/backend';
import { TokenType } from '@clerk/backend/internal';
import { expect, test } from '@playwright/test';

import type { Application } from '../../models/application';
import { appConfigs } from '../../presets';
import type { FakeAPIKey, FakeUser } from '../../testUtils';
import { createTestUtils } from '../../testUtils';

test.describe('Next.js API key auth within clerkMiddleware() @nextjs', () => {
test.describe.configure({ mode: 'parallel' });
let app: Application;
let fakeUser: FakeUser;
let fakeBapiUser: User;
let fakeAPIKey: FakeAPIKey;

test.beforeAll(async () => {
app = await appConfigs.next.appRouter
.clone()
.addFile(
`src/middleware.ts`,
() => `
import { clerkMiddleware, createRouteMatcher } from '@clerk/nextjs/server';

const isProtectedRoute = createRouteMatcher(['/api(.*)']);

export default clerkMiddleware(async (auth, req) => {
if (isProtectedRoute(req)) {
await auth.protect({ token: 'api_key' });
}
});

export const config = {
matcher: [
'/((?!.*\\..*|_next).*)', // Don't run middleware on static files
'/', // Run middleware on index page
'/(api|trpc)(.*)',
], // Run middleware on API routes
};
`,
)
.addFile(
'src/app/api/me/route.ts',
() => `
import { auth } from '@clerk/nextjs/server';

export async function GET() {
const { userId, tokenType } = await auth({ acceptsToken: 'api_key' });

return Response.json({ userId, tokenType });
}
`,
)
.commit();

await app.setup();
await app.withEnv(appConfigs.envs.withAPIKeys);
await app.dev();

const u = createTestUtils({ app });
fakeUser = u.services.users.createFakeUser();
fakeBapiUser = await u.services.users.createBapiUser(fakeUser);
fakeAPIKey = await u.services.users.createFakeAPIKey(fakeBapiUser.id);
});

test.afterAll(async () => {
await fakeAPIKey.revoke();
await fakeUser.deleteIfExists();
await app.teardown();
});

test('should return 401 if no API key is provided', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString());
expect(res.status()).toBe(401);
});

test('should return 401 if API key is invalid', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString(), {
headers: { Authorization: 'Bearer invalid_key' },
});
expect(res.status()).toBe(401);
});

test('should return 200 with auth object if API key is valid', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString(), {
headers: {
Authorization: `Bearer ${fakeAPIKey.secret}`,
},
});
const apiKeyData = await res.json();
expect(res.status()).toBe(200);
expect(apiKeyData.userId).toBe(fakeBapiUser.id);
expect(apiKeyData.tokenType).toBe(TokenType.ApiKey);
});
});

test.describe('Next.js API key auth within routes @nextjs', () => {
test.describe.configure({ mode: 'parallel' });
let app: Application;
let fakeUser: FakeUser;
let fakeBapiUser: User;
let fakeAPIKey: FakeAPIKey;

test.beforeAll(async () => {
app = await appConfigs.next.appRouter
.clone()
.addFile(
'src/app/api/me/route.ts',
() => `
import { auth } from '@clerk/nextjs/server';

export async function GET() {
const { userId, tokenType } = await auth({ acceptsToken: 'api_key' });

if (!userId) {
return Response.json({ error: 'Unauthorized' }, { status: 401 });
}

return Response.json({ userId, tokenType });
}

export async function POST() {
const authObject = await auth({ acceptsToken: ['api_key', 'session_token'] });

if (!authObject.isAuthenticated) {
return Response.json({ error: 'Unauthorized' }, { status: 401 });
}

return Response.json({ userId: authObject.userId, tokenType: authObject.tokenType });
}
`,
)
.commit();

await app.setup();
await app.withEnv(appConfigs.envs.withAPIKeys);
await app.dev();

const u = createTestUtils({ app });
fakeUser = u.services.users.createFakeUser();
fakeBapiUser = await u.services.users.createBapiUser(fakeUser);
fakeAPIKey = await u.services.users.createFakeAPIKey(fakeBapiUser.id);
});

test.afterAll(async () => {
await fakeAPIKey.revoke();
await fakeUser.deleteIfExists();
await app.teardown();
});

test('should return 401 if no API key is provided', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString());
expect(res.status()).toBe(401);
});

test('should return 401 if API key is invalid', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString(), {
headers: { Authorization: 'Bearer invalid_key' },
});
expect(res.status()).toBe(401);
});

test('should return 200 with auth object if API key is valid', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString(), {
headers: {
Authorization: `Bearer ${fakeAPIKey.secret}`,
},
});
const apiKeyData = await res.json();
expect(res.status()).toBe(200);
expect(apiKeyData.userId).toBe(fakeBapiUser.id);
expect(apiKeyData.tokenType).toBe(TokenType.ApiKey);
});

test('should handle multiple token types', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
const url = new URL('/api/me', app.serverUrl);

// Sign in to get a session token
await u.po.signIn.goTo();
await u.po.signIn.waitForMounted();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
await u.po.expect.toBeSignedIn();

// GET endpoint (only accepts api_key)
const getRes = await u.page.request.get(url.toString());
expect(getRes.status()).toBe(401);

// POST endpoint (accepts both api_key and session_token)
// Test with session token
const postWithSessionRes = await u.page.request.post(url.toString());
const sessionData = await postWithSessionRes.json();
expect(postWithSessionRes.status()).toBe(200);
expect(sessionData.userId).toBe(fakeBapiUser.id);
expect(sessionData.tokenType).toBe(TokenType.SessionToken);

// Test with API key
const postWithApiKeyRes = await u.page.request.post(url.toString(), {
headers: {
Authorization: `Bearer ${fakeAPIKey.secret}`,
},
});
const apiKeyData = await postWithApiKeyRes.json();
expect(postWithApiKeyRes.status()).toBe(200);
expect(apiKeyData.userId).toBe(fakeBapiUser.id);
expect(apiKeyData.tokenType).toBe(TokenType.ApiKey);
});
});
60 changes: 60 additions & 0 deletions packages/backend/src/api/endpoints/APIKeysApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,67 @@ import { AbstractAPI } from './AbstractApi';

const basePath = '/api_keys';

type CreateAPIKeyParams = {
type?: 'api_key';
/**
* API key name
*/
name: string;
/**
* user or organization ID the API key is associated with
*/
subject: string;
/**
* API key description
*/
description?: string | null;
claims?: Record<string, any> | null;
scopes?: string[];
createdBy?: string | null;
secondsUntilExpiration?: number | null;
};

type RevokeAPIKeyParams = {
/**
* API key ID
*/
apiKeyId: string;
/**
* Reason for revocation
*/
revocationReason?: string | null;
};

export class APIKeysAPI extends AbstractAPI {
async create(params: CreateAPIKeyParams) {
return this.request<APIKey>({
method: 'POST',
path: basePath,
bodyParams: params,
});
}

async revoke(params: RevokeAPIKeyParams) {
const { apiKeyId, ...bodyParams } = params;

this.requireId(apiKeyId);

return this.request<APIKey>({
method: 'POST',
path: joinPaths(basePath, apiKeyId, 'revoke'),
bodyParams,
});
}

async getSecret(apiKeyId: string) {
this.requireId(apiKeyId);

return this.request<{ secret: string }>({
method: 'GET',
path: joinPaths(basePath, apiKeyId, 'secret'),
});
}

async verifySecret(secret: string) {
return this.request<APIKey>({
method: 'POST',
Expand Down
Loading
, '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
5 changes: 5 additions & 0 deletions .changeset/eighty-frogs-return.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/nextjs": minor
---

Fix `auth.protect()` unauthorized error propagation within middleware
5 changes: 5 additions & 0 deletions .changeset/weak-adults-clean.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/backend": minor
---

Introduce API keys Backend SDK methods
4 changes: 4 additions & 0 deletions integration/.keys.json.sample
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,5 +54,9 @@
"with-whatsapp-phone-code": {
"pk": "",
"sk": ""
},
"with-api-keys": {
"pk": "",
"sk": ""
}
}
7 changes: 7 additions & 0 deletions integration/presets/envs.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -163,6 +163,12 @@ const withWhatsappPhoneCode = base
.setEnvVariable('private', 'CLERK_SECRET_KEY', instanceKeys.get('with-whatsapp-phone-code').sk)
.setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-whatsapp-phone-code').pk);

const withAPIKeys = base
.clone()
.setId('withAPIKeys')
.setEnvVariable('private', 'CLERK_SECRET_KEY', instanceKeys.get('with-api-keys').sk)
.setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-api-keys').pk);

export const envs = {
base,
withKeyless,
Expand All@@ -187,4 +193,5 @@ export const envs = {
withBillingStaging,
withBilling,
withWhatsappPhoneCode,
withAPIKeys,
} as const;
1 change: 1 addition & 0 deletions integration/presets/longRunningApps.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ export const createLongRunningApps = () => {
config: next.appRouter,
env: envs.withSessionTasks,
},
{ id: 'next.appRouter.withAPIKeys', config: next.appRouter, env: envs.withAPIKeys },
{ id: 'withBillingStaging.next.appRouter', config: next.appRouter, env: envs.withBillingStaging },
{ id: 'withBilling.next.appRouter', config: next.appRouter, env: envs.withBilling },
{ id: 'withBillingStaging.vue.vite', config: vue.vite, env: envs.withBillingStaging },
Expand Down
4 changes: 2 additions & 2 deletions integration/testUtils/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,10 @@ import type { Application } from '../models/application';
import { createEmailService } from './emailService';
import { createInvitationService } from './invitationsService';
import { createOrganizationsService } from './organizationsService';
import type { FakeOrganization, FakeUser } from './usersService';
import type { FakeAPIKey, FakeOrganization, FakeUser } from './usersService';
import { createUserService } from './usersService';

export type { FakeUser, FakeOrganization };
export type { FakeUser, FakeOrganization, FakeAPIKey };
const createClerkClient = (app: Application) => {
return backendCreateClerkClient({
apiUrl: app.env.privateVariables.get('CLERK_API_URL'),
Expand Down
26 changes: 25 additions & 1 deletion integration/testUtils/usersService.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { ClerkClient, Organization, User } from '@clerk/backend';
import type { APIKey, ClerkClient, Organization, User } from '@clerk/backend';
import { faker } from '@faker-js/faker';

import { hash } from '../models/helpers';
Expand DownExpand Up@@ -57,6 +57,12 @@ export type FakeOrganization = {
delete: () => Promise<Organization>;
};

export type FakeAPIKey = {
apiKey: APIKey;
secret: string;
revoke: () => Promise<APIKey>;
};

export type UserService = {
createFakeUser: (options?: FakeUserOptions) => FakeUser;
createBapiUser: (fakeUser: FakeUser) => Promise<User>;
Expand All@@ -67,6 +73,7 @@ export type UserService = {
deleteIfExists: (opts: { id?: string; email?: string; phoneNumber?: string }) => Promise<void>;
createFakeOrganization: (userId: string) => Promise<FakeOrganization>;
getUser: (opts: { id?: string; email?: string }) => Promise<User | undefined>;
createFakeAPIKey: (userId: string) => Promise<FakeAPIKey>;
};

/**
Expand DownExpand Up@@ -175,6 +182,23 @@ export const createUserService = (clerkClient: ClerkClient) => {
delete: () => clerkClient.organizations.deleteOrganization(organization.id),
} satisfies FakeOrganization;
},
createFakeAPIKey: async (userId: string) => {
const TWENTY_MINUTES = 20 * 60;

const apiKey = await clerkClient.apiKeys.create({
subject: userId,
name: `Integration Test - ${userId}`,
secondsUntilExpiration: TWENTY_MINUTES,
});

const { secret } = await clerkClient.apiKeys.getSecret(apiKey.id);

return {
apiKey,
secret,
revoke: () => clerkClient.apiKeys.revoke({ apiKeyId: apiKey.id, revocationReason: 'For testing purposes' }),
} satisfies FakeAPIKey;
},
};

return self;
Expand Down
214 changes: 214 additions & 0 deletions integration/tests/machine-auth/api-keys.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,214 @@
import type { User } from '@clerk/backend';
import { TokenType } from '@clerk/backend/internal';
import { expect, test } from '@playwright/test';

import type { Application } from '../../models/application';
import { appConfigs } from '../../presets';
import type { FakeAPIKey, FakeUser } from '../../testUtils';
import { createTestUtils } from '../../testUtils';

test.describe('Next.js API key auth within clerkMiddleware() @nextjs', () => {
test.describe.configure({ mode: 'parallel' });
let app: Application;
let fakeUser: FakeUser;
let fakeBapiUser: User;
let fakeAPIKey: FakeAPIKey;

test.beforeAll(async () => {
app = await appConfigs.next.appRouter
.clone()
.addFile(
`src/middleware.ts`,
() => `
import { clerkMiddleware, createRouteMatcher } from '@clerk/nextjs/server';

const isProtectedRoute = createRouteMatcher(['/api(.*)']);

export default clerkMiddleware(async (auth, req) => {
if (isProtectedRoute(req)) {
await auth.protect({ token: 'api_key' });
}
});

export const config = {
matcher: [
'/((?!.*\\..*|_next).*)', // Don't run middleware on static files
'/', // Run middleware on index page
'/(api|trpc)(.*)',
], // Run middleware on API routes
};
`,
)
.addFile(
'src/app/api/me/route.ts',
() => `
import { auth } from '@clerk/nextjs/server';

export async function GET() {
const { userId, tokenType } = await auth({ acceptsToken: 'api_key' });

return Response.json({ userId, tokenType });
}
`,
)
.commit();

await app.setup();
await app.withEnv(appConfigs.envs.withAPIKeys);
await app.dev();

const u = createTestUtils({ app });
fakeUser = u.services.users.createFakeUser();
fakeBapiUser = await u.services.users.createBapiUser(fakeUser);
fakeAPIKey = await u.services.users.createFakeAPIKey(fakeBapiUser.id);
});

test.afterAll(async () => {
await fakeAPIKey.revoke();
await fakeUser.deleteIfExists();
await app.teardown();
});

test('should return 401 if no API key is provided', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString());
expect(res.status()).toBe(401);
});

test('should return 401 if API key is invalid', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString(), {
headers: { Authorization: 'Bearer invalid_key' },
});
expect(res.status()).toBe(401);
});

test('should return 200 with auth object if API key is valid', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString(), {
headers: {
Authorization: `Bearer ${fakeAPIKey.secret}`,
},
});
const apiKeyData = await res.json();
expect(res.status()).toBe(200);
expect(apiKeyData.userId).toBe(fakeBapiUser.id);
expect(apiKeyData.tokenType).toBe(TokenType.ApiKey);
});
});

test.describe('Next.js API key auth within routes @nextjs', () => {
test.describe.configure({ mode: 'parallel' });
let app: Application;
let fakeUser: FakeUser;
let fakeBapiUser: User;
let fakeAPIKey: FakeAPIKey;

test.beforeAll(async () => {
app = await appConfigs.next.appRouter
.clone()
.addFile(
'src/app/api/me/route.ts',
() => `
import { auth } from '@clerk/nextjs/server';

export async function GET() {
const { userId, tokenType } = await auth({ acceptsToken: 'api_key' });

if (!userId) {
return Response.json({ error: 'Unauthorized' }, { status: 401 });
}

return Response.json({ userId, tokenType });
}

export async function POST() {
const authObject = await auth({ acceptsToken: ['api_key', 'session_token'] });

if (!authObject.isAuthenticated) {
return Response.json({ error: 'Unauthorized' }, { status: 401 });
}

return Response.json({ userId: authObject.userId, tokenType: authObject.tokenType });
}
`,
)
.commit();

await app.setup();
await app.withEnv(appConfigs.envs.withAPIKeys);
await app.dev();

const u = createTestUtils({ app });
fakeUser = u.services.users.createFakeUser();
fakeBapiUser = await u.services.users.createBapiUser(fakeUser);
fakeAPIKey = await u.services.users.createFakeAPIKey(fakeBapiUser.id);
});

test.afterAll(async () => {
await fakeAPIKey.revoke();
await fakeUser.deleteIfExists();
await app.teardown();
});

test('should return 401 if no API key is provided', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString());
expect(res.status()).toBe(401);
});

test('should return 401 if API key is invalid', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString(), {
headers: { Authorization: 'Bearer invalid_key' },
});
expect(res.status()).toBe(401);
});

test('should return 200 with auth object if API key is valid', async ({ request }) => {
const url = new URL('/api/me', app.serverUrl);
const res = await request.get(url.toString(), {
headers: {
Authorization: `Bearer ${fakeAPIKey.secret}`,
},
});
const apiKeyData = await res.json();
expect(res.status()).toBe(200);
expect(apiKeyData.userId).toBe(fakeBapiUser.id);
expect(apiKeyData.tokenType).toBe(TokenType.ApiKey);
});

test('should handle multiple token types', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });
const url = new URL('/api/me', app.serverUrl);

// Sign in to get a session token
await u.po.signIn.goTo();
await u.po.signIn.waitForMounted();
await u.po.signIn.signInWithEmailAndInstantPassword({ email: fakeUser.email, password: fakeUser.password });
await u.po.expect.toBeSignedIn();

// GET endpoint (only accepts api_key)
const getRes = await u.page.request.get(url.toString());
expect(getRes.status()).toBe(401);

// POST endpoint (accepts both api_key and session_token)
// Test with session token
const postWithSessionRes = await u.page.request.post(url.toString());
const sessionData = await postWithSessionRes.json();
expect(postWithSessionRes.status()).toBe(200);
expect(sessionData.userId).toBe(fakeBapiUser.id);
expect(sessionData.tokenType).toBe(TokenType.SessionToken);

// Test with API key
const postWithApiKeyRes = await u.page.request.post(url.toString(), {
headers: {
Authorization: `Bearer ${fakeAPIKey.secret}`,
},
});
const apiKeyData = await postWithApiKeyRes.json();
expect(postWithApiKeyRes.status()).toBe(200);
expect(apiKeyData.userId).toBe(fakeBapiUser.id);
expect(apiKeyData.tokenType).toBe(TokenType.ApiKey);
});
});
60 changes: 60 additions & 0 deletions packages/backend/src/api/endpoints/APIKeysApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,67 @@ import { AbstractAPI } from './AbstractApi';

const basePath = '/api_keys';

type CreateAPIKeyParams = {
type?: 'api_key';
/**
* API key name
*/
name: string;
/**
* user or organization ID the API key is associated with
*/
subject: string;
/**
* API key description
*/
description?: string | null;
claims?: Record<string, any> | null;
scopes?: string[];
createdBy?: string | null;
secondsUntilExpiration?: number | null;
};

type RevokeAPIKeyParams = {
/**
* API key ID
*/
apiKeyId: string;
/**
* Reason for revocation
*/
revocationReason?: string | null;
};

export class APIKeysAPI extends AbstractAPI {
async create(params: CreateAPIKeyParams) {
return this.request<APIKey>({
method: 'POST',
path: basePath,
bodyParams: params,
});
}

async revoke(params: RevokeAPIKeyParams) {
const { apiKeyId, ...bodyParams } = params;

this.requireId(apiKeyId);

return this.request<APIKey>({
method: 'POST',
path: joinPaths(basePath, apiKeyId, 'revoke'),
bodyParams,
});
}

async getSecret(apiKeyId: string) {
this.requireId(apiKeyId);

return this.request<{ secret: string }>({
method: 'GET',
path: joinPaths(basePath, apiKeyId, 'secret'),
});
}

async verifySecret(secret: string) {
return this.request<APIKey>({
method: 'POST',
Expand Down
Loading