Skip to content

Commit 3c04d1e

Browse files
committed
ISSUE #5373 more clean up
1 parent a845554 commit 3c04d1e

File tree

2 files changed

+7
-18
lines changed

2 files changed

+7
-18
lines changed

backend/src/v5/middleware/sessions.js

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ const { deleteIfUndefined } = require('../utils/helper/objects');
2222
const { destroySession } = require('../utils/sessions');
2323
const { events } = require('../services/eventsManager/eventsManager.constants');
2424
const { generateUUIDString } = require('../utils/helper/uuids');
25-
const { getURLDomain } = require('../utils/helper/strings');
2625
const { session: initSession } = require('../services/sessions');
2726
const { isFromWebBrowser } = require('../utils/helper/userAgent');
2827
const { publish } = require('../services/eventsManager/eventsManager');
@@ -46,20 +45,14 @@ Sessions.manageSessions = async (req, res, next) => {
4645
const updateSessionDetails = (req) => {
4746
const updatedUser = { ...req.loginData, webSession: false };
4847
const { session } = req;
49-
let userAgent = req.headers['user-agent'];
50-
51-
const { ssoInfo } = req.session;
52-
if (ssoInfo) {
53-
userAgent = ssoInfo.userAgent;
54-
if (ssoInfo.referer) {
55-
updatedUser.referer = ssoInfo.referer;
56-
}
57-
58-
delete req.session.ssoInfo;
59-
} else if (req.headers.referer) {
60-
updatedUser.referer = getURLDomain(req.headers.referer);
48+
49+
const { ssoInfo: { userAgent, referer } } = req.session;
50+
if (referer) {
51+
updatedUser.referer = referer;
6152
}
6253

54+
delete req.session.ssoInfo;
55+
6356
if (userAgent) {
6457
updatedUser.webSession = isFromWebBrowser(userAgent);
6558
updatedUser.userAgent = userAgent;

backend/src/v5/utils/sessions.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,12 @@
1818
const { CSRF_COOKIE, CSRF_HEADER, SESSION_HEADER } = require('./sessions.constants');
1919
const { cookie, cookie_domain } = require('./config');
2020
const { escapeRegexChrs, getURLDomain } = require('./helper/strings');
21+
const { apiUrls } = require('./config');
2122
const { deleteIfUndefined } = require('./helper/objects');
2223
const { events } = require('../services/eventsManager/eventsManager.constants');
2324
const { publish } = require('../services/eventsManager/eventsManager');
24-
const { v4Path } = require('../../interop');
2525
const { validateAndRefreshToken } = require('../services/sso/frontegg');
2626

27-
// FIXME: can remove the disable once we migrated config
28-
// eslint-disable-next-line
29-
const { apiUrls } = require(`${v4Path}/config`);
30-
3127
const referrerMatch = (sessionReferrer, headerReferrer) => {
3228
const domain = getURLDomain(headerReferrer);
3329
return domain === sessionReferrer

0 commit comments

Comments
 (0)