chore(passport): ID-3354: Revert "chore(passport): Check isLoggedIn before calling loginWithOIDC" (#2590)

Author: naveen-imtb

packages/passport/sdk/src/magic/magicAdapter.test.ts

@@ -6,7 +6,6 @@ import { PassportError, PassportErrorType } from '../errors/passportError';
 import { MagicProviderProxyFactory } from './magicProviderProxyFactory';
 
 const loginWithOIDCMock:jest.MockedFunction<(args: LoginWithOpenIdParams) => Promise<void>> = jest.fn();
-const isLoggedInMock:jest.MockedFunction<() => Promise<boolean>> = jest.fn();
 
 const rpcProvider = {};
 
@@ -37,7 +36,6 @@ describe('MagicWallet', () => {
       },
       user: {
         logout: logoutMock,
-        isLoggedIn: isLoggedInMock,
       },
       rpcProvider,
     }));
@@ -87,7 +85,6 @@ describe('MagicWallet', () => {
 
   describe('login', () => {
     it('should call loginWithOIDC and initialise the provider with the correct arguments', async () => {
-      isLoggedInMock.mockImplementation(() => Promise.resolve(false));
       const magicAdapter = new MagicAdapter(config, magicProviderProxyFactory);
       const magicProvider = await magicAdapter.login(idToken);
 
@@ -105,22 +102,6 @@ describe('MagicWallet', () => {
       expect(magicProvider).toEqual(rpcProvider);
     });
 
-    it('should not call loginWithOIDC if isLoggedIn is true', async () => {
-      isLoggedInMock.mockImplementation(() => Promise.resolve(true));
-      const magicAdapter = new MagicAdapter(config, magicProviderProxyFactory);
-      const magicProvider = await magicAdapter.login(idToken);
-
-      expect(Magic).toHaveBeenCalledWith(apiKey, {
-        network: 'mainnet',
-        extensions: [new OpenIdExtension()],
-      });
-
-      expect(loginWithOIDCMock).toBeCalledTimes(0);
-
-      expect(magicProviderProxyFactory.createProxy).toHaveBeenCalled();
-      expect(magicProvider).toEqual(rpcProvider);
-    });
-
     it('should throw a PassportError when an error is thrown', async () => {
       const magicAdapter = new MagicAdapter(config, magicProviderProxyFactory);
 

packages/passport/sdk/src/magic/magicAdapter.ts

@@ -51,13 +51,10 @@ export default class MagicAdapter {
         const magicClient = await this.magicClient;
         flow.addEvent('endMagicClientInit');
 
-        const isUserLoggedIn = await magicClient.user.isLoggedIn();
-        if (!isUserLoggedIn) {
-          await magicClient.openid.loginWithOIDC({
-            jwt: idToken,
-            providerId: this.config.magicProviderId,
-          });
-        }
+        await magicClient.openid.loginWithOIDC({
+          jwt: idToken,
+          providerId: this.config.magicProviderId,
+        });
         flow.addEvent('endLoginWithOIDC');
 
         trackDuration(