Merge pull request #14854 from Expensify/beaman-passwordlessPolish

User facing errors and messages on success / failure of magic code sending
Expensify · Feb 23, 2023 · cd2265f · cd2265f
2 parents 53cabec + c6a4d42
commit cd2265f
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 2 deletions.
diff --git a/src/languages/en.js b/src/languages/en.js
@@ -568,6 +568,7 @@ export default {
         enterAuthenticatorCode: 'Please enter your authenticator code',
         twoFactorCode: 'Two factor code',
         requiredWhen2FAEnabled: 'Required when 2FA is enabled',
+        codeSent: 'Magic code sent!',
         error: {
             pleaseFillMagicCode: 'Please enter your magic code',
             incorrectMagicCode: 'Incorrect magic code.',

diff --git a/src/languages/es.js b/src/languages/es.js
@@ -568,6 +568,7 @@ export default {
         enterAuthenticatorCode: 'Por favor ingresa su código de autenticador',
         twoFactorCode: 'Autenticación de 2 factores',
         requiredWhen2FAEnabled: 'Obligatorio cuando A2F está habilitado',
+        codeSent: '¡Código mágico enviado!',
         error: {
             pleaseFillMagicCode: 'Por favor, introduce el código mágico',
             incorrectMagicCode: 'Código mágico incorrecto.',

diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
@@ -107,6 +107,40 @@ function resendValidationLink(login = credentials.login) {
     API.write('RequestAccountValidationLink', {email: login}, {optimisticData, successData, failureData});
 }
 
+/**
+ * Request a new validate / magic code for user to sign in via passwordless flow
+ *
+ * @param {String} [login]
+ */
+function resendValidateCode(login = credentials.login) {
+    const optimisticData = [{
+        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        key: ONYXKEYS.ACCOUNT,
+        value: {
+            isLoading: true,
+            errors: null,
+            message: null,
+        },
+    }];
+    const successData = [{
+        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        key: ONYXKEYS.ACCOUNT,
+        value: {
+            isLoading: false,
+            message: Localize.translateLocal('validateCodeForm.codeSent'),
+        },
+    }];
+    const failureData = [{
+        onyxMethod: CONST.ONYX.METHOD.MERGE,
+        key: ONYXKEYS.ACCOUNT,
+        value: {
+            isLoading: false,
+            message: null,
+        },
+    }];
+    API.write('RequestNewValidateCode', {email: login}, {optimisticData, successData, failureData});
+}
+
 /**
  * Checks the API to see if an account exists for the given login
  *
@@ -539,6 +573,7 @@ export {
     signOut,
     signOutAndRedirectToSignIn,
     resendValidationLink,
+    resendValidateCode,
     resetPassword,
     resendResetPassword,
     clearSignInData,

diff --git a/src/libs/actions/User.js b/src/libs/actions/User.js
@@ -19,6 +19,7 @@ import * as SequentialQueue from '../Network/SequentialQueue';
 import PusherUtils from '../PusherUtils';
 import * as Report from './Report';
 import * as ReportActionsUtils from '../ReportActionsUtils';
+import * as Session from './Session';
 
 let currentUserAccountID = '';
 Onyx.connect({
@@ -95,8 +96,8 @@ function closeAccount(message) {
  * @param {String} login
  * @param {Boolean} isPasswordless - temporary param to trigger passwordless flow in backend
  */
-function resendValidateCode(login, isPasswordless = false) {
-    DeprecatedAPI.ResendValidateCode({email: login, isPasswordless});
+function resendValidateCode(login) {
+    Session.resendValidateCode(login);
 }
 
 /**