Merge branch 'master' into develop
This commit is contained in:
commit
c1ab2b3a6a
2 changed files with 8 additions and 4 deletions
|
@ -2,6 +2,7 @@ API_URL=/editor
|
|||
AWS_ACCESS_KEY=<your-aws-access-key>
|
||||
AWS_REGION=<your-aws-region>
|
||||
AWS_SECRET_KEY=<your-aws-secret-key>
|
||||
CORS_ALLOW_LOCALHOST=true
|
||||
EMAIL_SENDER=<transactional-email-sender>
|
||||
EMAIL_VERIFY_SECRET_TOKEN=whatever_you_want_this_to_be_it_only_matters_for_production
|
||||
EXAMPLE_USER_EMAIL=examples@p5js.org
|
||||
|
|
|
@ -46,17 +46,20 @@ if (process.env.BASIC_USERNAME && process.env.BASIC_PASSWORD) {
|
|||
}));
|
||||
}
|
||||
|
||||
const corsOriginsWhitelist = [
|
||||
const allowedCorsOrigins = [
|
||||
/p5js\.org$/,
|
||||
];
|
||||
|
||||
// to allow client-only development
|
||||
if (process.env.CORS_ALLOW_LOCALHOST === 'true') {
|
||||
allowedCorsOrigins.push(/localhost/);
|
||||
}
|
||||
|
||||
// Run Webpack dev server in development mode
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
const compiler = webpack(config);
|
||||
app.use(webpackDevMiddleware(compiler, { noInfo: true, publicPath: config.output.publicPath }));
|
||||
app.use(webpackHotMiddleware(compiler));
|
||||
|
||||
corsOriginsWhitelist.push(/localhost/);
|
||||
}
|
||||
|
||||
const mongoConnectionString = process.env.MONGO_URL;
|
||||
|
@ -65,7 +68,7 @@ app.set('trust proxy', true);
|
|||
// Enable Cross-Origin Resource Sharing (CORS) for all origins
|
||||
const corsMiddleware = cors({
|
||||
credentials: true,
|
||||
origin: corsOriginsWhitelist,
|
||||
origin: allowedCorsOrigins,
|
||||
});
|
||||
app.use(corsMiddleware);
|
||||
// Enable pre-flight OPTIONS route for all end-points
|
||||
|
|
Loading…
Reference in a new issue