@web3auth/no-modal 10.0.0-beta.0 → 10.0.0-beta.10

package/dist/lib.cjs/base/connector/baseConnector.js

@@ -13,6 +13,7 @@ class BaseConnector extends auth.SafeEventEmitter {
     super();
     _defineProperty(this, "connectorData", {});
     _defineProperty(this, "isInjected", void 0);
+    _defineProperty(this, "icon", void 0);
     _defineProperty(this, "coreOptions", void 0);
     _defineProperty(this, "rehydrated", false);
     this.coreOptions = options.coreOptions;
@@ -21,8 +22,9 @@ class BaseConnector extends auth.SafeEventEmitter {
     return this.status === constants.CONNECTOR_STATUS.CONNECTED;
   }
   checkConnectionRequirements() {
-    // we reconnect without killing existing wallet connect session on calling connect again.
+    // we reconnect without killing existing Wallet Connect or Metamask Connect session on calling connect again.
     if (this.name === index.WALLET_CONNECTORS.WALLET_CONNECT_V2 && this.status === constants.CONNECTOR_STATUS.CONNECTING) return;
+    if (this.name === index.WALLET_CONNECTORS.METAMASK && !this.isInjected && this.status === constants.CONNECTOR_STATUS.CONNECTING) return;
     if (this.status === constants.CONNECTOR_STATUS.CONNECTING) throw index$1.WalletInitializationError.notReady("Already connecting");
     if (this.status === constants.CONNECTOR_STATUS.CONNECTED) throw index$1.WalletLoginError.connectionError("Already connected");
     if (this.status !== constants.CONNECTOR_STATUS.READY) throw index$1.WalletLoginError.connectionError("Wallet connector is not ready yet, Please wait for init function to resolve before calling connect/connectTo function");

package/dist/lib.cjs/base/connector/constants.js

@@ -14,18 +14,15 @@ const CONNECTOR_STATUS = {
 const CONNECTOR_EVENTS = _objectSpread(_objectSpread({}, CONNECTOR_STATUS), {}, {
   CONNECTOR_DATA_UPDATED: "connector_data_updated",
   CACHE_CLEAR: "cache_clear",
-  CONNECTORS_UPDATED: "connectors_updated"
+  CONNECTORS_UPDATED: "connectors_updated",
+  MFA_ENABLED: "mfa_enabled",
+  REHYDRATION_ERROR: "rehydration_error"
 });
 const CONNECTOR_CATEGORY = {
   EXTERNAL: "external",
   IN_APP: "in_app"
 };
-const SMART_ACCOUNT_WALLET_SCOPE = {
-  EMBEDDED: "embedded",
-  ALL: "all"
-};
 
 exports.CONNECTOR_CATEGORY = CONNECTOR_CATEGORY;
 exports.CONNECTOR_EVENTS = CONNECTOR_EVENTS;
 exports.CONNECTOR_STATUS = CONNECTOR_STATUS;
-exports.SMART_ACCOUNT_WALLET_SCOPE = SMART_ACCOUNT_WALLET_SCOPE;

package/dist/lib.cjs/base/constants.js

@@ -0,0 +1,26 @@
+'use strict';
+
+const SMART_ACCOUNT_WALLET_SCOPE = {
+  EMBEDDED: "embedded",
+  ALL: "all"
+};
+const MODAL_SIGN_IN_METHODS = {
+  SOCIAL: "social",
+  PASSWORDLESS: "passwordless",
+  EXTERNAL_WALLETS: "externalWallets"
+};
+const WIDGET_TYPE = {
+  MODAL: "modal",
+  EMBED: "embed"
+};
+const WEB3AUTH_STATE_STORAGE_KEY = "Web3Auth-state";
+const LOGIN_MODE = {
+  MODAL: "modal",
+  NO_MODAL: "no-modal"
+};
+
+exports.LOGIN_MODE = LOGIN_MODE;
+exports.MODAL_SIGN_IN_METHODS = MODAL_SIGN_IN_METHODS;
+exports.SMART_ACCOUNT_WALLET_SCOPE = SMART_ACCOUNT_WALLET_SCOPE;
+exports.WEB3AUTH_STATE_STORAGE_KEY = WEB3AUTH_STATE_STORAGE_KEY;
+exports.WIDGET_TYPE = WIDGET_TYPE;

package/dist/lib.cjs/base/cookie.js

@@ -0,0 +1,38 @@
+'use strict';
+
+var constants = require('./constants.js');
+var deserialize = require('./deserialize.js');
+
+const cookieStorage = options => ({
+  getItem(key) {
+    if (typeof window === "undefined") return null;
+    const value = parseCookie(document.cookie, key);
+    return value !== null && value !== void 0 ? value : null;
+  },
+  setItem(key, value) {
+    if (typeof window === "undefined") return;
+    let cookieString = `${key}=${value};path=/;samesite=Lax`;
+    if (options !== null && options !== void 0 && options.expiry && typeof options.expiry === "number") cookieString += `; expires=${new Date(Date.now() + options.expiry).toUTCString()}`;
+    if (process.env.NODE_ENV === "production") cookieString += "; secure";
+    document.cookie = cookieString;
+  },
+  removeItem(key) {
+    if (typeof window === "undefined") return;
+    document.cookie = `${key}=;max-age=-1;path=/`;
+  }
+});
+function cookieToWeb3AuthState(cookie) {
+  if (!cookie) return undefined;
+  const parsed = parseCookie(cookie, constants.WEB3AUTH_STATE_STORAGE_KEY);
+  if (!parsed) return undefined;
+  return deserialize.deserialize(parsed);
+}
+function parseCookie(cookie, key) {
+  const keyValue = cookie.split("; ").find(x => x.startsWith(`${key}=`));
+  if (!keyValue) return undefined;
+  return keyValue.substring(key.length + 1);
+}
+
+exports.cookieStorage = cookieStorage;
+exports.cookieToWeb3AuthState = cookieToWeb3AuthState;
+exports.parseCookie = parseCookie;

package/dist/lib.cjs/base/deserialize.js

@@ -0,0 +1,13 @@
+'use strict';
+
+function deserialize(value, reviver) {
+  return JSON.parse(value, (key, value_) => {
+    var _value, _value2, _reviver;
+    let value = value_;
+    if (((_value = value) === null || _value === void 0 ? void 0 : _value.__type) === "bigint") value = BigInt(value.value);
+    if (((_value2 = value) === null || _value2 === void 0 ? void 0 : _value2.__type) === "Map") value = new Map(value.value);
+    return (_reviver = void 0 ) !== null && _reviver !== void 0 ? _reviver : value;
+  });
+}
+
+exports.deserialize = deserialize;

package/dist/lib.cjs/base/errors/index.js

@@ -3,24 +3,6 @@
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var tsCustomError = require('ts-custom-error');
 
-function serializeError(args) {
-  // Find first Error or create an "unknown" Error to keep stack trace.
-  const index = args.findIndex(arg => arg instanceof Error);
-  const msgIndex = args.findIndex(arg => typeof arg === "string");
-  const apiErrorIdx = args.findIndex(arg => arg && typeof arg === "object" && "status" in arg && "type" in arg);
-  let err;
-  if (apiErrorIdx !== -1) {
-    const apiError = args[apiErrorIdx];
-    err = new Error(`${apiError.status} ${apiError.type.toString()} ${apiError.statusText}`);
-  } else if (index !== -1) {
-    err = args.splice(index, 1)[0];
-  } else if (msgIndex !== -1) {
-    err = new Error(args.splice(msgIndex, 1)[0]);
-  } else {
-    err = new Error("Unknown error");
-  }
-  return [err, args];
-}
 class Web3AuthError extends tsCustomError.CustomError {
   constructor(code, message, cause) {
     // takes care of stack and proto
@@ -41,7 +23,7 @@ class Web3AuthError extends tsCustomError.CustomError {
       name: this.name,
       code: this.code,
       message: this.message,
-      cause: serializeError([this.cause])
+      cause: this.cause
     };
   }
   toString() {
@@ -149,7 +131,7 @@ class WalletLoginError extends Web3AuthError {
   static unsupportedOperation(extraMessage = "", cause) {
     return WalletLoginError.fromCode(5117, extraMessage, cause);
   }
-  static coreKitKeyNotFound(extraMessage = "", cause) {
+  static sfaKeyNotFound(extraMessage = "", cause) {
     return WalletLoginError.fromCode(5118, extraMessage, cause);
   }
   static userNotLoggedIn(extraMessage = "", cause) {
@@ -165,7 +147,7 @@ _defineProperty(WalletLoginError, "messages", {
   5115: "User has already enabled mfa, please use the @web3auth/web3auth-web sdk for login with mfa",
   5116: "Chain config has not been added. Please add the chain config before calling switchChain",
   5117: "Unsupported operation",
-  5118: "useCoreKitKey flag is enabled but coreKitKey is not available",
+  5118: "useSFAKey flag is enabled but SFA key is not available",
   5119: "User not logged in."
 });
 class WalletOperationsError extends Web3AuthError {
@@ -231,4 +213,3 @@ exports.WalletLoginError = WalletLoginError;
 exports.WalletOperationsError = WalletOperationsError;
 exports.WalletProviderError = WalletProviderError;
 exports.Web3AuthError = Web3AuthError;
-exports.serializeError = serializeError;

package/dist/lib.cjs/base/loglevel.js

@@ -1,7 +1,10 @@
 'use strict';
 
+var loglevelSentry = require('@toruslabs/loglevel-sentry');
 var loglevel = require('loglevel');
 
 const log = loglevel.getLogger("web3auth-logger");
+const loglevelPlugin = new loglevelSentry.LoglevelSentry();
+loglevelPlugin.install(log);
 
 exports.log = log;

package/dist/lib.cjs/base/utils.js

@@ -3,8 +3,8 @@
 var baseControllers = require('@toruslabs/base-controllers');
 var constants = require('@toruslabs/constants');
 var httpHelpers = require('@toruslabs/http-helpers');
-require('@babel/runtime/helpers/defineProperty');
 var auth = require('@web3auth/auth');
+require('@babel/runtime/helpers/defineProperty');
 require('./errors/index.js');
 require('./wallet/index.js');
 require('./connector/constants.js');
@@ -13,15 +13,22 @@ require('jwt-decode');
 const isHexStrict = hex => {
   return (typeof hex === "string" || typeof hex === "number") && /^(-)?0x[0-9a-f]*$/i.test(hex);
 };
-const signerHost = web3AuthNetwork => {
-  return constants.SIGNER_MAP[web3AuthNetwork !== null && web3AuthNetwork !== void 0 ? web3AuthNetwork : auth.WEB3AUTH_NETWORK.SAPPHIRE_MAINNET];
+const signerHost = (web3AuthNetwork = auth.WEB3AUTH_NETWORK.SAPPHIRE_MAINNET, authBuildEnv = auth.BUILD_ENV.PRODUCTION) => {
+  if (authBuildEnv === auth.BUILD_ENV.TESTING || authBuildEnv === auth.BUILD_ENV.DEVELOPMENT) {
+    return "https://test-signer.web3auth.io";
+  }
+  return constants.SIGNER_MAP[web3AuthNetwork];
 };
-const fetchProjectConfig = async (clientId, web3AuthNetwork, aaProvider) => {
-  // const url = new URL(`${signerHost(web3AuthNetwork)}/api/v2/configuration`);
-  // TODO: remove this before production
-  const url = new URL("https://test-signer.web3auth.io/api/v2/configuration");
+const fetchProjectConfig = async ({
+  clientId,
+  web3AuthNetwork,
+  aaProvider,
+  authBuildEnv
+}) => {
+  const url = new URL(`${signerHost(web3AuthNetwork, authBuildEnv)}/api/v2/configuration`);
   url.searchParams.append("project_id", clientId);
   url.searchParams.append("network", web3AuthNetwork);
+  if (authBuildEnv) url.searchParams.append("build_env", authBuildEnv);
   if (aaProvider) url.searchParams.append("aa_provider", aaProvider);
   const res = await httpHelpers.get(url.href);
   return res;
@@ -45,6 +52,38 @@ const normalizeWalletName = name => {
   normalizedName = normalizedName.replace(/\s/g, "-");
   return normalizedName;
 };
+const fromWagmiChain = chain => {
+  var _chain$blockExplorers, _chain$rpcUrls$defaul;
+  return {
+    chainNamespace: baseControllers.CHAIN_NAMESPACES.EIP155,
+    chainId: `0x${chain.id.toString(16)}`,
+    rpcTarget: chain.rpcUrls.default.http[0],
+    displayName: chain.name,
+    blockExplorerUrl: ((_chain$blockExplorers = chain.blockExplorers) === null || _chain$blockExplorers === void 0 ? void 0 : _chain$blockExplorers.default.url) || "",
+    ticker: chain.nativeCurrency.symbol,
+    tickerName: chain.nativeCurrency.name,
+    logo: "",
+    decimals: chain.nativeCurrency.decimals,
+    isTestnet: chain.testnet,
+    wsTarget: (_chain$rpcUrls$defaul = chain.rpcUrls.default.webSocket) === null || _chain$rpcUrls$defaul === void 0 ? void 0 : _chain$rpcUrls$defaul[0]
+  };
+};
+function withAbort(fn, signal, onAbort) {
+  if (!signal) return fn();
+  if (signal.aborted) return Promise.reject(new DOMException("Aborted", "AbortError"));
+  return new Promise((resolve, reject) => {
+    const abort = () => {
+      onAbort === null || onAbort === void 0 || onAbort();
+      reject(new DOMException("Aborted", "AbortError"));
+    };
+    signal.addEventListener("abort", abort);
+    return Promise.resolve().then(() => fn()).then(resolve, reject).finally(() => {
+      signal.removeEventListener("abort", abort);
+    });
+  });
+}
+const isBrowser = () => typeof window !== "undefined" && typeof document !== "undefined";
+const fromViemChain = fromWagmiChain;
 
 Object.defineProperty(exports, "cloneDeep", {
     enumerable: true,
@@ -52,6 +91,10 @@ Object.defineProperty(exports, "cloneDeep", {
 });
 exports.fetchProjectConfig = fetchProjectConfig;
 exports.fetchWalletRegistry = fetchWalletRegistry;
+exports.fromViemChain = fromViemChain;
+exports.fromWagmiChain = fromWagmiChain;
+exports.isBrowser = isBrowser;
 exports.isHexStrict = isHexStrict;
 exports.normalizeWalletName = normalizeWalletName;
 exports.signerHost = signerHost;
+exports.withAbort = withAbort;

package/dist/lib.cjs/base/wallet/index.js

@@ -5,19 +5,18 @@ var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 const MULTI_CHAIN_CONNECTORS = {
   AUTH: "auth",
   WALLET_CONNECT_V2: "wallet-connect-v2",
-  SFA: "sfa"
+  METAMASK: "metamask"
 };
 const SOLANA_CONNECTORS = _objectSpread({}, MULTI_CHAIN_CONNECTORS);
 const EVM_CONNECTORS = _objectSpread({
-  COINBASE: "coinbase",
-  METAMASK: "metamask"
+  COINBASE: "coinbase"
 }, MULTI_CHAIN_CONNECTORS);
 const WALLET_CONNECTORS = _objectSpread(_objectSpread({}, EVM_CONNECTORS), SOLANA_CONNECTORS);
 const CONNECTOR_NAMES = {
   [MULTI_CHAIN_CONNECTORS.AUTH]: "Auth",
   [MULTI_CHAIN_CONNECTORS.WALLET_CONNECT_V2]: "Wallet Connect v2",
-  [MULTI_CHAIN_CONNECTORS.SFA]: "SFA",
-  [EVM_CONNECTORS.COINBASE]: "Coinbase Smart Wallet"
+  [EVM_CONNECTORS.COINBASE]: "Coinbase Smart Wallet",
+  [EVM_CONNECTORS.METAMASK]: "MetaMask"
 };
 
 exports.CONNECTOR_NAMES = CONNECTOR_NAMES;

package/dist/lib.cjs/connectors/auth-connector/authConnector.js

@@ -6,17 +6,18 @@ var baseControllers = require('@toruslabs/base-controllers');
 var securePubSub = require('@toruslabs/secure-pub-sub');
 var auth = require('@web3auth/auth');
 var deepmerge = require('deepmerge');
-var index$1 = require('../../base/errors/index.js');
 var IChainInterface = require('../../base/chain/IChainInterface.js');
 var baseConnector = require('../../base/connector/baseConnector.js');
 var constants = require('../../base/connector/constants.js');
 require('jwt-decode');
+var index$1 = require('../../base/errors/index.js');
 var loglevel = require('../../base/loglevel.js');
 require('../../base/plugin/errors.js');
 require('../../base/plugin/IPlugin.js');
 require('@toruslabs/constants');
 require('@toruslabs/http-helpers');
 var index = require('../../base/wallet/index.js');
+var utils = require('../utils.js');
 
 class AuthConnector extends baseConnector.BaseConnector {
   constructor(params) {
@@ -34,6 +35,7 @@ class AuthConnector extends baseConnector.BaseConnector {
     _defineProperty(this, "wsSettings", void 0);
     _defineProperty(this, "wsEmbedInstance", null);
     _defineProperty(this, "authConnectionConfig", []);
+    _defineProperty(this, "wsEmbedInstancePromise", null);
     this.authOptions = params.connectorSettings;
     this.loginSettings = params.loginSettings || {
       authConnection: ""
@@ -73,7 +75,7 @@ class AuthConnector extends baseConnector.BaseConnector {
     const isRedirectResult = this.authOptions.uxMode === auth.UX_MODE.REDIRECT;
     this.authOptions = _objectSpread(_objectSpread({}, this.authOptions), {}, {
       replaceUrlOnRedirect: isRedirectResult,
-      useCoreKitKey: this.coreOptions.useCoreKitKey
+      useCoreKitKey: this.coreOptions.useSFAKey
     });
     this.authInstance = new auth.Auth(_objectSpread(_objectSpread({}, this.authOptions), {}, {
       clientId: this.coreOptions.clientId,
@@ -82,7 +84,8 @@ class AuthConnector extends baseConnector.BaseConnector {
       authConnectionConfig: this.authConnectionConfig.filter(x => !x.isDefault)
     }));
     loglevel.log.debug("initializing auth connector init", this.authOptions);
-    await this.authInstance.init();
+    // making it async here to initialize provider.
+    const authInstancePromise = this.authInstance.init();
     // Use this for xrpl, mpc cases
     if (this.coreOptions.privateKeyProvider) {
       this.privateKeyProvider = this.coreOptions.privateKeyProvider;
@@ -101,11 +104,14 @@ class AuthConnector extends baseConnector.BaseConnector {
               modalZIndex: this.wsSettings.modalZIndex
             });
             const wsSupportedChains = chains.filter(x => x.chainNamespace === baseControllers.CHAIN_NAMESPACES.EIP155 || x.chainNamespace === baseControllers.CHAIN_NAMESPACES.SOLANA);
-            await this.wsEmbedInstance.init(_objectSpread(_objectSpread({}, this.wsSettings), {}, {
+            this.wsEmbedInstancePromise = this.wsEmbedInstance.init(_objectSpread(_objectSpread({}, this.wsSettings), {}, {
               chains: wsSupportedChains,
               chainId,
               whiteLabel: _objectSpread(_objectSpread({}, this.authOptions.whiteLabel), this.wsSettings.whiteLabel)
-            }));
+            })).then(() => {
+              this.wsEmbedInstancePromise = null;
+              return;
+            });
             break;
           }
         case baseControllers.CHAIN_NAMESPACES.XRPL:
@@ -124,10 +130,12 @@ class AuthConnector extends baseConnector.BaseConnector {
           }
       }
     }
+    // wait for auth instance to be ready.
+    loglevel.log.debug("initializing auth connector");
+    await authInstancePromise;
     this.status = constants.CONNECTOR_STATUS.READY;
     this.emit(constants.CONNECTOR_EVENTS.READY, index.WALLET_CONNECTORS.AUTH);
     try {
-      loglevel.log.debug("initializing auth connector");
       const {
         sessionId
       } = this.authInstance || {};
@@ -137,10 +145,14 @@ class AuthConnector extends baseConnector.BaseConnector {
         await this.connect({
           chainId: options.chainId
         });
+      } else if (!sessionId && options.autoConnect) {
+        // if here, this means that the connector is cached but the sessionId is not available.
+        // this can happen if the sessionId has expired.
+        // we are throwing an error to reset the cached state.
+        throw index$1.WalletLoginError.connectionError("Failed to rehydrate");
       }
     } catch (error) {
-      loglevel.log.error("Failed to connect with cached auth provider", error);
-      this.emit(constants.CONNECTOR_EVENTS.ERRORED, error);
+      this.emit(constants.CONNECTOR_EVENTS.REHYDRATION_ERROR, error);
     }
   }
   async connect(params) {
@@ -172,7 +184,9 @@ class AuthConnector extends baseConnector.BaseConnector {
     if (this.status !== constants.CONNECTOR_STATUS.CONNECTED) throw index$1.WalletLoginError.notConnectedError("Not connected with wallet");
     if (!this.authInstance) throw index$1.WalletInitializationError.notReady("authInstance is not ready");
     try {
-      await this.authInstance.enableMFA(params);
+      const result = await this.authInstance.enableMFA(params);
+      // In redirect mode, the result is not available immediately, so we emit the event when the result is available.
+      if (result) this.emit(constants.CONNECTOR_EVENTS.MFA_ENABLED, result);
     } catch (error) {
       loglevel.log.error("Failed to enable MFA with auth provider", error);
       if (error instanceof index$1.Web3AuthError) {
@@ -265,19 +279,26 @@ class AuthConnector extends baseConnector.BaseConnector {
       await ((_this$privateKeyProvi = this.privateKeyProvider) === null || _this$privateKeyProvi === void 0 ? void 0 : _this$privateKeyProvi.switchChain(params));
     }
   }
+  async cleanup() {
+    if (!this.authInstance) throw index$1.WalletInitializationError.notReady("authInstance is not ready");
+    await this.authInstance.cleanup();
+    if (this.wsEmbedInstance) {
+      this.wsEmbedInstance.clearInit();
+    }
+  }
   getChain(chainId) {
     return this.coreOptions.chains.find(x => x.chainId === chainId);
   }
   _getFinalPrivKey() {
     if (!this.authInstance) return "";
     let finalPrivKey = this.authInstance.privKey;
-    // coreKitKey is available only for custom verifiers by default
-    if (this.coreOptions.useCoreKitKey) {
+    // coreKitKey is available only for custom connections by default
+    if (this.coreOptions.useSFAKey) {
       // this is to check if the user has already logged in but coreKitKey is not available.
-      // when useCoreKitKey is set to true.
+      // when useSFAKey is set to true.
       // This is to ensure that when there is no user session active, we don't throw an exception.
       if (this.authInstance.privKey && !this.authInstance.coreKitKey) {
-        throw index$1.WalletLoginError.coreKitKeyNotFound();
+        throw index$1.WalletLoginError.sfaKeyNotFound();
       }
       finalPrivKey = this.authInstance.coreKitKey;
     }
@@ -293,6 +314,9 @@ class AuthConnector extends baseConnector.BaseConnector {
     } = chainConfig;
     // if not logged in then login
     const keyAvailable = chainNamespace === baseControllers.CHAIN_NAMESPACES.EIP155 || chainNamespace === baseControllers.CHAIN_NAMESPACES.SOLANA ? (_this$authInstance = this.authInstance) === null || _this$authInstance === void 0 ? void 0 : _this$authInstance.sessionId : this._getFinalPrivKey();
+    if (params.idToken) params.extraLoginOptions = _objectSpread(_objectSpread({}, params.extraLoginOptions), {}, {
+      id_token: params.idToken
+    });
     if (!keyAvailable || (_params$extraLoginOpt = params.extraLoginOptions) !== null && _params$extraLoginOpt !== void 0 && _params$extraLoginOpt.id_token) {
       var _params$extraLoginOpt2;
       // always use "other" curve to return token with all keys encoded so wallet service can switch between evm and solana namespace
@@ -306,6 +330,8 @@ class AuthConnector extends baseConnector.BaseConnector {
     }
     // setup WS embed if chainNamespace is EIP155 or SOLANA
     if (chainNamespace === baseControllers.CHAIN_NAMESPACES.EIP155 || chainNamespace === baseControllers.CHAIN_NAMESPACES.SOLANA) {
+      // wait for ws embed instance to be ready.
+      if (this.wsEmbedInstancePromise) await this.wsEmbedInstancePromise;
       const {
         sessionId,
         sessionNamespace
@@ -354,19 +380,19 @@ class AuthConnector extends baseConnector.BaseConnector {
     });
     if (!(providerConfig !== null && providerConfig !== void 0 && providerConfig.authConnection)) throw index$1.WalletLoginError.connectionError("Invalid auth connection.");
     const jwtParams = _objectSpread(_objectSpread(_objectSpread({}, providerConfig.jwtParameters || {}), params.extraLoginOptions || {}), {}, {
-      login_hint: params.login_hint || ((_params$extraLoginOpt3 = params.extraLoginOptions) === null || _params$extraLoginOpt3 === void 0 ? void 0 : _params$extraLoginOpt3.login_hint)
+      login_hint: params.loginHint || ((_params$extraLoginOpt3 = params.extraLoginOptions) === null || _params$extraLoginOpt3 === void 0 ? void 0 : _params$extraLoginOpt3.login_hint)
     });
     const nonce = auth.randomId();
     // post a message to the auth provider to indicate that login has been initiated.
     const loginParams = baseControllers.cloneDeep(params);
     loginParams.extraLoginOptions = _objectSpread(_objectSpread({}, loginParams.extraLoginOptions || {}), {}, {
-      login_hint: params.login_hint || ((_params$extraLoginOpt4 = params.extraLoginOptions) === null || _params$extraLoginOpt4 === void 0 ? void 0 : _params$extraLoginOpt4.login_hint)
+      login_hint: params.loginHint || ((_params$extraLoginOpt4 = params.extraLoginOptions) === null || _params$extraLoginOpt4 === void 0 ? void 0 : _params$extraLoginOpt4.login_hint)
     });
     delete loginParams.chainId;
     const popupParams = {
       authConnection: params.authConnection,
       authConnectionId: providerConfig.authConnectionId,
-      clientId: providerConfig.clientId,
+      clientId: providerConfig.clientId || jwtParams.client_id,
       groupedAuthConnectionId: providerConfig.groupedAuthConnectionId,
       redirect_uri: `${this.authInstance.baseUrl}/auth`,
       jwtParams,
@@ -426,7 +452,7 @@ class AuthConnector extends baseConnector.BaseConnector {
     });
   }
   connectWithJwtLogin(params) {
-    var _params$extraLoginOpt5;
+    var _params$extraLoginOpt5, _params$extraLoginOpt7;
     const loginConfig = this.getOAuthProviderConfig({
       authConnection: params.authConnection,
       authConnectionId: params.authConnectionId,
@@ -443,8 +469,25 @@ class AuthConnector extends baseConnector.BaseConnector {
       });
     }
     const loginParams = baseControllers.cloneDeep(params);
-    loginParams.extraLoginOptions = _objectSpread(_objectSpread({}, loginParams.extraLoginOptions || {}), {}, {
-      login_hint: params.login_hint || ((_params$extraLoginOpt5 = params.extraLoginOptions) === null || _params$extraLoginOpt5 === void 0 ? void 0 : _params$extraLoginOpt5.login_hint)
+    const finalExtraLoginOptions = _objectSpread(_objectSpread({}, (loginConfig === null || loginConfig === void 0 ? void 0 : loginConfig.jwtParameters) || {}), params.extraLoginOptions || {});
+    let finalUserId;
+    if (params.loginHint || (_params$extraLoginOpt5 = params.extraLoginOptions) !== null && _params$extraLoginOpt5 !== void 0 && _params$extraLoginOpt5.login_hint) {
+      var _params$extraLoginOpt6;
+      finalUserId = params.loginHint || ((_params$extraLoginOpt6 = params.extraLoginOptions) === null || _params$extraLoginOpt6 === void 0 ? void 0 : _params$extraLoginOpt6.login_hint);
+    } else if ((_params$extraLoginOpt7 = params.extraLoginOptions) !== null && _params$extraLoginOpt7 !== void 0 && _params$extraLoginOpt7.id_token) {
+      if (typeof finalExtraLoginOptions.isUserIdCaseSensitive === "undefined") {
+        throw index$1.WalletInitializationError.invalidParams(`isUserIdCaseSensitive is required for this connection: ${finalExtraLoginOptions.authConnection}`);
+      }
+      const {
+        payload
+      } = utils.parseToken(params.extraLoginOptions.id_token);
+      finalUserId = auth.getUserId(payload, loginParams.authConnection, finalExtraLoginOptions.userIdField, finalExtraLoginOptions.isUserIdCaseSensitive);
+    } else {
+      throw index$1.WalletLoginError.connectionError("Invalid login hint or id_token");
+    }
+    // Adds the login_hint to the extraLoginOptions.
+    loginParams.extraLoginOptions = _objectSpread(_objectSpread({}, finalExtraLoginOptions), {}, {
+      login_hint: finalUserId
     });
     delete loginParams.chainId;
     return this.authInstance.postLoginInitiatedMessage(loginParams);
@@ -542,8 +585,8 @@ const authConnector = params => {
       walletServicesSettings: finalWsSettings,
       loginSettings: params === null || params === void 0 ? void 0 : params.loginSettings,
       coreOptions,
-      // TODO: check, test this and may need to send modal config here later on.!!
-      authConnectionConfig: projectConfig.embeddedWalletAuth
+      authConnectionConfig: projectConfig.embeddedWalletAuth,
+      mfaSettings: coreOptions.mfaSettings
     });
   };
 };

package/dist/lib.cjs/connectors/base-evm-connector/baseEvmConnector.js

@@ -2,11 +2,11 @@
 
 var baseControllers = require('@toruslabs/base-controllers');
 var wsEmbed = require('@web3auth/ws-embed');
-var index = require('../../base/errors/index.js');
 var baseConnector = require('../../base/connector/baseConnector.js');
 var constants = require('../../base/connector/constants.js');
 require('@web3auth/auth');
 var utils = require('../../base/connector/utils.js');
+var index = require('../../base/errors/index.js');
 require('../../base/loglevel.js');
 require('../../base/plugin/errors.js');
 require('../../base/plugin/IPlugin.js');

package/dist/lib.cjs/connectors/base-solana-connector/baseSolanaConnector.js

@@ -2,11 +2,11 @@
 
 var baseControllers = require('@toruslabs/base-controllers');
 var wsEmbed = require('@web3auth/ws-embed');
-var index = require('../../base/errors/index.js');
 var baseConnector = require('../../base/connector/baseConnector.js');
 var constants = require('../../base/connector/constants.js');
 require('@web3auth/auth');
 var utils = require('../../base/connector/utils.js');
+var index = require('../../base/errors/index.js');
 require('../../base/loglevel.js');
 require('../../base/plugin/errors.js');
 require('../../base/plugin/IPlugin.js');

package/dist/lib.cjs/connectors/coinbase-connector/coinbaseConnector.js

@@ -2,10 +2,9 @@
 
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
-var walletSdk = require('@coinbase/wallet-sdk');
-var index$1 = require('../../base/errors/index.js');
 var IChainInterface = require('../../base/chain/IChainInterface.js');
 require('@web3auth/auth');
+var index$1 = require('../../base/errors/index.js');
 var index = require('../../base/wallet/index.js');
 var constants = require('../../base/connector/constants.js');
 require('jwt-decode');
@@ -46,7 +45,10 @@ class CoinbaseConnector extends baseEvmConnector.BaseEvmConnector {
     super.checkInitializationRequirements({
       chainConfig
     });
-    const coinbaseInstance = walletSdk.createCoinbaseWalletSDK(_objectSpread(_objectSpread({}, this.coinbaseOptions), {}, {
+    const {
+      createCoinbaseWalletSDK
+    } = await import('@coinbase/wallet-sdk');
+    const coinbaseInstance = createCoinbaseWalletSDK(_objectSpread(_objectSpread({}, this.coinbaseOptions), {}, {
       preference: {
         options: this.coinbaseOptions.options || "smartWalletOnly"
       },
@@ -60,12 +62,17 @@ class CoinbaseConnector extends baseEvmConnector.BaseEvmConnector {
     try {
       if (options.autoConnect) {
         this.rehydrated = true;
-        await this.connect({
+        const provider = await this.connect({
           chainId: options.chainId
         });
+        // the connect function could fail silently as well.
+        if (!provider) {
+          this.rehydrated = false;
+          throw index$1.WalletLoginError.connectionError("Failed to rehydrate.");
+        }
       }
     } catch (error) {
-      this.emit(constants.CONNECTOR_EVENTS.ERRORED, error);
+      this.emit(constants.CONNECTOR_EVENTS.REHYDRATION_ERROR, error);
     }
   }
   async connect({
@@ -104,8 +111,9 @@ class CoinbaseConnector extends baseEvmConnector.BaseEvmConnector {
     } catch (error) {
       // ready again to be connected
       this.status = constants.CONNECTOR_STATUS.READY;
+      // only throw error if the connector is not rehydrated.
+      if (!this.rehydrated) this.emit(constants.CONNECTOR_EVENTS.ERRORED, error);
       this.rehydrated = false;
-      this.emit(constants.CONNECTOR_EVENTS.ERRORED, error);
       if (error instanceof index$1.Web3AuthError) throw error;
       throw index$1.WalletLoginError.connectionError("Failed to login with coinbase wallet", error);
     }

package/dist/lib.cjs/connectors/coinbase-connector/index.js

@@ -0,0 +1,7 @@
+'use strict';
+
+var coinbaseConnector = require('./coinbaseConnector.js');
+
+
+
+exports.coinbaseConnector = coinbaseConnector.coinbaseConnector;