ISSUE #5373 more clean up

3drepo · Feb 19, 2025 · 3c04d1e · 3c04d1e
1 parent a845554
commit 3c04d1e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 18 deletions.
diff --git a/backend/src/v5/middleware/sessions.js b/backend/src/v5/middleware/sessions.js
@@ -22,7 +22,6 @@ const { deleteIfUndefined } = require('../utils/helper/objects');
 const { destroySession } = require('../utils/sessions');
 const { events } = require('../services/eventsManager/eventsManager.constants');
 const { generateUUIDString } = require('../utils/helper/uuids');
-const { getURLDomain } = require('../utils/helper/strings');
 const { session: initSession } = require('../services/sessions');
 const { isFromWebBrowser } = require('../utils/helper/userAgent');
 const { publish } = require('../services/eventsManager/eventsManager');
@@ -46,20 +45,14 @@ Sessions.manageSessions = async (req, res, next) => {
 const updateSessionDetails = (req) => {
 	const updatedUser = { ...req.loginData, webSession: false };
 	const { session } = req;
-	let userAgent = req.headers['user-agent'];
-
-	const { ssoInfo } = req.session;
-	if (ssoInfo) {
-		userAgent = ssoInfo.userAgent;
-		if (ssoInfo.referer) {
-			updatedUser.referer = ssoInfo.referer;
-		}
-
-		delete req.session.ssoInfo;
-	} else if (req.headers.referer) {
-		updatedUser.referer = getURLDomain(req.headers.referer);
+
+	const { ssoInfo: { userAgent, referer } } = req.session;
+	if (referer) {
+		updatedUser.referer = referer;
 	}
 
+	delete req.session.ssoInfo;
+
 	if (userAgent) {
 		updatedUser.webSession = isFromWebBrowser(userAgent);
 		updatedUser.userAgent = userAgent;

diff --git a/backend/src/v5/utils/sessions.js b/backend/src/v5/utils/sessions.js
@@ -18,16 +18,12 @@
 const { CSRF_COOKIE, CSRF_HEADER, SESSION_HEADER } = require('./sessions.constants');
 const { cookie, cookie_domain } = require('./config');
 const { escapeRegexChrs, getURLDomain } = require('./helper/strings');
+const { apiUrls } = require('./config');
 const { deleteIfUndefined } = require('./helper/objects');
 const { events } = require('../services/eventsManager/eventsManager.constants');
 const { publish } = require('../services/eventsManager/eventsManager');
-const { v4Path } = require('../../interop');
 const { validateAndRefreshToken } = require('../services/sso/frontegg');
 
-// FIXME: can remove the disable once we migrated config
-// eslint-disable-next-line
-const { apiUrls } = require(`${v4Path}/config`);
-
 const referrerMatch = (sessionReferrer, headerReferrer) => {
 	const domain = getURLDomain(headerReferrer);
 	return domain === sessionReferrer