Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 10 additions & 14 deletions packages/passport/sdk/src/Passport.int.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ const oidcConfiguration: OidcConfiguration = {
logoutRedirectUri,
};

const getZkEvmProvider = async () => {
const passport = new Passport({
const getPassport = () => (
new Passport({
baseConfig: new ImmutableConfiguration({
environment: Environment.SANDBOX,
}),
Expand All @@ -87,8 +87,14 @@ const getZkEvmProvider = async () => {
popupRedirectUri,
logoutRedirectUri,
scope: 'openid offline_access profile email transact',
});
popupOverlayOptions: {
disableHeadlessLoginPromptOverlay: true,
},
})
);

const getZkEvmProvider = async () => {
const passport = getPassport();
return await passport.connectEvm();
};

Expand Down Expand Up @@ -357,17 +363,7 @@ describe('Passport', () => {
mockSigninPopup.mockResolvedValue(mockOidcUserZkevm);
mockSigninSilent.mockResolvedValueOnce(mockOidcUserZkevm);

const passport = new Passport({
baseConfig: new ImmutableConfiguration({
environment: Environment.SANDBOX,
}),
audience: 'platform_api',
clientId,
redirectUri,
popupRedirectUri,
logoutRedirectUri,
scope: 'openid offline_access profile email transact',
});
const passport = getPassport();

// user isn't logged in, so wont set signer when provider is instantiated
// #doc request-accounts
Expand Down
9 changes: 7 additions & 2 deletions packages/passport/sdk/src/Passport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import {
User,
UserProfile,
} from './types';
import { ConfirmationScreen } from './confirmation';
import { ConfirmationScreen, EmbeddedLoginPrompt } from './confirmation';
import { ZkEvmProvider } from './zkEvm';
import { Provider } from './zkEvm/types';
import TypedEventEmitter from './utils/typedEventEmitter';
Expand Down Expand Up @@ -57,7 +57,8 @@ const buildImxApiClients = (passportModuleConfiguration: PassportModuleConfigura

export const buildPrivateVars = (passportModuleConfiguration: PassportModuleConfiguration) => {
const config = new PassportConfiguration(passportModuleConfiguration);
const authManager = new AuthManager(config);
const embeddedLoginPrompt = new EmbeddedLoginPrompt(config);
const authManager = new AuthManager(config, embeddedLoginPrompt);
const magicProviderProxyFactory = new MagicProviderProxyFactory(authManager, config);
const magicAdapter = new MagicAdapter(config, magicProviderProxyFactory);
const confirmationScreen = new ConfirmationScreen(config);
Expand Down Expand Up @@ -91,6 +92,7 @@ export const buildPrivateVars = (passportModuleConfiguration: PassportModuleConf
authManager,
magicAdapter,
confirmationScreen,
embeddedLoginPrompt,
immutableXClient,
multiRollupApiClients,
passportEventEmitter,
Expand All @@ -106,6 +108,8 @@ export class Passport {

private readonly confirmationScreen: ConfirmationScreen;

private readonly embeddedLoginPrompt: EmbeddedLoginPrompt;

private readonly immutableXClient: IMXClient;

private readonly magicAdapter: MagicAdapter;
Expand All @@ -125,6 +129,7 @@ export class Passport {
this.authManager = privateVars.authManager;
this.magicAdapter = privateVars.magicAdapter;
this.confirmationScreen = privateVars.confirmationScreen;
this.embeddedLoginPrompt = privateVars.embeddedLoginPrompt;
this.immutableXClient = privateVars.immutableXClient;
this.multiRollupApiClients = privateVars.multiRollupApiClients;
this.passportEventEmitter = privateVars.passportEventEmitter;
Expand Down
Loading