Merge pull request #178 from kbss-cvut/netlify

Disable keycloack when deploying on Netlify
kbss-cvut · Jan 5, 2024 · 0d66d2c · 0d66d2c
2 parents df33c12 + d924274
commit 0d66d2c
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,6 @@
 # CSAT Maintenance Planner
+[![Netlify Status](https://api.netlify.com/api/v1/badges/2eea8b97-1504-4f69-be1a-efe298a9d1fc/deploy-status)](https://app.netlify.com/sites/magical-cranachan-80d5d3/deploys)
+
 The CSAT Plan Manager is a cooperation project between CTU and CSAT. The Maintenance Planner gives a visual, easy and practical way for CSAT employees to have an overview of passed, ongoing and future maintenance plans.
 This project is frontend application that works over REST API provided by [Aircraft Maintenance Planning System](https://github.com/kbss-cvut/aircraft-maintenance-planning-system).
 

diff --git a/src/AppRouter.tsx b/src/AppRouter.tsx
@@ -3,6 +3,7 @@ import { BrowserRouter, Route, Routes } from "react-router-dom";
 import PlanManager from "./components/PlanManager";
 import { ReactKeycloakProvider } from "@react-keycloak/web";
 import keycloak from "./utils/KeycloakConfig";
+import {Constants} from "./utils/Constants";
 
 import "./styles/global.scss";
 
@@ -15,7 +16,8 @@ const basename = window.location.pathname.replace(/(\/[^/]+)$/, "");
 const AppRouter = () => {
   return (
     <React.Fragment>
-      {process.env.NODE_ENV !== "development" ? (
+      {process.env.NODE_ENV === "production" &&
+      Constants.AUTHENTICATION === "true" ? (
         <ReactKeycloakProvider
           authClient={keycloak}
           initOptions={{ checkLoginIframe: false }}

diff --git a/src/components/PlanManager.tsx b/src/components/PlanManager.tsx
@@ -53,14 +53,17 @@ const PlanManager = ({ basename }: Props) => {
   const [showPlannedSchedule, setShowPlannedScheduled] = useState(true);
 
   useEffect(() => {
-	if (process.env.NODE_ENV !== "development") {
-  	  const initializeKeycloak = () => {
-	    if (initialized && keycloak && !keycloak.authenticated) {
-		  keycloak.login();
-	    }
-	  };
-	  initializeKeycloak();
-	}
+    if (
+      process.env.NODE_ENV === "production" &&
+      Constants.AUTHENTICATION === "true"
+    ) {
+      const initializeKeycloak = () => {
+        if (initialized && keycloak && !keycloak.authenticated) {
+          keycloak.login();
+        }
+      };
+      initializeKeycloak();
+    }
   }, [initialized]);
 
   useEffect(() => {
@@ -186,12 +189,14 @@ const PlanManager = ({ basename }: Props) => {
       {isWorkPackageListLoading && !workPackageListErrorMessage && (
         <LoadingSpinnerIcon />
       )}
-      {!isWorkPackageListLoading && process.env.NODE_ENV !== "development" && (
-        <WorkPackageList
-          workPackageList={workPackageList}
-          handleWorkPackageOnClick={handleWorkPackageOnClick}
-        />
-      )}
+      {!isWorkPackageListLoading &&
+        process.env.NODE_ENV === "production" &&
+        Constants.AUTHENTICATION === "true" && (
+          <WorkPackageList
+            workPackageList={workPackageList}
+            handleWorkPackageOnClick={handleWorkPackageOnClick}
+          />
+        )}
     </React.Fragment>
   );
   };
@@ -247,8 +252,12 @@ const PlanManager = ({ basename }: Props) => {
 	);
   };
 
-  if (!initialized && process.env.NODE_ENV !== "development") {
-	return <h1>Loading...</h1>;
+	if (
+    !initialized &&
+    process.env.NODE_ENV === "production" &&
+    Constants.AUTHENTICATION === "true"
+  ) {
+    return <h1>Loading...</h1>;
   }
 
   return (

diff --git a/src/utils/Constants.ts b/src/utils/Constants.ts
@@ -41,6 +41,8 @@ const Constants = {
     "https://kbss.felk.cvut.cz/csat/api2/plans/plan-from-similar-revisions?revisionId="
   ),
 
+  AUTHENTICATION: getEnv("AUTHENTICATION", "true"),
+
   APPLICATION_TYPE: {
     PHASE_PLAN: "PhasePlan",
     TASK_CARD_TYPE_GROUP: "GeneralTaskPlan",