Fix issue with API returning 204

bcgov · Feb 16, 2024 · 90bb234 · 90bb234
1 parent 0949974
commit 90bb234
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/express-api/src/controllers/users/usersController.ts b/express-api/src/controllers/users/usersController.ts
@@ -172,7 +172,7 @@ export const getSelf = async (req: Request, res: Response) => {
   try {
     const user = userServices.normalizeKeycloakUser(req.user as KeycloakUser);
     const result = await userServices.getUser(user.username);
-    if (result) {
+    if (result && result !== null) {
       return res.status(200).send(result);
     } else {
       return res.status(204).send(); //Valid request, but no user for this keycloak login.

diff --git a/react-app/src/pages/AccessRequest.tsx b/react-app/src/pages/AccessRequest.tsx
@@ -135,7 +135,7 @@ export const AccessRequest = () => {
     }
   };
 
-  if (auth.pimsUser.data.Status && auth.pimsUser.data.Status === 'Active') {
+  if (auth.pimsUser.data && auth.pimsUser.data.Status === 'Active') {
     return <Navigate replace to={'/'} />;
   }
 
@@ -152,7 +152,7 @@ export const AccessRequest = () => {
         <Typography mb={'2rem'} variant="h2">
           {auth.pimsUser.data ? 'Access Pending' : 'Access Request'}
         </Typography>
-        {auth.pimsUser.data.Status && auth.pimsUser.data.Status === 'OnHold' ? (
+        {auth.pimsUser.data && auth.pimsUser.data.Status === 'OnHold' ? (
           <AccessPending />
         ) : (
           <RequestForm submitHandler={onSubmit} />