Merge branch 'main' into fredrik/user-4043-remove-clerk-state-contexts-from-provider-and-rely-on

Author: Ephem

.changeset/busy-snakes-pump.md

@@ -0,0 +1,5 @@
+---
+'@clerk/ui': patch
+---
+
+Fix issue where the reset password form could be submitted via the enter key even when the confirmation password didn't match.

.changeset/kind-humans-retire.md

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

.changeset/loose-trams-look.md

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

.changeset/quick-mirrors-eat.md

@@ -0,0 +1,5 @@
+---
+'@clerk/upgrade': patch
+---
+
+Default Ready to upgrade? to yes

.changeset/tender-hairs-smash.md

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

.github/workflows/labeler.yml

@@ -19,5 +19,3 @@ jobs:
           filter: "blob:none"
           show-progress: false
       - uses: actions/labeler@v6
-        with:
-          repo-token: ${{ secrets.CLERK_COOKIE_PAT }}

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();
   });