Logic to support closed account receiving a link to set password and for unvalidated and closed accounts to get the email the moment they log into ecash

src/languages/en.js

@@ -193,8 +193,6 @@ export default {
     },
     resendValidationForm: {
         linkHasBeenResent: 'Link has been re-sent',
-        accountUnvalidated: 'Account is unvalidated',
-        accountForgotPassword: 'Account forgot password: Sending reset password link.',
         weSentYouMagicSignInLink: 'We\'ve sent you a magic sign in link – just click on it to log in!',
         resendLink: 'Resend Link',
     },

src/libs/API.js

@@ -35,6 +35,7 @@ function isAuthTokenRequired(command) {
         'User_SignUp',
         'ResendValidateCode',
         'ResetPassword',
+        'User_ReopenAccount',
         'ValidateEmail',
     ], command);
 }
@@ -622,6 +623,17 @@ function User_GetBetas() {
     return Network.post('User_GetBetas');
 }
 
+/**
+ * @param {Object} parameters
+ * @param {String} parameters.email
+ * @returns {Promise}
+ */
+function User_ReopenAccount(parameters) {
+    const commandName = 'User_ReopenAccount';
+    requireParameters(['email'], parameters, commandName);
+    return Network.post(commandName, parameters);
+}
+
 /**
  * @param {Object} parameters
  * @param {String} parameters.email
@@ -733,6 +745,7 @@ export {
     UpdateAccount,
     User_SignUp,
     User_GetBetas,
+    User_ReopenAccount,
     User_SecondaryLogin_Send,
     User_UploadAvatar,
     reauthenticate,

src/libs/actions/Session.js

@@ -71,6 +71,32 @@ function signOut() {
         .catch(error => Onyx.merge(ONYXKEYS.SESSION, {error: error.message}));
 }
 
+/**
+ * Reopen the account and send the user a link to set password
+ *
+ * @param {String} [login]
+ */
+function reopenAccount(login = credentials.login) {
+    Onyx.merge(ONYXKEYS.ACCOUNT, {loading: true});
+    API.User_ReopenAccount({email: login})
+        .finally(() => {
+            Onyx.merge(ONYXKEYS.ACCOUNT, {loading: false});
+        });
+}
+
+/**
+ * Resend the validation link to the user that is validating their account
+ *
+ * @param {String} [login]
+ */
+function resendValidationLink(login = credentials.login) {
+    Onyx.merge(ONYXKEYS.ACCOUNT, {loading: true});
+    API.ResendValidateCode({email: login})
+        .finally(() => {
+            Onyx.merge(ONYXKEYS.ACCOUNT, {loading: false});
+        });
+}
+
 /**
  * Checks the API to see if an account exists for the given login
  *
@@ -89,11 +115,16 @@ function fetchAccountDetails(login) {
                     accountExists: response.accountExists,
                     requiresTwoFactorAuth: response.requiresTwoFactorAuth,
                     validated: response.validated,
+                    closed: response.isClosed,
                     forgotPassword: false,
                 });
 
                 if (!response.accountExists) {
                     createAccount(login);
+                } else if (response.isClosed) {
+                    reopenAccount(login);
+                } else if (!response.validated) {
+                    resendValidationLink(login);
                 }
             }
             Onyx.merge(ONYXKEYS.ACCOUNT, {error: response.message});
@@ -185,18 +216,6 @@ function signIn(password, twoFactorAuthCode) {
         });
 }
 
-/**
- * Resend the validation link to the user that is validating their account
- * this happens in the createAccount() flow
- */
-function resendValidationLink() {
-    Onyx.merge(ONYXKEYS.ACCOUNT, {loading: true});
-    API.ResendValidateCode({email: credentials.login})
-        .finally(() => {
-            Onyx.merge(ONYXKEYS.ACCOUNT, {loading: false});
-        });
-}
-
 /**
  * User forgot the password so let's send them the link to reset their password
  */
@@ -251,6 +270,7 @@ export {
     setPassword,
     signIn,
     signOut,
+    reopenAccount,
     resendValidationLink,
     resetPassword,
     restartSignin,

src/pages/signin/ResendValidationForm.js

@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
 import _ from 'underscore';
 import styles from '../../styles/styles';
 import ButtonWithLoader from '../../components/ButtonWithLoader';
-import {resendValidationLink, resetPassword} from '../../libs/actions/Session';
+import {reopenAccount, resendValidationLink, resetPassword} from '../../libs/actions/Session';
 import ONYXKEYS from '../../ONYXKEYS';
 import ChangeExpensifyLoginLink from './ChangeExpensifyLoginLink';
 import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
@@ -19,8 +19,11 @@ const propTypes = {
         // Whether or not a sign on form is loading (being submitted)
         loading: PropTypes.bool,
 
-        // Weather or not the account is validated
+        // Whether or not the account is validated
         validated: PropTypes.bool,
+
+        // Whether or not the account is closed
+        closed: PropTypes.bool,
     }),
 
     ...withLocalizePropTypes,
@@ -55,12 +58,12 @@ class ResendValidationForm extends React.Component {
             formSuccess: this.props.translate('resendValidationForm.linkHasBeenResent'),
         });
 
-        if (!this.props.account.validated) {
+        if (this.props.account.closed) {
+            reopenAccount();
+        } else if (!this.props.account.validated) {
             resendValidationLink();
-            console.debug(this.props.translate('resendValidationForm.accountUnvalidated'));
         } else {
             resetPassword();
-            console.debug(this.props.translate('resendValidationForm.accountForgotPassword'));
         }
 
         this.successMessageTimer = setTimeout(() => {