#327 show login messages from server, remove old logo from login

pkpdapp-team · Jan 9, 2024 · ba15c97 · ba15c97
1 parent 24d4804
commit ba15c97
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 5 deletions.
diff --git a/frontend-v2/src/features/login/login.tsx b/frontend-v2/src/features/login/login.tsx
@@ -38,9 +38,20 @@ const Login: React.FC<LoginProps> = ({ onLogin, isLoading, errorMessage }) => {
       <form onSubmit={handleSubmit(onSubmit)}>
         <Stack spacing={2} sx={{ marginTop: 10 }}>
           <Box display="flex" justifyContent="center" alignItems="center">
-            <PkpdAppIcon style={{ width: 250 }} />
+          <Typography
+            variant="h3"
+            component="div"
+            sx={{
+              color: "#1976d2",
+              fontWeight: "bold",
+              paddingLeft: "1rem",
+              fontFamily: "Comfortaa",
+            }}
+          >
+            pkpd explorer
+          </Typography>
           </Box>
-          <Typography variant="h5">Login</Typography>
+          <Typography variant="h6">Login</Typography>
           <TextField
             label="Username"
             name="username"

diff --git a/frontend-v2/src/features/login/loginSlice.ts b/frontend-v2/src/features/login/loginSlice.ts
@@ -44,11 +44,27 @@ export const fetchSession = createAsyncThunk<
   return sessionResponse;
 });
 
+class ServerError extends Error {
+  constructor(message: string) {
+    super(message)
+    this.name = "ServerError";
+  }
+}
 function isResponseOk(response: Response) {
   if (response.status >= 200 && response.status <= 299) {
     return response.json();
   } else {
-    throw Error(response.statusText);
+    return response.json()
+      .then((data) => {
+        throw new ServerError(data.detail);
+      })
+      .catch((err) => {
+        if (err instanceof ServerError) {
+          throw err;
+        } else {
+          throw Error(response.statusText);
+        }
+      });
   }
 }
 
@@ -80,7 +96,7 @@ export const login = createAsyncThunk<
         return { isAuthenticated: true, user: data.user };
       })
       .catch((err) => {
-        return rejectWithValue({ error: err.message });
+        return rejectWithValue({ error: err.message});
       });
     return response;
   },

diff --git a/pkpdapp/pkpdapp/api/views/login.py b/pkpdapp/pkpdapp/api/views/login.py
@@ -39,7 +39,7 @@ def login_view(request):
 
     user = authenticate(username=username, password=password)
     if user is None:
-        return JsonResponse({'detail': 'Invalid credentials.'}, status=400)
+        return JsonResponse({'detail': 'Invalid credentials. Either you have supplied an incorrect username/password combination, or you do not have sufficient access'}, status=400)
 
     login(request, user)