Merge branch 'release/v4' into gatsby-eol-notice-to-v4

Author: wobsoriano

packages/chrome-extension/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## 0.7.4
+
+### Patch Changes
+
+- Updated dependencies [[`9c499ea78`](https://github.com/clerk/javascript/commit/9c499ea787af67bb0a3e0b02c8001145df81308b)]:
+  - @clerk/clerk-js@4.73.4
+
 ## 0.7.3
 
 ### Patch Changes

packages/chrome-extension/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clerk/chrome-extension",
-  "version": "0.7.3",
+  "version": "0.7.4",
   "description": "Clerk SDK for Chrome extensions",
   "keywords": [
     "auth",
@@ -45,7 +45,7 @@
     "test:coverage": "jest --collectCoverage && open coverage/lcov-report/index.html"
   },
   "dependencies": {
-    "@clerk/clerk-js": "4.73.3",
+    "@clerk/clerk-js": "4.73.4",
     "@clerk/clerk-react": "4.32.2"
   },
   "devDependencies": {

packages/clerk-js/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 4.73.4
+
+### Patch Changes
+
+- Adjust how we pass captcha tokens to the Clerk API when signing in with Google, Microsoft, and Apple ([#3817](https://github.com/clerk/javascript/pull/3817)) by [@hhsnopek](https://github.com/hhsnopek)
+
 ## 4.73.3
 
 ### Patch Changes

packages/clerk-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clerk/clerk-js",
-  "version": "4.73.3",
+  "version": "4.73.4",
   "description": "Clerk JS library",
   "keywords": [
     "clerk",

packages/clerk-js/src/core/resources/SignUp.ts

@@ -74,7 +74,13 @@ export class SignUp extends BaseResource implements SignUpResource {
     const { captchaSiteKey, canUseCaptcha, captchaURL, captchaWidgetType, captchaProvider, captchaPublicKeyInvisible } =
       retrieveCaptchaInfo(SignUp.clerk);
 
-    if (canUseCaptcha && captchaSiteKey && captchaURL && captchaPublicKeyInvisible) {
+    if (
+      !this.shouldBypassCaptchaForAttempt(params) &&
+      canUseCaptcha &&
+      captchaSiteKey &&
+      captchaURL &&
+      captchaPublicKeyInvisible
+    ) {
       try {
         const { captchaToken, captchaWidgetTypeUsed } = await getCaptchaToken({
           siteKey: captchaSiteKey,
@@ -94,6 +100,10 @@ export class SignUp extends BaseResource implements SignUpResource {
       }
     }
 
+    if (params.transfer && this.shouldBypassCaptchaForAttempt(params)) {
+      paramsWithCaptcha.strategy = SignUp.clerk.client?.signIn.firstFactorVerification.strategy;
+    }
+
     return this._basePost({
       path: this.pathRoot,
       body: normalizeUnsafeMetadata(paramsWithCaptcha),
@@ -324,4 +334,27 @@ export class SignUp extends BaseResource implements SignUpResource {
     }
     return this;
   }
+
+  /**
+   * We delegate bot detection to the following providers, instead of relying on turnstile exclusively
+   */
+  protected shouldBypassCaptchaForAttempt(params: SignUpCreateParams) {
+    if (
+      params.strategy === 'oauth_google' ||
+      params.strategy === 'oauth_microsoft' ||
+      params.strategy === 'oauth_apple'
+    ) {
+      return true;
+    }
+    if (
+      params.transfer &&
+      (SignUp.clerk.client?.signIn.firstFactorVerification.strategy === 'oauth_google' ||
+        SignUp.clerk.client?.signIn.firstFactorVerification.strategy === 'oauth_microsoft' ||
+        SignUp.clerk.client?.signIn.firstFactorVerification.strategy === 'oauth_apple')
+    ) {
+      return true;
+    }
+
+    return false;
+  }
 }

packages/expo/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## 0.20.26
+
+### Patch Changes
+
+- Updated dependencies [[`9c499ea78`](https://github.com/clerk/javascript/commit/9c499ea787af67bb0a3e0b02c8001145df81308b)]:
+  - @clerk/clerk-js@4.73.4
+
 ## 0.20.25
 
 ### Patch Changes

packages/expo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clerk/clerk-expo",
-  "version": "0.20.25",
+  "version": "0.20.26",
   "description": "Clerk React Native/Expo library",
   "keywords": [
     "react",
@@ -39,7 +39,7 @@
     "publish:local": "npx yalc push --replace  --sig"
   },
   "dependencies": {
-    "@clerk/clerk-js": "4.73.3",
+    "@clerk/clerk-js": "4.73.4",
     "@clerk/clerk-react": "4.32.2",
     "@clerk/shared": "1.4.1",
     "base-64": "1.0.0",