Merge branch 'main' into heat/grow-672-convert-drift-detection-to-a-server-action

Author: heatlikeheatwave

.changeset/chatty-kings-raise.md

@@ -125,6 +125,7 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
   "types/sign-up-resource.mdx",
   "types/signed-in-session-resource.mdx",
   "types/state-selectors.mdx",
+  "types/telemetry-log-entry.mdx",
   "types/use-auth-return.mdx",
   "types/use-session-list-return.mdx",
   "types/use-session-return.mdx",
@@ -148,6 +149,7 @@ exports[`Typedoc output > should have a deliberate file structure 1`] = `
   "shared/derive-state.mdx",
   "shared/extract-dev-browser-jwt-from-url.mdx",
   "shared/fast-deep-merge-and-replace.mdx",
+  "shared/generate-uuid.mdx",
   "shared/get-clerk-js-major-version-or-tag.mdx",
   "shared/get-cookie-suffix.mdx",
   "shared/get-env-variable.mdx",

.changeset/rich-donuts-agree.md

@@ -43,18 +43,7 @@ test.describe('machine-to-machine auth @machine', () => {
           const token = req.get('Authorization')?.split(' ')[1];
           
           try {
-            const m2mToken = await clerkClient.m2mTokens.verifyToken({ token });
-            res.send('Protected response ' + m2mToken.id);
-          } catch {
-            res.status(401).send('Unauthorized');
-          }
-        });
-
-        app.get('/api/protected-deprecated', async (req, res) => {
-          const secret = req.get('Authorization')?.split(' ')[1];
-          
-          try {
-            const m2mToken = await clerkClient.m2mTokens.verifySecret({ secret });
+            const m2mToken = await clerkClient.m2m.verifyToken({ token });
             res.send('Protected response ' + m2mToken.id);
           } catch {
             res.status(401).send('Unauthorized');
@@ -81,7 +70,7 @@ test.describe('machine-to-machine auth @machine', () => {
       name: `${fakeCompanyName} Email Server`,
       scopedMachines: [primaryApiServer.id],
     });
-    emailServerM2MToken = await client.m2mTokens.create({
+    emailServerM2MToken = await client.m2m.createToken({
       machineSecretKey: emailServer.secretKey,
       secondsUntilExpiration: 60 * 30,
     });
@@ -91,7 +80,7 @@ test.describe('machine-to-machine auth @machine', () => {
       name: `${fakeCompanyName} Analytics Server`,
       // No scoped machines
     });
-    analyticsServerM2MToken = await client.m2mTokens.create({
+    analyticsServerM2MToken = await client.m2m.createToken({
       machineSecretKey: analyticsServer.secretKey,
       secondsUntilExpiration: 60 * 30,
     });
@@ -102,10 +91,10 @@ test.describe('machine-to-machine auth @machine', () => {
       secretKey: instanceKeys.get('with-api-keys').sk,
     });
 
-    await client.m2mTokens.revoke({
+    await client.m2m.revokeToken({
       m2mTokenId: emailServerM2MToken.id,
     });
-    await client.m2mTokens.revoke({
+    await client.m2m.revokeToken({
       m2mTokenId: analyticsServerM2MToken.id,
     });
     await client.machines.delete(emailServer.id);
@@ -164,7 +153,7 @@ test.describe('machine-to-machine auth @machine', () => {
 
     // 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({
+    const m2mToken = await u.services.clerk.m2m.createToken({
       machineSecretKey: analyticsServer.secretKey,
       secondsUntilExpiration: 60 * 30,
     });
@@ -176,21 +165,8 @@ test.describe('machine-to-machine auth @machine', () => {
     });
     expect(res2.status()).toBe(200);
     expect(await res2.text()).toBe('Protected response ' + m2mToken.id);
-    await u.services.clerk.m2mTokens.revoke({
+    await u.services.clerk.m2m.revokeToken({
       m2mTokenId: m2mToken.id,
     });
   });
-
-  test('authorizes M2M requests with deprecated verifySecret method', 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-deprecated', {
-      headers: {
-        Authorization: `Bearer ${emailServerM2MToken.token}`,
-      },
-    });
-    expect(res.status()).toBe(200);
-    expect(await res.text()).toBe('Protected response ' + emailServerM2MToken.id);
-  });
 });

.changeset/small-adults-crash.md

@@ -1,5 +1,14 @@
 # @clerk/agent-toolkit
 
+## 0.1.21
+
+### Patch Changes
+
+- Updated dependencies [[`4db1e58`](https://github.com/clerk/javascript/commit/4db1e58d70b60e1e236709b507666715d571e925), [`d400782`](https://github.com/clerk/javascript/commit/d400782b7016c1232c0aa1e3399c61b61e4f0709), [`69498df`](https://github.com/clerk/javascript/commit/69498dfca3e6bb388eb8c94313eac06347dd5a27), [`307dc3f`](https://github.com/clerk/javascript/commit/307dc3f05ba1bd3b30b491b198d9e65eebcc95f9), [`2db7431`](https://github.com/clerk/javascript/commit/2db743147827fb69fb8fe73a1e26545aeb7be7aa), [`59f1559`](https://github.com/clerk/javascript/commit/59f15593bab708b9e13eebfff6780c2d52b31b0a)]:
+  - @clerk/types@4.77.0
+  - @clerk/backend@2.9.0
+  - @clerk/shared@3.20.1
+
 ## 0.1.20
 
 ### Patch Changes

.changeset/upset-sides-kneel.md

@@ -1,6 +1,6 @@
 {
   "name": "@clerk/agent-toolkit",
-  "version": "0.1.20",
+  "version": "0.1.21",
   "description": "Clerk Toolkit for AI Agents",
   "homepage": "https://clerk.com/",
   "bugs": {

.changeset/warm-rocks-flow.md

@@ -1,5 +1,14 @@
 # @clerk/astro
 
+## 2.11.2
+
+### Patch Changes
+
+- Updated dependencies [[`4db1e58`](https://github.com/clerk/javascript/commit/4db1e58d70b60e1e236709b507666715d571e925), [`d400782`](https://github.com/clerk/javascript/commit/d400782b7016c1232c0aa1e3399c61b61e4f0709), [`69498df`](https://github.com/clerk/javascript/commit/69498dfca3e6bb388eb8c94313eac06347dd5a27), [`307dc3f`](https://github.com/clerk/javascript/commit/307dc3f05ba1bd3b30b491b198d9e65eebcc95f9), [`2db7431`](https://github.com/clerk/javascript/commit/2db743147827fb69fb8fe73a1e26545aeb7be7aa), [`59f1559`](https://github.com/clerk/javascript/commit/59f15593bab708b9e13eebfff6780c2d52b31b0a)]:
+  - @clerk/types@4.77.0
+  - @clerk/backend@2.9.0
+  - @clerk/shared@3.20.1
+
 ## 2.11.1
 
 ### Patch Changes