Merge branch 'development'

NeuraLegion · Sep 1, 2021 · 1003483 · 1003483
2 parents b852ae1 + 155c0af
commit 1003483
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/public/public/assets/css/style.css b/public/public/assets/css/style.css
@@ -1732,3 +1732,7 @@ section {
   display: contents;
   cursor: pointer;
 }
+
+.error-text {
+  color: #ff0000;
+}
diff --git a/public/src/api/makeApiRequest.ts b/public/src/api/makeApiRequest.ts
@@ -18,7 +18,15 @@ export function makeApiRequest<T>(
       if (error.response.status === 401) {
         sessionStorage.removeItem('email');
         sessionStorage.removeItem('token');
-        window.location.reload();
+        return {
+          ...error,
+          errorText:
+            'Authentication failed, please check your credentials and try again'
+        };
       }
+      return {
+        ...error,
+        errorText: 'Something went wrong. Please try again later'
+      };
     });
 }
diff --git a/public/src/interfaces/User.ts b/public/src/interfaces/User.ts
@@ -17,6 +17,7 @@ export enum LoginFormMode {
 export interface LoginResponse {
   email: string;
   ldapProfileLink: string;
+  errorText: string | null;
 }
 
 export interface RegistrationUser {

diff --git a/public/src/pages/auth/Login/Login.tsx b/public/src/pages/auth/Login/Login.tsx
@@ -43,6 +43,7 @@ export const Login: FC = () => {
 
   const [loginResponse, setLoginResponse] = useState<LoginResponse | null>();
   const [ldapResponse, setLdapResponse] = useState<Array<RegistrationUser>>([]);
+  const [errorText, setErrorText] = useState<string | null>();
 
   const [mode, setMode] = useState<LoginFormMode>(LoginFormMode.BASIC);
   const [csrf, setCsrf] = useState<string>();
@@ -74,9 +75,12 @@ export const Login: FC = () => {
     getUser(params, config)
       .then((data: LoginResponse) => {
         setLoginResponse(data);
-        return data.email;
+        return data;
       })
-      .then((email) => sessionStorage.setItem('email', email));
+      .then(({ email, errorText }) => {
+        setErrorText(errorText);
+        sessionStorage.setItem('email', email);
+      });
   };
 
   const sendLdap = () => {
@@ -181,7 +185,7 @@ export const Login: FC = () => {
               onInput={onInput}
             />
           </div>
-
+          {errorText && <div className="error-text">{errorText}</div>}
           <div className="form-group">
             <label>Password</label>
             <input