Merge branch 'main' into renovate/typescript-5.x

.github/workflows/merge-main.yml

@@ -40,7 +40,7 @@ jobs:
     environment: test
     runs-on: ubuntu-22.04
     steps:
-      - uses: bcgov-nr/action-deployer-openshift@v1.2.1
+      - uses: bcgov-nr/action-deployer-openshift@v1.3.0
         with:
           file: frontend/openshift.deploy.yml
           oc_namespace: ${{ vars.OC_NAMESPACE }}
@@ -59,7 +59,7 @@ jobs:
     environment: prod
     runs-on: ubuntu-22.04
     steps:
-      - uses: bcgov-nr/action-deployer-openshift@v1.2.1
+      - uses: bcgov-nr/action-deployer-openshift@v1.3.0
         with:
           file: frontend/openshift.deploy.yml
           oc_namespace: ${{ vars.OC_NAMESPACE }}

.github/workflows/pr-open.yml

@@ -10,6 +10,7 @@ concurrency:
   group: pr-${{ github.workflow }}-${{ github.event.number }}
   cancel-in-progress: true
 
+
 jobs:
   pr-greeting:
     if: "!github.event.pull_request.head.repo.fork"
@@ -31,7 +32,7 @@ jobs:
             Thanks for the PR!
 
             Any successful deployments (not always required) will be available below.
-            [Frontend](https://${{ env.PREFIX }}-frontend.${{ env.DOMAIN }}/) available
+            [Frontend](https://${{ env.PREFIX }}-frontend.${{ env.DOMAIN }})
 
             Once merged, code will be promoted and handed off to following workflow run.
             [Main Merge Workflow](https://github.com/${{ github.repository }}/actions/workflows/merge-main.yml)
@@ -59,7 +60,7 @@ jobs:
       - builds
     runs-on: ubuntu-22.04
     steps:
-      - uses: bcgov-nr/action-deployer-openshift@v1.2.1
+      - uses: bcgov-nr/action-deployer-openshift@v1.3.0
         with:
           file: frontend/openshift.deploy.yml
           oc_namespace: ${{ vars.OC_NAMESPACE }}

frontend/Caddyfile

@@ -23,7 +23,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 "base-uri 'self'; connect-src 'self' https://*.gov.bc.ca; default-src 'self'; font-src 'self'; frame-src 'self' https://*.gov.bc.ca; img-src 'self'; manifest-src 'self'; media-src 'self'; object-src 'none'; script-src 'unsafe-inline' 'report-sample' 'self' https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js https://cdn.jsdelivr.net/npm/@popperjs/[email protected]/dist/umd/popper.min.js https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js; style-src 'report-sample' 'self' https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css; worker-src 'none';"
+		Content-Security-Policy "base-uri 'self'; connect-src 'self' https://*.gov.bc.ca https://*.amazoncognito.com https://cognito-idp.ca-central-1.amazonaws.com; default-src 'self'; font-src 'self'; frame-src 'self' https://*.gov.bc.ca; img-src 'self'; manifest-src 'self'; media-src 'self'; object-src 'none'; script-src 'unsafe-inline' 'report-sample' 'self' https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js https://cdn.jsdelivr.net/npm/@popperjs/[email protected]/dist/umd/popper.min.js https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js; style-src 'report-sample' 'self' https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css; worker-src 'none';"
 		Referrer-Policy "same-origin"
 	}
 

frontend/openshift.deploy.yml

@@ -98,6 +98,8 @@ objects:
                   value: https://${NAME}-${ZONE}-backend.${DOMAIN}:443
                 - name: LOG_LEVEL
                   value: ${LOG_LEVEL}
+                - name: REACT_APP_URL
+                  value: https://${NAME}-${ZONE}-${COMPONENT}.${DOMAIN}
               ports:
                 - containerPort: 3000
                   protocol: TCP