From accd0332a354ab9d6226ddec78a403b6d4384c1f Mon Sep 17 00:00:00 2001
From: amhsirak <karishmashuklaa@gmail.com>
Date: Tue, 3 Dec 2024 21:39:56 +0530
Subject: [PATCH] feat: simplify to use process.env.PUBLIC_URL

---
 server/src/server.ts | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/server/src/server.ts b/server/src/server.ts
index 1467e0c7..7965d6bd 100644
--- a/server/src/server.ts
+++ b/server/src/server.ts
@@ -18,19 +18,11 @@ import { fork } from 'child_process';
 import { capture } from "./utils/analytics";
 import swaggerUi from 'swagger-ui-express';
 import swaggerSpec from './swagger/config';
-const isProduction = process.env.NODE_ENV === 'production';
-const allowedOrigin = isProduction ? process.env.ALLOWED_PUBLIC_URL : '*';
 
 const app = express();
 app.use(cors({
-  origin: (origin, callback) => {
-    if (!isProduction || origin === allowedOrigin || allowedOrigin === '*') {
-      callback(null, true); // Allow all in development or match production origin
-    } else {
-      callback(new Error('Not allowed by CORS')); // Block unexpected origins in production
-    }
-  },
-  credentials: true, // Include credentials if needed
+  origin: process.env.PUBLIC_URL ? process.env.PUBLIC_URL : 'http://localhost:5173',
+  credentials: true,
 }));
 app.use(express.json());
 
@@ -70,6 +62,7 @@ readdirSync(path.join(__dirname, 'api')).forEach((r) => {
   }
 });
 
+const isProduction = process.env.NODE_ENV === 'production';
 const workerPath = path.resolve(__dirname, isProduction ? './worker.js' : './worker.ts');
 
 let workerProcess: any;
@@ -99,6 +92,7 @@ app.get('/', function (req, res) {
 
 // Add CORS headers
 app.use((req, res, next) => {
+  res.header('Access-Control-Allow-Origin', '*');
   res.header('Access-Control-Allow-Methods', 'GET,PUT,POST,DELETE,OPTIONS');
   res.header('Access-Control-Allow-Headers', 'Content-Type, Authorization');
   if (req.method === 'OPTIONS') {