@web3auth/no-modal 8.1.0 → 8.2.1

package/dist/noModal.cjs.js

@@ -68,274 +68,14 @@ const base_namespaceObject = require("@web3auth/base");
 const base_plugin_namespaceObject = require("@web3auth/base-plugin");
 ;// CONCATENATED MODULE: external "@web3auth/base-provider"
 const base_provider_namespaceObject = require("@web3auth/base-provider");
-;// CONCATENATED MODULE: external "@toruslabs/openlogin-utils"
-const openlogin_utils_namespaceObject = require("@toruslabs/openlogin-utils");
-;// CONCATENATED MODULE: external "@toruslabs/openlogin"
-const openlogin_namespaceObject = require("@toruslabs/openlogin");
-var openlogin_default = /*#__PURE__*/__webpack_require__.n(openlogin_namespaceObject);
-;// CONCATENATED MODULE: external "lodash.merge"
-const external_lodash_merge_namespaceObject = require("lodash.merge");
-var external_lodash_merge_default = /*#__PURE__*/__webpack_require__.n(external_lodash_merge_namespaceObject);
-;// CONCATENATED MODULE: ../adapters/openlogin-adapter/dist/openloginAdapter.esm.js
-
-
-
-
-
-
-
-const getOpenloginDefaultOptions = () => {
-  return {
-    adapterSettings: {
-      network: openlogin_utils_namespaceObject.OPENLOGIN_NETWORK.SAPPHIRE_MAINNET,
-      clientId: "",
-      uxMode: openlogin_utils_namespaceObject.UX_MODE.POPUP
-    },
-    loginSettings: {},
-    privateKeyProvider: undefined
-  };
-};
-class OpenloginAdapter extends base_namespaceObject.BaseAdapter {
-  constructor() {
-    let params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    super(params);
-    defineProperty_default()(this, "name", base_namespaceObject.WALLET_ADAPTERS.OPENLOGIN);
-    defineProperty_default()(this, "adapterNamespace", base_namespaceObject.ADAPTER_NAMESPACES.MULTICHAIN);
-    defineProperty_default()(this, "type", base_namespaceObject.ADAPTER_CATEGORY.IN_APP);
-    defineProperty_default()(this, "openloginInstance", null);
-    defineProperty_default()(this, "status", base_namespaceObject.ADAPTER_STATUS.NOT_READY);
-    defineProperty_default()(this, "currentChainNamespace", base_namespaceObject.CHAIN_NAMESPACES.EIP155);
-    defineProperty_default()(this, "privateKeyProvider", null);
-    defineProperty_default()(this, "openloginOptions", void 0);
-    defineProperty_default()(this, "loginSettings", {
-      loginProvider: ""
-    });
-    this.setAdapterSettings(objectSpread2_default()(objectSpread2_default()({}, params.adapterSettings), {}, {
-      chainConfig: params.chainConfig,
-      clientId: params.clientId || "",
-      sessionTime: params.sessionTime,
-      web3AuthNetwork: params.web3AuthNetwork,
-      useCoreKitKey: params.useCoreKitKey,
-      privateKeyProvider: params.privateKeyProvider
-    }));
-    this.loginSettings = params.loginSettings || {
-      loginProvider: ""
-    };
-    this.privateKeyProvider = params.privateKeyProvider || null;
-  }
-  get chainConfigProxy() {
-    return this.chainConfig ? objectSpread2_default()({}, this.chainConfig) : null;
-  }
-  get provider() {
-    if (this.status !== base_namespaceObject.ADAPTER_STATUS.NOT_READY && this.privateKeyProvider) {
-      return this.privateKeyProvider;
-    }
-    return null;
-  }
-  set provider(_) {
-    throw new Error("Not implemented");
-  }
-  async init(options) {
-    super.checkInitializationRequirements();
-    if (!this.clientId) throw base_namespaceObject.WalletInitializationError.invalidParams("clientId is required before openlogin's initialization");
-    if (!this.openloginOptions) throw base_namespaceObject.WalletInitializationError.invalidParams("openloginOptions is required before openlogin's initialization");
-    const isRedirectResult = this.openloginOptions.uxMode === openlogin_utils_namespaceObject.UX_MODE.REDIRECT;
-    this.openloginOptions = objectSpread2_default()(objectSpread2_default()({}, this.openloginOptions), {}, {
-      replaceUrlOnRedirect: isRedirectResult
-    });
-    this.openloginInstance = new (openlogin_default())(objectSpread2_default()(objectSpread2_default()({}, this.openloginOptions), {}, {
-      clientId: this.clientId,
-      network: this.openloginOptions.network || this.web3AuthNetwork || openlogin_utils_namespaceObject.OPENLOGIN_NETWORK.SAPPHIRE_MAINNET
-    }));
-    base_namespaceObject.log.debug("initializing openlogin adapter init");
-    await this.openloginInstance.init();
-    if (!this.chainConfig) throw base_namespaceObject.WalletInitializationError.invalidParams("chainConfig is required before initialization");
-    this.status = base_namespaceObject.ADAPTER_STATUS.READY;
-    this.emit(base_namespaceObject.ADAPTER_EVENTS.READY, base_namespaceObject.WALLET_ADAPTERS.OPENLOGIN);
-    try {
-      base_namespaceObject.log.debug("initializing openlogin adapter");
-      const finalPrivKey = this._getFinalPrivKey();
-      // connect only if it is redirect result or if connect (adapter is cached/already connected in same session) is true
-      if (finalPrivKey && (options.autoConnect || isRedirectResult)) {
-        this.rehydrated = true;
-        await this.connect();
-      }
-    } catch (error) {
-      base_namespaceObject.log.error("Failed to connect with cached openlogin provider", error);
-      this.emit("ERRORED", error);
-    }
-  }
-  async connect() {
-    let params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
-      loginProvider: ""
-    };
-    super.checkConnectionRequirements();
-    this.status = base_namespaceObject.ADAPTER_STATUS.CONNECTING;
-    this.emit(base_namespaceObject.ADAPTER_EVENTS.CONNECTING, objectSpread2_default()(objectSpread2_default()({}, params), {}, {
-      adapter: base_namespaceObject.WALLET_ADAPTERS.OPENLOGIN
-    }));
-    try {
-      await this.connectWithProvider(params);
-      return this.provider;
-    } catch (error) {
-      base_namespaceObject.log.error("Failed to connect with openlogin provider", error);
-      // ready again to be connected
-      this.status = base_namespaceObject.ADAPTER_STATUS.READY;
-      this.emit(base_namespaceObject.ADAPTER_EVENTS.ERRORED, error);
-      if (error !== null && error !== void 0 && error.message.includes("user closed popup")) {
-        throw base_namespaceObject.WalletLoginError.popupClosed();
-      } else if (error instanceof base_namespaceObject.Web3AuthError) {
-        throw error;
-      }
-      throw base_namespaceObject.WalletLoginError.connectionError("Failed to login with openlogin");
-    }
-  }
-  async enableMFA() {
-    let params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
-      loginProvider: ""
-    };
-    if (this.status !== base_namespaceObject.ADAPTER_STATUS.CONNECTED) throw base_namespaceObject.WalletLoginError.notConnectedError("Not connected with wallet");
-    if (!this.openloginInstance) throw base_namespaceObject.WalletInitializationError.notReady("openloginInstance is not ready");
-    try {
-      await this.openloginInstance.enableMFA(params);
-    } catch (error) {
-      base_namespaceObject.log.error("Failed to enable MFA with openlogin provider", error);
-      if (error instanceof base_namespaceObject.Web3AuthError) {
-        throw error;
-      }
-      throw base_namespaceObject.WalletLoginError.connectionError(error.message || "Failed to enable MFA with openlogin");
-    }
-  }
-  async disconnect() {
-    let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
-      cleanup: false
-    };
-    if (this.status !== base_namespaceObject.ADAPTER_STATUS.CONNECTED) throw base_namespaceObject.WalletLoginError.notConnectedError("Not connected with wallet");
-    if (!this.openloginInstance) throw base_namespaceObject.WalletInitializationError.notReady("openloginInstance is not ready");
-    await this.openloginInstance.logout();
-    if (options.cleanup) {
-      this.status = base_namespaceObject.ADAPTER_STATUS.NOT_READY;
-      this.openloginInstance = null;
-      this.privateKeyProvider = null;
-    } else {
-      // ready to be connected again
-      this.status = base_namespaceObject.ADAPTER_STATUS.READY;
-    }
-    this.rehydrated = false;
-    this.emit(base_namespaceObject.ADAPTER_EVENTS.DISCONNECTED);
-  }
-  async authenticateUser() {
-    if (this.status !== base_namespaceObject.ADAPTER_STATUS.CONNECTED) throw base_namespaceObject.WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
-    const userInfo = await this.getUserInfo();
-    return {
-      idToken: userInfo.idToken
-    };
-  }
-  async getUserInfo() {
-    if (this.status !== base_namespaceObject.ADAPTER_STATUS.CONNECTED) throw base_namespaceObject.WalletLoginError.notConnectedError("Not connected with wallet");
-    if (!this.openloginInstance) throw base_namespaceObject.WalletInitializationError.notReady("openloginInstance is not ready");
-    const userInfo = this.openloginInstance.getUserInfo();
-    return userInfo;
-  }
-
-  // should be called only before initialization.
-  setAdapterSettings(adapterSettings) {
-    super.setAdapterSettings(adapterSettings);
-    const defaultOptions = getOpenloginDefaultOptions();
-    base_namespaceObject.log.info("setting adapter settings", adapterSettings);
-    this.openloginOptions = objectSpread2_default()(objectSpread2_default()(objectSpread2_default()({}, defaultOptions.adapterSettings), this.openloginOptions), adapterSettings);
-    if (adapterSettings.web3AuthNetwork) {
-      this.openloginOptions.network = adapterSettings.web3AuthNetwork;
-    }
-    if (adapterSettings.privateKeyProvider) {
-      this.privateKeyProvider = adapterSettings.privateKeyProvider;
-    }
-  }
-  async addChain(chainConfig) {
-    var _this$privateKeyProvi;
-    let init = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-    super.checkAddChainRequirements(chainConfig, init);
-    (_this$privateKeyProvi = this.privateKeyProvider) === null || _this$privateKeyProvi === void 0 || _this$privateKeyProvi.addChain(chainConfig);
-    this.addChainConfig(chainConfig);
-  }
-  async switchChain(params) {
-    var _this$privateKeyProvi2;
-    let init = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-    super.checkSwitchChainRequirements(params, init);
-    await ((_this$privateKeyProvi2 = this.privateKeyProvider) === null || _this$privateKeyProvi2 === void 0 ? void 0 : _this$privateKeyProvi2.switchChain(params));
-    this.setAdapterSettings({
-      chainConfig: this.getChainConfig(params.chainId)
-    });
-  }
-  _getFinalPrivKey() {
-    if (!this.openloginInstance) return "";
-    let finalPrivKey = this.openloginInstance.privKey;
-    // coreKitKey is available only for custom verifiers by default
-    if (this.useCoreKitKey) {
-      // this is to check if the user has already logged in but coreKitKey is not available.
-      // when useCoreKitKey is set to true.
-      // This is to ensure that when there is no user session active, we don't throw an exception.
-      if (this.openloginInstance.privKey && !this.openloginInstance.coreKitKey) {
-        throw base_namespaceObject.WalletLoginError.coreKitKeyNotFound();
-      }
-      finalPrivKey = this.openloginInstance.coreKitKey;
-    }
-    return finalPrivKey;
-  }
-  _getFinalEd25519PrivKey() {
-    if (!this.openloginInstance) return "";
-    let finalPrivKey = this.openloginInstance.ed25519PrivKey;
-    // coreKitKey is available only for custom verifiers by default
-    if (this.useCoreKitKey) {
-      // this is to check if the user has already logged in but coreKitKey is not available.
-      // when useCoreKitKey is set to true.
-      // This is to ensure that when there is no user session active, we don't throw an exception.
-      if (this.openloginInstance.ed25519PrivKey && !this.openloginInstance.coreKitEd25519Key) {
-        throw base_namespaceObject.WalletLoginError.coreKitKeyNotFound();
-      }
-      finalPrivKey = this.openloginInstance.coreKitEd25519Key;
-    }
-    return finalPrivKey;
-  }
-  async connectWithProvider() {
-    var _params$extraLoginOpt;
-    let params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
-      loginProvider: ""
-    };
-    if (!this.privateKeyProvider) throw base_namespaceObject.WalletInitializationError.invalidParams("PrivateKey Provider is required before initialization");
-    if (!this.openloginInstance) throw base_namespaceObject.WalletInitializationError.notReady("openloginInstance is not ready");
-    const keyAvailable = this._getFinalPrivKey();
-    // if not logged in then login
-    if (!keyAvailable || (_params$extraLoginOpt = params.extraLoginOptions) !== null && _params$extraLoginOpt !== void 0 && _params$extraLoginOpt.id_token) {
-      var _params$extraLoginOpt2;
-      if (!this.loginSettings.curve) {
-        this.loginSettings.curve = this.currentChainNamespace === base_namespaceObject.CHAIN_NAMESPACES.SOLANA ? openlogin_utils_namespaceObject.SUPPORTED_KEY_CURVES.ED25519 : openlogin_utils_namespaceObject.SUPPORTED_KEY_CURVES.SECP256K1;
-      }
-      if (!params.loginProvider && !this.loginSettings.loginProvider) throw base_namespaceObject.WalletInitializationError.invalidParams("loginProvider is required for login");
-      await this.openloginInstance.login(external_lodash_merge_default()(this.loginSettings, params, {
-        extraLoginOptions: objectSpread2_default()(objectSpread2_default()({}, params.extraLoginOptions || {}), {}, {
-          login_hint: params.login_hint || ((_params$extraLoginOpt2 = params.extraLoginOptions) === null || _params$extraLoginOpt2 === void 0 ? void 0 : _params$extraLoginOpt2.login_hint)
-        })
-      }));
-    }
-    let finalPrivKey = this._getFinalPrivKey();
-    if (finalPrivKey) {
-      if (this.currentChainNamespace === base_namespaceObject.CHAIN_NAMESPACES.SOLANA) {
-        finalPrivKey = this._getFinalEd25519PrivKey();
-      }
-      await this.privateKeyProvider.setupProvider(finalPrivKey);
-      this.status = base_namespaceObject.ADAPTER_STATUS.CONNECTED;
-      this.emit(base_namespaceObject.ADAPTER_EVENTS.CONNECTED, {
-        adapter: base_namespaceObject.WALLET_ADAPTERS.OPENLOGIN,
-        reconnected: this.rehydrated
-      });
-    }
-  }
-}
-
+;// CONCATENATED MODULE: external "@web3auth/openlogin-adapter"
+const openlogin_adapter_namespaceObject = require("@web3auth/openlogin-adapter");
 ;// CONCATENATED MODULE: external "lodash.clonedeep"
 const external_lodash_clonedeep_namespaceObject = require("lodash.clonedeep");
 var external_lodash_clonedeep_default = /*#__PURE__*/__webpack_require__.n(external_lodash_clonedeep_namespaceObject);
+;// CONCATENATED MODULE: external "lodash.merge"
+const external_lodash_merge_namespaceObject = require("lodash.merge");
+var external_lodash_merge_default = /*#__PURE__*/__webpack_require__.n(external_lodash_merge_namespaceObject);
 ;// CONCATENATED MODULE: ./src/noModal.ts
 
 
@@ -391,7 +131,7 @@ class Web3AuthNoModal extends openlogin_jrpc_namespaceObject.SafeEventEmitter {
     });
     let projectConfig;
     try {
-      projectConfig = await (0,base_namespaceObject.fetchProjectConfig)(this.coreOptions.clientId);
+      projectConfig = await (0,base_namespaceObject.fetchProjectConfig)(this.coreOptions.clientId, this.coreOptions.web3AuthNetwork);
     } catch (e) {
       throw base_namespaceObject.WalletInitializationError.notReady("failed to fetch project configurations");
     }
@@ -424,12 +164,13 @@ class Web3AuthNoModal extends openlogin_jrpc_namespaceObject.SafeEventEmitter {
         } = projectConfig;
         this.coreOptions.uiConfig = external_lodash_merge_default()(external_lodash_clonedeep_default()(whitelabel), this.coreOptions.uiConfig);
         const {
-          sms_otp_enabled: smsOtpEnabled
+          sms_otp_enabled: smsOtpEnabled,
+          whitelist
         } = projectConfig;
         if (smsOtpEnabled !== undefined) {
           openloginAdapter.setAdapterSettings({
             loginConfig: {
-              [openlogin_utils_namespaceObject.LOGIN_PROVIDER.SMS_PASSWORDLESS]: {
+              [openlogin_adapter_namespaceObject.LOGIN_PROVIDER.SMS_PASSWORDLESS]: {
                 showOnModal: smsOtpEnabled,
                 showOnDesktop: smsOtpEnabled,
                 showOnMobile: smsOtpEnabled,
@@ -438,6 +179,11 @@ class Web3AuthNoModal extends openlogin_jrpc_namespaceObject.SafeEventEmitter {
             }
           });
         }
+        if (whitelist) {
+          openloginAdapter.setAdapterSettings({
+            originData: whitelist.signed_urls
+          });
+        }
         if (this.coreOptions.privateKeyProvider) {
           if (openloginAdapter.currentChainNamespace !== this.coreOptions.privateKeyProvider.currentChainConfig.chainNamespace) {
             throw base_namespaceObject.WalletInitializationError.incompatibleChainNameSpace("private key provider is not compatible with provided chainNamespace for openlogin adapter");
@@ -475,7 +221,7 @@ class Web3AuthNoModal extends openlogin_jrpc_namespaceObject.SafeEventEmitter {
       }).catch(e => base_namespaceObject.log.error(e));
     });
     await Promise.all(initPromises);
-    this.status = base_namespaceObject.ADAPTER_STATUS.READY;
+    if (this.status === base_namespaceObject.ADAPTER_STATUS.NOT_READY) this.status = base_namespaceObject.ADAPTER_STATUS.READY;
   }
   getAdapter(adapterName) {
     return this.walletAdapters[adapterName] || null;

package/dist/noModal.esm.js

@@ -53,7 +53,7 @@ class Web3AuthNoModal extends SafeEventEmitter {
     });
     let projectConfig;
     try {
-      projectConfig = await fetchProjectConfig(this.coreOptions.clientId);
+      projectConfig = await fetchProjectConfig(this.coreOptions.clientId, this.coreOptions.web3AuthNetwork);
     } catch (e) {
       throw WalletInitializationError.notReady("failed to fetch project configurations");
     }
@@ -86,7 +86,8 @@ class Web3AuthNoModal extends SafeEventEmitter {
         } = projectConfig;
         this.coreOptions.uiConfig = merge(clonedeep(whitelabel), this.coreOptions.uiConfig);
         const {
-          sms_otp_enabled: smsOtpEnabled
+          sms_otp_enabled: smsOtpEnabled,
+          whitelist
         } = projectConfig;
         if (smsOtpEnabled !== undefined) {
           openloginAdapter.setAdapterSettings({
@@ -100,6 +101,11 @@ class Web3AuthNoModal extends SafeEventEmitter {
             }
           });
         }
+        if (whitelist) {
+          openloginAdapter.setAdapterSettings({
+            originData: whitelist.signed_urls
+          });
+        }
         if (this.coreOptions.privateKeyProvider) {
           if (openloginAdapter.currentChainNamespace !== this.coreOptions.privateKeyProvider.currentChainConfig.chainNamespace) {
             throw WalletInitializationError.incompatibleChainNameSpace("private key provider is not compatible with provided chainNamespace for openlogin adapter");
@@ -137,7 +143,7 @@ class Web3AuthNoModal extends SafeEventEmitter {
       }).catch(e => log.error(e));
     });
     await Promise.all(initPromises);
-    this.status = ADAPTER_STATUS.READY;
+    if (this.status === ADAPTER_STATUS.NOT_READY) this.status = ADAPTER_STATUS.READY;
   }
   getAdapter(adapterName) {
     return this.walletAdapters[adapterName] || null;