From 5b39581b82a65fe0661c868861dfecdfe503713d Mon Sep 17 00:00:00 2001 From: Shahana Farooqui <23240721+ShahanaFarooqui@users.noreply.github.com> Date: Sun, 7 Aug 2022 14:12:47 -0700 Subject: [PATCH] Cookie connect.sid removed Cookie connect.sid removed --- backend/controllers/shared/RTLConf.js | 8 ++++---- backend/controllers/shared/authenticate.js | 6 ++++-- backend/routes/shared/RTLConf.js | 2 +- frontend/index.html | 2 +- frontend/main.114eb43a7d4c0e46.js | 1 + frontend/main.f6fd53cb12618878.js | 1 - server/controllers/shared/RTLConf.ts | 8 ++++---- server/controllers/shared/authenticate.ts | 6 ++++-- server/routes/shared/RTLConf.ts | 2 +- src/app/store/rtl.effects.ts | 2 +- 10 files changed, 21 insertions(+), 17 deletions(-) create mode 100644 frontend/main.114eb43a7d4c0e46.js delete mode 100644 frontend/main.f6fd53cb12618878.js diff --git a/backend/controllers/shared/RTLConf.js b/backend/controllers/shared/RTLConf.js index 6923a971..c20b7eb7 100644 --- a/backend/controllers/shared/RTLConf.js +++ b/backend/controllers/shared/RTLConf.js @@ -14,12 +14,12 @@ const wsServer = WSServer; const databaseService = Database; export const updateSelectedNode = (req, res, next) => { logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'RTLConf', msg: 'Updating Selected Node..' }); - const selNodeIndex = req.body.currNodeIndex ? req.body.currNodeIndex : common.initSelectedNode ? common.initSelectedNode.index : 1; + const selNodeIndex = req.params.currNodeIndex ? +req.params.currNodeIndex : common.initSelectedNode ? +common.initSelectedNode.index : 1; req.session.selectedNode = common.findNode(selNodeIndex); if (req.headers && req.headers.authorization && req.headers.authorization !== '') { - wsServer.updateLNWSClientDetails(req.session.id, +req.session.selectedNode.index, +req.body.prevNodeIndex); - if (req.body.prevNodeIndex !== -1) { - databaseService.unloadDatabase(req.body.prevNodeIndex); + wsServer.updateLNWSClientDetails(req.session.id, +req.session.selectedNode.index, +req.params.prevNodeIndex); + if (req.params.prevNodeIndex !== -1) { + databaseService.unloadDatabase(req.params.prevNodeIndex); } } const responseVal = !req.session.selectedNode.ln_node ? '' : req.session.selectedNode.ln_node; diff --git a/backend/controllers/shared/authenticate.js b/backend/controllers/shared/authenticate.js index ab91f07d..6be207a9 100644 --- a/backend/controllers/shared/authenticate.js +++ b/backend/controllers/shared/authenticate.js @@ -126,6 +126,8 @@ export const logoutUser = (req, res, next) => { if (req.session.selectedNode && req.session.selectedNode.index) { databaseService.unloadDatabase(+req.session.selectedNode.index); } - req.session.destroy(); - res.status(200).json({ loggedout: true }); + req.session.destroy((err) => { + res.clearCookie('connect.sid'); + res.status(200).json({ loggedout: true }); + }); }; diff --git a/backend/routes/shared/RTLConf.js b/backend/routes/shared/RTLConf.js index 5f89bd5e..d783092d 100644 --- a/backend/routes/shared/RTLConf.js +++ b/backend/routes/shared/RTLConf.js @@ -9,7 +9,7 @@ router.post('/', isAuthenticated, updateUISettings); router.post('/update2FA', isAuthenticated, update2FASettings); router.get('/config/:nodeType', isAuthenticated, getConfig); router.get('/file', isAuthenticated, getFile); -router.post('/updateSelNode', updateSelectedNode); +router.get('/updateSelNode/:currNodeIndex/:prevNodeIndex', updateSelectedNode); router.post('/updateDefaultNode', updateDefaultNode); router.post('/updateServiceSettings', updateServiceSettings); router.post('/updateSSO', updateSSO); diff --git a/frontend/index.html b/frontend/index.html index c2ea1381..b4d141ff 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -13,6 +13,6 @@