From 6ea0eb03803380b8a4ceb7af2a6069c6d8f6a38a Mon Sep 17 00:00:00 2001 From: Faisal Sami Date: Thu, 22 Aug 2019 11:57:06 +0500 Subject: [PATCH 1/2] fix jwt in native app for qewd up. Fix where qewd up would not allow jwt support even if we add jwt in config.json. --- up/run.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/up/run.js b/up/run.js index 6c2e125..4c9f8ca 100644 --- a/up/run.js +++ b/up/run.js @@ -748,6 +748,9 @@ function setup(isDocker, service_name) { } else { // native app + if (config_data.jwt && config_data.jwt.secret) { + config.jwt = Object.assign({}, config_data.jwt); // prevent it being simply by reference + } createModuleMap(cwd, config); } From cbbf992138988217086572511c521d7bcdf36ec8 Mon Sep 17 00:00:00 2001 From: Qazi Faisal Sami Date: Tue, 26 Oct 2021 09:16:09 +0500 Subject: [PATCH 2/2] cors changes --- lib/master-express.js | 10 +++++----- lib/master.js | 4 ++-- up/handlers.js | 4 ++++ up/run.js | 18 +++++++++--------- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/lib/master-express.js b/lib/master-express.js index 1e422bd..013f4aa 100644 --- a/lib/master-express.js +++ b/lib/master-express.js @@ -111,13 +111,13 @@ function configure(config, routes, qOper8, qExt) { console.log('webServerRootPath = ' + config.webServerRootPath); if (config.cors) { app.use('/', function (req, res, next) { - //res.header('Access-Control-Allow-Origin', '*'); - //res.header('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept'); + res.header('Access-Control-Allow-Origin', '*'); + res.header('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept'); - res.header('Access-Control-Allow-Credentials', 'true'); - res.header('Access-Control-Allow-Headers', 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization'); + //res.header('Access-Control-Allow-Credentials', 'true'); + //res.header('Access-Control-Allow-Headers', 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization'); res.header('Access-Control-Allow-Methods', 'GET, PUT, DELETE, POST, OPTIONS'); - res.header('Access-Control-Allow-Origin', '*'); + //res.header('Access-Control-Allow-Origin', '*'); next(); }); } diff --git a/lib/master.js b/lib/master.js index 1e94770..71f1a63 100644 --- a/lib/master.js +++ b/lib/master.js @@ -224,12 +224,12 @@ function start(params, routes) { if (!config.webSockets.module) config.webSockets.module = 'socket.io'; if (config.webSockets.module === 'socket.io') { if (!config.webSockets.engine) { - io = require('socket.io')(server, {wsEngine: 'ws'}); + io = require('socket.io')(server, {wsEngine: 'ws', cors: {origin: '*', credentials: true}, cookie: {name: "io", httpOnly: false, path: "/"}}); } else { var engine = config.webSockets.engine; if (engine !== 'ws' && engine !== 'uws') engine = 'ws'; - io = require('socket.io')(server, {wsEngine: engine}); + io = require('socket.io')(server, {wsEngine: engine, cors: {origin: '*', credentials: true}, cookie: {name: "io", httpOnly: false, path: "/"}}); } } } diff --git a/up/handlers.js b/up/handlers.js index 3a2faf9..746468c 100644 --- a/up/handlers.js +++ b/up/handlers.js @@ -182,7 +182,11 @@ module.exports = { var _this = this; var router = require('qewd-router'); var routes = getRoutes(); + console.log('Faisal:'); + console.log(routes); routes = router.initialise(routes, module.exports); + console.log('Faisal2:'); + console.log(routes); if (errorResponse) { var statusCode = errorResponse.statusCode || 404; var text = errorResponse.text || 'Not Found'; diff --git a/up/run.js b/up/run.js index 4c9f8ca..46918a8 100644 --- a/up/run.js +++ b/up/run.js @@ -879,20 +879,20 @@ module.exports = function(isDocker, serviceName) { if (config.database && config.database.type === 'gtm') { try { - console.log('Running down YottaDB...'); - child_process.execSync(process.env.ydb_dist + '/mupip rundown -region DEFAULT', {stdio:[0,1,2]}); - child_process.execSync(process.env.ydb_dist + '/mupip rundown -region qewdreg', {stdio:[0,1,2]}); - console.log('Rundown completed'); + //console.log('Running down YottaDB...'); + //child_process.execSync(process.env.ydb_dist + '/mupip rundown -region DEFAULT', {stdio:[0,1,2]}); + //child_process.execSync(process.env.ydb_dist + '/mupip rundown -region qewdreg', {stdio:[0,1,2]}); + //console.log('Rundown completed'); } catch(err) { - console.log('Error running down YottaDB: ' + err); - console.log('Recovering journal...'); + //console.log('Error running down YottaDB: ' + err); + //console.log('Recovering journal...'); try { - child_process.execSync(process.env.ydb_dist + '/mupip journal -recover -backward ' + process.env.ydb_dir + '/' + process.env.ydb_rel + '/g/yottadb.mjl', {stdio:[0,1,2]}); - console.log('Journal recovered'); + //child_process.execSync(process.env.ydb_dist + '/mupip journal -recover -backward ' + process.env.ydb_dir + '/' + process.env.ydb_rel + '/g/yottadb.mjl', {stdio:[0,1,2]}); + //console.log('Journal recovered'); } catch(err) { - console.log('YottaDB is probably already in use'); + //console.log('YottaDB is probably already in use'); } } }