chore(atlas-service): update atlas service sign in naming COMPASS-8493 (

#6544)
mongodb-js · Dec 9, 2024 · d55c864 · d55c864
1 parent fc2fb65
commit d55c864
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 23 deletions.
diff --git a/packages/atlas-service/src/atlas-auth-service.ts b/packages/atlas-service/src/atlas-auth-service.ts
@@ -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>;

diff --git a/packages/atlas-service/src/compass-atlas-auth-service.spec.ts b/packages/atlas-service/src/compass-atlas-auth-service.spec.ts
@@ -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 });
   });

diff --git a/packages/atlas-service/src/compass-atlas-auth-service.ts b/packages/atlas-service/src/compass-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);

diff --git a/packages/atlas-service/src/store/atlas-signin-reducer.spec.ts b/packages/atlas-service/src/store/atlas-signin-reducer.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 {

diff --git a/packages/atlas-service/src/store/atlas-signin-reducer.ts b/packages/atlas-service/src/store/atlas-signin-reducer.ts
@@ -308,7 +308,7 @@ const startAttempt = (fn: () => void): AtlasSignInThunkAction<AttemptState> => {
   };
 };
 
-export const signInWithoutPrompt = ({
+export const performSignInAttempt = ({
   signal,
 }: { signal?: AbortSignal } = {}): AtlasSignInThunkAction<
   Promise<AtlasUserInfo>
@@ -348,7 +348,10 @@ export const signIn = (): AtlasSignInThunkAction<Promise<void>> => {
       if (await atlasAuthService.isAuthenticated({ signal })) {
         userInfo = await atlasAuthService.getUserInfo({ signal });
       } else {
-        userInfo = await atlasAuthService.signIn({ signal });
+        userInfo = await atlasAuthService.signIn({
+          mainProcessSignIn: true,
+          signal,
+        });
       }
       openToast('atlas-sign-in-success', {
         variant: 'success',

diff --git a/packages/compass-generative-ai/src/store/atlas-signin-reducer.ts b/packages/compass-generative-ai/src/store/atlas-signin-reducer.ts
@@ -291,7 +291,6 @@ export const signIn = (): GenAIAtlasSignInThunkAction<Promise<void>> => {
 
       await atlasAuthService.signIn({
         signal,
-        promptType: 'none',
       });
       dispatch(atlasServiceSignedIn());
       resolve();

diff --git a/packages/compass-settings/src/stores/atlas-login.ts b/packages/compass-settings/src/stores/atlas-login.ts
@@ -171,7 +171,6 @@ export const signIn = (): SettingsThunkAction<Promise<void>> => {
       });
       const userInfo = await atlasAuthService.signIn({
         signal,
-        promptType: 'none',
       });
       dispatch({ type: AtlasLoginSettingsActionTypes.SignInSuccess, userInfo });
     } catch (err) {