fix(SILVA-546): fixing amplify authentication (#441)

.github/workflows/analysis.yml

@@ -55,6 +55,11 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - uses: bcgov-nr/[email protected]
+        env:
+          VITE_ZONE: test
+          VITE_USER_POOLS_ID: ca-central-1_abc123
+          VITE_USER_POOLS_WEB_CLIENT_ID: abc123
+          VITE_BACKEND_URL: http://localhost:8080
         with:
           commands: |
             npm ci

.github/workflows/merge.yml

@@ -34,6 +34,7 @@ jobs:
             -p POSTGRES_DB_PASSWORD='${{ secrets.POSTGRES_DB_PASSWORD }}'
             -p FORESTCLIENTAPI_KEY='${{ secrets.FORESTCLIENTAPI_KEY }}'
             -p VITE_USER_POOLS_WEB_CLIENT_ID=${{ vars.VITE_USER_POOLS_WEB_CLIENT_ID }}
+            -p VITE_USER_POOLS_ID=${{ vars.VITE_USER_POOLS_ID }}
             -p ZONE=test
 
   deploys-test:
@@ -106,6 +107,7 @@ jobs:
             -p POSTGRES_DB_PASSWORD='${{ secrets.POSTGRES_DB_PASSWORD }}'
             -p FORESTCLIENTAPI_KEY='${{ secrets.FORESTCLIENTAPI_KEY }}'
             -p VITE_USER_POOLS_WEB_CLIENT_ID=${{ vars.VITE_USER_POOLS_WEB_CLIENT_ID }}
+            -p VITE_USER_POOLS_ID=${{ vars.VITE_USER_POOLS_ID }}
             -p ZONE=prod
 
   image-promotions:

.github/workflows/pr-open.yml

@@ -65,6 +65,7 @@ jobs:
             -p POSTGRES_DB_PASSWORD='${{ secrets.POSTGRES_DB_PASSWORD }}'
             -p FORESTCLIENTAPI_KEY='${{ secrets.FORESTCLIENTAPI_KEY }}'
             -p VITE_USER_POOLS_WEB_CLIENT_ID=${{ vars.VITE_USER_POOLS_WEB_CLIENT_ID }}
+            -p VITE_USER_POOLS_ID=${{ vars.VITE_USER_POOLS_ID }}
           triggers: ('common/' 'backend/' 'frontend/')
 
   builds:

common/openshift.init.yml

@@ -40,6 +40,9 @@ parameters:
   - name: VITE_USER_POOLS_WEB_CLIENT_ID
     description: Cognito user pools web client ID
     required: true
+  - name: VITE_USER_POOLS_ID
+    description: Cognito user pools ID
+    required: true
 objects:
   - apiVersion: v1
     kind: Secret
@@ -95,6 +98,7 @@ objects:
         app: ${NAME}-${ZONE}
     stringData:
       vite-user-pools-web-client-id: ${VITE_USER_POOLS_WEB_CLIENT_ID}
+      vite-user-pools-id: ${VITE_USER_POOLS_ID}
   - apiVersion: networking.k8s.io/v1
     kind: NetworkPolicy
     metadata:

frontend/Caddyfile

@@ -28,7 +28,7 @@
 	}
 	handle /env.js {
 		header Content-Type "text/javascript"
-    respond `window.config = {"VITE_USER_POOLS_WEB_CLIENT_ID":"{$VITE_USER_POOLS_WEB_CLIENT_ID}","VITE_ZONE":"{$VITE_ZONE}","VITE_BACKEND_URL":"{$VITE_BACKEND_URL}"};`
+    respond `window.config = {"VITE_USER_POOLS_ID":"{$VITE_USER_POOLS_ID}","VITE_USER_POOLS_WEB_CLIENT_ID":"{$VITE_USER_POOLS_WEB_CLIENT_ID}","VITE_ZONE":"{$VITE_ZONE}","VITE_BACKEND_URL":"{$VITE_BACKEND_URL}"};`
 	}
 
 	handle_path /* {

frontend/openshift.deploy.yml

@@ -91,6 +91,11 @@ objects:
                     secretKeyRef:
                       name: ${NAME}-${ZONE}-frontend
                       key: vite-user-pools-web-client-id
+                - name: VITE_USER_POOLS_ID
+                  valueFrom:
+                    secretKeyRef:
+                      name: ${NAME}-${ZONE}-frontend
+                      key: vite-user-pools-id
               ports:
                 - containerPort: 3000
                   protocol: TCP