fix: login and signup error messages

3 files changed, 48 insertions, 32 deletions

diff --git a/src/api/server/ServerApi.ts b/src/api/server/ServerApi.ts
index 7b17fcdcd..8e1d45588 100644
--- a/src/api/server/ServerApi.ts
+++ b/src/api/server/ServerApi.ts
@@ -62,13 +62,19 @@ export default class ServerApi {
       },
       false,
     );
-    if (!request.ok) {
-      throw new Error(request.statusText);
-    }
-    const u = await request.json();
+    try {
+      const responseJson = await request.json();
 
-    debug('ServerApi::login resolves', u);
-    return u.token;
+      if (!request.ok) {
+        throw responseJson;
+      }
+
+      debug('ServerApi::login resolves', responseJson);
+      return responseJson.token;
+    } catch (error) {
+      debug('ServerApi::login ERROR:', error);
+      throw error;
+    }
   }
 
   async signup(data: any) {
@@ -80,13 +86,19 @@ export default class ServerApi {
       },
       false,
     );
-    if (!request.ok) {
-      throw new Error(request.statusText);
-    }
-    const u = await request.json();
+    try {
+      const responseJson = await request.json();
 
-    debug('ServerApi::signup resolves', u);
-    return u.token;
+      if (!request.ok) {
+        throw responseJson;
+      }
+
+      debug('ServerApi::signup resolves', responseJson);
+      return responseJson.token;
+    } catch (error) {
+      debug('ServerApi::signup ERROR:', error);
+      throw error;
+    }
   }
 
   async inviteUser(data: any) {
diff --git a/src/components/auth/Login.tsx b/src/components/auth/Login.tsx
index cf7abe654..9bad731c8 100644
--- a/src/components/auth/Login.tsx
+++ b/src/components/auth/Login.tsx
@@ -139,26 +139,30 @@ class Login extends Component<IProps> {
           <Input {...form.$('password').bind()} showPasswordToggle />
           {error.code === 'invalid-credentials' && (
             <>
-              <p className="error-message center">
+              <h2 className="error-message center">
                 {intl.formatMessage(messages.invalidCredentials)}
-              </p>
+              </h2>
               {window['ferdium'].stores.settings.all.app.server !==
                 LIVE_FRANZ_API && (
-                <p className="error-message center">
-                  {intl.formatMessage(messages.customServerQuestion)}{' '}
-                  <Link
-                    to={`${window[
-                      'ferdium'
-                    ].stores.settings.all.app.server.replace(
-                      API_VERSION,
-                      '',
-                    )}/import`}
-                    target="_blank"
-                    style={{ cursor: 'pointer', textDecoration: 'underline' }}
-                  >
-                    {intl.formatMessage(messages.customServerSuggestion)}
-                  </Link>
-                </p>
+                <>
+                  <p className="error-message center">
+                    {intl.formatMessage(messages.customServerQuestion)}{' '}
+                  </p>
+                  <p className="error-message center">
+                    <Link
+                      to={`${window[
+                        'ferdium'
+                      ].stores.settings.all.app.server.replace(
+                        API_VERSION,
+                        '',
+                      )}/import`}
+                      target="_blank"
+                      style={{ cursor: 'pointer', textDecoration: 'underline' }}
+                    >
+                      {intl.formatMessage(messages.customServerSuggestion)}
+                    </Link>
+                  </p>
+                </>
               )}
             </>
           )}
diff --git a/src/components/auth/Signup.tsx b/src/components/auth/Signup.tsx
index fb2a2360e..06a9774aa 100644
--- a/src/components/auth/Signup.tsx
+++ b/src/components/auth/Signup.tsx
@@ -148,10 +148,10 @@ class Signup extends Component<IProps> {
               showPasswordToggle
               scorePassword
             />
-            {error.code === 'email-duplicate' && (
-              <p className="error-message center">
+            {error.status === 401 && (
+              <h2 className="error-message center">
                 {intl.formatMessage(messages.emailDuplicate)}
-              </p>
+              </h2>
             )}
             {isSubmitting ? (
               <Button