Fix arkose CAPTCHA bugs

auth0 · May 30, 2024 · 8d1d28d · 8d1d28d
1 parent 4ec1a01
commit 8d1d28d
Showing 1 changed file with 27 additions and 6 deletions.
diff --git a/src/connection/database/actions.js b/src/connection/database/actions.js
@@ -309,21 +309,42 @@ function resetPasswordError(id, error) {
 }
 
 export function showLoginActivity(id, fields = ['password']) {
-  swapCaptcha(id, Flow.PASSWORD_RESET, false, () => {
+  const m = read(getEntity, 'lock', id);
+  const captchaConfig = l.captcha(m);
+  const captchaProvider = captchaConfig.get('provider');
+  if (captchaProvider === 'arkose') {
     swap(updateEntity, 'lock', id, setScreen, 'login', fields);
-  });
+  } else {
+    swapCaptcha(id, 'login', false, () => {
+      swap(updateEntity, 'lock', id, setScreen, 'login', fields);
+    });
+  }
 }
 
 export function showSignUpActivity(id, fields = ['password']) {
-  swapCaptcha(id, Flow.PASSWORD_RESET, false, () => {
+  const m = read(getEntity, 'lock', id);
+  const captchaConfig = l.captcha(m);
+  const captchaProvider = captchaConfig.get('provider');
+  if (captchaProvider === 'arkose') {
     swap(updateEntity, 'lock', id, setScreen, 'signUp', fields);
-  });
+  } else {
+    swapCaptcha(id, 'login', false, () => {
+      swap(updateEntity, 'lock', id, setScreen, 'signUp', fields);
+    });
+  }
 }
 
 export function showResetPasswordActivity(id, fields = ['password']) {
-  swapCaptcha(id, Flow.PASSWORD_RESET, false, () => {
+  const m = read(getEntity, 'lock', id);
+  const captchaConfig = l.passwordResetCaptcha(m);
+  const captchaProvider = captchaConfig.get('provider');
+  if (captchaProvider === 'arkose') {
     swap(updateEntity, 'lock', id, setScreen, 'forgotPassword', fields);
-  });
+  } else {
+    swapCaptcha(id, 'login', false, () => {
+      swap(updateEntity, 'lock', id, setScreen, 'forgotPassword', fields);
+    });
+  }
 }
 
 export function cancelResetPassword(id) {