Merge pull request #92 from bcgov/SPR-190-Solve-401-Error-Keycloak-Ex…

…pire SPR-190 Solve 401 error keycloak expire
bcgov · Jul 17, 2023 · 950148a · 950148a
2 parents ca5d41f + b58a681
commit 950148a
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 22 deletions.
diff --git a/app/src/components/custom/fileHandlers/FileLink.tsx b/app/src/components/custom/fileHandlers/FileLink.tsx
@@ -60,11 +60,19 @@ const FileLink = (props: FileLinkProps) => {
       const file: string = await axios(axiosReqConfig).then((response) => response.data.file);
       return file;
     } catch (e: any) {
-      setErrorState({
-        text: 'File could not be retrieved.',
-        open: true,
-        style: errorStyles.error,
-      });
+      if (axios.isAxiosError(e) && e.code === '401') {
+        setErrorState({
+          text: 'User is unauthenticated. Redirecting to login.',
+          open: true,
+        });
+        window.location.reload();
+      } else {
+        setErrorState({
+          text: 'File could not be retrieved.',
+          open: true,
+          style: errorStyles.error,
+        });
+      }
     }
   };
 

diff --git a/app/src/components/custom/forms/RequestForm.tsx b/app/src/components/custom/forms/RequestForm.tsx
@@ -146,11 +146,19 @@ const RequestForm = (props: RequestFormProps) => {
       }
     } catch (e) {
       console.warn(e);
-      setErrorState({
-        text: 'Deletion Unsuccessful.',
-        open: true,
-        style: errorStyles.error,
-      });
+      if (axios.isAxiosError(e) && e.code === '401') {
+        setErrorState({
+          text: 'User is unauthenticated. Redirecting to login.',
+          open: true,
+        });
+        window.location.reload();
+      } else {
+        setErrorState({
+          text: 'Deletion Unsuccessful.',
+          open: true,
+          style: errorStyles.error,
+        });
+      }
     }
   };
 

diff --git a/app/src/components/custom/modals/UserReport.tsx b/app/src/components/custom/modals/UserReport.tsx
@@ -65,12 +65,20 @@ export const UserReport = () => {
       }
     } catch (e) {
       console.warn(e);
-      // Request failed. Report error to user.
-      setErrorState({
-        text: 'Issue could not be submitted.',
-        open: true,
-        style: errorStyles.error,
-      });
+      if (axios.isAxiosError(e) && e.code === '401') {
+        setErrorState({
+          text: 'User is unauthenticated. Redirecting to login.',
+          open: true,
+        });
+        window.location.reload();
+      } else {
+        // Request failed. Report error to user.
+        setErrorState({
+          text: 'Issue could not be submitted.',
+          open: true,
+          style: errorStyles.error,
+        });
+      }
     }
   };
 

diff --git a/app/src/keycloak/KeycloakWrapper.tsx b/app/src/keycloak/KeycloakWrapper.tsx
@@ -9,8 +9,9 @@ interface IKeycloakWrapper {
 const KeycloakWrapper = (props: IKeycloakWrapper) => {
   const { children } = props;
   const { setUserInfo, refreshAccessToken } = useAuthService();
+  const tokenRefreshTime = 1000 * 60; // 60 seconds
 
-  useEffect(() => {
+  const checkToken = () => {
     // Get the current URL and its search parameters
     const url = new URL(window.location.href);
     const { searchParams } = url;
@@ -26,6 +27,11 @@ const KeycloakWrapper = (props: IKeycloakWrapper) => {
       // If there is no token in the URL, try to refresh the access token
       refreshAccessToken();
     }
+  };
+
+  useEffect(() => {
+    checkToken();
+    setInterval(checkToken, tokenRefreshTime);
   }, []);
 
   return <div>{children}</div>;

diff --git a/app/src/pages/IndividualRequest.tsx b/app/src/pages/IndividualRequest.tsx
@@ -185,11 +185,19 @@ const IndividualRequest = () => {
       }
     } catch (e) {
       console.warn('Record could not be updated.');
-      setErrorState({
-        text: 'Update was unsuccessful.',
-        open: true,
-        style: errorStyles.error,
-      });
+      if (axios.isAxiosError(e) && e.code === '401') {
+        setErrorState({
+          text: 'User is unauthenticated. Redirecting to login.',
+          open: true,
+        });
+        window.location.reload();
+      } else {
+        setErrorState({
+          text: 'Update was unsuccessful.',
+          open: true,
+          style: errorStyles.error,
+        });
+      }
     }
   };