f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-09 13:42:38 +00:00
Code Wiki Activity

add localhost to allowed origins only if in local, also remake regex

Browse Source
This commit is contained in:
Víctor Losada Hernández
2024-12-10 19:24:23 +01:00
parent 81f56ec91d
commit c29e1905bf
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/app.js
View File

@@ -57,17 +57,24 @@ app.use(forceSSL);
import cors from 'cors'; import cors from 'cors';
// CORS Configuration const nodeEnv = config.get('node_env');
const isLocalEnvironment = config.get('local_environments').includes(nodeEnv);
const corsOptions = { const corsOptions = {
origin: (origin, callback) => { origin: (origin, callback) => {
const allowedOrigins = [ const allowedOrigins = [
'https://homebrewery.naturalcrit.com', 'https://homebrewery.naturalcrit.com',
'http://localhost:8000', 'https://naturalcrit.com',
'http://localhost:8010', 'https://naturalcrit-stage.herokuapp.com',
'https://naturalcrit.com' 'https://homebrewery-stage.herokuapp.com',
]; ];
const herokuRegex = /^https:\/\/.*\.herokuapp\.com$/; // Matches any Heroku app if (isLocalEnvironment) {
allowedOrigins.push('http://localhost:8000', 'http://localhost:8010');
}
const herokuRegex = /^https:\/\/(?:homebrewery-pr-\d+\.herokuapp\.com|naturalcrit-pr-\d+\.herokuapp\.com)$/; // Matches any Heroku app
if (!origin || allowedOrigins.includes(origin) || herokuRegex.test(origin)) { if (!origin || allowedOrigins.includes(origin) || herokuRegex.test(origin)) {
callback(null, true); callback(null, true);
@@ -80,7 +87,6 @@ const corsOptions = {
credentials: true, credentials: true,
}; };
app.use(cors(corsOptions)); app.use(cors(corsOptions));
//Account Middleware //Account Middleware
@@ -505,8 +511,6 @@ app.get('/account', asyncHandler(async (req, res, next)=>{
return next(); return next();
})); }));
const nodeEnv = config.get('node_env');
const isLocalEnvironment = config.get('local_environments').includes(nodeEnv);
// Local only // Local only
if(isLocalEnvironment){ if(isLocalEnvironment){
// Login // Login