chore(repo): Backport backend API keys methods update (#7400) (#7427)

Author: wobsoriano

.changeset/kind-humans-retire.md

@@ -0,0 +1,2 @@
+---
+---

integration/testUtils/usersService.ts

@@ -75,7 +75,7 @@ export type FakeOrganization = {
 export type FakeAPIKey = {
   apiKey: APIKey;
   secret: string;
-  revoke: () => Promise<APIKey>;
+  revoke: (reason?: string | null) => Promise<APIKey>;
 };
 
 export type UserService = {
@@ -232,10 +232,8 @@ export const createUserService = (clerkClient: ClerkClient) => {
       return {
         apiKey,
         secret: apiKey.secret ?? '',
-        revoke: () =>
-          withErrorLogging('revokeAPIKey', () =>
-            clerkClient.apiKeys.revoke({ apiKeyId: apiKey.id, revocationReason: 'For testing purposes' }),
-          ),
+        revoke: (reason?: string | null) =>
+          clerkClient.apiKeys.revoke({ apiKeyId: apiKey.id, revocationReason: reason }),
       } satisfies FakeAPIKey;
     },
     passwordCompromised: async (userId: string) => {

integration/tests/machine-auth/api-keys.test.ts

@@ -65,7 +65,7 @@ test.describe('Next.js API key auth within clerkMiddleware() @machine', () => {
   });
 
   test.afterAll(async () => {
-    await fakeAPIKey.revoke();
+    await fakeAPIKey.revoke('Testing purposes within clerkMiddleware()');
     await fakeUser.deleteIfExists();
     await app.teardown();
   });