Skip to content

chore(backend): Improve subject handling for machine auth objects #6099

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wobsoriano merged 10 commits into from
Jun 11, 2025
Merged

chore(backend): Improve subject handling for machine auth objects #6099

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3a774f1
fix incorrect m2m token prefix
wobsoriano Jun 10, 2025
343ad53
chore: additional properties to machine auth objects
wobsoriano Jun 10, 2025
b3e7ac6
chore: update deprecated property
wobsoriano Jun 10, 2025
82cd832
chore: use better method name for verifying access token
wobsoriano Jun 10, 2025
429c4ab
chore: more tests
wobsoriano Jun 10, 2025
1494ec9
chore: add changeset
wobsoriano Jun 10, 2025
9926019
chore: revert machine ids
wobsoriano Jun 10, 2025
1fa791c
clean up tests
wobsoriano Jun 10, 2025
00d1e6c
clean up tests
wobsoriano Jun 10, 2025
b21e16f
fix nextjs tests
wobsoriano Jun 10, 2025
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
Prev Previous commit
Next Next commit
chore: revert machine ids
  • Loading branch information
@wobsoriano
wobsoriano committed Jun 10, 2025
commit 992601902e3506f8b5fdc739895a46a03ec58a67
2 changes: 1 addition & 1 deletion packages/backend/src/fixtures/machine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export const mockTokens = {
api_key: 'ak_LCWGdaM8mv8K4PC/57IICZQXAeWfCgF30DZaFXHoGn9=',
oauth_token: 'oat_8XOIucKvqHVr5tYP123456789abcdefghij',
machine_token: 'm2m_8XOIucKvqHVr5tYP123456789abcdefghij',
machine_token: 'mt_8XOIucKvqHVr5tYP123456789abcdefghij',
} as const;

export const mockVerificationResults = {
Expand Down
6 changes: 3 additions & 3 deletions packages/backend/src/tokens/__tests__/verify.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ describe('tokens.verifyMachineAuthToken(token, options)', () => {
});

it('verifies provided Machine token', async () => {
const token = 'm2m_8XOIucKvqHVr5tYP123456789abcdefghij';
const token = 'mt_8XOIucKvqHVr5tYP123456789abcdefghij';

server.use(
http.post(
Expand Down Expand Up @@ -199,7 +199,7 @@ describe('tokens.verifyMachineAuthToken(token, options)', () => {

describe('handles API errors for M2M tokens', () => {
it('handles invalid token', async () => {
const token = 'm2m_invalid_token';
const token = 'mt_invalid_token';

server.use(
http.post('https://api.clerk.test/m2m_tokens/verify', () => {
Expand All @@ -220,7 +220,7 @@ describe('tokens.verifyMachineAuthToken(token, options)', () => {
});

it('handles unexpected error', async () => {
const token = 'm2m_ey966f1b1xf93586b2debdcadb0b3bd1';
const token = 'mt_ey966f1b1xf93586b2debdcadb0b3bd1';

server.use(
http.post('https://api.clerk.test/m2m_tokens/verify', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/tokens/machine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { AuthenticateRequestOptions } from '../tokens/types';
import type { MachineTokenType } from './tokenTypes';
import { TokenType } from './tokenTypes';

export const M2M_TOKEN_PREFIX = 'm2m_';
export const M2M_TOKEN_PREFIX = 'mt_';
export const OAUTH_TOKEN_PREFIX = 'oat_';
export const API_KEY_PREFIX = 'ak_';

Expand Down
Loading