Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix cors for sockets #52

Merged
merged 1 commit into from
Nov 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 10 additions & 19 deletions api-gateway/api.conf
Original file line number Diff line number Diff line change
Expand Up @@ -43,48 +43,39 @@ server {
}

location /matching {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $host;

proxy_pass http://matching_service/;

# socket support
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'Upgrade';

# forward headers
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header Connection "upgrade";
}

location /chat {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $host;

proxy_pass http://chat_service/;

# socket support
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'Upgrade';

# forward headers
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
}

location /collaboration {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $host;

proxy_pass http://collab_service/;

# socket support
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'Upgrade';

# forward headers
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
}

location / {
Expand Down
3 changes: 2 additions & 1 deletion server/ai-service/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@ dotenv.config();
const port = process.env.PORT || 3005;

const corsOptions = {
origin: "*",
origin: ["http://localhost:3000", "https://peerprep-nine.vercel.app"],
methods: "GET, POST, DELETE, PUT, PATCH",
allowedHeaders:
"Origin, X-Requested-With, Content-Type, Accept, Authorization, Cookie",
credentials: true
};

app.use(cors(corsOptions));
Expand Down
10 changes: 6 additions & 4 deletions server/chat-service/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@ const port = process.env.PORT || 3006; // Ensure this matches SVC_PORTS for chat
const server = http.createServer();
const io = new Server(server, {
cors: {
origin: "*",
origin: ["http://localhost:3000", "https://peerprep-nine.vercel.app"],
methods: "GET, POST, DELETE, PUT, PATCH",
allowedHeaders: "Origin, X-Requested-With, Content-Type, Accept, Authorization, Cookie"
}
allowedHeaders:
"Origin, X-Requested-With, Content-Type, Accept, Authorization, Cookie",
credentials: true,
},
});

io.on("connection", (socket) => {
Expand All @@ -27,7 +29,7 @@ io.on("connection", (socket) => {
const roomName = `${roomId}`;
console.log(`Message in room ${roomName}: ${message}`);
// Broadcast message to all users in the room
io.to(roomName).emit("receive_message", {senderId, message});
io.to(roomName).emit("receive_message", { senderId, message });
});

// Handle disconnection
Expand Down
3 changes: 2 additions & 1 deletion server/collaboration-service/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ const port = process.env.PORT || 3004;
const server = http.createServer();
const io = new Server(server, {
cors: {
origin: "*",
origin: ["http://localhost:3000", "https://peerprep-nine.vercel.app"],
methods: "GET, POST, DELETE, PUT, PATCH",
allowedHeaders:
"Origin, X-Requested-With, Content-Type, Accept, Authorization, Cookie",
credentials: true
},
});

Expand Down
5 changes: 3 additions & 2 deletions server/matching-service/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ const redis_url = process.env.REDIS_URL;
const server = http.createServer();
const io = new Server(server, {
cors: {
origin: "*",
origin: ["http://localhost:3000", "https://peerprep-nine.vercel.app"],
methods: "GET, POST, DELETE, PUT, PATCH",
allowedHeaders: "Origin, X-Requested-With, Content-Type, Accept, Authorization, Cookie"
allowedHeaders: "Origin, X-Requested-With, Content-Type, Accept, Authorization, Cookie",
credentials: true
}
});
const redisClient = redis.createClient({
Expand Down
5 changes: 3 additions & 2 deletions server/question-service/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ const questionsRoutes = require("./routes/questionRoute");
dotenv.config();

const corsOptions = {
origin: "*",
origin: ["http://localhost:3000", "https://peerprep-nine.vercel.app"],
methods: "GET, POST, DELETE, PUT, PATCH",
allowedHeaders: "Origin, X-Requested-With, Content-Type, Accept, Authorization, Cookie"
allowedHeaders: "Origin, X-Requested-With, Content-Type, Accept, Authorization, Cookie",
credentials: true
}

app.use(cors(corsOptions));
Expand Down
Loading