chore: fixing cors issue (#473)

Co-authored-by: Derek Roberts <[email protected]>
bcgov · Nov 18, 2024 · 07a93fc · 07a93fc
1 parent 5612b3c
commit 07a93fc
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -63,6 +63,7 @@ jobs:
               -p AWS_COGNITO_ISSUER_URI=https://cognito-idp.${{ vars.AWS_REGION }}.amazonaws.com/${{ vars.VITE_USER_POOLS_ID }}
               -p DASHBOARD_JOB_IDIR_USERS=${{ vars.DASHBOARD_JOB_IDIR_USERS }}
               -p WMS_LAYERS_WHITELIST_USERS=${{ vars.WMS_LAYERS_WHITELIST_USERS }}
+              -p ALLOWED_ORIGINS=https://silva-test.nrs.gov.bc.ca/
           - name: frontend
             file: frontend/openshift.deploy.yml
             overwrite: true
@@ -153,6 +154,7 @@ jobs:
               -p AWS_COGNITO_ISSUER_URI=https://cognito-idp.${{ vars.AWS_REGION }}.amazonaws.com/${{ vars.VITE_USER_POOLS_ID }}
               -p DASHBOARD_JOB_IDIR_USERS=${{ vars.DASHBOARD_JOB_IDIR_USERS }}
               -p WMS_LAYERS_WHITELIST_USERS=${{ vars.WMS_LAYERS_WHITELIST_USERS }}
+              -p ALLOWED_ORIGINS=https://silva.nrs.gov.bc.ca/
           - name: frontend
             file: frontend/openshift.deploy.yml
             overwrite: true

diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
@@ -118,6 +118,7 @@ jobs:
               -p AWS_COGNITO_ISSUER_URI=https://cognito-idp.${{ vars.AWS_REGION }}.amazonaws.com/${{ vars.VITE_USER_POOLS_ID }}
               -p DASHBOARD_JOB_IDIR_USERS=${{ vars.DASHBOARD_JOB_IDIR_USERS }}
               -p WMS_LAYERS_WHITELIST_USERS=${{ vars.WMS_LAYERS_WHITELIST_USERS }}
+              -p ALLOWED_ORIGINS=https://${{ github.event.repository.name }}-${{ needs.init.outputs.route }}-frontend.apps.silver.devops.gov.bc.ca
           - name: frontend
             file: frontend/openshift.deploy.yml
             parameters:

diff --git a/README.md b/README.md
@@ -90,4 +90,4 @@ our [CONTRIBUTING](CONTRIBUTING.md) guide.
 
 As mentioned, we're here to help. Feel free to reach out and 
 start a conversation on Rocket chat, you can search for
-`@jazz.grewal` or `@ricardo.campos`.
+`@jazz.grewal` or `@paulushcgcj`.
diff --git a/backend/openshift.deploy.yml b/backend/openshift.deploy.yml
@@ -77,7 +77,7 @@ parameters:
     required: true
   - name: ALLOWED_ORIGINS
     description: Sets all the allowed request origins
-    value: "http://localhost:300*,https://*.apps.silver.devops.gov.bc.ca"
+    required: true
   - name: WMS_LAYERS_WHITELIST_USERS
     description: List of users that can see active layers on the map view
     required: true

diff --git a/frontend/src/components/FriendlyDate/index.tsx b/frontend/src/components/FriendlyDate/index.tsx
@@ -60,7 +60,7 @@ const FriendlyDate: React.FC<FriendlyDateProps> = ({ date }) => {
     const formattedDate = isFuture(parsedDate)
       ? formatFutureDateAtlassianStyle(parsedDate)
       : formatDateAtlassianStyle(parsedDate);
-      
+
     return (
       <>
       {(cleanDate === formattedDate) ? (<span>{formattedDate}</span>) : (