From dc94293f4d01f61b3ab05ef87647b7db77a7f5f1 Mon Sep 17 00:00:00 2001 From: Alexandre Bourdin Date: Thu, 30 Sep 2021 17:27:59 +0200 Subject: [PATCH] Merge pull request #5302 from overleaf/ta-identify-identity Skip Identify Job When userId Equal analyticsId GitOrigin-RevId: 11eac0905dd0060df3556484db7ba301aba55375 --- .../web/app/src/Features/Analytics/AnalyticsManager.js | 2 +- .../test/unit/src/Analytics/AnalyticsManagerTests.js | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/services/web/app/src/Features/Analytics/AnalyticsManager.js b/services/web/app/src/Features/Analytics/AnalyticsManager.js index ed2328fd7e..220813eb4a 100644 --- a/services/web/app/src/Features/Analytics/AnalyticsManager.js +++ b/services/web/app/src/Features/Analytics/AnalyticsManager.js @@ -15,7 +15,7 @@ const analyticsUserPropertiesQueue = Queues.getAnalyticsUserPropertiesQueue() const ONE_MINUTE_MS = 60 * 1000 function identifyUser(userId, analyticsId, isNewUser) { - if (!userId || !analyticsId) { + if (!userId || !analyticsId || userId === analyticsId) { return } if (_isAnalyticsDisabled() || _isSmokeTestUser(userId)) { diff --git a/services/web/test/unit/src/Analytics/AnalyticsManagerTests.js b/services/web/test/unit/src/Analytics/AnalyticsManagerTests.js index 8e4c91601f..29dfa0d8ee 100644 --- a/services/web/test/unit/src/Analytics/AnalyticsManagerTests.js +++ b/services/web/test/unit/src/Analytics/AnalyticsManagerTests.js @@ -70,6 +70,16 @@ describe('AnalyticsManager', function () { this.AnalyticsManager.identifyUser(this.fakeUserId, '') sinon.assert.notCalled(this.analyticsEventsQueue.add) }) + + it('userId or analyticsId is missing', function () { + this.AnalyticsManager.identifyUser(this.fakeUserId, undefined) + sinon.assert.notCalled(this.analyticsEventsQueue.add) + }) + + it('userId equal analyticsId', function () { + this.AnalyticsManager.identifyUser(this.fakeUserId, this.fakeUserId) + sinon.assert.notCalled(this.analyticsEventsQueue.add) + }) }) describe('queues the appropriate message for', function () {