Merge pull request #2584 from cisagov/2576-fix-organizationlist-compo…

…nent Revert Access-Control-Allow-Origin settings; Add logging to list /organizations.
cisagov · Feb 28, 2024 · 2975c53 · 2975c53
2 parents e29a8a5 + f7af611
commit 2975c53
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 18 deletions.
diff --git a/backend/src/api/app.ts b/backend/src/api/app.ts
@@ -61,15 +61,7 @@ app.use(express.json({ strict: false }));
 
 app.use(
   cors({
-    origin: [
-      'api.staging-cd.crossfeed.cyber.dhs.gov',
-      'api.crossfeed.cyber.dhs.gov',
-      'api.staging.crossfeed.cyber.dhs.gov',
-      'crossfeed.cyber.dhs.gov',
-      'staging.crossfeed.cyber.dhs.gov',
-      'staging-cd.crossfeed.cyber.dhs.gov',
-      /localhost$/
-    ],
+    origin: [/.*crossfeed\.cyber\.dhs\.gov$/, /localhost$/],
     methods: ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS']
   })
 );

diff --git a/backend/src/api/organizations.ts b/backend/src/api/organizations.ts
@@ -367,6 +367,8 @@ export const create = wrapHandler(async (event) => {
  *    - Organizations
  */
 export const list = wrapHandler(async (event) => {
+  console.log('list function called with event: ', event);
+
   if (!isGlobalViewAdmin(event) && getOrgMemberships(event).length === 0) {
     return {
       //TODO: Should we return a 403?
@@ -375,6 +377,8 @@ export const list = wrapHandler(async (event) => {
     };
   }
   await connectToDatabase();
+  console.log('Database connected');
+
   let where: any = { parent: null };
   if (!isGlobalViewAdmin(event)) {
     where = { id: In(getOrgMemberships(event)), parent: null };
@@ -385,6 +389,8 @@ export const list = wrapHandler(async (event) => {
     order: { name: 'ASC' }
   });
 
+  console.log('Organization.find result: ', result);
+
   return {
     statusCode: 200,
     body: JSON.stringify(result)

diff --git a/frontend/scripts/constants.js b/frontend/scripts/constants.js
@@ -1,11 +1,3 @@
 //CORS Options
-export const ALLOW_ORIGIN = [
-  'api.staging-cd.crossfeed.cyber.dhs.gov',
-  'api.crossfeed.cyber.dhs.gov',
-  'api.staging.crossfeed.cyber.dhs.gov',
-  'crossfeed.cyber.dhs.gov',
-  'staging.crossfeed.cyber.dhs.gov',
-  'staging-cd.crossfeed.cyber.dhs.gov',
-  /localhost$/
-];
+export const ALLOW_ORIGIN = [/.*crossfeed\.cyber\.dhs\.gov$/, /localhost$/];
 export const ALLOW_METHODS = ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS'];