authentication changes

bcgov · Jul 31, 2024 · 4e8dd14 · 4e8dd14
1 parent 52d727c
commit 4e8dd14
Show file tree

Hide file tree

Showing 7 changed files with 523 additions and 484 deletions.
diff --git a/compliance-web/index.html b/compliance-web/index.html
@@ -4,6 +4,7 @@
     <meta charset="UTF-8" />
     <link rel="icon" type="image/png" href="/BCFavIcon.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <script src="/config/config.js"></script>
     <title>Epic.Compliance</title>
   </head>
   <body>

diff --git a/compliance-web/package-lock.json b/compliance-web/package-lock.json
diff --git a/compliance-web/package.json b/compliance-web/package.json
@@ -7,7 +7,9 @@
     "dev": "vite",
     "build": "tsc && vite build",
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
-    "preview": "vite preview"
+    "preview": "vite preview",
+    "cy:open": "cypress open",
+    "cy:run-unit": "cypress run --component"
   },
   "dependencies": {
     "@emotion/react": "^11.11.4",
@@ -20,7 +22,7 @@
     "@tanstack/router-devtools": "^1.45.7",
     "@tanstack/router-plugin": "^1.45.7",
     "axios": "^1.7.2",
-    "epic.theme": "^1.0.3",
+    "epic.theme": "^1.0.4",
     "keycloak-js": "^25.0.1",
     "oidc-client-ts": "^3.0.1",
     "react": "^18.2.0",

diff --git a/compliance-web/public/config/config.js b/compliance-web/public/config/config.js
@@ -0,0 +1 @@
+window['_env_'] = {};
diff --git a/compliance-web/src/routes/_authenticated.tsx b/compliance-web/src/routes/_authenticated.tsx
@@ -1,10 +1,19 @@
-import { createFileRoute } from '@tanstack/react-router'
+import { createFileRoute, Outlet } from "@tanstack/react-router";
+import { useEffect } from "react";
+import { useAuth } from "react-oidc-context";
 
-export const Route = createFileRoute('/_authenticated')({
-  beforeLoad: ({ context }) => {
-    const { isAuthenticated, signinRedirect } = context.authentication;
-    if (!isAuthenticated) {
+export const Route = createFileRoute("/_authenticated")({
+  component: Auth,
+});
+
+function Auth() {
+  const { isAuthenticated, signinRedirect, isLoading } = useAuth();
+
+  useEffect(() => {
+    if (!isAuthenticated && !isLoading) {
       signinRedirect();
     }
-  },
-})
+  }, [isAuthenticated, isLoading, signinRedirect]);
+
+  return <Outlet />;
+}
diff --git a/compliance-web/src/styles/App.scss b/compliance-web/src/styles/App.scss
@@ -1,8 +1,5 @@
 :root {
   font-family: 'BC Sans';
-  line-height: 1.5;
-  font-weight: 400;
-
   font-synthesis: none;
   text-rendering: optimizeLegibility;
   -webkit-font-smoothing: antialiased;

diff --git a/compliance-web/tsconfig.app.json b/compliance-web/tsconfig.app.json
@@ -28,5 +28,10 @@
     "noUnusedParameters": true,
     "noFallthroughCasesInSwitch": true
   },
-  "include": ["src"]
+  "include": ["src"],
+  "exclude": [
+    "node_modules",
+    "**/*.test.tsx", // Update this pattern if your tests use a different extension
+    "**/*.cy.tsx" // Or whichever extension you use for Cypress tests
+  ],
 }