Skip to content

Refactor CORS configuration and enable credentials for API requests #9

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.

Sign up for GitHub

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

Open
rajibsalui wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Refactor CORS configuration and enable credentials for API requests #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
56 changes: 31 additions & 25 deletions backend-expressjs/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,32 +13,38 @@ const MONGO_URI = process.env.MONGO_URI || 'mongodb://localhost:27017/agroconnec

app.use(bodyParser.json());

// // cors middleware
// app.use(cors({
// origin: ['http://localhost:8080','http://localhost:8081','https://agro-connect-y6nl-git-main-upayanchatterjee7-gmailcoms-projects.vercel.app','https://agro-connect-y6nl-upayanchatterjee7-gmailcoms-projects.vercel.app','https://agro-connect-y6nl.vercel.app','https://agro-connect-p7j2.vercel.app'],
// //origin:true,
// methods: ['GET', 'POST', 'PUT', 'DELETE'],
// allowedHeaders: ['Content-Type', 'Authorization'],
// credentials: true,
// }));


// CORS middleware at the very top
app.use((req, res, next) => {
res.header("Access-Control-Allow-Origin", "https://agro-connect-y6nl-git-main-upayanchatterjee7-gmailcoms-projects.vercel.app");
res.header("Access-Control-Allow-Credentials", "true");
res.header("Access-Control-Allow-Methods", "GET,POST,PUT,DELETE,OPTIONS");
res.header("Access-Control-Allow-Headers", "Content-Type, Authorization");

if (req.method === "OPTIONS") {
return res.sendStatus(200);
}
next();
});

// CORS configuration
const allowedOrigins = [
'http://localhost:5173',
'http://localhost:3000',
'http://localhost:8080',
'http://localhost:8081',
// Vercel preview and production URLs for the frontend
'https://agro-connect-y6nl-git-main-upayanchatterjee7-gmailcoms-projects.vercel.app',
'https://agro-connect-y6nl-upayanchatterjee7-gmailcoms-projects.vercel.app',
'https://agro-connect-y6nl.vercel.app',
];

const corsOptions = {
origin: function (origin, callback) {
if (!origin) return callback(null, true);
if (
allowedOrigins.includes(origin) ||
/\.vercel\.app$/.test(origin) // allow any vercel.app domain
) {
return callback(null, true);
}
return callback(new Error('Not allowed by CORS'));
},
methods: ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS'],
allowedHeaders: ['Content-Type', 'Authorization'],
credentials: true,
};


// Enable CORS for all routes
app.use(cors(corsOptions));

// Handle preflight requests
app.options('*', cors());

// for testing
app.get('/', (req, res) => {
Expand Down
5 changes: 5 additions & 0 deletions frontend/src/services/authService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ class AuthService {
'Content-Type': 'application/json',
},
body: JSON.stringify(userData),
credentials: 'include',
});

if (!response.ok) {
Expand All @@ -86,6 +87,7 @@ class AuthService {
'Content-Type': 'application/json',
},
body: JSON.stringify(loginData),
credentials: 'include',
});

if (!response.ok) {
Expand All @@ -103,6 +105,7 @@ class AuthService {
'Content-Type': 'application/json',
},
body: JSON.stringify({ email }),
credentials: 'include',
});

if (!response.ok) {
Expand All @@ -117,6 +120,7 @@ class AuthService {
const response = await fetch(`${API_BASE_URL}/auth/profile`, {
method: 'GET',
headers: this.getAuthHeaders(),
credentials: 'include',
});

if (!response.ok) {
Expand All @@ -136,6 +140,7 @@ class AuthService {
method: 'PUT',
headers: this.getAuthHeaders(),
body: JSON.stringify(profileData),
credentials: 'include',
});

if (!response.ok) {
Expand Down