cors issue persists

Tabish1511 · Dec 19, 2024 · 7e0bd23 · 7e0bd23
1 parent 7557eb6
commit 7e0bd23
Showing 1 changed file with 10 additions and 126 deletions.
diff --git a/apps/api/src/index.ts b/apps/api/src/index.ts
@@ -15,6 +15,7 @@ const allowedOrigins = [
 app.use(cors({
   origin: (origin, callback) => {
     if (!origin || allowedOrigins.includes(origin)) {
+      console.log(`CORS allowed for origin: ${origin}`);
       callback(null, true);
     } else {
       console.error(`Blocked by CORS: ${origin}`);
@@ -23,14 +24,20 @@ app.use(cors({
   },
   methods: ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS'],
   allowedHeaders: ['Content-Type', 'Authorization'],
-  credentials: true // Allow credentials (e.g., cookies)
+  credentials: true
 }));
 
 // Middleware to parse JSON bodies
 app.use(express.json());
 
 // Preflight request handling
-app.options('*', cors());
+app.options('*', (req, res) => {
+  res.header('Access-Control-Allow-Origin', req.headers.origin || '*');
+  res.header('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS');
+  res.header('Access-Control-Allow-Headers', 'Content-Type, Authorization');
+  res.header('Access-Control-Allow-Credentials', 'true');
+  res.sendStatus(204); // No content for preflight
+});
 
 // Setup routes
 app.use('/api/v1/user', userRouter);
@@ -41,130 +48,7 @@ const httpServer = app.listen(8080, () => {
   console.log('API server running on port 8080');
 });
 
-// WebSocket import (make sure it initializes properly)
+// WebSocket import
 import './websocket';
 
 export { httpServer };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-// import express from 'express';
-// import cookieParser from 'cookie-parser';
-// import cors from 'cors';
-// import jwt, { JwtPayload } from 'jsonwebtoken';
-// import userRouter from './routes/user';
-// import messageRouter from './routes/message';
-
-// const app = express();
-// app.use(cookieParser());
-// app.use(express.json());
-
-// // Configure CORS
-// app.use(cors({
-//   origin: (origin, callback) => {
-//     const allowedOrigins = ['https://journalink-web-tabish1511s-projects.vercel.app', 'http://localhost:3000'];
-//     // Allow requests without an origin (like tools or Postman)
-//     if (!origin || allowedOrigins.includes(origin)) {
-//       callback(null, true);
-//     } else {
-//       callback(new Error('Not allowed by CORS'));
-//     }
-//   },
-//   methods: 'GET,POST,PUT,DELETE',
-//   credentials: true,
-// }));
-
-// app.options("*", (req, res) => {
-//   res.header("Access-Control-Allow-Origin", req.headers.origin || "*");
-//   res.header("Access-Control-Allow-Methods", "GET,POST,PUT,DELETE,OPTIONS");
-//   res.header("Access-Control-Allow-Headers", "Content-Type,Authorization");
-//   res.header("Access-Control-Allow-Credentials", "true");
-//   res.sendStatus(204); // No content for OPTIONS requests
-// });
-
-
-// app.use(express.json());
-
-// app.use('/api/v1/user', userRouter);
-// app.use('/api/v1/message', messageRouter);
-
-// const httpServer = app.listen(8080, () => {
-//   console.log('API server running on port 8080');
-// });
-
-// export { httpServer };
-
-// import './websocket';
-
-
-
-
-
-
-
-
-
-
-
-// import express from 'express';
-// import cors from 'cors';
-// import userRouter from './routes/user';
-// import messageRouter from './routes/message';
-
-// // 1st TRY BUILD WORKFLOW - SECONDARY
-// // 2nd TRY BUILD WORKFLOW - SECONDARY
-// // 3rd TRY BUILD WORKFLOW - SECONDARY
-// // 4th TRY BUILD WORKFLOW - SECONDARY
-
-// // 5th TRY DEPLOY WORKFLOW - SECONDARY
-
-// // 5th TRY DEPLOY WORKFLOW FINALLY TO EC2 - SECONDARY
-
-// const app = express();
-// app.use(cors());
-// app.use(express.json());
-
-// app.use('/api/v1/user', userRouter);
-// app.use('/api/v1/message', messageRouter);
-
-// const httpServer = app.listen(8080);
-
-// export { httpServer };
-
-// import './websocket';