removed cors from express (#43)

* removed cors from express * Caddyfile + VITE_AWS_DOMAIN --------- Co-authored-by: Derek Roberts <[email protected]>
bcgov · Oct 5, 2023 · 4e50f8a · 4e50f8a
1 parent b26436b
commit 4e50f8a
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 11 deletions.
diff --git a/backend/index.js b/backend/index.js
@@ -1,5 +1,4 @@
 const express = require('express');
-const cors = require('cors');
 const dotenv =require('dotenv');
 const indexRoutes = require("./routes/indexRoutes");
 const mailRoutes = require("./routes/mailRoutes");
@@ -9,14 +8,7 @@ dotenv.config({
   path: './.env'
 })
 const app = express();
-
-// Configure CORS options
-const corsOptions = {
-  origin: ['http://localhost:3000', 'https://nr-results-exam-test-frontend.apps.silver.devops.gov.bc.ca/'],
-  methods: ['GET','POST'], // Specify the allowed HTTP methods
-};
 app.use(express.json());
-app.use(cors(corsOptions));
 
 app.use('/api/', indexRoutes);
 app.use('/api/mail', mailRoutes);

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,7 +3,6 @@ version: '3.9'
 x-common: &common
   depends_on: ["backend"]
   environment:
-    VITE_AWS_DOMAIN: prod-fam-user-pool-domain.auth.ca-central-1.amazoncognito.com
     VITE_BACKEND_URL: http://backend:5000
     VITE_CHES_FROM_EMAIL : [email protected]
     VITE_CHES_ADMIN_EMAIL : [email protected]

diff --git a/frontend/Caddyfile b/frontend/Caddyfile
@@ -29,7 +29,7 @@
 
 	handle /env.js {
 		header Content-Type "text/javascript"
-    respond `window.config = {"VITE_USER_POOLS_ID":"{$VITE_USER_POOLS_ID}","VITE_USER_POOLS_WEB_CLIENT_ID":"{$VITE_USER_POOLS_WEB_CLIENT_ID}","VITE_REDIRECT_SIGN_OUT":"{$VITE_REDIRECT_SIGN_OUT}","VITE_ZONE":"{$VITE_ZONE}","VITE_CHES_FROM_EMAIL":"{$VITE_CHES_FROM_EMAIL}","VITE_CHES_ADMIN_EMAIL":"{$VITE_CHES_ADMIN_EMAIL}","VITE_BACKEND_URL":"{$VITE_BACKEND_URL}"};`
+    respond `window.config = {"VITE_AWS_DOMAIN":"{$VITE_AWS_DOMAIN}","VITE_USER_POOLS_ID":"{$VITE_USER_POOLS_ID}","VITE_USER_POOLS_WEB_CLIENT_ID":"{$VITE_USER_POOLS_WEB_CLIENT_ID}","VITE_REDIRECT_SIGN_OUT":"{$VITE_REDIRECT_SIGN_OUT}","VITE_ZONE":"{$VITE_ZONE}","VITE_CHES_FROM_EMAIL":"{$VITE_CHES_FROM_EMAIL}","VITE_CHES_ADMIN_EMAIL":"{$VITE_CHES_ADMIN_EMAIL}","VITE_BACKEND_URL":"{$VITE_BACKEND_URL}"};`
 	}
 
 	handle_path /* {

diff --git a/frontend/openshift.deploy.yml b/frontend/openshift.deploy.yml
@@ -50,7 +50,7 @@ parameters:
   - name: VITE_ZONE
     value: DEV
   - name: VITE_AWS_DOMAIN
-    value: "test-fam-user-pool-domain.auth.ca-central-1.amazoncognito.com"
+    value: "prod-fam-user-pool-domain.auth.ca-central-1.amazoncognito.com"
   - name: VITE_CHES_FROM_EMAIL
     value: "[email protected]"
   - name: VITE_CHES_ADMIN_EMAIL