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/nasty-colts-travel.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/backend": minor
---

Exports `Machine` and `M2MToken` resource classes

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

💡 Verification agent

🧩 Analysis chain

Clarify wording and verify “classes” vs “types”; double-check semver level

The body currently says “resource classes,” while the PR summary mentions exporting “types.” Ensure the note matches the actual exports (classes vs types). Also, adding new public exports is often considered a minor release per SemVer, not a patch—confirm if “patch” is intended.

If the intent is generic and accurate regardless of implementation detail, you can update the copy to avoid ambiguity:

-Exports `Machine` and `M2MToken` resource classes+Expose `Machine` and `M2MToken` as public exports.

Optionally, if this is a minor release:

-"@clerk/backend": patch+"@clerk/backend": minor

Run this script to verify the nature of the exports and ensure the wording is accurate:


🏁 Script executed:

#!/bin/bashset -euo pipefail
echo"Checking export statements in packages/backend/src/index.ts..."
rg -n -A2 -B2 'export .* (Machine|M2MToken)' packages/backend/src/index.ts ||trueechoecho"Searching for declarations to determine if they are classes or types..."
rg -n -A2 -B2 'export (class|type|interface) (Machine|M2MToken)' packages/backend/src ||true

Length of output: 6239


Update semver to minor for new exports

The term “resource classes” is accurate—both Machine and M2MToken are declared as export class in packages/backend/src/api/resources. However, exposing new public API requires a minor bump, not a patch.

  • .changeset/nasty-colts-travel.md
--- a/.changeset/nasty-colts-travel.md- "@clerk/backend": patch+ "@clerk/backend": minor
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
Exports `Machine` and `M2MToken` resource classes
---
"@clerk/backend": minor
---
Exports `Machine` and `M2MToken` resource classes
🤖 Prompt for AI Agents
In .changeset/nasty-colts-travel.md around line 5, the changeset currently marks
the package bump as a patch despite adding new exported resource classes; edit
the changeset to change the version bump from "patch" to "minor" (i.e., update
the bump level in the file header or package entry to "minor"), save and commit
the updated changeset so the release tooling will perform a minor version bump.

1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -293,6 +293,7 @@ jobs:
'nuxt',
'react-router',
'billing',
'machine'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🙃

Suggested change
'machine'
'm2m'

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

So there's a follow up PR for this that will group all "machine" related tests (api keys, m2m)

]
Comment thread
wobsoriano marked this conversation as resolved.
test-project: ['chrome']
include:
Expand Down
6 changes: 6 additions & 0 deletions integration/presets/longRunningApps.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,12 @@ export const createLongRunningApps = () => {
{ id: 'withBillingJwtV2.vue.vite', config: vue.vite, env: envs.withBillingJwtV2 },
{ id: 'withBilling.vue.vite', config: vue.vite, env: envs.withBilling },

/**
* Machine auth apps
* TODO(rob): Group other machine auth apps together (api keys, m2m tokens, etc)
*/
{ id: 'withMachine.express.vite', config: express.vite, env: envs.withAPIKeys },

/**
* Vite apps - basic flows
*/
Expand Down
172 changes: 172 additions & 0 deletions integration/tests/machine-auth/m2m.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,172 @@
import { createClerkClient, type M2MToken, type Machine } from '@clerk/backend';
import { faker } from '@faker-js/faker';
import { expect, test } from '@playwright/test';

import type { Application } from '../../models/application';
import { appConfigs } from '../../presets';
import { instanceKeys } from '../../presets/envs';
import { createTestUtils } from '../../testUtils';

test.describe('machine-to-machine auth @machine', () => {
test.describe.configure({ mode: 'parallel' });
let app: Application;
let primaryApiServer: Machine;
let emailServer: Machine;
let analyticsServer: Machine;
let emailServerM2MToken: M2MToken;
let analyticsServerM2MToken: M2MToken;

test.beforeAll(async () => {
const fakeCompanyName = faker.company.name();

// Create primary machine using instance secret key
const client = createClerkClient({
secretKey: instanceKeys.get('with-api-keys').sk,
});
primaryApiServer = await client.machines.create({
name: `${fakeCompanyName} Primary API Server`,
});

app = await appConfigs.express.vite
.clone()
.addFile(
'src/server/main.ts',
() => `
import 'dotenv/config';
import { clerkClient } from '@clerk/express';
import express from 'express';
import ViteExpress from 'vite-express';

const app = express();

app.get('/api/protected', async (req, res) => {
const secret = req.get('Authorization')?.split(' ')[1];

try {
const m2mToken = await clerkClient.m2mTokens.verifySecret({ secret });
res.send('Protected response ' + m2mToken.id);
} catch {
res.status(401).send('Unauthorized');
}
});

const port = parseInt(process.env.PORT as string) || 3002;
ViteExpress.listen(app, port, () => console.log('Server started'));
`,
)
.commit();

await app.setup();

// Using the created machine, set a machine secret key using the primary machine's secret key
const env = appConfigs.envs.withAPIKeys
.clone()
.setEnvVariable('private', 'CLERK_MACHINE_SECRET_KEY', primaryApiServer.secretKey);
await app.withEnv(env);
await app.dev();

// Email server can access primary API server
emailServer = await client.machines.create({
name: `${fakeCompanyName} Email Server`,
scopedMachines: [primaryApiServer.id],
});
emailServerM2MToken = await client.m2mTokens.create({
machineSecretKey: emailServer.secretKey,
secondsUntilExpiration: 60 * 30,
});

// Analytics server cannot access primary API server
analyticsServer = await client.machines.create({
name: `${fakeCompanyName} Analytics Server`,
// No scoped machines
});
analyticsServerM2MToken = await client.m2mTokens.create({
machineSecretKey: analyticsServer.secretKey,
secondsUntilExpiration: 60 * 30,
});
});

test.afterAll(async () => {
const client = createClerkClient({
secretKey: instanceKeys.get('with-api-keys').sk,
});

await client.m2mTokens.revoke({
m2mTokenId: emailServerM2MToken.id,
});
await client.m2mTokens.revoke({
m2mTokenId: analyticsServerM2MToken.id,
});
await client.machines.delete(emailServer.id);
await client.machines.delete(primaryApiServer.id);
await client.machines.delete(analyticsServer.id);

await app.teardown();
});

test('rejects requests with invalid M2M tokens', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

const res = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer invalid`,
},
});
expect(res.status()).toBe(401);
expect(await res.text()).toBe('Unauthorized');

const res2 = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer mt_xxx`,
},
});
expect(res2.status()).toBe(401);
expect(await res2.text()).toBe('Unauthorized');
});

test('rejects M2M requests when sender machine lacks access to receiver machine', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

const res = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer ${analyticsServerM2MToken.secret}`,
},
});
expect(res.status()).toBe(401);
expect(await res.text()).toBe('Unauthorized');
});

test('authorizes M2M requests when sender machine has proper access to receiver machine', async ({
page,
context,
}) => {
const u = createTestUtils({ app, page, context });

// Email server can access primary API server
const res = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer ${emailServerM2MToken.secret}`,
},
});
expect(res.status()).toBe(200);
expect(await res.text()).toBe('Protected response ' + emailServerM2MToken.id);

// Analytics server can access primary API server after adding scope
await u.services.clerk.machines.createScope(analyticsServer.id, primaryApiServer.id);
const m2mToken = await u.services.clerk.m2mTokens.create({
machineSecretKey: analyticsServer.secretKey,
secondsUntilExpiration: 60 * 30,
});

const res2 = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer ${m2mToken.secret}`,
},
});
expect(res2.status()).toBe(200);
expect(await res2.text()).toBe('Protected response ' + m2mToken.id);
await u.services.clerk.m2mTokens.revoke({
m2mTokenId: m2mToken.id,
});
});
});
1 change: 1 addition & 0 deletions package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@
"test:integration:generic": "E2E_APP_ID=react.vite.*,next.appRouter.withEmailCodes* pnpm test:integration:base --grep @generic",
"test:integration:handshake": "DISABLE_WEB_SECURITY=true E2E_APP_ID=next.appRouter.sessionsProd1 pnpm test:integration:base --grep @handshake",
"test:integration:localhost": "pnpm test:integration:base --grep @localhost",
"test:integration:machine": "E2E_APP_ID=withMachine.* pnpm test:integration:base --grep @machine",
"test:integration:nextjs": "E2E_APP_ID=next.appRouter.* pnpm test:integration:base --grep @nextjs",
"test:integration:nuxt": "E2E_APP_ID=nuxt.node npm run test:integration:base -- --grep @nuxt",
"test:integration:quickstart": "E2E_APP_ID=quickstart.* pnpm test:integration:base --grep @quickstart",
Expand Down
5 changes: 5 additions & 0 deletions packages/backend/src/api/endpoints/M2MTokenApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,11 @@ type CreateM2MTokenParams = {
* Custom machine secret key for authentication.
*/
machineSecretKey?: string;
/**
* Number of seconds until the token expires.
*
* @default null - Token does not expire
*/
secondsUntilExpiration?: number | null;
claims?: Record<string, unknown> | null;
};
Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,8 @@ export type {
InstanceSettings,
Invitation,
JwtTemplate,
Machine,
M2MToken,
OauthAccessToken,
OAuthApplication,
Organization,
Expand Down
12 changes: 12 additions & 0 deletions turbo.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -344,6 +344,18 @@
"env": ["CLEANUP", "DEBUG", "E2E_*", "INTEGRATION_INSTANCE_KEYS"],
"inputs": ["integration/**"],
"outputLogs": "new-only"
},
"//#test:integration:machine": {
"dependsOn": [
"@clerk/testing#build",
"@clerk/clerk-js#build",
"@clerk/backend#build",
"@clerk/nextjs#build",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We are testing against nextjs, right ?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Related to my comment above, the api keys test needs nextjs

"@clerk/express#build"
],
"env": ["CLEANUP", "DEBUG", "E2E_*", "INTEGRATION_INSTANCE_KEYS"],
"inputs": ["integration/**"],
"outputLogs": "new-only"
}
}
}
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/nasty-colts-travel.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/backend": minor
---

Exports `Machine` and `M2MToken` resource classes

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

💡 Verification agent

🧩 Analysis chain

Clarify wording and verify “classes” vs “types”; double-check semver level

The body currently says “resource classes,” while the PR summary mentions exporting “types.” Ensure the note matches the actual exports (classes vs types). Also, adding new public exports is often considered a minor release per SemVer, not a patch—confirm if “patch” is intended.

If the intent is generic and accurate regardless of implementation detail, you can update the copy to avoid ambiguity:

-Exports `Machine` and `M2MToken` resource classes+Expose `Machine` and `M2MToken` as public exports.

Optionally, if this is a minor release:

-"@clerk/backend": patch+"@clerk/backend": minor

Run this script to verify the nature of the exports and ensure the wording is accurate:


🏁 Script executed:

#!/bin/bashset -euo pipefail
echo"Checking export statements in packages/backend/src/index.ts..."
rg -n -A2 -B2 'export .* (Machine|M2MToken)' packages/backend/src/index.ts ||trueechoecho"Searching for declarations to determine if they are classes or types..."
rg -n -A2 -B2 'export (class|type|interface) (Machine|M2MToken)' packages/backend/src ||true

Length of output: 6239


Update semver to minor for new exports

The term “resource classes” is accurate—both Machine and M2MToken are declared as export class in packages/backend/src/api/resources. However, exposing new public API requires a minor bump, not a patch.

  • .changeset/nasty-colts-travel.md
--- a/.changeset/nasty-colts-travel.md- "@clerk/backend": patch+ "@clerk/backend": minor
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
Exports `Machine` and `M2MToken` resource classes
---
"@clerk/backend": minor
---
Exports `Machine` and `M2MToken` resource classes
🤖 Prompt for AI Agents
In .changeset/nasty-colts-travel.md around line 5, the changeset currently marks
the package bump as a patch despite adding new exported resource classes; edit
the changeset to change the version bump from "patch" to "minor" (i.e., update
the bump level in the file header or package entry to "minor"), save and commit
the updated changeset so the release tooling will perform a minor version bump.

1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -293,6 +293,7 @@ jobs:
'nuxt',
'react-router',
'billing',
'machine'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🙃

Suggested change
'machine'
'm2m'

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

So there's a follow up PR for this that will group all "machine" related tests (api keys, m2m)

]
Comment thread
wobsoriano marked this conversation as resolved.
test-project: ['chrome']
include:
Expand Down
6 changes: 6 additions & 0 deletions integration/presets/longRunningApps.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,12 @@ export const createLongRunningApps = () => {
{ id: 'withBillingJwtV2.vue.vite', config: vue.vite, env: envs.withBillingJwtV2 },
{ id: 'withBilling.vue.vite', config: vue.vite, env: envs.withBilling },

/**
* Machine auth apps
* TODO(rob): Group other machine auth apps together (api keys, m2m tokens, etc)
*/
{ id: 'withMachine.express.vite', config: express.vite, env: envs.withAPIKeys },

/**
* Vite apps - basic flows
*/
Expand Down
172 changes: 172 additions & 0 deletions integration/tests/machine-auth/m2m.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,172 @@
import { createClerkClient, type M2MToken, type Machine } from '@clerk/backend';
import { faker } from '@faker-js/faker';
import { expect, test } from '@playwright/test';

import type { Application } from '../../models/application';
import { appConfigs } from '../../presets';
import { instanceKeys } from '../../presets/envs';
import { createTestUtils } from '../../testUtils';

test.describe('machine-to-machine auth @machine', () => {
test.describe.configure({ mode: 'parallel' });
let app: Application;
let primaryApiServer: Machine;
let emailServer: Machine;
let analyticsServer: Machine;
let emailServerM2MToken: M2MToken;
let analyticsServerM2MToken: M2MToken;

test.beforeAll(async () => {
const fakeCompanyName = faker.company.name();

// Create primary machine using instance secret key
const client = createClerkClient({
secretKey: instanceKeys.get('with-api-keys').sk,
});
primaryApiServer = await client.machines.create({
name: `${fakeCompanyName} Primary API Server`,
});

app = await appConfigs.express.vite
.clone()
.addFile(
'src/server/main.ts',
() => `
import 'dotenv/config';
import { clerkClient } from '@clerk/express';
import express from 'express';
import ViteExpress from 'vite-express';

const app = express();

app.get('/api/protected', async (req, res) => {
const secret = req.get('Authorization')?.split(' ')[1];

try {
const m2mToken = await clerkClient.m2mTokens.verifySecret({ secret });
res.send('Protected response ' + m2mToken.id);
} catch {
res.status(401).send('Unauthorized');
}
});

const port = parseInt(process.env.PORT as string) || 3002;
ViteExpress.listen(app, port, () => console.log('Server started'));
`,
)
.commit();

await app.setup();

// Using the created machine, set a machine secret key using the primary machine's secret key
const env = appConfigs.envs.withAPIKeys
.clone()
.setEnvVariable('private', 'CLERK_MACHINE_SECRET_KEY', primaryApiServer.secretKey);
await app.withEnv(env);
await app.dev();

// Email server can access primary API server
emailServer = await client.machines.create({
name: `${fakeCompanyName} Email Server`,
scopedMachines: [primaryApiServer.id],
});
emailServerM2MToken = await client.m2mTokens.create({
machineSecretKey: emailServer.secretKey,
secondsUntilExpiration: 60 * 30,
});

// Analytics server cannot access primary API server
analyticsServer = await client.machines.create({
name: `${fakeCompanyName} Analytics Server`,
// No scoped machines
});
analyticsServerM2MToken = await client.m2mTokens.create({
machineSecretKey: analyticsServer.secretKey,
secondsUntilExpiration: 60 * 30,
});
});

test.afterAll(async () => {
const client = createClerkClient({
secretKey: instanceKeys.get('with-api-keys').sk,
});

await client.m2mTokens.revoke({
m2mTokenId: emailServerM2MToken.id,
});
await client.m2mTokens.revoke({
m2mTokenId: analyticsServerM2MToken.id,
});
await client.machines.delete(emailServer.id);
await client.machines.delete(primaryApiServer.id);
await client.machines.delete(analyticsServer.id);

await app.teardown();
});

test('rejects requests with invalid M2M tokens', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

const res = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer invalid`,
},
});
expect(res.status()).toBe(401);
expect(await res.text()).toBe('Unauthorized');

const res2 = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer mt_xxx`,
},
});
expect(res2.status()).toBe(401);
expect(await res2.text()).toBe('Unauthorized');
});

test('rejects M2M requests when sender machine lacks access to receiver machine', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

const res = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer ${analyticsServerM2MToken.secret}`,
},
});
expect(res.status()).toBe(401);
expect(await res.text()).toBe('Unauthorized');
});

test('authorizes M2M requests when sender machine has proper access to receiver machine', async ({
page,
context,
}) => {
const u = createTestUtils({ app, page, context });

// Email server can access primary API server
const res = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer ${emailServerM2MToken.secret}`,
},
});
expect(res.status()).toBe(200);
expect(await res.text()).toBe('Protected response ' + emailServerM2MToken.id);

// Analytics server can access primary API server after adding scope
await u.services.clerk.machines.createScope(analyticsServer.id, primaryApiServer.id);
const m2mToken = await u.services.clerk.m2mTokens.create({
machineSecretKey: analyticsServer.secretKey,
secondsUntilExpiration: 60 * 30,
});

const res2 = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer ${m2mToken.secret}`,
},
});
expect(res2.status()).toBe(200);
expect(await res2.text()).toBe('Protected response ' + m2mToken.id);
await u.services.clerk.m2mTokens.revoke({
m2mTokenId: m2mToken.id,
});
});
});
1 change: 1 addition & 0 deletions package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@
"test:integration:generic": "E2E_APP_ID=react.vite.*,next.appRouter.withEmailCodes* pnpm test:integration:base --grep @generic",
"test:integration:handshake": "DISABLE_WEB_SECURITY=true E2E_APP_ID=next.appRouter.sessionsProd1 pnpm test:integration:base --grep @handshake",
"test:integration:localhost": "pnpm test:integration:base --grep @localhost",
"test:integration:machine": "E2E_APP_ID=withMachine.* pnpm test:integration:base --grep @machine",
"test:integration:nextjs": "E2E_APP_ID=next.appRouter.* pnpm test:integration:base --grep @nextjs",
"test:integration:nuxt": "E2E_APP_ID=nuxt.node npm run test:integration:base -- --grep @nuxt",
"test:integration:quickstart": "E2E_APP_ID=quickstart.* pnpm test:integration:base --grep @quickstart",
Expand Down
5 changes: 5 additions & 0 deletions packages/backend/src/api/endpoints/M2MTokenApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,11 @@ type CreateM2MTokenParams = {
* Custom machine secret key for authentication.
*/
machineSecretKey?: string;
/**
* Number of seconds until the token expires.
*
* @default null - Token does not expire
*/
secondsUntilExpiration?: number | null;
claims?: Record<string, unknown> | null;
};
Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,8 @@ export type {
InstanceSettings,
Invitation,
JwtTemplate,
Machine,
M2MToken,
OauthAccessToken,
OAuthApplication,
Organization,
Expand Down
12 changes: 12 additions & 0 deletions turbo.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -344,6 +344,18 @@
"env": ["CLEANUP", "DEBUG", "E2E_*", "INTEGRATION_INSTANCE_KEYS"],
"inputs": ["integration/**"],
"outputLogs": "new-only"
},
"//#test:integration:machine": {
"dependsOn": [
"@clerk/testing#build",
"@clerk/clerk-js#build",
"@clerk/backend#build",
"@clerk/nextjs#build",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We are testing against nextjs, right ?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Related to my comment above, the api keys test needs nextjs

"@clerk/express#build"
],
"env": ["CLEANUP", "DEBUG", "E2E_*", "INTEGRATION_INSTANCE_KEYS"],
"inputs": ["integration/**"],
"outputLogs": "new-only"
}
}
}
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/nasty-colts-travel.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/backend": minor
---

Exports `Machine` and `M2MToken` resource classes

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

💡 Verification agent

🧩 Analysis chain

Clarify wording and verify “classes” vs “types”; double-check semver level

The body currently says “resource classes,” while the PR summary mentions exporting “types.” Ensure the note matches the actual exports (classes vs types). Also, adding new public exports is often considered a minor release per SemVer, not a patch—confirm if “patch” is intended.

If the intent is generic and accurate regardless of implementation detail, you can update the copy to avoid ambiguity:

-Exports `Machine` and `M2MToken` resource classes+Expose `Machine` and `M2MToken` as public exports.

Optionally, if this is a minor release:

-"@clerk/backend": patch+"@clerk/backend": minor

Run this script to verify the nature of the exports and ensure the wording is accurate:


🏁 Script executed:

#!/bin/bashset -euo pipefail
echo"Checking export statements in packages/backend/src/index.ts..."
rg -n -A2 -B2 'export .* (Machine|M2MToken)' packages/backend/src/index.ts ||trueechoecho"Searching for declarations to determine if they are classes or types..."
rg -n -A2 -B2 'export (class|type|interface) (Machine|M2MToken)' packages/backend/src ||true

Length of output: 6239


Update semver to minor for new exports

The term “resource classes” is accurate—both Machine and M2MToken are declared as export class in packages/backend/src/api/resources. However, exposing new public API requires a minor bump, not a patch.

  • .changeset/nasty-colts-travel.md
--- a/.changeset/nasty-colts-travel.md- "@clerk/backend": patch+ "@clerk/backend": minor
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
Exports `Machine` and `M2MToken` resource classes
---
"@clerk/backend": minor
---
Exports `Machine` and `M2MToken` resource classes
🤖 Prompt for AI Agents
In .changeset/nasty-colts-travel.md around line 5, the changeset currently marks
the package bump as a patch despite adding new exported resource classes; edit
the changeset to change the version bump from "patch" to "minor" (i.e., update
the bump level in the file header or package entry to "minor"), save and commit
the updated changeset so the release tooling will perform a minor version bump.

1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -293,6 +293,7 @@ jobs:
'nuxt',
'react-router',
'billing',
'machine'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🙃

Suggested change
'machine'
'm2m'

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

So there's a follow up PR for this that will group all "machine" related tests (api keys, m2m)

]
Comment thread
wobsoriano marked this conversation as resolved.
test-project: ['chrome']
include:
Expand Down
6 changes: 6 additions & 0 deletions integration/presets/longRunningApps.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,12 @@ export const createLongRunningApps = () => {
{ id: 'withBillingJwtV2.vue.vite', config: vue.vite, env: envs.withBillingJwtV2 },
{ id: 'withBilling.vue.vite', config: vue.vite, env: envs.withBilling },

/**
* Machine auth apps
* TODO(rob): Group other machine auth apps together (api keys, m2m tokens, etc)
*/
{ id: 'withMachine.express.vite', config: express.vite, env: envs.withAPIKeys },

/**
* Vite apps - basic flows
*/
Expand Down
172 changes: 172 additions & 0 deletions integration/tests/machine-auth/m2m.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,172 @@
import { createClerkClient, type M2MToken, type Machine } from '@clerk/backend';
import { faker } from '@faker-js/faker';
import { expect, test } from '@playwright/test';

import type { Application } from '../../models/application';
import { appConfigs } from '../../presets';
import { instanceKeys } from '../../presets/envs';
import { createTestUtils } from '../../testUtils';

test.describe('machine-to-machine auth @machine', () => {
test.describe.configure({ mode: 'parallel' });
let app: Application;
let primaryApiServer: Machine;
let emailServer: Machine;
let analyticsServer: Machine;
let emailServerM2MToken: M2MToken;
let analyticsServerM2MToken: M2MToken;

test.beforeAll(async () => {
const fakeCompanyName = faker.company.name();

// Create primary machine using instance secret key
const client = createClerkClient({
secretKey: instanceKeys.get('with-api-keys').sk,
});
primaryApiServer = await client.machines.create({
name: `${fakeCompanyName} Primary API Server`,
});

app = await appConfigs.express.vite
.clone()
.addFile(
'src/server/main.ts',
() => `
import 'dotenv/config';
import { clerkClient } from '@clerk/express';
import express from 'express';
import ViteExpress from 'vite-express';

const app = express();

app.get('/api/protected', async (req, res) => {
const secret = req.get('Authorization')?.split(' ')[1];

try {
const m2mToken = await clerkClient.m2mTokens.verifySecret({ secret });
res.send('Protected response ' + m2mToken.id);
} catch {
res.status(401).send('Unauthorized');
}
});

const port = parseInt(process.env.PORT as string) || 3002;
ViteExpress.listen(app, port, () => console.log('Server started'));
`,
)
.commit();

await app.setup();

// Using the created machine, set a machine secret key using the primary machine's secret key
const env = appConfigs.envs.withAPIKeys
.clone()
.setEnvVariable('private', 'CLERK_MACHINE_SECRET_KEY', primaryApiServer.secretKey);
await app.withEnv(env);
await app.dev();

// Email server can access primary API server
emailServer = await client.machines.create({
name: `${fakeCompanyName} Email Server`,
scopedMachines: [primaryApiServer.id],
});
emailServerM2MToken = await client.m2mTokens.create({
machineSecretKey: emailServer.secretKey,
secondsUntilExpiration: 60 * 30,
});

// Analytics server cannot access primary API server
analyticsServer = await client.machines.create({
name: `${fakeCompanyName} Analytics Server`,
// No scoped machines
});
analyticsServerM2MToken = await client.m2mTokens.create({
machineSecretKey: analyticsServer.secretKey,
secondsUntilExpiration: 60 * 30,
});
});

test.afterAll(async () => {
const client = createClerkClient({
secretKey: instanceKeys.get('with-api-keys').sk,
});

await client.m2mTokens.revoke({
m2mTokenId: emailServerM2MToken.id,
});
await client.m2mTokens.revoke({
m2mTokenId: analyticsServerM2MToken.id,
});
await client.machines.delete(emailServer.id);
await client.machines.delete(primaryApiServer.id);
await client.machines.delete(analyticsServer.id);

await app.teardown();
});

test('rejects requests with invalid M2M tokens', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

const res = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer invalid`,
},
});
expect(res.status()).toBe(401);
expect(await res.text()).toBe('Unauthorized');

const res2 = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer mt_xxx`,
},
});
expect(res2.status()).toBe(401);
expect(await res2.text()).toBe('Unauthorized');
});

test('rejects M2M requests when sender machine lacks access to receiver machine', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

const res = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer ${analyticsServerM2MToken.secret}`,
},
});
expect(res.status()).toBe(401);
expect(await res.text()).toBe('Unauthorized');
});

test('authorizes M2M requests when sender machine has proper access to receiver machine', async ({
page,
context,
}) => {
const u = createTestUtils({ app, page, context });

// Email server can access primary API server
const res = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer ${emailServerM2MToken.secret}`,
},
});
expect(res.status()).toBe(200);
expect(await res.text()).toBe('Protected response ' + emailServerM2MToken.id);

// Analytics server can access primary API server after adding scope
await u.services.clerk.machines.createScope(analyticsServer.id, primaryApiServer.id);
const m2mToken = await u.services.clerk.m2mTokens.create({
machineSecretKey: analyticsServer.secretKey,
secondsUntilExpiration: 60 * 30,
});

const res2 = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer ${m2mToken.secret}`,
},
});
expect(res2.status()).toBe(200);
expect(await res2.text()).toBe('Protected response ' + m2mToken.id);
await u.services.clerk.m2mTokens.revoke({
m2mTokenId: m2mToken.id,
});
});
});
1 change: 1 addition & 0 deletions package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@
"test:integration:generic": "E2E_APP_ID=react.vite.*,next.appRouter.withEmailCodes* pnpm test:integration:base --grep @generic",
"test:integration:handshake": "DISABLE_WEB_SECURITY=true E2E_APP_ID=next.appRouter.sessionsProd1 pnpm test:integration:base --grep @handshake",
"test:integration:localhost": "pnpm test:integration:base --grep @localhost",
"test:integration:machine": "E2E_APP_ID=withMachine.* pnpm test:integration:base --grep @machine",
"test:integration:nextjs": "E2E_APP_ID=next.appRouter.* pnpm test:integration:base --grep @nextjs",
"test:integration:nuxt": "E2E_APP_ID=nuxt.node npm run test:integration:base -- --grep @nuxt",
"test:integration:quickstart": "E2E_APP_ID=quickstart.* pnpm test:integration:base --grep @quickstart",
Expand Down
5 changes: 5 additions & 0 deletions packages/backend/src/api/endpoints/M2MTokenApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,11 @@ type CreateM2MTokenParams = {
* Custom machine secret key for authentication.
*/
machineSecretKey?: string;
/**
* Number of seconds until the token expires.
*
* @default null - Token does not expire
*/
secondsUntilExpiration?: number | null;
claims?: Record<string, unknown> | null;
};
Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,8 @@ export type {
InstanceSettings,
Invitation,
JwtTemplate,
Machine,
M2MToken,
OauthAccessToken,
OAuthApplication,
Organization,
Expand Down
12 changes: 12 additions & 0 deletions turbo.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -344,6 +344,18 @@
"env": ["CLEANUP", "DEBUG", "E2E_*", "INTEGRATION_INSTANCE_KEYS"],
"inputs": ["integration/**"],
"outputLogs": "new-only"
},
"//#test:integration:machine": {
"dependsOn": [
"@clerk/testing#build",
"@clerk/clerk-js#build",
"@clerk/backend#build",
"@clerk/nextjs#build",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We are testing against nextjs, right ?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Related to my comment above, the api keys test needs nextjs

"@clerk/express#build"
],
"env": ["CLEANUP", "DEBUG", "E2E_*", "INTEGRATION_INSTANCE_KEYS"],
"inputs": ["integration/**"],
"outputLogs": "new-only"
}
}
}
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/nasty-colts-travel.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/backend": minor
---

Exports `Machine` and `M2MToken` resource classes

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

💡 Verification agent

🧩 Analysis chain

Clarify wording and verify “classes” vs “types”; double-check semver level

The body currently says “resource classes,” while the PR summary mentions exporting “types.” Ensure the note matches the actual exports (classes vs types). Also, adding new public exports is often considered a minor release per SemVer, not a patch—confirm if “patch” is intended.

If the intent is generic and accurate regardless of implementation detail, you can update the copy to avoid ambiguity:

-Exports `Machine` and `M2MToken` resource classes+Expose `Machine` and `M2MToken` as public exports.

Optionally, if this is a minor release:

-"@clerk/backend": patch+"@clerk/backend": minor

Run this script to verify the nature of the exports and ensure the wording is accurate:


🏁 Script executed:

#!/bin/bashset -euo pipefail
echo"Checking export statements in packages/backend/src/index.ts..."
rg -n -A2 -B2 'export .* (Machine|M2MToken)' packages/backend/src/index.ts ||trueechoecho"Searching for declarations to determine if they are classes or types..."
rg -n -A2 -B2 'export (class|type|interface) (Machine|M2MToken)' packages/backend/src ||true

Length of output: 6239


Update semver to minor for new exports

The term “resource classes” is accurate—both Machine and M2MToken are declared as export class in packages/backend/src/api/resources. However, exposing new public API requires a minor bump, not a patch.

  • .changeset/nasty-colts-travel.md
--- a/.changeset/nasty-colts-travel.md- "@clerk/backend": patch+ "@clerk/backend": minor
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
Exports `Machine` and `M2MToken` resource classes
---
"@clerk/backend": minor
---
Exports `Machine` and `M2MToken` resource classes
🤖 Prompt for AI Agents
In .changeset/nasty-colts-travel.md around line 5, the changeset currently marks
the package bump as a patch despite adding new exported resource classes; edit
the changeset to change the version bump from "patch" to "minor" (i.e., update
the bump level in the file header or package entry to "minor"), save and commit
the updated changeset so the release tooling will perform a minor version bump.

1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -293,6 +293,7 @@ jobs:
'nuxt',
'react-router',
'billing',
'machine'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🙃

Suggested change
'machine'
'm2m'

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

So there's a follow up PR for this that will group all "machine" related tests (api keys, m2m)

]
Comment thread
wobsoriano marked this conversation as resolved.
test-project: ['chrome']
include:
Expand Down
6 changes: 6 additions & 0 deletions integration/presets/longRunningApps.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,12 @@ export const createLongRunningApps = () => {
{ id: 'withBillingJwtV2.vue.vite', config: vue.vite, env: envs.withBillingJwtV2 },
{ id: 'withBilling.vue.vite', config: vue.vite, env: envs.withBilling },

/**
* Machine auth apps
* TODO(rob): Group other machine auth apps together (api keys, m2m tokens, etc)
*/
{ id: 'withMachine.express.vite', config: express.vite, env: envs.withAPIKeys },

/**
* Vite apps - basic flows
*/
Expand Down
172 changes: 172 additions & 0 deletions integration/tests/machine-auth/m2m.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,172 @@
import { createClerkClient, type M2MToken, type Machine } from '@clerk/backend';
import { faker } from '@faker-js/faker';
import { expect, test } from '@playwright/test';

import type { Application } from '../../models/application';
import { appConfigs } from '../../presets';
import { instanceKeys } from '../../presets/envs';
import { createTestUtils } from '../../testUtils';

test.describe('machine-to-machine auth @machine', () => {
test.describe.configure({ mode: 'parallel' });
let app: Application;
let primaryApiServer: Machine;
let emailServer: Machine;
let analyticsServer: Machine;
let emailServerM2MToken: M2MToken;
let analyticsServerM2MToken: M2MToken;

test.beforeAll(async () => {
const fakeCompanyName = faker.company.name();

// Create primary machine using instance secret key
const client = createClerkClient({
secretKey: instanceKeys.get('with-api-keys').sk,
});
primaryApiServer = await client.machines.create({
name: `${fakeCompanyName} Primary API Server`,
});

app = await appConfigs.express.vite
.clone()
.addFile(
'src/server/main.ts',
() => `
import 'dotenv/config';
import { clerkClient } from '@clerk/express';
import express from 'express';
import ViteExpress from 'vite-express';

const app = express();

app.get('/api/protected', async (req, res) => {
const secret = req.get('Authorization')?.split(' ')[1];

try {
const m2mToken = await clerkClient.m2mTokens.verifySecret({ secret });
res.send('Protected response ' + m2mToken.id);
} catch {
res.status(401).send('Unauthorized');
}
});

const port = parseInt(process.env.PORT as string) || 3002;
ViteExpress.listen(app, port, () => console.log('Server started'));
`,
)
.commit();

await app.setup();

// Using the created machine, set a machine secret key using the primary machine's secret key
const env = appConfigs.envs.withAPIKeys
.clone()
.setEnvVariable('private', 'CLERK_MACHINE_SECRET_KEY', primaryApiServer.secretKey);
await app.withEnv(env);
await app.dev();

// Email server can access primary API server
emailServer = await client.machines.create({
name: `${fakeCompanyName} Email Server`,
scopedMachines: [primaryApiServer.id],
});
emailServerM2MToken = await client.m2mTokens.create({
machineSecretKey: emailServer.secretKey,
secondsUntilExpiration: 60 * 30,
});

// Analytics server cannot access primary API server
analyticsServer = await client.machines.create({
name: `${fakeCompanyName} Analytics Server`,
// No scoped machines
});
analyticsServerM2MToken = await client.m2mTokens.create({
machineSecretKey: analyticsServer.secretKey,
secondsUntilExpiration: 60 * 30,
});
});

test.afterAll(async () => {
const client = createClerkClient({
secretKey: instanceKeys.get('with-api-keys').sk,
});

await client.m2mTokens.revoke({
m2mTokenId: emailServerM2MToken.id,
});
await client.m2mTokens.revoke({
m2mTokenId: analyticsServerM2MToken.id,
});
await client.machines.delete(emailServer.id);
await client.machines.delete(primaryApiServer.id);
await client.machines.delete(analyticsServer.id);

await app.teardown();
});

test('rejects requests with invalid M2M tokens', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

const res = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer invalid`,
},
});
expect(res.status()).toBe(401);
expect(await res.text()).toBe('Unauthorized');

const res2 = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer mt_xxx`,
},
});
expect(res2.status()).toBe(401);
expect(await res2.text()).toBe('Unauthorized');
});

test('rejects M2M requests when sender machine lacks access to receiver machine', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

const res = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer ${analyticsServerM2MToken.secret}`,
},
});
expect(res.status()).toBe(401);
expect(await res.text()).toBe('Unauthorized');
});

test('authorizes M2M requests when sender machine has proper access to receiver machine', async ({
page,
context,
}) => {
const u = createTestUtils({ app, page, context });

// Email server can access primary API server
const res = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer ${emailServerM2MToken.secret}`,
},
});
expect(res.status()).toBe(200);
expect(await res.text()).toBe('Protected response ' + emailServerM2MToken.id);

// Analytics server can access primary API server after adding scope
await u.services.clerk.machines.createScope(analyticsServer.id, primaryApiServer.id);
const m2mToken = await u.services.clerk.m2mTokens.create({
machineSecretKey: analyticsServer.secretKey,
secondsUntilExpiration: 60 * 30,
});

const res2 = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer ${m2mToken.secret}`,
},
});
expect(res2.status()).toBe(200);
expect(await res2.text()).toBe('Protected response ' + m2mToken.id);
await u.services.clerk.m2mTokens.revoke({
m2mTokenId: m2mToken.id,
});
});
});
1 change: 1 addition & 0 deletions package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@
"test:integration:generic": "E2E_APP_ID=react.vite.*,next.appRouter.withEmailCodes* pnpm test:integration:base --grep @generic",
"test:integration:handshake": "DISABLE_WEB_SECURITY=true E2E_APP_ID=next.appRouter.sessionsProd1 pnpm test:integration:base --grep @handshake",
"test:integration:localhost": "pnpm test:integration:base --grep @localhost",
"test:integration:machine": "E2E_APP_ID=withMachine.* pnpm test:integration:base --grep @machine",
"test:integration:nextjs": "E2E_APP_ID=next.appRouter.* pnpm test:integration:base --grep @nextjs",
"test:integration:nuxt": "E2E_APP_ID=nuxt.node npm run test:integration:base -- --grep @nuxt",
"test:integration:quickstart": "E2E_APP_ID=quickstart.* pnpm test:integration:base --grep @quickstart",
Expand Down
5 changes: 5 additions & 0 deletions packages/backend/src/api/endpoints/M2MTokenApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,11 @@ type CreateM2MTokenParams = {
* Custom machine secret key for authentication.
*/
machineSecretKey?: string;
/**
* Number of seconds until the token expires.
*
* @default null - Token does not expire
*/
secondsUntilExpiration?: number | null;
claims?: Record<string, unknown> | null;
};
Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,8 @@ export type {
InstanceSettings,
Invitation,
JwtTemplate,
Machine,
M2MToken,
OauthAccessToken,
OAuthApplication,
Organization,
Expand Down
12 changes: 12 additions & 0 deletions turbo.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -344,6 +344,18 @@
"env": ["CLEANUP", "DEBUG", "E2E_*", "INTEGRATION_INSTANCE_KEYS"],
"inputs": ["integration/**"],
"outputLogs": "new-only"
},
"//#test:integration:machine": {
"dependsOn": [
"@clerk/testing#build",
"@clerk/clerk-js#build",
"@clerk/backend#build",
"@clerk/nextjs#build",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We are testing against nextjs, right ?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Related to my comment above, the api keys test needs nextjs

"@clerk/express#build"
],
"env": ["CLEANUP", "DEBUG", "E2E_*", "INTEGRATION_INSTANCE_KEYS"],
"inputs": ["integration/**"],
"outputLogs": "new-only"
}
}
}
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/nasty-colts-travel.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/backend": minor
---

Exports `Machine` and `M2MToken` resource classes

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

💡 Verification agent

🧩 Analysis chain

Clarify wording and verify “classes” vs “types”; double-check semver level

The body currently says “resource classes,” while the PR summary mentions exporting “types.” Ensure the note matches the actual exports (classes vs types). Also, adding new public exports is often considered a minor release per SemVer, not a patch—confirm if “patch” is intended.

If the intent is generic and accurate regardless of implementation detail, you can update the copy to avoid ambiguity:

-Exports `Machine` and `M2MToken` resource classes+Expose `Machine` and `M2MToken` as public exports.

Optionally, if this is a minor release:

-"@clerk/backend": patch+"@clerk/backend": minor

Run this script to verify the nature of the exports and ensure the wording is accurate:


🏁 Script executed:

#!/bin/bashset -euo pipefail
echo"Checking export statements in packages/backend/src/index.ts..."
rg -n -A2 -B2 'export .* (Machine|M2MToken)' packages/backend/src/index.ts ||trueechoecho"Searching for declarations to determine if they are classes or types..."
rg -n -A2 -B2 'export (class|type|interface) (Machine|M2MToken)' packages/backend/src ||true

Length of output: 6239


Update semver to minor for new exports

The term “resource classes” is accurate—both Machine and M2MToken are declared as export class in packages/backend/src/api/resources. However, exposing new public API requires a minor bump, not a patch.

  • .changeset/nasty-colts-travel.md
--- a/.changeset/nasty-colts-travel.md- "@clerk/backend": patch+ "@clerk/backend": minor
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
Exports `Machine` and `M2MToken` resource classes
---
"@clerk/backend": minor
---
Exports `Machine` and `M2MToken` resource classes
🤖 Prompt for AI Agents
In .changeset/nasty-colts-travel.md around line 5, the changeset currently marks
the package bump as a patch despite adding new exported resource classes; edit
the changeset to change the version bump from "patch" to "minor" (i.e., update
the bump level in the file header or package entry to "minor"), save and commit
the updated changeset so the release tooling will perform a minor version bump.

1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -293,6 +293,7 @@ jobs:
'nuxt',
'react-router',
'billing',
'machine'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🙃

Suggested change
'machine'
'm2m'

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

So there's a follow up PR for this that will group all "machine" related tests (api keys, m2m)

]
Comment thread
wobsoriano marked this conversation as resolved.
test-project: ['chrome']
include:
Expand Down
6 changes: 6 additions & 0 deletions integration/presets/longRunningApps.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,12 @@ export const createLongRunningApps = () => {
{ id: 'withBillingJwtV2.vue.vite', config: vue.vite, env: envs.withBillingJwtV2 },
{ id: 'withBilling.vue.vite', config: vue.vite, env: envs.withBilling },

/**
* Machine auth apps
* TODO(rob): Group other machine auth apps together (api keys, m2m tokens, etc)
*/
{ id: 'withMachine.express.vite', config: express.vite, env: envs.withAPIKeys },

/**
* Vite apps - basic flows
*/
Expand Down
172 changes: 172 additions & 0 deletions integration/tests/machine-auth/m2m.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,172 @@
import { createClerkClient, type M2MToken, type Machine } from '@clerk/backend';
import { faker } from '@faker-js/faker';
import { expect, test } from '@playwright/test';

import type { Application } from '../../models/application';
import { appConfigs } from '../../presets';
import { instanceKeys } from '../../presets/envs';
import { createTestUtils } from '../../testUtils';

test.describe('machine-to-machine auth @machine', () => {
test.describe.configure({ mode: 'parallel' });
let app: Application;
let primaryApiServer: Machine;
let emailServer: Machine;
let analyticsServer: Machine;
let emailServerM2MToken: M2MToken;
let analyticsServerM2MToken: M2MToken;

test.beforeAll(async () => {
const fakeCompanyName = faker.company.name();

// Create primary machine using instance secret key
const client = createClerkClient({
secretKey: instanceKeys.get('with-api-keys').sk,
});
primaryApiServer = await client.machines.create({
name: `${fakeCompanyName} Primary API Server`,
});

app = await appConfigs.express.vite
.clone()
.addFile(
'src/server/main.ts',
() => `
import 'dotenv/config';
import { clerkClient } from '@clerk/express';
import express from 'express';
import ViteExpress from 'vite-express';

const app = express();

app.get('/api/protected', async (req, res) => {
const secret = req.get('Authorization')?.split(' ')[1];

try {
const m2mToken = await clerkClient.m2mTokens.verifySecret({ secret });
res.send('Protected response ' + m2mToken.id);
} catch {
res.status(401).send('Unauthorized');
}
});

const port = parseInt(process.env.PORT as string) || 3002;
ViteExpress.listen(app, port, () => console.log('Server started'));
`,
)
.commit();

await app.setup();

// Using the created machine, set a machine secret key using the primary machine's secret key
const env = appConfigs.envs.withAPIKeys
.clone()
.setEnvVariable('private', 'CLERK_MACHINE_SECRET_KEY', primaryApiServer.secretKey);
await app.withEnv(env);
await app.dev();

// Email server can access primary API server
emailServer = await client.machines.create({
name: `${fakeCompanyName} Email Server`,
scopedMachines: [primaryApiServer.id],
});
emailServerM2MToken = await client.m2mTokens.create({
machineSecretKey: emailServer.secretKey,
secondsUntilExpiration: 60 * 30,
});

// Analytics server cannot access primary API server
analyticsServer = await client.machines.create({
name: `${fakeCompanyName} Analytics Server`,
// No scoped machines
});
analyticsServerM2MToken = await client.m2mTokens.create({
machineSecretKey: analyticsServer.secretKey,
secondsUntilExpiration: 60 * 30,
});
});

test.afterAll(async () => {
const client = createClerkClient({
secretKey: instanceKeys.get('with-api-keys').sk,
});

await client.m2mTokens.revoke({
m2mTokenId: emailServerM2MToken.id,
});
await client.m2mTokens.revoke({
m2mTokenId: analyticsServerM2MToken.id,
});
await client.machines.delete(emailServer.id);
await client.machines.delete(primaryApiServer.id);
await client.machines.delete(analyticsServer.id);

await app.teardown();
});

test('rejects requests with invalid M2M tokens', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

const res = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer invalid`,
},
});
expect(res.status()).toBe(401);
expect(await res.text()).toBe('Unauthorized');

const res2 = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer mt_xxx`,
},
});
expect(res2.status()).toBe(401);
expect(await res2.text()).toBe('Unauthorized');
});

test('rejects M2M requests when sender machine lacks access to receiver machine', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

const res = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer ${analyticsServerM2MToken.secret}`,
},
});
expect(res.status()).toBe(401);
expect(await res.text()).toBe('Unauthorized');
});

test('authorizes M2M requests when sender machine has proper access to receiver machine', async ({
page,
context,
}) => {
const u = createTestUtils({ app, page, context });

// Email server can access primary API server
const res = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer ${emailServerM2MToken.secret}`,
},
});
expect(res.status()).toBe(200);
expect(await res.text()).toBe('Protected response ' + emailServerM2MToken.id);

// Analytics server can access primary API server after adding scope
await u.services.clerk.machines.createScope(analyticsServer.id, primaryApiServer.id);
const m2mToken = await u.services.clerk.m2mTokens.create({
machineSecretKey: analyticsServer.secretKey,
secondsUntilExpiration: 60 * 30,
});

const res2 = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer ${m2mToken.secret}`,
},
});
expect(res2.status()).toBe(200);
expect(await res2.text()).toBe('Protected response ' + m2mToken.id);
await u.services.clerk.m2mTokens.revoke({
m2mTokenId: m2mToken.id,
});
});
});
1 change: 1 addition & 0 deletions package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@
"test:integration:generic": "E2E_APP_ID=react.vite.*,next.appRouter.withEmailCodes* pnpm test:integration:base --grep @generic",
"test:integration:handshake": "DISABLE_WEB_SECURITY=true E2E_APP_ID=next.appRouter.sessionsProd1 pnpm test:integration:base --grep @handshake",
"test:integration:localhost": "pnpm test:integration:base --grep @localhost",
"test:integration:machine": "E2E_APP_ID=withMachine.* pnpm test:integration:base --grep @machine",
"test:integration:nextjs": "E2E_APP_ID=next.appRouter.* pnpm test:integration:base --grep @nextjs",
"test:integration:nuxt": "E2E_APP_ID=nuxt.node npm run test:integration:base -- --grep @nuxt",
"test:integration:quickstart": "E2E_APP_ID=quickstart.* pnpm test:integration:base --grep @quickstart",
Expand Down
5 changes: 5 additions & 0 deletions packages/backend/src/api/endpoints/M2MTokenApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,11 @@ type CreateM2MTokenParams = {
* Custom machine secret key for authentication.
*/
machineSecretKey?: string;
/**
* Number of seconds until the token expires.
*
* @default null - Token does not expire
*/
secondsUntilExpiration?: number | null;
claims?: Record<string, unknown> | null;
};
Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,8 @@ export type {
InstanceSettings,
Invitation,
JwtTemplate,
Machine,
M2MToken,
OauthAccessToken,
OAuthApplication,
Organization,
Expand Down
12 changes: 12 additions & 0 deletions turbo.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -344,6 +344,18 @@
"env": ["CLEANUP", "DEBUG", "E2E_*", "INTEGRATION_INSTANCE_KEYS"],
"inputs": ["integration/**"],
"outputLogs": "new-only"
},
"//#test:integration:machine": {
"dependsOn": [
"@clerk/testing#build",
"@clerk/clerk-js#build",
"@clerk/backend#build",
"@clerk/nextjs#build",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We are testing against nextjs, right ?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Related to my comment above, the api keys test needs nextjs

"@clerk/express#build"
],
"env": ["CLEANUP", "DEBUG", "E2E_*", "INTEGRATION_INSTANCE_KEYS"],
"inputs": ["integration/**"],
"outputLogs": "new-only"
}
}
}
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/nasty-colts-travel.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/backend": minor
---

Exports `Machine` and `M2MToken` resource classes

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

💡 Verification agent

🧩 Analysis chain

Clarify wording and verify “classes” vs “types”; double-check semver level

The body currently says “resource classes,” while the PR summary mentions exporting “types.” Ensure the note matches the actual exports (classes vs types). Also, adding new public exports is often considered a minor release per SemVer, not a patch—confirm if “patch” is intended.

If the intent is generic and accurate regardless of implementation detail, you can update the copy to avoid ambiguity:

-Exports `Machine` and `M2MToken` resource classes+Expose `Machine` and `M2MToken` as public exports.

Optionally, if this is a minor release:

-"@clerk/backend": patch+"@clerk/backend": minor

Run this script to verify the nature of the exports and ensure the wording is accurate:


🏁 Script executed:

#!/bin/bashset -euo pipefail
echo"Checking export statements in packages/backend/src/index.ts..."
rg -n -A2 -B2 'export .* (Machine|M2MToken)' packages/backend/src/index.ts ||trueechoecho"Searching for declarations to determine if they are classes or types..."
rg -n -A2 -B2 'export (class|type|interface) (Machine|M2MToken)' packages/backend/src ||true

Length of output: 6239


Update semver to minor for new exports

The term “resource classes” is accurate—both Machine and M2MToken are declared as export class in packages/backend/src/api/resources. However, exposing new public API requires a minor bump, not a patch.

  • .changeset/nasty-colts-travel.md
--- a/.changeset/nasty-colts-travel.md- "@clerk/backend": patch+ "@clerk/backend": minor
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
Exports `Machine` and `M2MToken` resource classes
---
"@clerk/backend": minor
---
Exports `Machine` and `M2MToken` resource classes
🤖 Prompt for AI Agents
In .changeset/nasty-colts-travel.md around line 5, the changeset currently marks
the package bump as a patch despite adding new exported resource classes; edit
the changeset to change the version bump from "patch" to "minor" (i.e., update
the bump level in the file header or package entry to "minor"), save and commit
the updated changeset so the release tooling will perform a minor version bump.

1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -293,6 +293,7 @@ jobs:
'nuxt',
'react-router',
'billing',
'machine'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🙃

Suggested change
'machine'
'm2m'

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

So there's a follow up PR for this that will group all "machine" related tests (api keys, m2m)

]
Comment thread
wobsoriano marked this conversation as resolved.
test-project: ['chrome']
include:
Expand Down
6 changes: 6 additions & 0 deletions integration/presets/longRunningApps.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,12 @@ export const createLongRunningApps = () => {
{ id: 'withBillingJwtV2.vue.vite', config: vue.vite, env: envs.withBillingJwtV2 },
{ id: 'withBilling.vue.vite', config: vue.vite, env: envs.withBilling },

/**
* Machine auth apps
* TODO(rob): Group other machine auth apps together (api keys, m2m tokens, etc)
*/
{ id: 'withMachine.express.vite', config: express.vite, env: envs.withAPIKeys },

/**
* Vite apps - basic flows
*/
Expand Down
172 changes: 172 additions & 0 deletions integration/tests/machine-auth/m2m.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,172 @@
import { createClerkClient, type M2MToken, type Machine } from '@clerk/backend';
import { faker } from '@faker-js/faker';
import { expect, test } from '@playwright/test';

import type { Application } from '../../models/application';
import { appConfigs } from '../../presets';
import { instanceKeys } from '../../presets/envs';
import { createTestUtils } from '../../testUtils';

test.describe('machine-to-machine auth @machine', () => {
test.describe.configure({ mode: 'parallel' });
let app: Application;
let primaryApiServer: Machine;
let emailServer: Machine;
let analyticsServer: Machine;
let emailServerM2MToken: M2MToken;
let analyticsServerM2MToken: M2MToken;

test.beforeAll(async () => {
const fakeCompanyName = faker.company.name();

// Create primary machine using instance secret key
const client = createClerkClient({
secretKey: instanceKeys.get('with-api-keys').sk,
});
primaryApiServer = await client.machines.create({
name: `${fakeCompanyName} Primary API Server`,
});

app = await appConfigs.express.vite
.clone()
.addFile(
'src/server/main.ts',
() => `
import 'dotenv/config';
import { clerkClient } from '@clerk/express';
import express from 'express';
import ViteExpress from 'vite-express';

const app = express();

app.get('/api/protected', async (req, res) => {
const secret = req.get('Authorization')?.split(' ')[1];

try {
const m2mToken = await clerkClient.m2mTokens.verifySecret({ secret });
res.send('Protected response ' + m2mToken.id);
} catch {
res.status(401).send('Unauthorized');
}
});

const port = parseInt(process.env.PORT as string) || 3002;
ViteExpress.listen(app, port, () => console.log('Server started'));
`,
)
.commit();

await app.setup();

// Using the created machine, set a machine secret key using the primary machine's secret key
const env = appConfigs.envs.withAPIKeys
.clone()
.setEnvVariable('private', 'CLERK_MACHINE_SECRET_KEY', primaryApiServer.secretKey);
await app.withEnv(env);
await app.dev();

// Email server can access primary API server
emailServer = await client.machines.create({
name: `${fakeCompanyName} Email Server`,
scopedMachines: [primaryApiServer.id],
});
emailServerM2MToken = await client.m2mTokens.create({
machineSecretKey: emailServer.secretKey,
secondsUntilExpiration: 60 * 30,
});

// Analytics server cannot access primary API server
analyticsServer = await client.machines.create({
name: `${fakeCompanyName} Analytics Server`,
// No scoped machines
});
analyticsServerM2MToken = await client.m2mTokens.create({
machineSecretKey: analyticsServer.secretKey,
secondsUntilExpiration: 60 * 30,
});
});

test.afterAll(async () => {
const client = createClerkClient({
secretKey: instanceKeys.get('with-api-keys').sk,
});

await client.m2mTokens.revoke({
m2mTokenId: emailServerM2MToken.id,
});
await client.m2mTokens.revoke({
m2mTokenId: analyticsServerM2MToken.id,
});
await client.machines.delete(emailServer.id);
await client.machines.delete(primaryApiServer.id);
await client.machines.delete(analyticsServer.id);

await app.teardown();
});

test('rejects requests with invalid M2M tokens', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

const res = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer invalid`,
},
});
expect(res.status()).toBe(401);
expect(await res.text()).toBe('Unauthorized');

const res2 = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer mt_xxx`,
},
});
expect(res2.status()).toBe(401);
expect(await res2.text()).toBe('Unauthorized');
});

test('rejects M2M requests when sender machine lacks access to receiver machine', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

const res = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer ${analyticsServerM2MToken.secret}`,
},
});
expect(res.status()).toBe(401);
expect(await res.text()).toBe('Unauthorized');
});

test('authorizes M2M requests when sender machine has proper access to receiver machine', async ({
page,
context,
}) => {
const u = createTestUtils({ app, page, context });

// Email server can access primary API server
const res = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer ${emailServerM2MToken.secret}`,
},
});
expect(res.status()).toBe(200);
expect(await res.text()).toBe('Protected response ' + emailServerM2MToken.id);

// Analytics server can access primary API server after adding scope
await u.services.clerk.machines.createScope(analyticsServer.id, primaryApiServer.id);
const m2mToken = await u.services.clerk.m2mTokens.create({
machineSecretKey: analyticsServer.secretKey,
secondsUntilExpiration: 60 * 30,
});

const res2 = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer ${m2mToken.secret}`,
},
});
expect(res2.status()).toBe(200);
expect(await res2.text()).toBe('Protected response ' + m2mToken.id);
await u.services.clerk.m2mTokens.revoke({
m2mTokenId: m2mToken.id,
});
});
});
1 change: 1 addition & 0 deletions package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@
"test:integration:generic": "E2E_APP_ID=react.vite.*,next.appRouter.withEmailCodes* pnpm test:integration:base --grep @generic",
"test:integration:handshake": "DISABLE_WEB_SECURITY=true E2E_APP_ID=next.appRouter.sessionsProd1 pnpm test:integration:base --grep @handshake",
"test:integration:localhost": "pnpm test:integration:base --grep @localhost",
"test:integration:machine": "E2E_APP_ID=withMachine.* pnpm test:integration:base --grep @machine",
"test:integration:nextjs": "E2E_APP_ID=next.appRouter.* pnpm test:integration:base --grep @nextjs",
"test:integration:nuxt": "E2E_APP_ID=nuxt.node npm run test:integration:base -- --grep @nuxt",
"test:integration:quickstart": "E2E_APP_ID=quickstart.* pnpm test:integration:base --grep @quickstart",
Expand Down
5 changes: 5 additions & 0 deletions packages/backend/src/api/endpoints/M2MTokenApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,11 @@ type CreateM2MTokenParams = {
* Custom machine secret key for authentication.
*/
machineSecretKey?: string;
/**
* Number of seconds until the token expires.
*
* @default null - Token does not expire
*/
secondsUntilExpiration?: number | null;
claims?: Record<string, unknown> | null;
};
Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,8 @@ export type {
InstanceSettings,
Invitation,
JwtTemplate,
Machine,
M2MToken,
OauthAccessToken,
OAuthApplication,
Organization,
Expand Down
12 changes: 12 additions & 0 deletions turbo.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -344,6 +344,18 @@
"env": ["CLEANUP", "DEBUG", "E2E_*", "INTEGRATION_INSTANCE_KEYS"],
"inputs": ["integration/**"],
"outputLogs": "new-only"
},
"//#test:integration:machine": {
"dependsOn": [
"@clerk/testing#build",
"@clerk/clerk-js#build",
"@clerk/backend#build",
"@clerk/nextjs#build",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We are testing against nextjs, right ?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Related to my comment above, the api keys test needs nextjs

"@clerk/express#build"
],
"env": ["CLEANUP", "DEBUG", "E2E_*", "INTEGRATION_INSTANCE_KEYS"],
"inputs": ["integration/**"],
"outputLogs": "new-only"
}
}
}
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/nasty-colts-travel.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/backend": minor
---

Exports `Machine` and `M2MToken` resource classes

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

💡 Verification agent

🧩 Analysis chain

Clarify wording and verify “classes” vs “types”; double-check semver level

The body currently says “resource classes,” while the PR summary mentions exporting “types.” Ensure the note matches the actual exports (classes vs types). Also, adding new public exports is often considered a minor release per SemVer, not a patch—confirm if “patch” is intended.

If the intent is generic and accurate regardless of implementation detail, you can update the copy to avoid ambiguity:

-Exports `Machine` and `M2MToken` resource classes+Expose `Machine` and `M2MToken` as public exports.

Optionally, if this is a minor release:

-"@clerk/backend": patch+"@clerk/backend": minor

Run this script to verify the nature of the exports and ensure the wording is accurate:


🏁 Script executed:

#!/bin/bashset -euo pipefail
echo"Checking export statements in packages/backend/src/index.ts..."
rg -n -A2 -B2 'export .* (Machine|M2MToken)' packages/backend/src/index.ts ||trueechoecho"Searching for declarations to determine if they are classes or types..."
rg -n -A2 -B2 'export (class|type|interface) (Machine|M2MToken)' packages/backend/src ||true

Length of output: 6239


Update semver to minor for new exports

The term “resource classes” is accurate—both Machine and M2MToken are declared as export class in packages/backend/src/api/resources. However, exposing new public API requires a minor bump, not a patch.

  • .changeset/nasty-colts-travel.md
--- a/.changeset/nasty-colts-travel.md- "@clerk/backend": patch+ "@clerk/backend": minor
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
Exports `Machine` and `M2MToken` resource classes
---
"@clerk/backend": minor
---
Exports `Machine` and `M2MToken` resource classes
🤖 Prompt for AI Agents
In .changeset/nasty-colts-travel.md around line 5, the changeset currently marks
the package bump as a patch despite adding new exported resource classes; edit
the changeset to change the version bump from "patch" to "minor" (i.e., update
the bump level in the file header or package entry to "minor"), save and commit
the updated changeset so the release tooling will perform a minor version bump.

1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -293,6 +293,7 @@ jobs:
'nuxt',
'react-router',
'billing',
'machine'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🙃

Suggested change
'machine'
'm2m'

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

So there's a follow up PR for this that will group all "machine" related tests (api keys, m2m)

]
Comment thread
wobsoriano marked this conversation as resolved.
test-project: ['chrome']
include:
Expand Down
6 changes: 6 additions & 0 deletions integration/presets/longRunningApps.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,12 @@ export const createLongRunningApps = () => {
{ id: 'withBillingJwtV2.vue.vite', config: vue.vite, env: envs.withBillingJwtV2 },
{ id: 'withBilling.vue.vite', config: vue.vite, env: envs.withBilling },

/**
* Machine auth apps
* TODO(rob): Group other machine auth apps together (api keys, m2m tokens, etc)
*/
{ id: 'withMachine.express.vite', config: express.vite, env: envs.withAPIKeys },

/**
* Vite apps - basic flows
*/
Expand Down
172 changes: 172 additions & 0 deletions integration/tests/machine-auth/m2m.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,172 @@
import { createClerkClient, type M2MToken, type Machine } from '@clerk/backend';
import { faker } from '@faker-js/faker';
import { expect, test } from '@playwright/test';

import type { Application } from '../../models/application';
import { appConfigs } from '../../presets';
import { instanceKeys } from '../../presets/envs';
import { createTestUtils } from '../../testUtils';

test.describe('machine-to-machine auth @machine', () => {
test.describe.configure({ mode: 'parallel' });
let app: Application;
let primaryApiServer: Machine;
let emailServer: Machine;
let analyticsServer: Machine;
let emailServerM2MToken: M2MToken;
let analyticsServerM2MToken: M2MToken;

test.beforeAll(async () => {
const fakeCompanyName = faker.company.name();

// Create primary machine using instance secret key
const client = createClerkClient({
secretKey: instanceKeys.get('with-api-keys').sk,
});
primaryApiServer = await client.machines.create({
name: `${fakeCompanyName} Primary API Server`,
});

app = await appConfigs.express.vite
.clone()
.addFile(
'src/server/main.ts',
() => `
import 'dotenv/config';
import { clerkClient } from '@clerk/express';
import express from 'express';
import ViteExpress from 'vite-express';

const app = express();

app.get('/api/protected', async (req, res) => {
const secret = req.get('Authorization')?.split(' ')[1];

try {
const m2mToken = await clerkClient.m2mTokens.verifySecret({ secret });
res.send('Protected response ' + m2mToken.id);
} catch {
res.status(401).send('Unauthorized');
}
});

const port = parseInt(process.env.PORT as string) || 3002;
ViteExpress.listen(app, port, () => console.log('Server started'));
`,
)
.commit();

await app.setup();

// Using the created machine, set a machine secret key using the primary machine's secret key
const env = appConfigs.envs.withAPIKeys
.clone()
.setEnvVariable('private', 'CLERK_MACHINE_SECRET_KEY', primaryApiServer.secretKey);
await app.withEnv(env);
await app.dev();

// Email server can access primary API server
emailServer = await client.machines.create({
name: `${fakeCompanyName} Email Server`,
scopedMachines: [primaryApiServer.id],
});
emailServerM2MToken = await client.m2mTokens.create({
machineSecretKey: emailServer.secretKey,
secondsUntilExpiration: 60 * 30,
});

// Analytics server cannot access primary API server
analyticsServer = await client.machines.create({
name: `${fakeCompanyName} Analytics Server`,
// No scoped machines
});
analyticsServerM2MToken = await client.m2mTokens.create({
machineSecretKey: analyticsServer.secretKey,
secondsUntilExpiration: 60 * 30,
});
});

test.afterAll(async () => {
const client = createClerkClient({
secretKey: instanceKeys.get('with-api-keys').sk,
});

await client.m2mTokens.revoke({
m2mTokenId: emailServerM2MToken.id,
});
await client.m2mTokens.revoke({
m2mTokenId: analyticsServerM2MToken.id,
});
await client.machines.delete(emailServer.id);
await client.machines.delete(primaryApiServer.id);
await client.machines.delete(analyticsServer.id);

await app.teardown();
});

test('rejects requests with invalid M2M tokens', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

const res = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer invalid`,
},
});
expect(res.status()).toBe(401);
expect(await res.text()).toBe('Unauthorized');

const res2 = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer mt_xxx`,
},
});
expect(res2.status()).toBe(401);
expect(await res2.text()).toBe('Unauthorized');
});

test('rejects M2M requests when sender machine lacks access to receiver machine', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

const res = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer ${analyticsServerM2MToken.secret}`,
},
});
expect(res.status()).toBe(401);
expect(await res.text()).toBe('Unauthorized');
});

test('authorizes M2M requests when sender machine has proper access to receiver machine', async ({
page,
context,
}) => {
const u = createTestUtils({ app, page, context });

// Email server can access primary API server
const res = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer ${emailServerM2MToken.secret}`,
},
});
expect(res.status()).toBe(200);
expect(await res.text()).toBe('Protected response ' + emailServerM2MToken.id);

// Analytics server can access primary API server after adding scope
await u.services.clerk.machines.createScope(analyticsServer.id, primaryApiServer.id);
const m2mToken = await u.services.clerk.m2mTokens.create({
machineSecretKey: analyticsServer.secretKey,
secondsUntilExpiration: 60 * 30,
});

const res2 = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer ${m2mToken.secret}`,
},
});
expect(res2.status()).toBe(200);
expect(await res2.text()).toBe('Protected response ' + m2mToken.id);
await u.services.clerk.m2mTokens.revoke({
m2mTokenId: m2mToken.id,
});
});
});
1 change: 1 addition & 0 deletions package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@
"test:integration:generic": "E2E_APP_ID=react.vite.*,next.appRouter.withEmailCodes* pnpm test:integration:base --grep @generic",
"test:integration:handshake": "DISABLE_WEB_SECURITY=true E2E_APP_ID=next.appRouter.sessionsProd1 pnpm test:integration:base --grep @handshake",
"test:integration:localhost": "pnpm test:integration:base --grep @localhost",
"test:integration:machine": "E2E_APP_ID=withMachine.* pnpm test:integration:base --grep @machine",
"test:integration:nextjs": "E2E_APP_ID=next.appRouter.* pnpm test:integration:base --grep @nextjs",
"test:integration:nuxt": "E2E_APP_ID=nuxt.node npm run test:integration:base -- --grep @nuxt",
"test:integration:quickstart": "E2E_APP_ID=quickstart.* pnpm test:integration:base --grep @quickstart",
Expand Down
5 changes: 5 additions & 0 deletions packages/backend/src/api/endpoints/M2MTokenApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,11 @@ type CreateM2MTokenParams = {
* Custom machine secret key for authentication.
*/
machineSecretKey?: string;
/**
* Number of seconds until the token expires.
*
* @default null - Token does not expire
*/
secondsUntilExpiration?: number | null;
claims?: Record<string, unknown> | null;
};
Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,8 @@ export type {
InstanceSettings,
Invitation,
JwtTemplate,
Machine,
M2MToken,
OauthAccessToken,
OAuthApplication,
Organization,
Expand Down
12 changes: 12 additions & 0 deletions turbo.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -344,6 +344,18 @@
"env": ["CLEANUP", "DEBUG", "E2E_*", "INTEGRATION_INSTANCE_KEYS"],
"inputs": ["integration/**"],
"outputLogs": "new-only"
},
"//#test:integration:machine": {
"dependsOn": [
"@clerk/testing#build",
"@clerk/clerk-js#build",
"@clerk/backend#build",
"@clerk/nextjs#build",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We are testing against nextjs, right ?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Related to my comment above, the api keys test needs nextjs

"@clerk/express#build"
],
"env": ["CLEANUP", "DEBUG", "E2E_*", "INTEGRATION_INSTANCE_KEYS"],
"inputs": ["integration/**"],
"outputLogs": "new-only"
}
}
}
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/nasty-colts-travel.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@clerk/backend": minor
---

Exports `Machine` and `M2MToken` resource classes

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

💡 Verification agent

🧩 Analysis chain

Clarify wording and verify “classes” vs “types”; double-check semver level

The body currently says “resource classes,” while the PR summary mentions exporting “types.” Ensure the note matches the actual exports (classes vs types). Also, adding new public exports is often considered a minor release per SemVer, not a patch—confirm if “patch” is intended.

If the intent is generic and accurate regardless of implementation detail, you can update the copy to avoid ambiguity:

-Exports `Machine` and `M2MToken` resource classes+Expose `Machine` and `M2MToken` as public exports.

Optionally, if this is a minor release:

-"@clerk/backend": patch+"@clerk/backend": minor

Run this script to verify the nature of the exports and ensure the wording is accurate:


🏁 Script executed:

#!/bin/bashset -euo pipefail
echo"Checking export statements in packages/backend/src/index.ts..."
rg -n -A2 -B2 'export .* (Machine|M2MToken)' packages/backend/src/index.ts ||trueechoecho"Searching for declarations to determine if they are classes or types..."
rg -n -A2 -B2 'export (class|type|interface) (Machine|M2MToken)' packages/backend/src ||true

Length of output: 6239


Update semver to minor for new exports

The term “resource classes” is accurate—both Machine and M2MToken are declared as export class in packages/backend/src/api/resources. However, exposing new public API requires a minor bump, not a patch.

  • .changeset/nasty-colts-travel.md
--- a/.changeset/nasty-colts-travel.md- "@clerk/backend": patch+ "@clerk/backend": minor
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
Exports `Machine` and `M2MToken` resource classes
---
"@clerk/backend": minor
---
Exports `Machine` and `M2MToken` resource classes
🤖 Prompt for AI Agents
In .changeset/nasty-colts-travel.md around line 5, the changeset currently marks
the package bump as a patch despite adding new exported resource classes; edit
the changeset to change the version bump from "patch" to "minor" (i.e., update
the bump level in the file header or package entry to "minor"), save and commit
the updated changeset so the release tooling will perform a minor version bump.

1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -293,6 +293,7 @@ jobs:
'nuxt',
'react-router',
'billing',
'machine'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🙃

Suggested change
'machine'
'm2m'

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

So there's a follow up PR for this that will group all "machine" related tests (api keys, m2m)

]
Comment thread
wobsoriano marked this conversation as resolved.
test-project: ['chrome']
include:
Expand Down
6 changes: 6 additions & 0 deletions integration/presets/longRunningApps.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,12 @@ export const createLongRunningApps = () => {
{ id: 'withBillingJwtV2.vue.vite', config: vue.vite, env: envs.withBillingJwtV2 },
{ id: 'withBilling.vue.vite', config: vue.vite, env: envs.withBilling },

/**
* Machine auth apps
* TODO(rob): Group other machine auth apps together (api keys, m2m tokens, etc)
*/
{ id: 'withMachine.express.vite', config: express.vite, env: envs.withAPIKeys },

/**
* Vite apps - basic flows
*/
Expand Down
172 changes: 172 additions & 0 deletions integration/tests/machine-auth/m2m.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,172 @@
import { createClerkClient, type M2MToken, type Machine } from '@clerk/backend';
import { faker } from '@faker-js/faker';
import { expect, test } from '@playwright/test';

import type { Application } from '../../models/application';
import { appConfigs } from '../../presets';
import { instanceKeys } from '../../presets/envs';
import { createTestUtils } from '../../testUtils';

test.describe('machine-to-machine auth @machine', () => {
test.describe.configure({ mode: 'parallel' });
let app: Application;
let primaryApiServer: Machine;
let emailServer: Machine;
let analyticsServer: Machine;
let emailServerM2MToken: M2MToken;
let analyticsServerM2MToken: M2MToken;

test.beforeAll(async () => {
const fakeCompanyName = faker.company.name();

// Create primary machine using instance secret key
const client = createClerkClient({
secretKey: instanceKeys.get('with-api-keys').sk,
});
primaryApiServer = await client.machines.create({
name: `${fakeCompanyName} Primary API Server`,
});

app = await appConfigs.express.vite
.clone()
.addFile(
'src/server/main.ts',
() => `
import 'dotenv/config';
import { clerkClient } from '@clerk/express';
import express from 'express';
import ViteExpress from 'vite-express';

const app = express();

app.get('/api/protected', async (req, res) => {
const secret = req.get('Authorization')?.split(' ')[1];

try {
const m2mToken = await clerkClient.m2mTokens.verifySecret({ secret });
res.send('Protected response ' + m2mToken.id);
} catch {
res.status(401).send('Unauthorized');
}
});

const port = parseInt(process.env.PORT as string) || 3002;
ViteExpress.listen(app, port, () => console.log('Server started'));
`,
)
.commit();

await app.setup();

// Using the created machine, set a machine secret key using the primary machine's secret key
const env = appConfigs.envs.withAPIKeys
.clone()
.setEnvVariable('private', 'CLERK_MACHINE_SECRET_KEY', primaryApiServer.secretKey);
await app.withEnv(env);
await app.dev();

// Email server can access primary API server
emailServer = await client.machines.create({
name: `${fakeCompanyName} Email Server`,
scopedMachines: [primaryApiServer.id],
});
emailServerM2MToken = await client.m2mTokens.create({
machineSecretKey: emailServer.secretKey,
secondsUntilExpiration: 60 * 30,
});

// Analytics server cannot access primary API server
analyticsServer = await client.machines.create({
name: `${fakeCompanyName} Analytics Server`,
// No scoped machines
});
analyticsServerM2MToken = await client.m2mTokens.create({
machineSecretKey: analyticsServer.secretKey,
secondsUntilExpiration: 60 * 30,
});
});

test.afterAll(async () => {
const client = createClerkClient({
secretKey: instanceKeys.get('with-api-keys').sk,
});

await client.m2mTokens.revoke({
m2mTokenId: emailServerM2MToken.id,
});
await client.m2mTokens.revoke({
m2mTokenId: analyticsServerM2MToken.id,
});
await client.machines.delete(emailServer.id);
await client.machines.delete(primaryApiServer.id);
await client.machines.delete(analyticsServer.id);

await app.teardown();
});

test('rejects requests with invalid M2M tokens', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

const res = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer invalid`,
},
});
expect(res.status()).toBe(401);
expect(await res.text()).toBe('Unauthorized');

const res2 = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer mt_xxx`,
},
});
expect(res2.status()).toBe(401);
expect(await res2.text()).toBe('Unauthorized');
});

test('rejects M2M requests when sender machine lacks access to receiver machine', async ({ page, context }) => {
const u = createTestUtils({ app, page, context });

const res = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer ${analyticsServerM2MToken.secret}`,
},
});
expect(res.status()).toBe(401);
expect(await res.text()).toBe('Unauthorized');
});

test('authorizes M2M requests when sender machine has proper access to receiver machine', async ({
page,
context,
}) => {
const u = createTestUtils({ app, page, context });

// Email server can access primary API server
const res = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer ${emailServerM2MToken.secret}`,
},
});
expect(res.status()).toBe(200);
expect(await res.text()).toBe('Protected response ' + emailServerM2MToken.id);

// Analytics server can access primary API server after adding scope
await u.services.clerk.machines.createScope(analyticsServer.id, primaryApiServer.id);
const m2mToken = await u.services.clerk.m2mTokens.create({
machineSecretKey: analyticsServer.secretKey,
secondsUntilExpiration: 60 * 30,
});

const res2 = await u.page.request.get(app.serverUrl + '/api/protected', {
headers: {
Authorization: `Bearer ${m2mToken.secret}`,
},
});
expect(res2.status()).toBe(200);
expect(await res2.text()).toBe('Protected response ' + m2mToken.id);
await u.services.clerk.m2mTokens.revoke({
m2mTokenId: m2mToken.id,
});
});
});
1 change: 1 addition & 0 deletions package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@
"test:integration:generic": "E2E_APP_ID=react.vite.*,next.appRouter.withEmailCodes* pnpm test:integration:base --grep @generic",
"test:integration:handshake": "DISABLE_WEB_SECURITY=true E2E_APP_ID=next.appRouter.sessionsProd1 pnpm test:integration:base --grep @handshake",
"test:integration:localhost": "pnpm test:integration:base --grep @localhost",
"test:integration:machine": "E2E_APP_ID=withMachine.* pnpm test:integration:base --grep @machine",
"test:integration:nextjs": "E2E_APP_ID=next.appRouter.* pnpm test:integration:base --grep @nextjs",
"test:integration:nuxt": "E2E_APP_ID=nuxt.node npm run test:integration:base -- --grep @nuxt",
"test:integration:quickstart": "E2E_APP_ID=quickstart.* pnpm test:integration:base --grep @quickstart",
Expand Down
5 changes: 5 additions & 0 deletions packages/backend/src/api/endpoints/M2MTokenApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,11 @@ type CreateM2MTokenParams = {
* Custom machine secret key for authentication.
*/
machineSecretKey?: string;
/**
* Number of seconds until the token expires.
*
* @default null - Token does not expire
*/
secondsUntilExpiration?: number | null;
claims?: Record<string, unknown> | null;
};
Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,8 @@ export type {
InstanceSettings,
Invitation,
JwtTemplate,
Machine,
M2MToken,
OauthAccessToken,
OAuthApplication,
Organization,
Expand Down
12 changes: 12 additions & 0 deletions turbo.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -344,6 +344,18 @@
"env": ["CLEANUP", "DEBUG", "E2E_*", "INTEGRATION_INSTANCE_KEYS"],
"inputs": ["integration/**"],
"outputLogs": "new-only"
},
"//#test:integration:machine": {
"dependsOn": [
"@clerk/testing#build",
"@clerk/clerk-js#build",
"@clerk/backend#build",
"@clerk/nextjs#build",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We are testing against nextjs, right ?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Related to my comment above, the api keys test needs nextjs

"@clerk/express#build"
],
"env": ["CLEANUP", "DEBUG", "E2E_*", "INTEGRATION_INSTANCE_KEYS"],
"inputs": ["integration/**"],
"outputLogs": "new-only"
}
}
}
Loading