Merge branch 'main' into rob/eco-302-move-environment-variable-logic-…

…into-clerkshared
clerk · Feb 4, 2025 · 01ba102 · 01ba102
2 parents db1427e + 1f8ebfb
commit 01ba102
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 7 deletions.
diff --git a/packages/testing/CHANGELOG.md b/packages/testing/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @clerk/testing
 
+## 1.4.20
+
+### Patch Changes
+
+- Fix captcha triggering on Playwright tests ([#5075](https://github.com/clerk/javascript/pull/5075)) by [@anagstef](https://github.com/anagstef)
+
 ## 1.4.19
 
 ### Patch Changes

diff --git a/packages/testing/package.json b/packages/testing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clerk/testing",
-  "version": "1.4.19",
+  "version": "1.4.20",
   "description": "Utilities to help you create E2E test suites for apps using Clerk",
   "keywords": [
     "auth",

diff --git a/packages/testing/src/playwright/setupClerkTestingToken.ts b/packages/testing/src/playwright/setupClerkTestingToken.ts
@@ -31,16 +31,41 @@ export const setupClerkTestingToken = async ({ page, options }: SetupClerkTestin
   }
   const apiUrl = `https://${fapiUrl}/v1/**/*`;
 
-  await page.route(apiUrl, (route, request) => {
-    const originalUrl = new URL(request.url());
+  await page.route(apiUrl, async route => {
+    const originalUrl = new URL(route.request().url());
     const testingToken = process.env.CLERK_TESTING_TOKEN;
 
     if (testingToken) {
       originalUrl.searchParams.set(TESTING_TOKEN_PARAM, testingToken);
     }
 
-    void route.continue({
-      url: originalUrl.toString(),
-    });
+    try {
+      const response = await route.fetch({
+        url: originalUrl.toString(),
+      });
+
+      const json = await response.json();
+
+      // Override captcha_bypass in /v1/client
+      if (json?.response?.captcha_bypass === false) {
+        json.response.captcha_bypass = true;
+      }
+
+      // Override captcha_bypass in piggybacking
+      if (json?.client?.captcha_bypass === false) {
+        json.client.captcha_bypass = true;
+      }
+
+      await route.fulfill({
+        response,
+        json,
+      });
+    } catch {
+      await route
+        .continue({
+          url: originalUrl.toString(),
+        })
+        .catch(console.error);
+    }
   });
 };
diff --git a/packages/types/src/json.ts b/packages/types/src/json.ts
@@ -70,7 +70,7 @@ export interface ClientJSON extends ClerkResourceJSON {
   sessions: SessionJSON[];
   sign_up: SignUpJSON | null;
   sign_in: SignInJSON | null;
-  captcha_bypass?: boolean;
+  captcha_bypass?: boolean; // this is used by the @clerk/testing package
   last_active_session_id: string | null;
   cookie_expires_at: number | null;
   created_at: number;