Fixed Improvements to error messaging issue #1091

src/libs/API.js

@@ -4,6 +4,7 @@ import CONFIG from '../CONFIG';
 import ONYXKEYS from '../ONYXKEYS';
 import redirectToSignIn from './actions/SignInRedirect';
 import * as Network from './Network';
+import authenticationErrorMessages from './ErrorMessage/authenticationErrorMessages';
 
 let isAuthenticating;
 
@@ -481,6 +482,23 @@ function SetPassword(parameters) {
     return request(commandName, parameters);
 }
 
+/**
+ * Display a error message in the UI when the API returns an authentication error.
+ *
+ * @param {String} error
+ * @returns {String}
+ */
+function GetSignInErrorMessage(error) {
+    const code = error.split(' ')[0];
+    if (!_.isEmpty(code)) {
+        const errorMessage = _.filter(authenticationErrorMessages, {errorCode: +code.trim()});
+        if (!_.isEmpty(errorMessage)) {
+            return errorMessage[0].errorMessage;
+        }
+    }
+    return error;
+}
+
 export {
     getAuthToken,
     Authenticate,
@@ -502,4 +520,5 @@ export {
     SetGithubUsername,
     SetPassword,
     User_SignUp,
+    GetSignInErrorMessage,
 };

src/libs/ErrorMessage/authenticationErrorMessages.js

@@ -0,0 +1,31 @@
+const authenticationErrorMessages = [
+    {
+        errorCode: 401,
+        errorMessage: 'Incorrect login or password. Please try again.',
+    },
+    {
+        errorCode: 402,
+        errorMessage:
+          'You have 2FA enabled on this account. Please sign in using your email or phone number.',
+    },
+    {
+        errorCode: 403,
+        errorMessage:
+          'Invalid login or password. Please try again or reset your password.',
+    },
+    {
+        errorCode: 404,
+        errorMessage:
+          'We were unable to change your password. This is likely due to an expired password reset link in an old password reset email. We have emailed you a new link so you can try again. Check your Inbox and your Spam folder; it should arrive in just a few minutes.',
+    },
+    {
+        errorCode: 405,
+        errorMessage:
+          'You do not have access to this application. Please add your GitHub username for access.',
+    },
+    {
+        errorCode: 413,
+        errorMessage: 'Your account has been locked.',
+    },
+];
+export default authenticationErrorMessages;

src/libs/actions/Session.js

@@ -158,14 +158,14 @@ function signIn(password, exitTo, twoFactorAuthCode) {
                     Onyx.merge(ONYXKEYS.CREDENTIALS, {autoGeneratedLogin, autoGeneratedPassword});
                 })
                 .catch((error) => {
-                    Onyx.merge(ONYXKEYS.ACCOUNT, {error: error.message});
+                    Onyx.merge(ONYXKEYS.ACCOUNT, {error: API.GetSignInErrorMessage(error.message)});
                 })
                 .finally(() => {
                     Onyx.merge(ONYXKEYS.ACCOUNT, {loading: false});
                 });
         })
         .catch((error) => {
-            Onyx.merge(ONYXKEYS.ACCOUNT, {error: error.message, loading: false});
+            Onyx.merge(ONYXKEYS.ACCOUNT, {error: API.GetSignInErrorMessage(error.message), loading: false});
         });
 }