Skip to content

Commit d400782

Browse files
authored
chore(backend): Remove secret in favor of token in m2m response (#6542)
1 parent 2db7431 commit d400782

File tree

4 files changed

+28
-16
lines changed

4 files changed

+28
-16
lines changed

.changeset/chatty-kings-raise.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
"@clerk/backend": minor
3+
---
4+
5+
Remove `secret` in favor of `token` in m2m response.
6+
7+
Before:
8+
9+
```ts
10+
const result = await clerkClient.m2mTokens.create()
11+
12+
console.log(result.secret)
13+
```
14+
15+
After:
16+
17+
```ts
18+
const result = await clerkClient.m2mTokens.create()
19+
20+
console.log(result.token)
21+
```

packages/backend/src/api/__tests__/M2MTokenApi.test.ts

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ describe('M2MToken', () => {
1414
subject: 'mch_xxxxx',
1515
scopes: ['mch_1xxxxx', 'mch_2xxxxx'],
1616
claims: { foo: 'bar' },
17-
// Deprecated in favor of `token`
18-
secret: m2mSecret,
1917
token: m2mSecret,
2018
revoked: false,
2119
revocation_reason: null,
@@ -47,7 +45,6 @@ describe('M2MToken', () => {
4745
});
4846

4947
expect(response.id).toBe(m2mId);
50-
expect(response.secret).toBe(m2mSecret);
5148
expect(response.token).toBe(m2mSecret);
5249
expect(response.scopes).toEqual(['mch_1xxxxx', 'mch_2xxxxx']);
5350
expect(response.claims).toEqual({ foo: 'bar' });
@@ -74,7 +71,7 @@ describe('M2MToken', () => {
7471
});
7572

7673
expect(response.id).toBe(m2mId);
77-
expect(response.secret).toBe(m2mSecret);
74+
expect(response.token).toBe(m2mSecret);
7875
expect(response.scopes).toEqual(['mch_1xxxxx', 'mch_2xxxxx']);
7976
expect(response.claims).toEqual({ foo: 'bar' });
8077
});
@@ -152,7 +149,7 @@ describe('M2MToken', () => {
152149
});
153150

154151
expect(response.revoked).toBe(true);
155-
expect(response.secret).toBeUndefined();
152+
expect(response.token).toBeUndefined();
156153
expect(response.revocationReason).toBe('revoked by test');
157154
expect(response.scopes).toEqual(['mch_1xxxxx', 'mch_2xxxxx']);
158155
expect(response.claims).toEqual({ foo: 'bar' });
@@ -180,7 +177,7 @@ describe('M2MToken', () => {
180177
});
181178

182179
expect(response.revoked).toBe(true);
183-
expect(response.secret).toBeUndefined();
180+
expect(response.token).toBeUndefined();
184181
expect(response.revocationReason).toBe('revoked by test');
185182
});
186183

@@ -231,7 +228,7 @@ describe('M2MToken', () => {
231228
});
232229

233230
expect(response.id).toBe(m2mId);
234-
expect(response.secret).toBe(m2mSecret);
231+
expect(response.token).toBe(m2mSecret);
235232
expect(response.scopes).toEqual(['mch_1xxxxx', 'mch_2xxxxx']);
236233
expect(response.claims).toEqual({ foo: 'bar' });
237234
});
@@ -257,7 +254,7 @@ describe('M2MToken', () => {
257254
});
258255

259256
expect(response.id).toBe(m2mId);
260-
expect(response.secret).toBe(m2mSecret);
257+
expect(response.token).toBe(m2mSecret);
261258
expect(response.scopes).toEqual(['mch_1xxxxx', 'mch_2xxxxx']);
262259
expect(response.claims).toEqual({ foo: 'bar' });
263260
});
@@ -308,7 +305,7 @@ describe('M2MToken', () => {
308305
});
309306

310307
expect(response.id).toBe(m2mId);
311-
expect(response.secret).toBe(m2mSecret);
308+
expect(response.token).toBe(m2mSecret);
312309
expect(response.scopes).toEqual(['mch_1xxxxx', 'mch_2xxxxx']);
313310
expect(response.claims).toEqual({ foo: 'bar' });
314311
});
@@ -334,7 +331,7 @@ describe('M2MToken', () => {
334331
});
335332

336333
expect(response.id).toBe(m2mId);
337-
expect(response.secret).toBe(m2mSecret);
334+
expect(response.token).toBe(m2mSecret);
338335
expect(response.scopes).toEqual(['mch_1xxxxx', 'mch_2xxxxx']);
339336
expect(response.claims).toEqual({ foo: 'bar' });
340337
});

packages/backend/src/api/resources/JSON.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -734,10 +734,6 @@ export interface MachineSecretKeyJSON {
734734

735735
export interface M2MTokenJSON extends ClerkResourceJSON {
736736
object: typeof ObjectType.M2MToken;
737-
/**
738-
* @deprecated Use {@link token} instead.
739-
*/
740-
secret?: string;
741737
token?: string;
742738
subject: string;
743739
scopes: string[];

packages/backend/src/api/resources/M2MToken.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ export class M2MToken {
1313
readonly createdAt: number,
1414
readonly updatedAt: number,
1515
readonly token?: string,
16-
readonly secret?: string,
1716
) {}
1817

1918
static fromJSON(data: M2MTokenJSON): M2MToken {
@@ -29,7 +28,6 @@ export class M2MToken {
2928
data.created_at,
3029
data.updated_at,
3130
data.token,
32-
data.secret,
3331
);
3432
}
3533
}

0 commit comments

Comments
 (0)