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

Author: github-actions[bot]

.evergreen/functions.yml

@@ -322,7 +322,7 @@ functions:
           # Load environment variables
           eval $(.evergreen/print-compass-env.sh)
           # Generates and expansion file with build target metadata in packages/compass/expansions.yml
-          npm run --workspace mongodb-compass build-info -- ${target_platform} ${target_arch} --format=yaml --flatten --out expansions.raw.yml
+          npm run --workspace mongodb-compass build-info -- --format=yaml --flatten --out expansions.raw.yml
           # the 'author' key conflicts with evergreen's own expansion
           grep -v '^author:' < packages/compass/expansions.raw.yml > packages/compass/expansions.yml
     - command: expansions.update

AUTHORS

@@ -95,3 +95,4 @@ Ruchitha Rajaghatta <[email protected]>
 syn-zhu <[email protected]>
 Nikola Irinchev <[email protected]>
 djechlin-mongodb <[email protected]>
+Dylan Richardson <[email protected]>

THIRD-PARTY-NOTICES.md

@@ -1,7 +1,7 @@
 
 # Compass Tracking Plan
 
-Generated on Sun, Dec 8, 2024 at 03:24 AM
+Generated on Sun, Dec 15, 2024 at 03:29 AM
 
 ## Table of Contents
 

docs/tracking-plan.md

@@ -79,8 +79,8 @@
     "@mongodb-js/compass-user-data": "^0.3.12",
     "@mongodb-js/compass-utils": "^0.6.16",
     "@mongodb-js/connection-info": "^0.9.5",
-    "@mongodb-js/devtools-connect": "^3.3.3",
-    "@mongodb-js/devtools-proxy-support": "^0.4.1",
+    "@mongodb-js/devtools-connect": "^3.3.4",
+    "@mongodb-js/devtools-proxy-support": "^0.4.2",
     "@mongodb-js/oidc-plugin": "^1.1.5",
     "hadron-app-registry": "^9.2.8",
     "compass-preferences-model": "^2.31.1",

package-lock.json

@@ -4,7 +4,6 @@ import type { AtlasUserInfo } from './util';
 export type ArgsWithSignal<T = Record<string, unknown>> = T & {
   signal?: AbortSignal;
 };
-export type SignInPrompt = 'none';
 
 type AtlasAuthServiceEvents = {
   'signed-in': [];
@@ -19,7 +18,7 @@ type AtlasAuthEventListener<T extends AtlasAuthEventNames> = (
 
 export abstract class AtlasAuthService extends EventEmitter {
   abstract signIn(
-    opts?: ArgsWithSignal<{ promptType?: SignInPrompt }>
+    opts?: ArgsWithSignal<{ mainProcessSignIn?: boolean }>
   ): Promise<AtlasUserInfo>;
   abstract signOut(): Promise<void>;
   abstract isAuthenticated(opts?: ArgsWithSignal): Promise<boolean>;

packages/atlas-service/package.json

@@ -43,7 +43,10 @@ describe('CompassAtlasAuthService', function () {
     const atlasAuthService = getAtlasAuthService({
       signIn: signInStub,
     });
-    await atlasAuthService.signIn({ signal: c.signal });
+    await atlasAuthService.signIn({
+      mainProcessSignIn: true,
+      signal: c.signal,
+    });
     expect(signInStub.calledOnce).to.be.true;
     expect(signInStub.firstCall.firstArg).to.deep.equal({ signal: c.signal });
   });

packages/atlas-service/src/atlas-auth-service.ts

@@ -1,9 +1,9 @@
 import { ipcRenderer } from 'hadron-ipc';
 import type { CompassAuthService as AtlasServiceMain } from './main';
-import { signInWithoutPrompt } from './store/atlas-signin-reducer';
+import { performSignInAttempt } from './store/atlas-signin-reducer';
 import { getStore } from './store/atlas-signin-store';
 import { AtlasAuthService } from './atlas-auth-service';
-import type { ArgsWithSignal, SignInPrompt } from './atlas-auth-service';
+import type { ArgsWithSignal } from './atlas-auth-service';
 
 export class CompassAtlasAuthService extends AtlasAuthService {
   private _ipc = ipcRenderer?.createInvoke<
@@ -37,15 +37,14 @@ export class CompassAtlasAuthService extends AtlasAuthService {
     return this.ipc.signOut();
   }
   signIn({
-    promptType,
+    mainProcessSignIn,
     signal,
-  }: ArgsWithSignal<{ promptType?: SignInPrompt }> = {}) {
-    switch (promptType) {
-      case 'none':
-        return getStore().dispatch(signInWithoutPrompt({ signal }));
-      default:
-        return this.ipc.signIn({ signal });
+  }: ArgsWithSignal<{ mainProcessSignIn?: boolean }> = {}) {
+    if (mainProcessSignIn) {
+      return this.ipc.signIn({ signal });
     }
+
+    return getStore().dispatch(performSignInAttempt({ signal }));
   }
   getUserInfo(opts?: ArgsWithSignal) {
     return this.ipc.getUserInfo(opts);

packages/atlas-service/src/compass-atlas-auth-service.spec.ts

@@ -5,7 +5,7 @@ import {
   cancelSignIn,
   attemptId,
   AttemptStateMap,
-  signInWithoutPrompt,
+  performSignInAttempt,
 } from './atlas-signin-reducer';
 import { expect } from 'chai';
 import { configureStore } from './atlas-signin-store';
@@ -174,7 +174,7 @@ describe('atlasSignInReducer', function () {
         atlasAuthService: mockAtlasService as any,
       });
 
-      void store.dispatch(signInWithoutPrompt()).catch(() => {});
+      void store.dispatch(performSignInAttempt()).catch(() => {});
 
       await Promise.all([
         store.dispatch(signIn()),
@@ -184,7 +184,7 @@ describe('atlasSignInReducer', function () {
     });
   });
 
-  describe('signInWithoutPrompt', function () {
+  describe('performSignInAttempt', function () {
     it('should resolve when sign in flow finishes', async function () {
       const mockAtlasService = {
         isAuthenticated: sandbox.stub().resolves(false),
@@ -195,7 +195,7 @@ describe('atlasSignInReducer', function () {
       const store = configureStore({
         atlasAuthService: mockAtlasService as any,
       });
-      await store.dispatch(signInWithoutPrompt());
+      await store.dispatch(performSignInAttempt());
       expect(store.getState()).to.have.property('state', 'success');
     });
 
@@ -210,8 +210,8 @@ describe('atlasSignInReducer', function () {
         atlasAuthService: mockAtlasService as any,
       });
       try {
-        await store.dispatch(signInWithoutPrompt());
-        expect.fail('Expected signInWithoutPrompt action to throw');
+        await store.dispatch(performSignInAttempt());
+        expect.fail('Expected performSignInAttempt action to throw');
       } catch (err) {
         expect(err).to.have.property('message', 'Sign in failed');
       }
@@ -237,7 +237,7 @@ describe('atlasSignInReducer', function () {
       });
       const c = new AbortController();
       const signInPromise = store.dispatch(
-        signInWithoutPrompt({ signal: c.signal })
+        performSignInAttempt({ signal: c.signal })
       );
       c.abort(new Error('Aborted from outside'));
       try {