From 92aafa1b8710fcb8c936f0e16d0588660cdb46c1 Mon Sep 17 00:00:00 2001
From: Ariel Rotter-Aboyoun <raarielgrace@gmail.com>
Date: Wed, 4 Dec 2024 13:19:11 -0800
Subject: [PATCH 01/21] Draft w/ changes

---
 backend/package-lock.json                     | 24 ++++++++---
 backend/package.json                          |  1 +
 backend/src/express.ts                        |  9 ++++
 backend/src/middleware/globalErrorHandler.ts  | 23 ++++++++++
 backend/src/middleware/index.ts               |  2 +
 docker-compose.yml                            |  6 ++-
 frontend/package-lock.json                    | 11 +++++
 frontend/package.json                         |  1 +
 .../src/components/common/Header/Header.tsx   | 23 ++++++++++
 frontend/src/main.tsx                         | 12 ++++--
 frontend/vite.config.ts                       | 42 +++++++++++++++----
 11 files changed, 135 insertions(+), 19 deletions(-)
 create mode 100644 backend/src/middleware/globalErrorHandler.ts
 create mode 100644 backend/src/middleware/index.ts

diff --git a/backend/package-lock.json b/backend/package-lock.json
index c139668..d881241 100644
--- a/backend/package-lock.json
+++ b/backend/package-lock.json
@@ -9,6 +9,7 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
+        "@bcgov/citz-imb-sso-express": "^1.0.2",
         "compression": "^1.7.4",
         "cookie-parser": "^1.4.6",
         "cors": "^2.8.5",
@@ -758,6 +759,17 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@bcgov/citz-imb-sso-express": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@bcgov/citz-imb-sso-express/-/citz-imb-sso-express-1.0.2.tgz",
+      "integrity": "sha512-I6p6mSg2dr6/ySYclotJhqTIJ3hbw++G3w4kZQn96dYRLjbSV+qOtWMWjFZWmMUq/KRES/OITho30az1fOh9VQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "cookie-parser": "1.4.6",
+        "cors": "2.8.5",
+        "express": "4.19.2"
+      }
+    },
     "node_modules/@bcoe/v8-coverage": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
@@ -3258,9 +3270,9 @@
       "license": "MIT"
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6813,9 +6825,9 @@
       }
     },
     "node_modules/micromatch": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz",
-      "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/backend/package.json b/backend/package.json
index a202b3c..5ad02cb 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -42,6 +42,7 @@
     "typescript-eslint": "^7.8.0"
   },
   "dependencies": {
+    "@bcgov/citz-imb-sso-express": "^1.0.2",
     "compression": "^1.7.4",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
diff --git a/backend/src/express.ts b/backend/src/express.ts
index 7f298c5..275f880 100644
--- a/backend/src/express.ts
+++ b/backend/src/express.ts
@@ -13,11 +13,15 @@ import morgan from 'morgan';
 import cors from 'cors';
 import swaggerUi from 'swagger-ui-express';
 import swaggerJSDoc from 'swagger-jsdoc';
+import { protectedRoute, sso } from '@bcgov/citz-imb-sso-express';
 import swaggerConfig from './config/swaggerConfig';
 import * as routers from './routes/index';
+import * as middleware from './middleware';
 
 const app = express();
 
+sso(app);
+
 // Express middleware
 app.use(express.json());
 app.use(express.urlencoded({ extended: false }));
@@ -27,7 +31,12 @@ app.use(morgan('dev')); // Logger Requests and Responses in the console
 app.use(cors()); // Activate CORS, allowing access
 app.use('/api/api-docs', swaggerUi.serve, swaggerUi.setup(swaggerJSDoc(swaggerConfig)));
 
+// Add the protectedRoute function to any endpoint routes in the Admin Portal
+
 // Routes
 app.use('/api', [routers.healthRouter, routers.developersRouter]);
 
+// Integrate global error handler after routes to cover all ends.
+app.use(middleware.globalErrorHandler);
+
 export default app;
diff --git a/backend/src/middleware/globalErrorHandler.ts b/backend/src/middleware/globalErrorHandler.ts
new file mode 100644
index 0000000..6dc44ee
--- /dev/null
+++ b/backend/src/middleware/globalErrorHandler.ts
@@ -0,0 +1,23 @@
+import { Request, Response, NextFunction } from 'express';
+/**
+ * PURPOSE: Global Error Handler is in place to give more meaningful communication with
+ *          the user if something in the application goes wrong
+ */
+
+type Props = {
+  req: Request;
+  res: Response;
+  next: NextFunction;
+}
+
+const globalErrorHandler = ({
+  res,
+  next,
+}: Props) => {
+  res.status(500).json({
+    message: 'Internal Server Error',
+  });
+  next();
+};
+
+export default globalErrorHandler;
\ No newline at end of file
diff --git a/backend/src/middleware/index.ts b/backend/src/middleware/index.ts
new file mode 100644
index 0000000..fd9fe62
--- /dev/null
+++ b/backend/src/middleware/index.ts
@@ -0,0 +1,2 @@
+// eslint-disable-next-line import/prefer-default-export
+export { default as globalErrorHandler } from './globalErrorHandler';
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index bef0ca1..a7d3ed0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -50,6 +50,7 @@ services:
           path: ./backend/
           target: app
           ignore: [node_modules]
+    env_file: .env
     environment:
       LOG_LEVEL: info
       PORT: 3000
@@ -72,8 +73,9 @@ services:
     #       path: ./frontend
     #       target: /app
     #       ignore: [node_modules]
-    environment:
-      VITE_BACKEND_URL: http://localhost:3000/api
+    env_file: .env
+    # environment:
+    #  VITE_BACKEND_URL: http://localhost:3000
     healthcheck:
       test: curl --fail http://localhost:5173 || exit 1
     ports: ["5173:5173"]
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index f02382c..6712e57 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -9,6 +9,7 @@
       "version": "0.0.0",
       "dependencies": {
         "@bcgov/bc-sans": "^2.1.0",
+        "@bcgov/citz-imb-sso-react": "^1.0.1",
         "@bcgov/design-tokens": "^3.1.1",
         "@emotion/styled": "^11.13.0",
         "axios": "^1.7.7",
@@ -337,6 +338,16 @@
       "resolved": "https://registry.npmjs.org/@bcgov/bc-sans/-/bc-sans-2.1.0.tgz",
       "integrity": "sha512-1MesF4NAVpM5dywoJ68wNcBylHbPqg1dDV/FNuQm0BbspETGlPmfX8LG8rtrCjCAPhWuL2qRT/lBYDUMvFTUnw=="
     },
+    "node_modules/@bcgov/citz-imb-sso-react": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@bcgov/citz-imb-sso-react/-/citz-imb-sso-react-1.0.1.tgz",
+      "integrity": "sha512-Bg3SVDlLvWeuPHgriY4KjPICxbAle8UFetFdlWE6ig/VjIo8C18ogUptMjEX1rZtwtd/AP4wfL36apLyLVOzrw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@bcgov/bc-sans": "2.1.0",
+        "react": "18.3.1"
+      }
+    },
     "node_modules/@bcgov/design-tokens": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/@bcgov/design-tokens/-/design-tokens-3.1.1.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index a569c27..d5d0d69 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -14,6 +14,7 @@
   },
   "dependencies": {
     "@bcgov/bc-sans": "^2.1.0",
+    "@bcgov/citz-imb-sso-react": "^1.0.1",
     "@bcgov/design-tokens": "^3.1.1",
     "@emotion/styled": "^11.13.0",
     "axios": "^1.7.7",
diff --git a/frontend/src/components/common/Header/Header.tsx b/frontend/src/components/common/Header/Header.tsx
index 96535ae..fb8dde9 100644
--- a/frontend/src/components/common/Header/Header.tsx
+++ b/frontend/src/components/common/Header/Header.tsx
@@ -1,12 +1,25 @@
 /**
  * @summary Reusable BC Gov Header Component
  */
+import { useSSO } from '@bcgov/citz-imb-sso-react';
 import logo from '/logo-banner.svg';
 // import { Link } from 'react-router-dom';
 
 import { HeaderWrapper, Heading, Banner, Image, StyledLink } from './header.styles';
+import { Button } from '../Button/Button';
+import { ButtonWrapper } from '../../../views/LandingPage/landingPage.styles';
 
 export default function Header() {
+  const { login, logout, isAuthenticated } = useSSO();
+
+  const handleLoginButton = () => {
+    if (isAuthenticated) {
+      logout();
+    } else {
+      login({ backendURL: 'http://localhost:3000', idpHint: 'idir', postLoginRedirectURL: '/' });
+    }
+  };
+
   return (
     <HeaderWrapper>
       <Banner>
@@ -17,6 +30,16 @@ export default function Header() {
         <StyledLink href="/">
           <Heading>Nutrient Management Calculator</Heading>
         </StyledLink>
+        <ButtonWrapper>
+          <Button
+            handleClick={handleLoginButton}
+            variant="secondary"
+            size="sm"
+            disabled={false}
+            text={isAuthenticated ? 'Logout' : 'Login'}
+            aria-label={isAuthenticated ? 'Logout' : 'Login'}
+          />
+        </ButtonWrapper>
       </Banner>
     </HeaderWrapper>
   );
diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index 34def5f..6bcec0e 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -1,12 +1,18 @@
 import { StrictMode } from 'react';
 import { createRoot } from 'react-dom/client';
 import { BrowserRouter } from 'react-router-dom';
+import { SSOProvider } from '@bcgov/citz-imb-sso-react';
 import App from './App.tsx';
 
 createRoot(document.getElementById('root')!).render(
   <StrictMode>
-    <BrowserRouter>
-      <App />
-    </BrowserRouter>
+    <SSOProvider
+      backendURL="http://localhost:3000"
+      idpHint="idir"
+    >
+      <BrowserRouter>
+        <App />
+      </BrowserRouter>
+    </SSOProvider>
   </StrictMode>,
 );
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
index e7c3c74..1df4c0e 100644
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -1,11 +1,37 @@
-import { defineConfig } from 'vite';
+/* eslint-disable @typescript-eslint/no-unused-vars */
+/* eslint-disable import/no-extraneous-dependencies */
+import { defineConfig, loadEnv } from 'vite';
 import react from '@vitejs/plugin-react';
 
-export default defineConfig({
-  resolve: {},
-  server: {
-    host: '0.0.0.0',
-    port: 5173,
-  },
-  plugins: [react()],
+export default defineConfig(({ mode }) => {
+  const env = loadEnv(mode, process.cwd());
+
+  return {
+    resolve: {},
+    server: {
+      host: '0.0.0.0',
+      port: Number(env.VITE_PORT),
+      /*
+      proxy: {
+        '/api': {
+          target: env.VITE_BACKEND_URL,
+          changeOrigin: true,
+          rewrite: (path) => path.replace(/^\/api/, ''),
+          configure: (proxy, _options) => {
+            proxy.on('error', (err, _req, _res) => {
+              console.log('proxy error', err);
+            });
+            proxy.on('proxyReq', (proxyReq, req, _res) => {
+              console.log('Sending Request to the Target:', req.method, req.url);
+            });
+            proxy.on('proxyRes', (proxyRes, req, _res) => {
+              console.log('Received Response from the Target:', proxyRes.statusCode, req.url);
+            });
+          },
+        },
+      },
+      */
+    },
+    plugins: [react()],
+  };
 });

From 56507f0c96efefa92f66d4cd492b5570d5053081 Mon Sep 17 00:00:00 2001
From: Ariel Rotter-Aboyoun <raarielgrace@gmail.com>
Date: Wed, 4 Dec 2024 15:56:53 -0800
Subject: [PATCH 02/21] Finishing up functionality

---
 backend/src/express.ts                        |  2 +-
 docker-compose.yml                            |  4 ++--
 .../src/components/common/Header/Header.tsx   |  7 +++++--
 frontend/src/main.tsx                         |  2 +-
 frontend/vite.config.ts                       | 21 -------------------
 5 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/backend/src/express.ts b/backend/src/express.ts
index 275f880..2a66750 100644
--- a/backend/src/express.ts
+++ b/backend/src/express.ts
@@ -13,7 +13,7 @@ import morgan from 'morgan';
 import cors from 'cors';
 import swaggerUi from 'swagger-ui-express';
 import swaggerJSDoc from 'swagger-jsdoc';
-import { protectedRoute, sso } from '@bcgov/citz-imb-sso-express';
+import { sso } from '@bcgov/citz-imb-sso-express';
 import swaggerConfig from './config/swaggerConfig';
 import * as routers from './routes/index';
 import * as middleware from './middleware';
diff --git a/docker-compose.yml b/docker-compose.yml
index a7d3ed0..4310367 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -74,8 +74,8 @@ services:
     #       target: /app
     #       ignore: [node_modules]
     env_file: .env
-    # environment:
-    #  VITE_BACKEND_URL: http://localhost:3000
+    environment:
+      VITE_BACKEND_URL: http://localhost:3000
     healthcheck:
       test: curl --fail http://localhost:5173 || exit 1
     ports: ["5173:5173"]
diff --git a/frontend/src/components/common/Header/Header.tsx b/frontend/src/components/common/Header/Header.tsx
index fb8dde9..7ad74ba 100644
--- a/frontend/src/components/common/Header/Header.tsx
+++ b/frontend/src/components/common/Header/Header.tsx
@@ -14,9 +14,12 @@ export default function Header() {
 
   const handleLoginButton = () => {
     if (isAuthenticated) {
-      logout();
+      logout(import.meta.env.VITE_BACKEND_URL);
     } else {
-      login({ backendURL: 'http://localhost:3000', idpHint: 'idir', postLoginRedirectURL: '/' });
+      login({
+        backendURL: import.meta.env.VITE_BACKEND_URL,
+        idpHint: 'idir',
+      });
     }
   };
 
diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index 6bcec0e..6ce688c 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -7,7 +7,7 @@ import App from './App.tsx';
 createRoot(document.getElementById('root')!).render(
   <StrictMode>
     <SSOProvider
-      backendURL="http://localhost:3000"
+      backendURL={import.meta.env.VITE_BACKEND_URL}
       idpHint="idir"
     >
       <BrowserRouter>
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
index 1df4c0e..1bfc936 100644
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
 /* eslint-disable import/no-extraneous-dependencies */
 import { defineConfig, loadEnv } from 'vite';
 import react from '@vitejs/plugin-react';
@@ -11,26 +10,6 @@ export default defineConfig(({ mode }) => {
     server: {
       host: '0.0.0.0',
       port: Number(env.VITE_PORT),
-      /*
-      proxy: {
-        '/api': {
-          target: env.VITE_BACKEND_URL,
-          changeOrigin: true,
-          rewrite: (path) => path.replace(/^\/api/, ''),
-          configure: (proxy, _options) => {
-            proxy.on('error', (err, _req, _res) => {
-              console.log('proxy error', err);
-            });
-            proxy.on('proxyReq', (proxyReq, req, _res) => {
-              console.log('Sending Request to the Target:', req.method, req.url);
-            });
-            proxy.on('proxyRes', (proxyRes, req, _res) => {
-              console.log('Received Response from the Target:', proxyRes.statusCode, req.url);
-            });
-          },
-        },
-      },
-      */
     },
     plugins: [react()],
   };

From 96620290bec05111afa3a314441d5212ac685c5f Mon Sep 17 00:00:00 2001
From: Ariel Rotter-Aboyoun <raarielgrace@gmail.com>
Date: Wed, 4 Dec 2024 16:01:47 -0800
Subject: [PATCH 03/21] Add keycloak fields to env template

---
 .env.template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.env.template b/.env.template
index 205bb74..a9ff9d7 100644
--- a/.env.template
+++ b/.env.template
@@ -14,6 +14,12 @@ PGADMIN_DEFAULT_EMAIL=
 PGADMIN_DEFAULT_PASSWORD=
 
 # VITE FRONTEND
-VITE_HOST=
 VITE_PORT=
 VITE_BACKEND_URL=
+
+# KEYCLOAK SETTINGS
+SSO_CLIENT_ID=
+SSO_CLIENT_SECRET=
+SSO_REDIRECT_URL=
+FRONTEND_URL=
+BACKEND_URL=
\ No newline at end of file

From 7e09321ab3d7650680d707f62cf2d80838906b75 Mon Sep 17 00:00:00 2001
From: Dallas Richmond <dallas.richmond@gov.bc.ca>
Date: Wed, 4 Dec 2024 17:01:45 -0800
Subject: [PATCH 04/21] Updated healthcheck

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 4310367..fc8b4ea 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -56,7 +56,7 @@ services:
       PORT: 3000
       <<: *postgres-vars
     healthcheck:
-      test: curl localhost:3000/api/health | grep 'NMP API is healthy and ready!'
+      test: curl localhost:3000/health | grep 'NMP API is healthy and ready!'
     ports: [3000:3000]
 
   # Frontend

From 9cff51ffbc6a1241fd18a9ace7fc4a27d0c0fce0 Mon Sep 17 00:00:00 2001
From: Dallas Richmond <dallas.richmond@gov.bc.ca>
Date: Wed, 4 Dec 2024 17:36:26 -0800
Subject: [PATCH 05/21] Updated deploy config

---
 backend/src/controllers/health-api-controller.ts | 3 +--
 docker-compose.yml                               | 2 +-
 frontend/openshift.deploy.yml                    | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/backend/src/controllers/health-api-controller.ts b/backend/src/controllers/health-api-controller.ts
index 80e1411..bf776ae 100644
--- a/backend/src/controllers/health-api-controller.ts
+++ b/backend/src/controllers/health-api-controller.ts
@@ -1,6 +1,5 @@
 /**
- * @desc Simple health endpoint to check API status
- * @author GDamaso
+ * @dsummary Simple health endpoint to check API status
  */
 import { Response, Request } from 'express';
 
diff --git a/docker-compose.yml b/docker-compose.yml
index fc8b4ea..4310367 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -56,7 +56,7 @@ services:
       PORT: 3000
       <<: *postgres-vars
     healthcheck:
-      test: curl localhost:3000/health | grep 'NMP API is healthy and ready!'
+      test: curl localhost:3000/api/health | grep 'NMP API is healthy and ready!'
     ports: [3000:3000]
 
   # Frontend
diff --git a/frontend/openshift.deploy.yml b/frontend/openshift.deploy.yml
index 3fb5058..c857570 100644
--- a/frontend/openshift.deploy.yml
+++ b/frontend/openshift.deploy.yml
@@ -64,7 +64,7 @@ objects:
                 - name: LOG_LEVEL
                   value: info
                 - name: VITE_BACKEND_URL
-                  value: http://${APP}-${TARGET}-backend/api
+                  value: http://${APP}-${TARGET}-backend
               ports:
                 - name: http
                   containerPort: 5173

From ddd4d8bfb854322324b8e0c4c0e5ba65c6881ad4 Mon Sep 17 00:00:00 2001
From: Ariel Rotter-Aboyoun <raarielgrace@gmail.com>
Date: Thu, 5 Dec 2024 11:51:39 -0800
Subject: [PATCH 06/21] More openshift.deploy edits

---
 backend/openshift.deploy.yml  | 47 +++++++++++++++++++++++------------
 frontend/openshift.deploy.yml | 13 +++++++++-
 2 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/backend/openshift.deploy.yml b/backend/openshift.deploy.yml
index b2c81af..2cd79be 100644
--- a/backend/openshift.deploy.yml
+++ b/backend/openshift.deploy.yml
@@ -28,8 +28,8 @@ objects:
     apiVersion: v1
     metadata:
       labels:
-        app: nr-nmp${NAME_SUFFIX}
-      name: nr-nmp-backend${NAME_SUFFIX}
+        app: ${APP}${NAME_SUFFIX}
+      name: ${APP}-${COMPONENT}${NAME_SUFFIX}
     spec:
       type: ClusterIP
       ports:
@@ -38,30 +38,30 @@ objects:
           protocol: TCP
           name: http-3000
       selector:
-        service: nr-nmp-backend${NAME_SUFFIX}
+        service: ${APP}-${COMPONENT}${NAME_SUFFIX}
   - kind: Deployment
     apiVersion: apps/v1
     metadata:
       labels:
-        app: nr-nmp${NAME_SUFFIX}
-        deployment: nr-nmp-backend${NAME_SUFFIX}
-      name: nr-nmp-backend${NAME_SUFFIX}
+        app: ${APP}${NAME_SUFFIX}
+        deployment: ${APP}-${COMPONENT}${NAME_SUFFIX}
+      name: ${APP}-${COMPONENT}${NAME_SUFFIX}
     spec:
       strategy:
         type: Recreate
       selector:
         matchLabels:
-          deployment: nr-nmp-backend${NAME_SUFFIX}
+          deployment: ${APP}-${COMPONENT}${NAME_SUFFIX}
       template:
         metadata:
           labels:
-            app: nr-nmp${NAME_SUFFIX}
-            deployment: nr-nmp-backend${NAME_SUFFIX}
-            service: nr-nmp-backend${NAME_SUFFIX}
+            app: ${APP}${NAME_SUFFIX}
+            deployment: ${APP}-${COMPONENT}${NAME_SUFFIX}
+            service: ${APP}-${COMPONENT}${NAME_SUFFIX}
         spec:
           containers:
-            - name: nr-nmp-backend${NAME_SUFFIX}
-              image: ghcr.io/bcgov/nr-nmp/backend:${IMAGE_TAG}
+            - name: ${APP}-${COMPONENT}${NAME_SUFFIX}
+              image: ghcr.io/${ORG}/${APP}/${COMPONENT}:${IMAGE_TAG}
               imagePullPolicy: Always
               env:
                 - name: LOG_LEVEL
@@ -83,6 +83,21 @@ objects:
                     secretKeyRef:
                       name: nr-nmp-database${NAME_SUFFIX}
                       key: database-user
+                - name: SSO_CLIENT_ID
+                  valueFrom:
+                    secretKeyRef:
+                      name: nr-nmp-keycloak
+                      key: SSO_CLIENT_ID
+                - name: SSO_CLIENT_SECRET
+                  valueFrom:
+                    secretKeyRef: nr-nmp-keycloak
+                    key: SSO_CLIENT_SECRET
+                - name: SSO_REDIRECT_URL
+                  value: http://${APP}-${TARGET}-${COMPONENT}/auth/callback
+                - name: FRONTEND_URL
+                  value: http://${APP}-${TARGET}
+                - name: BACKEND_URL
+                  value: http://${APP}-${TARGET}-${COMPONENT}
               ports:
                 - containerPort: 3000
                   protocol: TCP
@@ -117,15 +132,15 @@ objects:
     apiVersion: route.openshift.io/v1
     metadata:
       labels:
-        app: nr-nmp${NAME_SUFFIX}
-      name: nr-nmp-backend${NAME_SUFFIX}
+        app: ${APP}${NAME_SUFFIX}
+      name: ${APP}-${COMPONENT}${NAME_SUFFIX}
     spec:
-      host: nr-nmp-backend${NAME_SUFFIX}.apps.silver.devops.gov.bc.ca
+      host: ${APP}-${COMPONENT}${NAME_SUFFIX}.apps.silver.devops.gov.bc.ca
       port:
         targetPort: http-3000
       to:
         kind: Service
-        name: nr-nmp-backend${NAME_SUFFIX}
+        name: ${APP}-${COMPONENT}${NAME_SUFFIX}
         weight: 100
       tls:
         termination: edge
diff --git a/frontend/openshift.deploy.yml b/frontend/openshift.deploy.yml
index c857570..0e5f6dc 100644
--- a/frontend/openshift.deploy.yml
+++ b/frontend/openshift.deploy.yml
@@ -65,6 +65,17 @@ objects:
                   value: info
                 - name: VITE_BACKEND_URL
                   value: http://${APP}-${TARGET}-backend
+                - name: VITE_PORT
+                  value: 5173
+                - name: SSO_CLIENT_ID
+                  valueFrom:
+                    secretKeyRef:
+                      name: nr-nmp-keycloak
+                      key: SSO_CLIENT_ID
+                - name: SSO_CLIENT_SECRET
+                  valueFrom:
+                    secretKeyRef: nr-nmp-keycloak
+                    key: SSO_CLIENT_SECRET
               ports:
                 - name: http
                   containerPort: 5173
@@ -103,7 +114,7 @@ objects:
         app: ${APP}-${TARGET}
       name: ${APP}-${TARGET}-${COMPONENT}
     spec:
-      host: nr-nmp-${TARGET}.apps.silver.devops.gov.bc.ca
+      host: ${APP}-${TARGET}.apps.silver.devops.gov.bc.ca
       port:
         targetPort: http-3000
       to:

From 2a1e4c59fcb7d45db5b45547bc92cbc0b652f0b4 Mon Sep 17 00:00:00 2001
From: Ariel Rotter-Aboyoun <raarielgrace@gmail.com>
Date: Thu, 5 Dec 2024 12:10:34 -0800
Subject: [PATCH 07/21] Experiment

---
 .github/workflows/.deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/.deploy.yml b/.github/workflows/.deploy.yml
index b63d9ed..05894ff 100644
--- a/.github/workflows/.deploy.yml
+++ b/.github/workflows/.deploy.yml
@@ -83,7 +83,7 @@ jobs:
 
   frontend:
     name: Frontend
-    needs: [init, database, backend]
+    needs: [init, database]
     environment: ${{ inputs.environment }}
     runs-on: ubuntu-22.04
     steps:

From 754d1ff9b99b1d3565f66575bdca9862b91faa25 Mon Sep 17 00:00:00 2001
From: Ariel Rotter-Aboyoun <raarielgrace@gmail.com>
Date: Thu, 5 Dec 2024 12:23:12 -0800
Subject: [PATCH 08/21] Env struct fix

---
 backend/openshift.deploy.yml  | 5 +++--
 frontend/openshift.deploy.yml | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/backend/openshift.deploy.yml b/backend/openshift.deploy.yml
index 2cd79be..3b30013 100644
--- a/backend/openshift.deploy.yml
+++ b/backend/openshift.deploy.yml
@@ -90,8 +90,9 @@ objects:
                       key: SSO_CLIENT_ID
                 - name: SSO_CLIENT_SECRET
                   valueFrom:
-                    secretKeyRef: nr-nmp-keycloak
-                    key: SSO_CLIENT_SECRET
+                    secretKeyRef:
+                      name: nr-nmp-keycloak
+                      key: SSO_CLIENT_SECRET
                 - name: SSO_REDIRECT_URL
                   value: http://${APP}-${TARGET}-${COMPONENT}/auth/callback
                 - name: FRONTEND_URL
diff --git a/frontend/openshift.deploy.yml b/frontend/openshift.deploy.yml
index 0e5f6dc..b44c14a 100644
--- a/frontend/openshift.deploy.yml
+++ b/frontend/openshift.deploy.yml
@@ -74,8 +74,9 @@ objects:
                       key: SSO_CLIENT_ID
                 - name: SSO_CLIENT_SECRET
                   valueFrom:
-                    secretKeyRef: nr-nmp-keycloak
-                    key: SSO_CLIENT_SECRET
+                    secretKeyRef:
+                      name: nr-nmp-keycloak
+                      key: SSO_CLIENT_SECRET
               ports:
                 - name: http
                   containerPort: 5173

From 0d75a29077943b0a9fe9e31430d2a1776c633898 Mon Sep 17 00:00:00 2001
From: Ariel Rotter-Aboyoun <raarielgrace@gmail.com>
Date: Thu, 5 Dec 2024 12:32:59 -0800
Subject: [PATCH 09/21] Restoring workflows

---
 .github/workflows/.deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/.deploy.yml b/.github/workflows/.deploy.yml
index 05894ff..b63d9ed 100644
--- a/.github/workflows/.deploy.yml
+++ b/.github/workflows/.deploy.yml
@@ -83,7 +83,7 @@ jobs:
 
   frontend:
     name: Frontend
-    needs: [init, database]
+    needs: [init, database, backend]
     environment: ${{ inputs.environment }}
     runs-on: ubuntu-22.04
     steps:

From 47cc9bc039eabc38f6b4e13cbc655d4814d37a31 Mon Sep 17 00:00:00 2001
From: Ariel Rotter-Aboyoun <raarielgrace@gmail.com>
Date: Thu, 5 Dec 2024 12:44:48 -0800
Subject: [PATCH 10/21] More env yml fixes

---
 frontend/openshift.deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/openshift.deploy.yml b/frontend/openshift.deploy.yml
index b44c14a..6a6edb3 100644
--- a/frontend/openshift.deploy.yml
+++ b/frontend/openshift.deploy.yml
@@ -66,7 +66,7 @@ objects:
                 - name: VITE_BACKEND_URL
                   value: http://${APP}-${TARGET}-backend
                 - name: VITE_PORT
-                  value: 5173
+                  value: '5173'
                 - name: SSO_CLIENT_ID
                   valueFrom:
                     secretKeyRef:

From 2254cc9c640b8b4d3941bb0e2265e5dae9beb978 Mon Sep 17 00:00:00 2001
From: Ariel Rotter-Aboyoun <raarielgrace@gmail.com>
Date: Thu, 5 Dec 2024 12:57:16 -0800
Subject: [PATCH 11/21] test

---
 frontend/src/components/common/Header/Header.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/common/Header/Header.tsx b/frontend/src/components/common/Header/Header.tsx
index 72f019c..fd20e98 100644
--- a/frontend/src/components/common/Header/Header.tsx
+++ b/frontend/src/components/common/Header/Header.tsx
@@ -10,7 +10,7 @@ import { ButtonWrapper } from '../../../views/LandingPage/landingPage.styles';
 
 export default function Header() {
   const { login, logout, isAuthenticated } = useSSO();
-
+  console.info(import.meta.env.VITE_BACKEND_URL);
   const handleLoginButton = () => {
     if (isAuthenticated) {
       logout(import.meta.env.VITE_BACKEND_URL);

From c772606d95507feff3c4de663bcabbeb44ed09a2 Mon Sep 17 00:00:00 2001
From: Ariel Rotter-Aboyoun <raarielgrace@gmail.com>
Date: Thu, 5 Dec 2024 13:23:29 -0800
Subject: [PATCH 12/21] Vite config test

---
 frontend/vite.config.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
index 1bfc936..c73d793 100644
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -12,5 +12,8 @@ export default defineConfig(({ mode }) => {
       port: Number(env.VITE_PORT),
     },
     plugins: [react()],
+    define: {
+      __APP_ENV__: JSON.stringify(env.APP_ENV),
+    },
   };
 });

From 7713a664440cb4c6743162ff7a7488e2cf82c8da Mon Sep 17 00:00:00 2001
From: Ariel Rotter-Aboyoun <raarielgrace@gmail.com>
Date: Thu, 5 Dec 2024 14:08:32 -0800
Subject: [PATCH 13/21] Duplicating variable for Caddy

---
 frontend/openshift.deploy.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frontend/openshift.deploy.yml b/frontend/openshift.deploy.yml
index 6a6edb3..7ba5c4f 100644
--- a/frontend/openshift.deploy.yml
+++ b/frontend/openshift.deploy.yml
@@ -65,6 +65,8 @@ objects:
                   value: info
                 - name: VITE_BACKEND_URL
                   value: http://${APP}-${TARGET}-backend
+                - name: BACKEND_URL
+                  value: http://${APP}-${TARGET}-backend
                 - name: VITE_PORT
                   value: '5173'
                 - name: SSO_CLIENT_ID

From 5c91391769f3caa7f1b5de00c90c466d80bf0811 Mon Sep 17 00:00:00 2001
From: Ariel Rotter-Aboyoun <raarielgrace@gmail.com>
Date: Thu, 5 Dec 2024 14:35:31 -0800
Subject: [PATCH 14/21] Copied logic from nr-spar

---
 frontend/Caddyfile                            |  4 ++++
 .../src/components/common/Header/Header.tsx   |  7 ++++---
 frontend/src/env.ts                           |  9 +++++++++
 frontend/src/main.tsx                         |  3 ++-
 frontend/vite.config.ts                       | 20 ++++++++++++++++++-
 5 files changed, 38 insertions(+), 5 deletions(-)
 create mode 100644 frontend/src/env.ts

diff --git a/frontend/Caddyfile b/frontend/Caddyfile
index c13a173..46387db 100644
--- a/frontend/Caddyfile
+++ b/frontend/Caddyfile
@@ -40,6 +40,10 @@
 		Referrer-Policy "same-origin"
 		Feature-Policy "fullscreen 'self'; camera 'none'; microphone 'none'"
 	}
+	handle /env.js {
+		header Content-Type "text/javascript"
+		respond `window.config = {"VITE_BACKEND_URL":"{$VITE_BACKEND_URL}","VITE_PORT":"{$VITE_PORT}"};`
+	}
 }
 :3001 {
 	handle /health {
diff --git a/frontend/src/components/common/Header/Header.tsx b/frontend/src/components/common/Header/Header.tsx
index fd20e98..450df94 100644
--- a/frontend/src/components/common/Header/Header.tsx
+++ b/frontend/src/components/common/Header/Header.tsx
@@ -4,19 +4,20 @@
 import { useSSO } from '@bcgov/citz-imb-sso-react';
 import logo from '/logo-banner.svg';
 
+import { env } from '../../../env';
 import { HeaderWrapper, Heading, Banner, Image, StyledLink } from './header.styles';
 import { Button } from '../Button/Button';
 import { ButtonWrapper } from '../../../views/LandingPage/landingPage.styles';
 
 export default function Header() {
   const { login, logout, isAuthenticated } = useSSO();
-  console.info(import.meta.env.VITE_BACKEND_URL);
+
   const handleLoginButton = () => {
     if (isAuthenticated) {
-      logout(import.meta.env.VITE_BACKEND_URL);
+      logout(env.VITE_BACKEND_URL);
     } else {
       login({
-        backendURL: import.meta.env.VITE_BACKEND_URL,
+        backendURL: env.VITE_BACKEND_URL,
         idpHint: 'idir',
       });
     }
diff --git a/frontend/src/env.ts b/frontend/src/env.ts
new file mode 100644
index 0000000..55f9edd
--- /dev/null
+++ b/frontend/src/env.ts
@@ -0,0 +1,9 @@
+declare global {
+  // eslint-disable-next-line no-unused-vars
+  interface Window {
+    config: any;
+  }
+}
+
+// eslint-disable-next-line import/prefer-default-export
+export const env: Record<string, any> = { ...import.meta.env, ...window.config };
diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index 6ce688c..925090f 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -3,11 +3,12 @@ import { createRoot } from 'react-dom/client';
 import { BrowserRouter } from 'react-router-dom';
 import { SSOProvider } from '@bcgov/citz-imb-sso-react';
 import App from './App.tsx';
+import { env } from './env.ts';
 
 createRoot(document.getElementById('root')!).render(
   <StrictMode>
     <SSOProvider
-      backendURL={import.meta.env.VITE_BACKEND_URL}
+      backendURL={env.VITE_BACKEND_URL}
       idpHint="idir"
     >
       <BrowserRouter>
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
index c73d793..0d89629 100644
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -11,7 +11,25 @@ export default defineConfig(({ mode }) => {
       host: '0.0.0.0',
       port: Number(env.VITE_PORT),
     },
-    plugins: [react()],
+    plugins: [
+      {
+        name: 'build-html',
+        apply: 'build',
+        transformIndexHtml: (html) => ({
+          html,
+          tags: [
+            {
+              tag: 'script',
+              attrs: {
+                src: '/env.js',
+              },
+              injectTo: 'head',
+            },
+          ],
+        }),
+      },
+      react(),
+    ],
     define: {
       __APP_ENV__: JSON.stringify(env.APP_ENV),
     },

From 8b87ce7dbaa55e09a342035656d088a9c488e64a Mon Sep 17 00:00:00 2001
From: Ariel Rotter-Aboyoun <raarielgrace@gmail.com>
Date: Thu, 5 Dec 2024 16:24:55 -0800
Subject: [PATCH 15/21] Another test

---
 frontend/Caddyfile      |  4 +++-
 frontend/src/env.ts     |  2 +-
 frontend/vite.config.ts | 13 ++++++++-----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/frontend/Caddyfile b/frontend/Caddyfile
index 46387db..2b31ae3 100644
--- a/frontend/Caddyfile
+++ b/frontend/Caddyfile
@@ -41,7 +41,9 @@
 		Feature-Policy "fullscreen 'self'; camera 'none'; microphone 'none'"
 	}
 	handle /env.js {
-		header Content-Type "text/javascript"
+		header {
+			Content-Type "text/javascript"
+		}
 		respond `window.config = {"VITE_BACKEND_URL":"{$VITE_BACKEND_URL}","VITE_PORT":"{$VITE_PORT}"};`
 	}
 }
diff --git a/frontend/src/env.ts b/frontend/src/env.ts
index 55f9edd..e9d2003 100644
--- a/frontend/src/env.ts
+++ b/frontend/src/env.ts
@@ -1,7 +1,7 @@
 declare global {
   // eslint-disable-next-line no-unused-vars
   interface Window {
-    config: any;
+    config: any
   }
 }
 
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
index 0d89629..d8c29c9 100644
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -3,13 +3,18 @@ import { defineConfig, loadEnv } from 'vite';
 import react from '@vitejs/plugin-react';
 
 export default defineConfig(({ mode }) => {
-  const env = loadEnv(mode, process.cwd());
+  // Load app-level env vars to node-level env vars.
+  process.env = { ...process.env, ...loadEnv(mode, process.cwd()) };
+
+  const define: Record<string, any> = {
+    'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV),
+  };
 
   return {
     resolve: {},
     server: {
       host: '0.0.0.0',
-      port: Number(env.VITE_PORT),
+      port: Number(process.env.VITE_PORT),
     },
     plugins: [
       {
@@ -30,8 +35,6 @@ export default defineConfig(({ mode }) => {
       },
       react(),
     ],
-    define: {
-      __APP_ENV__: JSON.stringify(env.APP_ENV),
-    },
+    define,
   };
 });

From 5397f9a206b183b93eb66eea222e40da9d4287fd Mon Sep 17 00:00:00 2001
From: Ariel Rotter-Aboyoun <raarielgrace@gmail.com>
Date: Thu, 5 Dec 2024 16:46:15 -0800
Subject: [PATCH 16/21] Another attempt

---
 frontend/Caddyfile                               | 14 +++++++-------
 frontend/src/components/common/Header/Header.tsx |  2 +-
 frontend/src/env.ts                              |  2 +-
 frontend/src/main.tsx                            |  2 +-
 frontend/tsconfig.json                           |  6 +++++-
 frontend/vite.config.ts                          |  7 ++++++-
 6 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/frontend/Caddyfile b/frontend/Caddyfile
index 2b31ae3..1a2ab33 100644
--- a/frontend/Caddyfile
+++ b/frontend/Caddyfile
@@ -14,11 +14,17 @@
 		}
 		level {$LOG_LEVEL}
 	}
+	handle /env.js {
+		header {
+			Content-Type "text/javascript"
+		}
+		respond `window.config = {"VITE_BACKEND_URL":"{$VITE_BACKEND_URL}","VITE_PORT":"{$VITE_PORT}"};`
+	}
 	root * /srv
 	encode zstd gzip
 	file_server
 	@spa_router {
-		not path /api*
+		not path /api* /env.js
 		file {
 			try_files {path} /index.html
 		}
@@ -40,12 +46,6 @@
 		Referrer-Policy "same-origin"
 		Feature-Policy "fullscreen 'self'; camera 'none'; microphone 'none'"
 	}
-	handle /env.js {
-		header {
-			Content-Type "text/javascript"
-		}
-		respond `window.config = {"VITE_BACKEND_URL":"{$VITE_BACKEND_URL}","VITE_PORT":"{$VITE_PORT}"};`
-	}
 }
 :3001 {
 	handle /health {
diff --git a/frontend/src/components/common/Header/Header.tsx b/frontend/src/components/common/Header/Header.tsx
index 450df94..f08a655 100644
--- a/frontend/src/components/common/Header/Header.tsx
+++ b/frontend/src/components/common/Header/Header.tsx
@@ -4,7 +4,7 @@
 import { useSSO } from '@bcgov/citz-imb-sso-react';
 import logo from '/logo-banner.svg';
 
-import { env } from '../../../env';
+import { env } from '@/env';
 import { HeaderWrapper, Heading, Banner, Image, StyledLink } from './header.styles';
 import { Button } from '../Button/Button';
 import { ButtonWrapper } from '../../../views/LandingPage/landingPage.styles';
diff --git a/frontend/src/env.ts b/frontend/src/env.ts
index e9d2003..55f9edd 100644
--- a/frontend/src/env.ts
+++ b/frontend/src/env.ts
@@ -1,7 +1,7 @@
 declare global {
   // eslint-disable-next-line no-unused-vars
   interface Window {
-    config: any
+    config: any;
   }
 }
 
diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index 925090f..0067ab3 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -3,7 +3,7 @@ import { createRoot } from 'react-dom/client';
 import { BrowserRouter } from 'react-router-dom';
 import { SSOProvider } from '@bcgov/citz-imb-sso-react';
 import App from './App.tsx';
-import { env } from './env.ts';
+import { env } from '@/env';
 
 createRoot(document.getElementById('root')!).render(
   <StrictMode>
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
index e03157f..f102888 100644
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -17,7 +17,11 @@
     "strict": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
-    "noFallthroughCasesInSwitch": true
+    "noFallthroughCasesInSwitch": true,
+    "paths": {
+      "@": ["src"],
+      "@/*": ["src/*"],
+    }
   },
   "include": ["src"],
   "references": [
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
index d8c29c9..9a21155 100644
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -1,6 +1,7 @@
 /* eslint-disable import/no-extraneous-dependencies */
 import { defineConfig, loadEnv } from 'vite';
 import react from '@vitejs/plugin-react';
+import { fileURLToPath } from 'node:url';
 
 export default defineConfig(({ mode }) => {
   // Load app-level env vars to node-level env vars.
@@ -11,7 +12,11 @@ export default defineConfig(({ mode }) => {
   };
 
   return {
-    resolve: {},
+    resolve: {
+      alias: {
+        '@': fileURLToPath(new URL('./src', import.meta.url)),
+      },
+    },
     server: {
       host: '0.0.0.0',
       port: Number(process.env.VITE_PORT),

From 7dfb18c9c3e88b03bb05535693cf459c55a4e6f0 Mon Sep 17 00:00:00 2001
From: Ariel Rotter-Aboyoun <raarielgrace@gmail.com>
Date: Thu, 5 Dec 2024 16:57:56 -0800
Subject: [PATCH 17/21] Maybe this time

---
 frontend/openshift.deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/openshift.deploy.yml b/frontend/openshift.deploy.yml
index 7ba5c4f..9156974 100644
--- a/frontend/openshift.deploy.yml
+++ b/frontend/openshift.deploy.yml
@@ -64,7 +64,7 @@ objects:
                 - name: LOG_LEVEL
                   value: info
                 - name: VITE_BACKEND_URL
-                  value: http://${APP}-${TARGET}-backend
+                  value: http://${APP}-${TARGET}-backend.apps.silver.devops.gov.bc.ca
                 - name: BACKEND_URL
                   value: http://${APP}-${TARGET}-backend
                 - name: VITE_PORT

From 1377c535c5418de6fe0e65eebce84cd0950d98d4 Mon Sep 17 00:00:00 2001
From: Ariel Rotter-Aboyoun <raarielgrace@gmail.com>
Date: Thu, 5 Dec 2024 17:17:02 -0800
Subject: [PATCH 18/21] More openshift yaml changes for consistency

---
 .github/workflows/.deploy.yml |  1 -
 backend/openshift.deploy.yml  | 41 ++++++++++++++++-------------------
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/.deploy.yml b/.github/workflows/.deploy.yml
index b63d9ed..4da7bcc 100644
--- a/.github/workflows/.deploy.yml
+++ b/.github/workflows/.deploy.yml
@@ -74,7 +74,6 @@ jobs:
           file: backend/openshift.deploy.yml
           overwrite: true
           parameters:
-            -p NAME_SUFFIX=-${{ inputs.target }}
             -p IMAGE_TAG=${{ inputs.tag }}
             -p TARGET=${{ inputs.target }}
           verification_path: /api/health
diff --git a/backend/openshift.deploy.yml b/backend/openshift.deploy.yml
index 3b30013..4523557 100644
--- a/backend/openshift.deploy.yml
+++ b/backend/openshift.deploy.yml
@@ -20,16 +20,13 @@ parameters:
     description: Password for the PostgreSQL connection user.
     from: '[a-zA-Z0-9]{16}'
     generate: expression
-  - name: NAME_SUFFIX
-    description: Suffix for the name
-    required: true
 objects:
   - kind: Service
     apiVersion: v1
     metadata:
       labels:
-        app: ${APP}${NAME_SUFFIX}
-      name: ${APP}-${COMPONENT}${NAME_SUFFIX}
+        app: ${APP}-${TARGET}
+      name: ${APP}-${TARGET}-${COMPONENT}
     spec:
       type: ClusterIP
       ports:
@@ -38,50 +35,50 @@ objects:
           protocol: TCP
           name: http-3000
       selector:
-        service: ${APP}-${COMPONENT}${NAME_SUFFIX}
+        service: ${APP}-${TARGET}-${COMPONENT}
   - kind: Deployment
     apiVersion: apps/v1
     metadata:
       labels:
-        app: ${APP}${NAME_SUFFIX}
-        deployment: ${APP}-${COMPONENT}${NAME_SUFFIX}
-      name: ${APP}-${COMPONENT}${NAME_SUFFIX}
+        app: ${APP}-${TARGET}
+        deployment: ${APP}-${TARGET}-${COMPONENT}
+      name: ${APP}-${TARGET}-${COMPONENT}
     spec:
       strategy:
         type: Recreate
       selector:
         matchLabels:
-          deployment: ${APP}-${COMPONENT}${NAME_SUFFIX}
+          deployment: ${APP}-${TARGET}-${COMPONENT}
       template:
         metadata:
           labels:
-            app: ${APP}${NAME_SUFFIX}
-            deployment: ${APP}-${COMPONENT}${NAME_SUFFIX}
-            service: ${APP}-${COMPONENT}${NAME_SUFFIX}
+            app: ${APP}-${TARGET}
+            deployment: ${APP}-${TARGET}-${COMPONENT}
+            service: ${APP}-${TARGET}-${COMPONENT}
         spec:
           containers:
-            - name: ${APP}-${COMPONENT}${NAME_SUFFIX}
+            - name: ${APP}-${TARGET}-${COMPONENT}
               image: ghcr.io/${ORG}/${APP}/${COMPONENT}:${IMAGE_TAG}
               imagePullPolicy: Always
               env:
                 - name: LOG_LEVEL
                   value: info
                 - name: POSTGRES_HOST
-                  value: nr-nmp-database${NAME_SUFFIX}
+                  value: nr-nmp-database-${TARGET}
                 - name: POSTGRES_DB
                   valueFrom:
                     secretKeyRef:
-                      name: nr-nmp-database${NAME_SUFFIX}
+                      name: nr-nmp-database-${TARGET}
                       key: database-name
                 - name: POSTGRES_PASSWORD
                   valueFrom:
                     secretKeyRef:
-                      name: nr-nmp-database${NAME_SUFFIX}
+                      name: nr-nmp-database-${TARGET}
                       key: database-password
                 - name: POSTGRES_USER
                   valueFrom:
                     secretKeyRef:
-                      name: nr-nmp-database${NAME_SUFFIX}
+                      name: nr-nmp-database-${TARGET}
                       key: database-user
                 - name: SSO_CLIENT_ID
                   valueFrom:
@@ -133,15 +130,15 @@ objects:
     apiVersion: route.openshift.io/v1
     metadata:
       labels:
-        app: ${APP}${NAME_SUFFIX}
-      name: ${APP}-${COMPONENT}${NAME_SUFFIX}
+        app: ${APP}-${TARGET}
+      name: ${APP}-${TARGET}-${COMPONENT}
     spec:
-      host: ${APP}-${COMPONENT}${NAME_SUFFIX}.apps.silver.devops.gov.bc.ca
+      host: ${APP}-${TARGET}-${COMPONENT}.apps.silver.devops.gov.bc.ca
       port:
         targetPort: http-3000
       to:
         kind: Service
-        name: ${APP}-${COMPONENT}${NAME_SUFFIX}
+        name: ${APP}-${TARGET}-${COMPONENT}
         weight: 100
       tls:
         termination: edge

From 42489eb73e396c021fdda2c34923129cf6c361b5 Mon Sep 17 00:00:00 2001
From: Ariel Rotter-Aboyoun <raarielgrace@gmail.com>
Date: Thu, 5 Dec 2024 17:39:06 -0800
Subject: [PATCH 19/21] Here we gogit status

---
 backend/openshift.deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/openshift.deploy.yml b/backend/openshift.deploy.yml
index 4523557..b18e2ec 100644
--- a/backend/openshift.deploy.yml
+++ b/backend/openshift.deploy.yml
@@ -91,7 +91,7 @@ objects:
                       name: nr-nmp-keycloak
                       key: SSO_CLIENT_SECRET
                 - name: SSO_REDIRECT_URL
-                  value: http://${APP}-${TARGET}-${COMPONENT}/auth/callback
+                  value: http://${APP}-${TARGET}-${COMPONENT}.apps.silver.devops.gov.bc.ca/auth/callback
                 - name: FRONTEND_URL
                   value: http://${APP}-${TARGET}
                 - name: BACKEND_URL

From 213fe83e5d0e561286ffd833c4cf23bc40b66e2b Mon Sep 17 00:00:00 2001
From: Ariel Rotter-Aboyoun <raarielgrace@gmail.com>
Date: Thu, 5 Dec 2024 17:52:23 -0800
Subject: [PATCH 20/21] I cri evertim

---
 backend/openshift.deploy.yml  | 4 ++--
 frontend/openshift.deploy.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/openshift.deploy.yml b/backend/openshift.deploy.yml
index b18e2ec..a890928 100644
--- a/backend/openshift.deploy.yml
+++ b/backend/openshift.deploy.yml
@@ -93,9 +93,9 @@ objects:
                 - name: SSO_REDIRECT_URL
                   value: http://${APP}-${TARGET}-${COMPONENT}.apps.silver.devops.gov.bc.ca/auth/callback
                 - name: FRONTEND_URL
-                  value: http://${APP}-${TARGET}
+                  value: http://${APP}-${TARGET}.apps.silver.devops.gov.bc.ca
                 - name: BACKEND_URL
-                  value: http://${APP}-${TARGET}-${COMPONENT}
+                  value: http://${APP}-${TARGET}-${COMPONENT}.apps.silver.devops.gov.bc.ca
               ports:
                 - containerPort: 3000
                   protocol: TCP
diff --git a/frontend/openshift.deploy.yml b/frontend/openshift.deploy.yml
index 9156974..7f53aac 100644
--- a/frontend/openshift.deploy.yml
+++ b/frontend/openshift.deploy.yml
@@ -66,7 +66,7 @@ objects:
                 - name: VITE_BACKEND_URL
                   value: http://${APP}-${TARGET}-backend.apps.silver.devops.gov.bc.ca
                 - name: BACKEND_URL
-                  value: http://${APP}-${TARGET}-backend
+                  value: http://${APP}-${TARGET}-backend.apps.silver.devops.gov.bc.ca
                 - name: VITE_PORT
                   value: '5173'
                 - name: SSO_CLIENT_ID

From 7eb6568668332a1a3b2763f8b96eba1173f74e5c Mon Sep 17 00:00:00 2001
From: Ariel Rotter-Aboyoun <raarielgrace@gmail.com>
Date: Fri, 6 Dec 2024 11:42:54 -0800
Subject: [PATCH 21/21] Update csp

---
 backend/openshift.deploy.yml  | 6 +++---
 frontend/Caddyfile            | 2 +-
 frontend/openshift.deploy.yml | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/backend/openshift.deploy.yml b/backend/openshift.deploy.yml
index a890928..15c2931 100644
--- a/backend/openshift.deploy.yml
+++ b/backend/openshift.deploy.yml
@@ -91,11 +91,11 @@ objects:
                       name: nr-nmp-keycloak
                       key: SSO_CLIENT_SECRET
                 - name: SSO_REDIRECT_URL
-                  value: http://${APP}-${TARGET}-${COMPONENT}.apps.silver.devops.gov.bc.ca/auth/callback
+                  value: https://${APP}-${TARGET}-${COMPONENT}.apps.silver.devops.gov.bc.ca/auth/callback
                 - name: FRONTEND_URL
-                  value: http://${APP}-${TARGET}.apps.silver.devops.gov.bc.ca
+                  value: https://${APP}-${TARGET}.apps.silver.devops.gov.bc.ca
                 - name: BACKEND_URL
-                  value: http://${APP}-${TARGET}-${COMPONENT}.apps.silver.devops.gov.bc.ca
+                  value: https://${APP}-${TARGET}-${COMPONENT}.apps.silver.devops.gov.bc.ca
               ports:
                 - containerPort: 3000
                   protocol: TCP
diff --git a/frontend/Caddyfile b/frontend/Caddyfile
index 1a2ab33..4897acd 100644
--- a/frontend/Caddyfile
+++ b/frontend/Caddyfile
@@ -42,7 +42,7 @@
 		Cache-Control "no-store, no-cache, must-revalidate, proxy-revalidate"
 		X-Content-Type-Options "nosniff"
 		Strict-Transport-Security "max-age=31536000"
-		Content-Security-Policy "default-src 'self' https://spt.apps.gov.bc.ca data:; script-src 'self' 'unsafe-eval' https://www2.gov.bc.ca ;style-src 'self' 'unsafe-inline' https://fonts.googleapis.com https://use.fontawesome.com; font-src 'self' https://fonts.gstatic.com; img-src 'self' data: https://fonts.googleapis.com http://www.w3.org https://*.gov.bc.ca"
+		Content-Security-Policy "connect-src 'self' https://*.gov.bc.ca https://registry.npmjs.org ;default-src 'self' https://spt.apps.gov.bc.ca data:; script-src 'self' 'unsafe-eval' https://www2.gov.bc.ca ;style-src 'self' 'unsafe-inline' https://fonts.googleapis.com https://use.fontawesome.com; font-src 'self' https://fonts.gstatic.com; img-src 'self' data: https://fonts.googleapis.com http://www.w3.org https://*.gov.bc.ca"
 		Referrer-Policy "same-origin"
 		Feature-Policy "fullscreen 'self'; camera 'none'; microphone 'none'"
 	}
diff --git a/frontend/openshift.deploy.yml b/frontend/openshift.deploy.yml
index 7f53aac..22eab40 100644
--- a/frontend/openshift.deploy.yml
+++ b/frontend/openshift.deploy.yml
@@ -64,9 +64,9 @@ objects:
                 - name: LOG_LEVEL
                   value: info
                 - name: VITE_BACKEND_URL
-                  value: http://${APP}-${TARGET}-backend.apps.silver.devops.gov.bc.ca
+                  value: https://${APP}-${TARGET}-backend.apps.silver.devops.gov.bc.ca
                 - name: BACKEND_URL
-                  value: http://${APP}-${TARGET}-backend.apps.silver.devops.gov.bc.ca
+                  value: https://${APP}-${TARGET}-backend.apps.silver.devops.gov.bc.ca
                 - name: VITE_PORT
                   value: '5173'
                 - name: SSO_CLIENT_ID