Merge pull request #113 from CS3219-AY2425S1/cloud-fix

allow everyone to access cors

Author: simbayippy

api-gateway/src/app.ts

@@ -13,10 +13,9 @@ import WebSocket from 'ws';
 
 const app = express();
 
-// Middleware
-app.use(cors(config.corsOptions));
-app.options('*', cors(config.corsOptions)); // enable pre-flight for all routes
 app.use(express.json());
+app.use(cors()); // configured so everyone can use
+app.options('*', cors());
 
 // Logging middleware
 // app.use((req, res, next) => {

api-gateway/src/config/index.ts

@@ -1,40 +1,15 @@
 import dotenv from 'dotenv';
 import path from 'path';
-import logger from '../utils/logger';
 
 // Load different env files based on NODE_ENV
 const envFile = process.env.NODE_ENV === 'production' ? '.env' : '.env.dev';
 dotenv.config({ path: path.resolve(process.cwd(), envFile) });
 
-const getAllowedOrigins = () => {
-  if (process.env.NODE_ENV === 'production') {
-    const frontendUrl = process.env.FRONTEND_URL;
-    if (!frontendUrl) {
-      logger.warn('FRONTEND_URL environment variable not set in production');
-      return ['http://localhost:3000'];
-    }
-    // If frontendUrl already includes protocol, use it as is
-    if (
-      frontendUrl.startsWith('http://') ||
-      frontendUrl.startsWith('https://')
-    ) {
-      const httpVersion = frontendUrl;
-      const httpsVersion = frontendUrl.replace('http://', 'https://');
-      return [httpVersion, httpsVersion];
-    }
-    // Otherwise, add protocols (backward compatibility)
-    return [`http://${frontendUrl}`, `https://${frontendUrl}`];
-  }
-  return ['http://localhost:3000'];
-};
-
 export default {
   port: process.env.PORT || 8001,
   corsOptions: {
-    origin: getAllowedOrigins(),
+    origin: process.env.FRONTEND_URL || 'http://localhost:3000',
     credentials: true,
-    methods: ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS'],
-    allowedHeaders: ['Content-Type', 'Authorization'],
   },
   services: {
     question: process.env.QUESTION_SERVICE_URL || 'http://localhost:4001',