Merge pull request #89 from CybercentreCanada/hotfix/api_debug

Hotfix/api debug
CybercentreCanada · Jul 13, 2021 · 42797e9 · 42797e9
2 parents c886905 + 37e2034
commit 42797e9
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 12 deletions.
diff --git a/src/components/hooks/useMyAPI.tsx b/src/components/hooks/useMyAPI.tsx
@@ -53,13 +53,7 @@ export default function useMyAPI() {
 
     // Fetch the URL
     fetch(url, requestOptions)
-      .then(res => {
-        if (res.status === 401 && reloadOnUnauthorize) {
-          // Trigger a page reload, we're not logged in anymore
-          window.location.reload(false);
-        }
-        return res.json();
-      })
+      .then(res => res.json())
       .catch(err => {
         // eslint-disable-next-line no-console
         console.error(err);
@@ -81,6 +75,7 @@ export default function useMyAPI() {
         } else if (api_data.api_status_code === 401 && reloadOnUnauthorize) {
           // Detect login request
           // Do nothing... we are reloading the page
+          window.location.reload();
           return;
         } else if (api_data.api_status_code !== 200) {
           // Handle errors

diff --git a/src/components/routes/login.tsx b/src/components/routes/login.tsx
@@ -143,7 +143,7 @@ export default function LoginScreen({ allowUserPass, allowSignup, allowPWReset,
         }
       },
       onSuccess: () => {
-        window.location.reload(false);
+        window.location.reload();
       }
     });
   }

diff --git a/src/components/routes/login/reset.tsx b/src/components/routes/login/reset.tsx
@@ -46,7 +46,7 @@ export function ResetPasswordNow({ buttonLoading, setButtonLoading }: ResetPassw
       onExit: () => setButtonLoading(false),
       onSuccess: () => {
         setDone(true);
-        setTimeout(() => window.location.reload(false), 7000);
+        setTimeout(() => window.location.reload(), 7000);
       }
     });
     event.preventDefault();

diff --git a/src/components/routes/submit.tsx b/src/components/routes/submit.tsx
@@ -153,7 +153,7 @@ function Submit() {
         const data = JSON.parse(api_data);
         if (Object.hasOwnProperty.call(data, 'api_status_code')) {
           if (data.api_status_code === 401) {
-            window.location.reload(false);
+            window.location.reload();
           }
         }
       } catch (ex) {

diff --git a/src/components/routes/tos.tsx b/src/components/routes/tos.tsx
@@ -46,7 +46,7 @@ export default function Tos() {
   function acceptTOS() {
     apiCall({
       url: `/api/v4/user/tos/${currentUser.username}/`,
-      onSuccess: () => window.location.reload(false),
+      onSuccess: () => window.location.reload(),
       onEnter: () => setButtonLoading(true),
       onExit: () => setButtonLoading(false)
     });
@@ -55,7 +55,7 @@ export default function Tos() {
   function cancelTOS() {
     apiCall({
       url: '/api/v4/auth/logout/',
-      onSuccess: () => window.location.reload(false),
+      onSuccess: () => window.location.reload(),
       onEnter: () => setButtonLoading(true),
       onExit: () => setButtonLoading(false)
     });