Merge remote-tracking branch 'origin/main' into beta-releases

Author: github-actions[bot]

THIRD-PARTY-NOTICES.md

@@ -1,11 +1,11 @@
 import Sinon from 'sinon';
 import { expect } from 'chai';
-import { AtlasService, getTrackingUserInfo, throwIfNotOk } from './main';
+import { AtlasService, throwIfNotOk } from './main';
+import * as util from './util';
 import { EventEmitter } from 'events';
 import { createSandboxFromDefaultPreferences } from 'compass-preferences-model';
 import type { PreferencesAccess } from 'compass-preferences-model';
 import type { AtlasUserConfigStore } from './user-config-store';
-import type { AtlasUserInfo } from './util';
 
 function getListenerCount(emitter: EventEmitter) {
   return emitter.eventNames().reduce((acc, name) => {
@@ -74,6 +74,14 @@ describe('AtlasServiceMain', function () {
 
   let preferences: PreferencesAccess;
 
+  let getTrackingUserInfoStub: Sinon.SinonStubbedMember<
+    typeof util.getTrackingUserInfo
+  >;
+
+  before(function () {
+    getTrackingUserInfoStub = sandbox.stub(util, 'getTrackingUserInfo');
+  });
+
   beforeEach(async function () {
     AtlasService['ipcMain'] = {
       handle: sandbox.stub(),
@@ -114,8 +122,15 @@ describe('AtlasServiceMain', function () {
     sandbox.resetHistory();
   });
 
+  after(function () {
+    sandbox.restore();
+  });
+
   describe('signIn', function () {
     it('should sign in using oidc plugin', async function () {
+      const atlasUid = 'abcdefgh';
+      getTrackingUserInfoStub.returns({ auid: atlasUid });
+
       const userInfo = await AtlasService.signIn();
       expect(
         mockOidcPlugin.mongoClientOptions.authMechanismProperties
@@ -124,6 +139,9 @@ describe('AtlasServiceMain', function () {
         // proper error message from oidc plugin in case of failed sign in
       ).to.have.been.calledTwice;
       expect(userInfo).to.have.property('sub', '1234');
+      expect(preferences.getPreferences().telemetryAtlasUserId).to.equal(
+        atlasUid
+      );
     });
 
     it('should debounce inflight sign in requests', async function () {
@@ -522,19 +540,6 @@ describe('AtlasServiceMain', function () {
     });
   });
 
-  describe('getTrackingUserInfo', function () {
-    it('should return required tracking info from user info', function () {
-      expect(
-        getTrackingUserInfo({
-          sub: '1234',
-          primaryEmail: '[email protected]',
-        } as AtlasUserInfo)
-      ).to.deep.eq({
-        auid: '03ac674216f3e15c761ee1a5e255f067953623c8b388b4459e13f978d7c846f4',
-      });
-    });
-  });
-
   describe('setupAIAccess', function () {
     beforeEach(async function () {
       await preferences.savePreferences({

package-lock.json

@@ -1,8 +1,7 @@
 import { shell, app } from 'electron';
 import { URL, URLSearchParams } from 'url';
-import { createHash } from 'crypto';
 import type { AuthFlowType, MongoDBOIDCPlugin } from '@mongodb-js/oidc-plugin';
-import { AtlasServiceError } from './util';
+import { AtlasServiceError, getTrackingUserInfo } from './util';
 import {
   createMongoDBOIDCPlugin,
   hookLoggerToMongoLogWriter as oidcPluginHookLoggerToMongoLogWriter,
@@ -114,14 +113,6 @@ const TOKEN_TYPE_TO_HINT = {
   refreshToken: 'refresh_token',
 } as const;
 
-export function getTrackingUserInfo(userInfo: AtlasUserInfo) {
-  return {
-    // AUID is shared Cloud user identificator that can be tracked through
-    // various MongoDB properties
-    auid: createHash('sha256').update(userInfo.sub, 'utf8').digest('hex'),
-  };
-}
-
 export type AtlasServiceConfig = {
   atlasApiBaseUrl: string;
   atlasApiUnauthBaseUrl: string;
@@ -374,7 +365,11 @@ export class AtlasService {
             'AtlasService',
             'Signed in successfully'
           );
-          track('Atlas Sign In Success', getTrackingUserInfo(userInfo));
+          const { auid } = getTrackingUserInfo(userInfo);
+          track('Atlas Sign In Success', { auid });
+          await this.preferences.savePreferences({
+            telemetryAtlasUserId: auid,
+          });
           return userInfo;
         } catch (err) {
           track('Atlas Sign In Error', {

packages/atlas-service/src/main.spec.ts

@@ -0,0 +1,16 @@
+import { getTrackingUserInfo } from './util';
+import type { AtlasUserInfo } from './util';
+import { expect } from 'chai';
+
+describe('getTrackingUserInfo', function () {
+  it('should return required tracking info from user info', function () {
+    expect(
+      getTrackingUserInfo({
+        sub: '1234',
+        primaryEmail: '[email protected]',
+      } as AtlasUserInfo)
+    ).to.deep.eq({
+      auid: '03ac674216f3e15c761ee1a5e255f067953623c8b388b4459e13f978d7c846f4',
+    });
+  });
+});

packages/atlas-service/src/main.ts

@@ -1,6 +1,7 @@
 import type * as plugin from '@mongodb-js/oidc-plugin';
 import util from 'util';
 import type { AtlasUserConfig } from './user-config-store';
+import { createHash } from 'crypto';
 
 export type AtlasUserInfo = {
   sub: string;
@@ -160,3 +161,11 @@ export class AtlasServiceError extends Error {
     this.detail = detail;
   }
 }
+
+export function getTrackingUserInfo(userInfo: AtlasUserInfo) {
+  return {
+    // AUID is shared Cloud user identificator that can be tracked through
+    // various MongoDB properties
+    auid: createHash('sha256').update(userInfo.sub, 'utf8').digest('hex'),
+  };
+}

packages/atlas-service/src/util.spec.ts

@@ -89,7 +89,7 @@
     "mongodb-database-model": "^2.17.4",
     "mongodb-instance-model": "^12.17.4",
     "mongodb-ns": "^2.4.0",
-    "mongodb-query-parser": "^4.0.2",
+    "mongodb-query-parser": "^4.1.0",
     "mongodb-schema": "^12.1.0",
     "nyc": "^15.1.0",
     "prettier": "^2.7.1",

packages/atlas-service/src/util.ts

@@ -593,7 +593,7 @@ describe('match', function () {
       const onChangeSpy = Sinon.spy();
       render(<MatchForm fields={SAMPLE_FIELDS} onChange={onChangeSpy} />);
       setComboboxValue(new RegExp(SINGLE_SELECT_LABEL, 'i'), 'name');
-      expect(onChangeSpy.lastCall.args).deep.equal(["{\n name: ''\n}", null]);
+      expect(onChangeSpy.lastCall.args).deep.equal(["{\n  name: ''\n}", null]);
     });
 
     it('should call onChange with an error if there was an error during the conversion to stage', function () {

packages/compass-aggregations/package.json

@@ -100,7 +100,7 @@
     "mocha": "^10.2.0",
     "mongodb-instance-model": "^12.17.4",
     "mongodb-ns": "^2.4.0",
-    "mongodb-query-parser": "^4.0.2",
+    "mongodb-query-parser": "^4.1.0",
     "nyc": "^15.1.0",
     "prop-types": "^15.7.2",
     "react": "^17.0.2",

packages/compass-aggregations/src/components/aggregation-side-panel/stage-wizard-use-cases/match/match.spec.tsx

@@ -70,7 +70,7 @@ describe('BulkDeleteModal Component', function () {
   it('shows the provided query', function () {
     renderBulkDeleteModal({ filter: { a: 1 } });
     expect(screen.getByTestId('readonly-filter').textContent).to.equal(
-      '{\n a: 1\n}'
+      '{\n  a: 1\n}'
     );
   });