Skip to content

Commit 24d910b

Browse files
JavedmvJavedmv
committed
feat:cors disabled
1 parent af17f2d commit 24d910b

7 files changed

Lines changed: 51 additions & 55 deletions

File tree

‎api-gateway/src/app.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import cookieParser from "cookie-parser";
33
import morgan from "morgan";
44
import { applySecurityMiddleware } from "./middleware/security";
55
import { routes } from "./routes";
6-
import { redirectDebugMiddleware } from "./redirect-debug";
76

87

98
const app:Application = express();
@@ -15,7 +14,6 @@ app.use(cookieParser())
1514

1615
applySecurityMiddleware(app);
1716

18-
app.use(redirectDebugMiddleware);
1917
routes(app);
2018

2119
export default app;

‎api-gateway/src/middleware/security.ts‎

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,24 @@ import { Application } from "express";
55
import { Service } from "../config";
66

77
export const applySecurityMiddleware = (app: Application) => {
8-
// Add request logging
9-
// app.use((req: Request, res: Response, next: NextFunction) => {
10-
// console.log(`[${new Date().toISOString()}] ${req.method} ${req.url}`);
11-
// console.log('Headers:', JSON.stringify(req.headers));
12-
// next();
13-
// });
14-
15-
// app.use(helmet({
16-
// crossOriginResourcePolicy: { policy: "cross-origin" },
17-
// }));
8+
// Apply Helmet with CORS-friendly settings
9+
app.use(helmet({
10+
crossOriginResourcePolicy: { policy: "cross-origin" },
11+
}));
1812

19-
// console.log('Setting up CORS with client URL:', Service.CLIENT_URL);
20-
13+
// Configure CORS properly
2114
app.use(cors({
22-
origin: "*",
15+
origin: [Service.CLIENT_URL, "https://welearning.online"],
2316
methods: ["GET", "POST", "HEAD", "PUT", "PATCH", "DELETE", "OPTIONS"],
2417
credentials: true,
25-
// allowedHeaders: ['Content-Type', 'Authorization', 'Cookie', 'Range', 'Accept'],
26-
// exposedHeaders: ['Content-Disposition', 'Content-Range', 'Accept-Ranges', 'Content-Length', 'Content-Type']
18+
allowedHeaders: ['Content-Type', 'Authorization', 'Cookie', 'Range', 'Accept', 'X-Requested-With'],
19+
exposedHeaders: ['Content-Disposition', 'Content-Range', 'Accept-Ranges', 'Content-Length', 'Content-Type']
2720
}));
28-
21+
22+
// Apply rate limiter if needed
2923
const limiter = rateLimit({
30-
windowMs: 15 * 60 * 1000, // 15 minutes (fixed from 15 * 16 * 1000 which was incorrect)
24+
windowMs: 15 * 60 * 1000, // 15 minutes
3125
max: 100
3226
});
33-
3427
app.use(limiter);
3528
};

‎auth-service/src/presentation/server.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { dependencies } from "../__boot/dependencies";
1010
import { routes } from "../infrastructure/routes";
1111
import { errorHandler } from "../_lib/common/error";
1212
// import { multerError } from "../_lib/common/error/multerError";
13-
import cors from "cors";
13+
// import cors from "cors";
1414
const app:Application = express();
1515

1616
app.use(express.json())
@@ -30,13 +30,13 @@ if(process.env.NODE_ENV === "development"){
3030
// }));
3131

3232

33-
app.use(cors({
34-
origin: 'https://v-learning-client-5r8j.vercel.app',
35-
methods: ["GET", "POST", "HEAD", "PUT", "PATCH", "DELETE", "OPTIONS"],
36-
credentials: true,
37-
// allowedHeaders: ['Content-Type', 'Authorization', 'Cookie', 'Range', 'Accept'],
38-
// exposedHeaders: ['Content-Disposition', 'Content-Range', 'Accept-Ranges', 'Content-Length', 'Content-Type']
39-
}));
33+
// app.use(cors({
34+
// origin: 'https://v-learning-client-5r8j.vercel.app',
35+
// methods: ["GET", "POST", "HEAD", "PUT", "PATCH", "DELETE", "OPTIONS"],
36+
// credentials: true,
37+
// // allowedHeaders: ['Content-Type', 'Authorization', 'Cookie', 'Range', 'Accept'],
38+
// // exposedHeaders: ['Content-Disposition', 'Content-Range', 'Accept-Ranges', 'Content-Length', 'Content-Type']
39+
// }));
4040

4141
app.use('/',routes(dependencies));
4242

‎chat-service/src/presentation/server.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { dependencies } from "../__boot/dependencies";
88
import { createServer } from "http";
99
import connectSokcetIo from "../infrastructure/socket/connection";
1010
import { SocketService } from "../infrastructure/socket/SocketService";
11-
import cors from 'cors';
11+
// import cors from 'cors';
1212
import { errorHandler } from "../_lib/error";
1313

1414
dotenv.config();
@@ -29,13 +29,13 @@ const allowedOrigins = process.env.CLIENT_URL;
2929

3030
// app.use(cors(corsOptions));
3131

32-
app.use(cors({
33-
origin:allowedOrigins,
34-
methods: ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS','HEAD'],
35-
credentials: true,
36-
// allowedHeaders: ['Authorization', 'Content-Type', 'Range', 'Accept'],
37-
// exposedHeaders: ['Content-Disposition', 'Content-Range', 'Accept-Ranges', 'Content-Length', 'Content-Type'],
38-
}));
32+
// app.use(cors({
33+
// origin:allowedOrigins,
34+
// methods: ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS','HEAD'],
35+
// credentials: true,
36+
// // allowedHeaders: ['Authorization', 'Content-Type', 'Range', 'Accept'],
37+
// // exposedHeaders: ['Content-Disposition', 'Content-Range', 'Accept-Ranges', 'Content-Length', 'Content-Type'],
38+
// }));
3939

4040

4141
const server = createServer(app);

‎course-srv/src/presentation/server.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ config();
1010
import { errorHandler } from "../_lib/error";
1111
import {routes} from "../infrastructure/routes";
1212
import { dependencies } from "../__boot/dependencies";
13-
import cors from 'cors';
13+
// import cors from 'cors';
1414

1515

1616
const app: Application = express();
@@ -31,13 +31,13 @@ app.use(cookieParser());
3131
// }));
3232

3333

34-
app.use(cors({
35-
origin: 'https://v-learning-client-5r8j.vercel.app',
36-
methods: ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS','HEAD'],
37-
credentials: true,
38-
// allowedHeaders: ['Authorization', 'Content-Type', 'Range', 'Accept'],
39-
// exposedHeaders: ['Content-Disposition', 'Content-Range', 'Accept-Ranges', 'Content-Length', 'Content-Type'],
40-
}));
34+
// app.use(cors({
35+
// origin: 'https://v-learning-client-5r8j.vercel.app',
36+
// methods: ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS','HEAD'],
37+
// credentials: true,
38+
// // allowedHeaders: ['Authorization', 'Content-Type', 'Range', 'Accept'],
39+
// // exposedHeaders: ['Content-Disposition', 'Content-Range', 'Accept-Ranges', 'Content-Length', 'Content-Type'],
40+
// }));
4141

4242

4343
// Add helmet with CORP configuration

‎manifest/ingress-controller.yaml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,18 @@ metadata:
55
annotations:
66
kubernetes.io/ingress.class: "nginx"
77
nginx.ingress.kubernetes.io/ssl-redirect: "false"
8-
nginx.ingress.kubernetes.io/use-regex: "true"
8+
nginx.ingress.kubernetes.io/use-regex: "true"
99
nginx.ingress.kubernetes.io/enable-cors: "true"
10-
nginx.ingress.kubernetes.io/cors-allow-origin: "https://v-learning-client-5r8j.vercel.app"
10+
nginx.ingress.kubernetes.io/cors-allow-origin: "https://v-learning-client-5r8j.vercel.app,https://welearning.online"
1111
nginx.ingress.kubernetes.io/cors-allow-methods: "GET, PUT, POST, DELETE, PATCH, OPTIONS"
12-
nginx.ingress.kubernetes.io/cors-allow-headers: "DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization,Range"
12+
nginx.ingress.kubernetes.io/cors-allow-headers: "DNT,X-Custom-Header,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization,Range,Accept,Origin"
1313
nginx.ingress.kubernetes.io/cors-expose-headers: "Content-Disposition,Content-Range,Accept-Ranges,Content-Length,Content-Type"
1414
nginx.ingress.kubernetes.io/cors-allow-credentials: "true"
15+
nginx.ingress.kubernetes.io/proxy-body-size: "50m"
16+
nginx.ingress.kubernetes.io/proxy-buffer-size: "128k"
17+
nginx.ingress.kubernetes.io/proxy-connect-timeout: "300"
18+
nginx.ingress.kubernetes.io/proxy-read-timeout: "300"
19+
nginx.ingress.kubernetes.io/proxy-send-timeout: "300"
1520
spec:
1621
rules:
1722
- host: welearning.online
@@ -58,4 +63,4 @@ spec:
5863
service:
5964
name: vlearning-frontend
6065
port:
61-
number: 80
66+
number: 80

‎notification-service/src/presentation/server.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ app.use(express.json());
1414
app.use(express.urlencoded({extended:true}));
1515
app.use(cookieParser());
1616

17-
app.use(cors({
18-
origin: 'https://v-learning-client-5r8j.vercel.app',
19-
methods: ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS','HEAD'],
20-
credentials: true,
21-
// allowedHeaders: ['Authorization', 'Content-Type', 'Range', 'Accept'],
22-
// exposedHeaders: ['Content-Disposition', 'Content-Range', 'Accept-Ranges', 'Content-Length', 'Content-Type'],
23-
}));
17+
// app.use(cors({
18+
// origin: 'https://v-learning-client-5r8j.vercel.app',
19+
// methods: ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS','HEAD'],
20+
// credentials: true,
21+
// // allowedHeaders: ['Authorization', 'Content-Type', 'Range', 'Accept'],
22+
// // exposedHeaders: ['Content-Disposition', 'Content-Range', 'Accept-Ranges', 'Content-Length', 'Content-Type'],
23+
// }));
2424

2525

2626
app.get("/",(req:Request, res:Response) => {

0 commit comments

Comments
 (0)