fix: fix login screen is show for canary checker image

Fixes #2267
flanksource · Sep 10, 2024 · 55eeec7 · 55eeec7
1 parent 513663d
commit 55eeec7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/pages/index.tsx b/pages/index.tsx
@@ -5,10 +5,19 @@ import AuthSessionChecker from "../src/components/Authentication/AuthSessionChec
 import { isCanaryUI } from "../src/context/Environment";
 
 const Home: NextPage = () => {
+  // For the canary UI, we don't have any authentication system in place
+  if (isCanaryUI) {
+    return (
+      <div className="container-fluid flex flex-col overflow-auto">
+        <CanaryCheckerApp />
+      </div>
+    );
+  }
+
   return (
     <AuthSessionChecker>
       <div className="container-fluid flex flex-col overflow-auto">
-        {isCanaryUI ? <CanaryCheckerApp /> : <App />}
+        <App />
       </div>
     </AuthSessionChecker>
   );

diff --git a/src/api/axios.ts b/src/api/axios.ts
@@ -1,4 +1,5 @@
 import { toastError } from "@flanksource-ui/components/Toast/toast";
+import { isCanaryUI } from "@flanksource-ui/context/Environment";
 import axios, { AxiosError } from "axios";
 
 const isClerkAuthSystem = !!process.env.NEXT_PUBLIC_AUTH_IS_CLERK === true;
@@ -150,7 +151,10 @@ for (const client of [
       return response;
     },
     (error) => {
-      redirectToLoginPageOnSessionExpiry(error);
+      // For canary UI, we don't have an auth system in place
+      if (!isCanaryUI) {
+        redirectToLoginPageOnSessionExpiry(error);
+      }
       if ("code" in (error as any)) {
         // Show a toast message for timeout and network errors
         if (error.code === "ECONNABORTED") {