From 7c384d5f26994c70d64c5bac87d348bf36798b3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Alby?= Date: Mon, 4 Oct 2021 14:28:33 +0200 Subject: [PATCH] Merge pull request #5330 from overleaf/ab-analytics-middleware-passport-id Fix passport user id reference in analytics ID middleware GitOrigin-RevId: 7d237a6f358b5632c672aafd6e1e72ab53d8650f --- .../web/app/src/Features/Analytics/AnalyticsManager.js | 2 +- .../web/test/unit/src/Analytics/AnalyticsManagerTests.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/services/web/app/src/Features/Analytics/AnalyticsManager.js b/services/web/app/src/Features/Analytics/AnalyticsManager.js index 6c24b940ad..006995ba79 100644 --- a/services/web/app/src/Features/Analytics/AnalyticsManager.js +++ b/services/web/app/src/Features/Analytics/AnalyticsManager.js @@ -232,7 +232,7 @@ async function analyticsIdMiddleware(req, res, next) { if (sessionUser) { // ensure `session.analyticsId` is set to the user's `analyticsId`, and fallback to their `userId` for pre-analyticsId users - session.analyticsId = sessionUser.analyticsId || sessionUser.userId + session.analyticsId = sessionUser.analyticsId || sessionUser._id } else if (!session.analyticsId) { // generate an `analyticsId` if needed session.analyticsId = uuid.v4() diff --git a/services/web/test/unit/src/Analytics/AnalyticsManagerTests.js b/services/web/test/unit/src/Analytics/AnalyticsManagerTests.js index f1fef211cf..ba028937fe 100644 --- a/services/web/test/unit/src/Analytics/AnalyticsManagerTests.js +++ b/services/web/test/unit/src/Analytics/AnalyticsManagerTests.js @@ -198,7 +198,7 @@ describe('AnalyticsManager', function () { it('sets session.analyticsId with a logged in user in session having an analyticsId', async function () { this.req.session.user = { - userId: this.userId, + _id: this.userId, analyticsId: this.analyticsId, } await this.AnalyticsManager.analyticsIdMiddleware( @@ -211,7 +211,7 @@ describe('AnalyticsManager', function () { it('sets session.analyticsId with a legacy user session without an analyticsId', async function () { this.req.session.user = { - userId: this.userId, + _id: this.userId, analyticsId: undefined, } await this.AnalyticsManager.analyticsIdMiddleware( @@ -224,7 +224,7 @@ describe('AnalyticsManager', function () { it('updates session.analyticsId with a legacy user session without an analyticsId if different', async function () { this.req.session.user = { - userId: this.userId, + _id: this.userId, analyticsId: undefined, } this.req.analyticsId = 'foo' @@ -238,7 +238,7 @@ describe('AnalyticsManager', function () { it('does not update session.analyticsId with a legacy user session without an analyticsId if same', async function () { this.req.session.user = { - userId: this.userId, + _id: this.userId, analyticsId: undefined, } this.req.analyticsId = this.userId