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

Author: github-actions[bot]

THIRD-PARTY-NOTICES.md

@@ -1,5 +1,5 @@
 The following third-party software is used by and included in **Mongodb Compass**.
-This document was automatically generated on Sun Aug 13 2023.
+This document was automatically generated on Tue Aug 15 2023.
 
 ## List of dependencies
 

package-lock.json

@@ -73,6 +73,7 @@
     "@mongodb-js/devtools-connect": "^2.4.0",
     "@mongodb-js/oidc-plugin": "^0.3.0",
     "electron": "^23.3.12",
+    "keytar": "^7.9.0",
     "node-fetch": "^2.6.7",
     "react": "^17.0.2",
     "react-redux": "^8.0.5",

packages/atlas-service/package.json

@@ -37,11 +37,14 @@ describe('AtlasServiceMain', function () {
   AtlasService['attachOidcPluginLoggerEvents']();
 
   const fetch = AtlasService['fetch'];
+  const ipcMain = AtlasService['ipcMain'];
   const apiBaseUrl = process.env.COMPASS_ATLAS_SERVICE_BASE_URL;
   const issuer = process.env.COMPASS_OIDC_ISSUER;
   const clientId = process.env.COMPASS_CLIENT_ID;
 
   beforeEach(function () {
+    AtlasService['ipcMain'] = { handle: sandbox.stub() };
+
     process.env.COMPASS_ATLAS_SERVICE_BASE_URL = 'http://example.com';
     process.env.COMPASS_OIDC_ISSUER = 'http://example.com';
     process.env.COMPASS_CLIENT_ID = '1234abcd';
@@ -53,7 +56,9 @@ describe('AtlasServiceMain', function () {
     process.env.COMPASS_CLIENT_ID = clientId;
 
     AtlasService['fetch'] = fetch;
+    AtlasService['ipcMain'] = ipcMain;
     AtlasService['token'] = null;
+    AtlasService['initPromise'] = null;
     AtlasService['oidcPluginSyncedFromLoggerState'] = 'initial';
 
     sandbox.resetHistory();
@@ -182,10 +187,11 @@ describe('AtlasServiceMain', function () {
         (async () => {
           await wait(20);
           AtlasService['oidcPluginLogger'].emit(
-            'mongodb-oidc-plugin:refresh-succeeded'
+            'mongodb-oidc-plugin:refresh-started'
           );
           AtlasService['oidcPluginLogger'].emit(
-            'mongodb-oidc-plugin:state-updated'
+            'mongodb-oidc-plugin:auth-succeeded',
+            {} as any
           );
         })(),
       ]);
@@ -346,10 +352,11 @@ describe('AtlasServiceMain', function () {
         (async () => {
           await wait(20);
           AtlasService['oidcPluginLogger'].emit(
-            'mongodb-oidc-plugin:refresh-succeeded'
+            'mongodb-oidc-plugin:refresh-started'
           );
           AtlasService['oidcPluginLogger'].emit(
-            'mongodb-oidc-plugin:state-updated'
+            'mongodb-oidc-plugin:auth-succeeded',
+            {} as any
           );
         })(),
       ]);
@@ -480,51 +487,67 @@ describe('AtlasServiceMain', function () {
       );
     });
 
-    it('should set AtlasService state to error on `mongodb-oidc-plugin:refresh-failed` event', function () {
-      AtlasService['oidcPluginLogger'].emit(
-        'mongodb-oidc-plugin:refresh-failed' as any,
-        { error: 'Stringified logger error' }
-      );
-      expect(AtlasService).to.have.property(
-        'oidcPluginSyncedFromLoggerState',
-        'error'
-      );
-    });
-
-    it('should refresh token in atlas service state on `mongodb-oidc-plugin:refresh-succeeded` event', async function () {
-      const initialListenerCount = getListenerCount(
-        mockOidcPlugin.logger as EventEmitter
-      );
+    it('should refresh token in atlas service state on `mongodb-oidc-plugin:refresh-started` event', async function () {
       // Checking that multiple events while we are refreshing don't cause
-      // multiple calls to REFRESH_TOKEN_CALLBACK
-      mockOidcPlugin.logger.emit('mongodb-oidc-plugin:refresh-succeeded');
-      mockOidcPlugin.logger.emit('mongodb-oidc-plugin:refresh-succeeded');
-      mockOidcPlugin.logger.emit('mongodb-oidc-plugin:refresh-succeeded');
-      // Checking that refresh-succeeded doesn't update the service state as we
-      // are just starting the refresh actually
-      expect(AtlasService).to.have.property(
-        'oidcPluginSyncedFromLoggerState',
-        'initial'
+      // multiple calls to REQUEST_TOKEN_CALLBACK
+      mockOidcPlugin.logger.emit('mongodb-oidc-plugin:refresh-started');
+      mockOidcPlugin.logger.emit('mongodb-oidc-plugin:refresh-started');
+      mockOidcPlugin.logger.emit('mongodb-oidc-plugin:refresh-started');
+      // Make it look like oidc-plugin successfully updated
+      mockOidcPlugin.logger.emit(
+        'mongodb-oidc-plugin:auth-succeeded',
+        {} as any
       );
-      mockOidcPlugin.logger.emit('mongodb-oidc-plugin:state-updated');
       await once(
         AtlasService['oidcPluginLogger'],
         'atlas-service-token-refreshed'
       );
       expect(
         mockOidcPlugin.mongoClientOptions.authMechanismProperties
-          .REFRESH_TOKEN_CALLBACK
+          .REQUEST_TOKEN_CALLBACK
       ).to.have.been.calledOnce;
       expect(AtlasService).to.have.property(
         'oidcPluginSyncedFromLoggerState',
         'authenticated'
       );
       expect(AtlasService)
         .to.have.property('token')
-        .deep.eq({ accessToken: '4321' });
-      // Checking that we cleaned up all listeners
-      expect(getListenerCount(mockOidcPlugin.logger as EventEmitter)).to.eq(
-        initialListenerCount
+        .deep.eq({ accessToken: '1234' });
+    });
+  });
+
+  describe('init', function () {
+    it('should set service to unauthenticated state if requesting token throws', async function () {
+      mockOidcPlugin.mongoClientOptions.authMechanismProperties.REQUEST_TOKEN_CALLBACK =
+        sandbox
+          .stub()
+          .rejects(new Error('Could not retrieve valid access token'));
+      const createPlugin = () => mockOidcPlugin;
+      const initPromise = AtlasService.init(createPlugin);
+      expect(AtlasService).to.have.property(
+        'oidcPluginSyncedFromLoggerState',
+        'restoring'
+      );
+      await initPromise;
+      expect(AtlasService).to.have.property(
+        'oidcPluginSyncedFromLoggerState',
+        'unauthenticated'
+      );
+    });
+
+    it('should set service to autenticated state if token was returned', async function () {
+      mockOidcPlugin.mongoClientOptions.authMechanismProperties.REQUEST_TOKEN_CALLBACK =
+        sandbox.stub().resolves({ accessToken: 'token' });
+      const createPlugin = () => mockOidcPlugin;
+      const initPromise = AtlasService.init(createPlugin);
+      expect(AtlasService).to.have.property(
+        'oidcPluginSyncedFromLoggerState',
+        'restoring'
+      );
+      await initPromise;
+      expect(AtlasService).to.have.property(
+        'oidcPluginSyncedFromLoggerState',
+        'authenticated'
       );
     });
   });