@imtbl/sdk 0.0.1-alpha → 0.0.1-alpha.2

package/dist/passport.d.ts

@@ -663,23 +663,6 @@ interface IMXProvider {
     completeWithdrawal(starkPublicKey: string, token: AnyToken): Promise<TransactionResponse>;
 }
 
-declare enum Environment {
-    PRODUCTION = "production",
-    SANDBOX = "sandbox"
-}
-declare class ImmutableConfiguration {
-    readonly environment: Environment;
-    readonly apiKey?: string;
-    constructor(options: {
-        environment: Environment;
-        apiKey?: string;
-    });
-}
-interface ModuleConfiguration<T> {
-    baseConfig: ImmutableConfiguration;
-    overrides?: T;
-}
-
 type UserProfile = {
     email?: string;
     nickname?: string;
@@ -689,29 +672,27 @@ declare enum Networks {
     PRODUCTION = "mainnet",
     SANDBOX = "goerli"
 }
-interface OidcConfiguration {
-    clientId: string;
-    logoutRedirectUri: string;
-    redirectUri: string;
-    scope?: string;
-    audience?: string;
-}
-interface PassportOverrides {
+interface EnvironmentConfiguration {
     network: Networks;
     authenticationDomain: string;
     magicPublishableApiKey: string;
     magicProviderId: string;
+    baseIMXApiPath: string;
     passportDomain: string;
-    imxApiBasePath: string;
 }
-interface PassportModuleConfiguration extends ModuleConfiguration<PassportOverrides>, OidcConfiguration {
+interface OidcConfiguration {
+    clientId: string;
+    logoutRedirectUri: string;
+    redirectUri: string;
+    scope?: string;
+    audience?: string;
 }
 
 declare class Passport {
     private authManager;
     private magicAdapter;
     private readonly config;
-    constructor(passportModuleConfiguration: PassportModuleConfiguration);
+    constructor(environmentConfiguration: EnvironmentConfiguration, oidcConfiguration: OidcConfiguration);
     connectImx(): Promise<IMXProvider>;
     loginCallback(): Promise<void>;
     logout(): Promise<void>;
@@ -721,16 +702,9 @@ declare class Passport {
     private registerUser;
 }
 
-declare class PassportConfiguration {
-    readonly network: Networks;
-    readonly authenticationDomain: string;
-    readonly passportDomain: string;
-    readonly magicPublishableApiKey: string;
-    readonly magicProviderId: string;
-    readonly imxApiBasePath: string;
-    readonly oidcConfiguration: OidcConfiguration;
-    readonly baseConfig: ImmutableConfiguration;
-    constructor({ baseConfig, overrides, ...oidcConfiguration }: PassportModuleConfiguration);
-}
+declare const Config: {
+    PRODUCTION: EnvironmentConfiguration;
+    SANDBOX: EnvironmentConfiguration;
+};
 
-export { Passport, PassportConfiguration, PassportError };
+export { Config, Passport, PassportError };

package/dist/passport.js

@@ -1,8 +1,8 @@
-import { Configuration, UsersApi, TransfersApi, OrdersApi, ExchangesApi, TradesApi, generateLegacyStarkPrivateKey, createStarkSigner } from '@imtbl/core-sdk';
 import { UserManager } from 'oidc-client-ts';
 import { ethers } from 'ethers';
 import { Magic } from 'magic-sdk';
 import { OpenIdExtension } from '@magic-ext/oidc';
+import { Configuration, UsersApi, TransfersApi, OrdersApi, ExchangesApi, TradesApi, generateLegacyStarkPrivateKey, createStarkSigner } from '@imtbl/core-sdk';
 import BN from 'bn.js';
 import * as encUtils from 'enc-utils';
 
@@ -67,12 +67,6 @@ function convertToSignableToken(token) {
     }
 }
 
-var Environment;
-(function (Environment) {
-    Environment["PRODUCTION"] = "production";
-    Environment["SANDBOX"] = "sandbox";
-})(Environment || (Environment = {}));
-
 var PassportErrorType;
 (function (PassportErrorType) {
     PassportErrorType["AUTHENTICATION_ERROR"] = "AUTHENTICATION_ERROR";
@@ -125,17 +119,17 @@ const retryWithDelay = async (fn, options) => {
     }
 };
 
-const getAuthConfiguration = ({ oidcConfiguration, authenticationDomain, }) => {
+const getAuthConfiguration = ({ oidcConfiguration, }) => {
     const baseConfiguration = {
-        authority: authenticationDomain,
+        authority: oidcConfiguration.authenticationDomain,
         redirect_uri: oidcConfiguration.redirectUri,
         popup_redirect_uri: oidcConfiguration.redirectUri,
         client_id: oidcConfiguration.clientId,
         metadata: {
-            authorization_endpoint: `${authenticationDomain}/authorize`,
-            token_endpoint: `${authenticationDomain}/oauth/token`,
-            userinfo_endpoint: `${authenticationDomain}/userinfo`,
-            end_session_endpoint: `${authenticationDomain}/v2/logout` +
+            authorization_endpoint: `${oidcConfiguration.authenticationDomain}/authorize`,
+            token_endpoint: `${oidcConfiguration.authenticationDomain}/oauth/token`,
+            userinfo_endpoint: `${oidcConfiguration.authenticationDomain}/userinfo`,
+            end_session_endpoint: `${oidcConfiguration.authenticationDomain}/v2/logout` +
                 `?returnTo=${encodeURIComponent(oidcConfiguration.logoutRedirectUri)}` +
                 `&client_id=${oidcConfiguration.clientId}`,
         },
@@ -173,10 +167,7 @@ class AuthManager {
     };
     async login() {
         return withPassportError(async () => {
-            const popupWindowFeatures = { width: 400, height: 420 };
-            const oidcUser = await this.userManager.signinPopup({
-                popupWindowFeatures,
-            });
+            const oidcUser = await this.userManager.signinPopup();
             return this.mapOidcUserToDomainModel(oidcUser);
         }, PassportErrorType.AUTHENTICATION_ERROR);
     }
@@ -259,12 +250,26 @@ var TransactionTypes;
 const PassportEventType = 'imx_passport_confirmation';
 
 const openPopupCenter = ({ url, title, width, height, }) => {
-    const left = Math.max(0, Math.round(window.screenX + (window.outerWidth - width) / 2));
-    const top = Math.max(0, Math.round(window.screenY + (window.outerHeight - height) / 2));
+    // Fixes dual-screen position                             Most browsers      Firefox
+    const dualScreenLeft = window.screenLeft !== undefined ? window.screenLeft : window.screenX;
+    const dualScreenTop = window.screenTop !== undefined ? window.screenTop : window.screenY;
+    const windowWidth = window.innerWidth
+        ? window.innerWidth
+        : document.documentElement.clientWidth
+            ? document.documentElement.clientWidth
+            : screen.width;
+    const windowHeight = window.innerHeight
+        ? window.innerHeight
+        : document.documentElement.clientHeight
+            ? document.documentElement.clientHeight
+            : screen.height;
+    const systemZoom = windowWidth / window.screen.availWidth;
+    const left = (windowWidth - width) / 2 / systemZoom + dualScreenLeft;
+    const top = (windowHeight - height) / 2 / systemZoom + dualScreenTop;
     const newWindow = window.open(url, title, `
       scrollbars=yes,
-      width=${width}, 
-      height=${height}, 
+      width=${width / systemZoom}, 
+      height=${height / systemZoom}, 
       top=${top}, 
       left=${left}
      `);
@@ -276,8 +281,8 @@ const openPopupCenter = ({ url, title, width, height, }) => {
 };
 
 const ConfirmationWindowTitle = 'Confirm this transaction';
-const ConfirmationWindowHeight = 380;
-const ConfirmationWindowWidth = 480;
+const ConfirmationWindowHeight = 600;
+const ConfirmationWindowWidth = 600;
 const ConfirmationWindowClosedPollingDuration = 1000;
 class ConfirmationScreen {
     config;
@@ -291,7 +296,7 @@ class ConfirmationScreen {
             ...message,
         }, this.config.passportDomain);
     }
-    startTransaction(accessToken, transaction, popupOptions) {
+    startTransaction(accessToken, transaction) {
         return new Promise((resolve, reject) => {
             const messageHandler = ({ data, origin }) => {
                 if (origin != this.config.passportDomain ||
@@ -322,8 +327,8 @@ class ConfirmationScreen {
             const confirmationWindow = openPopupCenter({
                 url: `${this.config.passportDomain}/transaction-confirmation`,
                 title: ConfirmationWindowTitle,
-                width: popupOptions?.width || ConfirmationWindowWidth,
-                height: popupOptions?.height || ConfirmationWindowHeight,
+                width: ConfirmationWindowWidth,
+                height: ConfirmationWindowHeight,
             });
             // https://stackoverflow.com/questions/9388380/capture-the-close-event-of-popup-window-in-javascript/48240128#48240128
             const timer = setInterval(function () {
@@ -410,11 +415,10 @@ async function batchNftTransfer({ user, starkSigner, request, transfersApi, pass
             getSignableTransferRequestV2,
         });
         const confirmationScreen = new ConfirmationScreen(passportConfig);
-        const popupWindowSize = { width: 480, height: 784 };
         const confirmationResult = await confirmationScreen.startTransaction(user.accessToken, {
             transactionType: TransactionTypes.CreateBatchTransfer,
             transactionData: getSignableTransferRequestV2,
-        }, popupWindowSize);
+        });
         if (!confirmationResult.confirmed) {
             throw new Error('Transaction rejected by user');
         }
@@ -643,7 +647,7 @@ class PassportImxProvider {
         this.starkSigner = starkSigner;
         this.passportConfig = passportConfig;
         const apiConfig = new Configuration({
-            basePath: passportConfig.imxApiBasePath,
+            basePath: passportConfig.imxAPIConfiguration.basePath,
         });
         this.transfersApi = new TransfersApi(apiConfig);
         this.ordersApi = new OrdersApi(apiConfig);
@@ -735,75 +739,67 @@ var Networks;
     Networks["SANDBOX"] = "goerli";
 })(Networks || (Networks = {}));
 
-const validateConfiguration = (configuration, requiredKeys, prefix) => {
+const Config = {
+    PRODUCTION: {
+        network: Networks.PRODUCTION,
+        authenticationDomain: 'https://auth.immutable.com',
+        magicPublishableApiKey: 'pk_live_10F423798A540ED7',
+        magicProviderId: 'fSMzaRQ4O7p4fttl7pCyGVtJS_G70P8SNsLXtPPGHo0=',
+        baseIMXApiPath: 'https://api.x.immutable.com',
+        passportDomain: 'https://passport.immutable.com',
+    },
+    SANDBOX: {
+        network: Networks.SANDBOX,
+        authenticationDomain: 'https://auth.immutable.com',
+        magicPublishableApiKey: 'pk_live_10F423798A540ED7',
+        magicProviderId: 'fSMzaRQ4O7p4fttl7pCyGVtJS_G70P8SNsLXtPPGHo0=',
+        baseIMXApiPath: 'https://api.sandbox.x.immutable.com',
+        passportDomain: 'https://passport.sandbox.immutable.com',
+    },
+};
+const validateConfiguration = (configurationName, configuration, requiredKeys) => {
+    if (!configuration) {
+        throw new PassportError(`${configurationName} cannot be null`, PassportErrorType.INVALID_CONFIGURATION);
+    }
     const missingKeys = requiredKeys
         .map((key) => !configuration[key] && key)
         .filter((n) => n)
         .join(', ');
     if (missingKeys !== '') {
-        const errorMessage = prefix
-            ? `${prefix} - ${missingKeys} cannot be null`
-            : `${missingKeys} cannot be null`;
-        throw new PassportError(errorMessage, PassportErrorType.INVALID_CONFIGURATION);
+        throw new PassportError(`${configurationName} - ${missingKeys} cannot be null`, PassportErrorType.INVALID_CONFIGURATION);
     }
 };
-class PassportConfiguration {
-    network;
-    authenticationDomain;
-    passportDomain;
-    magicPublishableApiKey;
-    magicProviderId;
-    imxApiBasePath;
-    oidcConfiguration;
-    baseConfig;
-    constructor({ baseConfig, overrides, ...oidcConfiguration }) {
-        validateConfiguration(oidcConfiguration, [
-            'clientId',
-            'logoutRedirectUri',
-            'redirectUri',
-        ]);
-        this.oidcConfiguration = oidcConfiguration;
-        this.baseConfig = baseConfig;
-        if (overrides) {
-            validateConfiguration(overrides, [
-                'network',
-                'authenticationDomain',
-                'magicPublishableApiKey',
-                'magicProviderId',
-                'passportDomain',
-                'imxApiBasePath',
-            ], 'overrides');
-            this.network = overrides.network;
-            this.authenticationDomain = overrides.authenticationDomain;
-            this.passportDomain = overrides.passportDomain;
-            this.magicPublishableApiKey = overrides.magicPublishableApiKey;
-            this.magicProviderId = overrides.magicProviderId;
-            this.imxApiBasePath = overrides.imxApiBasePath;
-        }
-        else {
-            switch (baseConfig.environment) {
-                case Environment.SANDBOX: {
-                    this.network = Networks.SANDBOX;
-                    this.authenticationDomain = 'https://auth.immutable.com';
-                    this.magicPublishableApiKey = 'pk_live_10F423798A540ED7';
-                    this.magicProviderId = 'fSMzaRQ4O7p4fttl7pCyGVtJS_G70P8SNsLXtPPGHo0=';
-                    this.passportDomain = 'https://passport.immutable.com';
-                    this.imxApiBasePath = 'https://api.x.immutable.com';
-                    break;
-                }
-                case Environment.PRODUCTION: {
-                    this.network = Networks.PRODUCTION;
-                    this.authenticationDomain = 'https://auth.immutable.com';
-                    this.magicPublishableApiKey = 'pk_live_10F423798A540ED7';
-                    this.magicProviderId = 'fSMzaRQ4O7p4fttl7pCyGVtJS_G70P8SNsLXtPPGHo0=';
-                    this.passportDomain = 'https://passport.sandbox.immutable.com';
-                    this.imxApiBasePath = 'https://api.sandbox.x.immutable.com';
-                    break;
-                }
-            }
-        }
-    }
-}
+const getPassportConfiguration = (environmentConfiguration, oidcConfiguration) => {
+    validateConfiguration('EnvironmentConfiguration', environmentConfiguration, [
+        'network',
+        'authenticationDomain',
+        'magicPublishableApiKey',
+        'magicProviderId',
+        'passportDomain',
+    ]);
+    validateConfiguration('OidcConfiguration', oidcConfiguration, [
+        'clientId',
+        'logoutRedirectUri',
+        'redirectUri',
+    ]);
+    return {
+        network: environmentConfiguration.network,
+        oidcConfiguration: {
+            authenticationDomain: environmentConfiguration.authenticationDomain,
+            clientId: oidcConfiguration.clientId,
+            logoutRedirectUri: oidcConfiguration.logoutRedirectUri,
+            redirectUri: oidcConfiguration.redirectUri,
+            scope: oidcConfiguration.scope,
+            audience: oidcConfiguration.audience,
+        },
+        imxAPIConfiguration: {
+            basePath: environmentConfiguration.baseIMXApiPath,
+        },
+        passportDomain: environmentConfiguration.passportDomain,
+        magicPublishableApiKey: environmentConfiguration.magicPublishableApiKey,
+        magicProviderId: environmentConfiguration.magicProviderId,
+    };
+};
 
 const getStarkSigner = async (signer) => {
     return withPassportError(async () => {
@@ -842,8 +838,8 @@ class Passport {
     authManager;
     magicAdapter;
     config;
-    constructor(passportModuleConfiguration) {
-        const passportConfiguration = new PassportConfiguration(passportModuleConfiguration);
+    constructor(environmentConfiguration, oidcConfiguration) {
+        const passportConfiguration = getPassportConfiguration(environmentConfiguration, oidcConfiguration);
         this.config = passportConfiguration;
         this.authManager = new AuthManager(this.config);
         this.magicAdapter = new MagicAdapter(this.config);
@@ -891,7 +887,7 @@ class Passport {
     }
     async registerUser(userAdminKeySigner, starkSigner, jwt) {
         const configuration = new Configuration({
-            basePath: this.config.imxApiBasePath,
+            basePath: this.config.imxAPIConfiguration.basePath,
         });
         const usersApi = new UsersApi(configuration);
         await registerPassport({
@@ -907,4 +903,4 @@ class Passport {
     }
 }
 
-export { Passport, PassportConfiguration, PassportError };
+export { Config, Passport, PassportError };

package/dist/provider.d.ts

@@ -1,5 +1,3 @@
-import { ProviderConfiguration as ProviderConfiguration$1 } from 'config';
-
 declare type Bytes = ArrayLike<number>;
 declare type BytesLike = Bytes | string;
 interface Hexable {
@@ -331,7 +329,7 @@ interface ConfigurationParameters {
     baseOptions?: any;
     formDataCtor?: new () => any;
 }
-declare class Configuration {
+declare class Configuration$1 {
     /**
      * parameter for apiKey security
      * @param name security name
@@ -813,7 +811,7 @@ interface ImmutableXConfiguration {
     /**
      * The configuration for the API client
      */
-    apiConfiguration: Configuration;
+    apiConfiguration: Configuration$1;
     /**
      * The configuration for the Ethereum network
      */
@@ -905,10 +903,24 @@ interface IMXProvider {
     completeWithdrawal(starkPublicKey: string, token: AnyToken): Promise<TransactionResponse>;
 }
 
+declare enum Environment {
+    DEVELOPMENT = "development",
+    SANDBOX = "sandbox",
+    PRODUCTION = "production"
+}
+type StarkExConfig = ImmutableXConfiguration & {
+    env: Environment;
+};
+declare class Configuration {
+    private readonly starkExConfig;
+    constructor(config: StarkExConfig);
+    getStarkExConfig(): StarkExConfig;
+}
+
 declare class GenericIMXProvider implements IMXProvider {
     private readonly config;
     private readonly signers;
-    constructor(config: ProviderConfiguration$1, ethSigner: Signer, starkExSigner: StarkSigner);
+    constructor(config: Configuration, ethSigner: Signer, starkExSigner: StarkSigner);
     getAddress(): Promise<string>;
     registerOffchain(): Promise<RegisterUserResponse>;
     batchNftTransfer(request: Array<NftTransferDetails>): Promise<CreateTransferResponse>;
@@ -925,38 +937,10 @@ declare class GenericIMXProvider implements IMXProvider {
 
 declare class MetaMaskIMXProvider extends GenericIMXProvider {
     private static imxSigner;
-    constructor(config: ProviderConfiguration$1, ethSigner: Signer, starkExSigner: StarkSigner);
-    static connect(config: ProviderConfiguration$1): Promise<MetaMaskIMXProvider>;
+    constructor(config: Configuration, ethSigner: Signer, starkExSigner: StarkSigner);
+    static connect(config: Configuration): Promise<MetaMaskIMXProvider>;
     static disconnect(): Promise<void>;
     static signMessage(message: string): Promise<string>;
 }
 
-declare enum Environment {
-    PRODUCTION = "production",
-    SANDBOX = "sandbox"
-}
-declare class ImmutableConfiguration {
-    readonly environment: Environment;
-    readonly apiKey?: string;
-    constructor(options: {
-        environment: Environment;
-        apiKey?: string;
-    });
-}
-interface ModuleConfiguration<T> {
-    baseConfig: ImmutableConfiguration;
-    overrides?: T;
-}
-
-interface ProviderOverrides {
-    immutableXConfig: ImmutableXConfiguration;
-}
-interface ProviderModuleConfiguration extends ModuleConfiguration<ProviderOverrides> {
-}
-declare class ProviderConfiguration {
-    readonly immutableXConfig: ImmutableXConfiguration;
-    readonly baseConfig: ImmutableConfiguration;
-    constructor({ baseConfig, overrides }: ProviderModuleConfiguration);
-}
-
-export { GenericIMXProvider, IMXProvider, MetaMaskIMXProvider, ProviderConfiguration };
+export { GenericIMXProvider, IMXProvider, MetaMaskIMXProvider };