GitHub/trunk-server
1
0
Fork 0
mirror of https://github.com/openmhz/trunk-server.git synced 2026-11-14 09:48:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix CORS

Browse Source
This commit is contained in:
Luke Berndt
2023-04-13 20:55:30 -04:00
parent d4204b87f1
commit f12d23d9c5
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
account/server/config/express.js
View File

@@ -10,6 +10,7 @@ var backend_server = process.env['REACT_APP_BACKEND_SERVER'] != null ? process.e
var frontend_server = process.env['REACT_APP_FRONTEND_SERVER'] != null ? process.env['REACT_APP_FRONTEND_SERVER'] : 'https://openmhz.com'; var frontend_server = process.env['REACT_APP_FRONTEND_SERVER'] != null ? process.env['REACT_APP_FRONTEND_SERVER'] : 'https://openmhz.com';
var socket_server = process.env['REACT_APP_SOCKET_SERVER'] != null ? process.env['REACT_APP_SOCKET_SERVER'] : 'wss://socket.openmhz.com'; //'https://s3.amazonaws.com/robotastic'; var socket_server = process.env['REACT_APP_SOCKET_SERVER'] != null ? process.env['REACT_APP_SOCKET_SERVER'] : 'wss://socket.openmhz.com'; //'https://s3.amazonaws.com/robotastic';
var account_server = process.env['REACT_APP_ACCOUNT_SERVER'] != null ? process.env['REACT_APP_ACCOUNT_SERVER'] : 'https://account.openmhz.com'; //'https://s3.amazonaws.com/robotastic'; var account_server = process.env['REACT_APP_ACCOUNT_SERVER'] != null ? process.env['REACT_APP_ACCOUNT_SERVER'] : 'https://account.openmhz.com'; //'https://s3.amazonaws.com/robotastic';
var admin_server = process.env['REACT_APP_ADMIN_SERVER'] != null ? process.env['REACT_APP_ADMIN_SERVER'] : 'https://admin.openmhz.com';
var account_dev_server = "http://account.openmhz.test:3000" var account_dev_server = "http://account.openmhz.test:3000"
var admin_dev_server = "http://admin.openmhz.test:3000" var admin_dev_server = "http://admin.openmhz.test:3000"
@@ -66,6 +67,7 @@ module.exports = function(app, passport) {
allowedOrigins.push(frontend_server); allowedOrigins.push(frontend_server);
allowedOrigins.push(backend_server); allowedOrigins.push(backend_server);
allowedOrigins.push(socket_server); allowedOrigins.push(socket_server);
allowedOrigins.push(admin_server);
allowedOrigins.push(admin_dev_server); allowedOrigins.push(admin_dev_server);
allowedOrigins.push(account_dev_server); allowedOrigins.push(account_dev_server);
var origin = req.headers.origin; var origin = req.headers.origin;

1
account/server/config/passport-strategies/local.js
View File

@@ -12,7 +12,6 @@ If your site prefers to name these fields differently, options are available to
const local = new LocalStrategy({ const local = new LocalStrategy({
usernameField: "email" usernameField: "email"
}, async (email, password, done) => { }, async (email, password, done) => {
console.log(`${email} ${password}`);
const user = await User.findOne({ const user = await User.findOne({
$or: [{ $or: [{
email email