@web3auth/no-modal 10.0.0-beta.9 → 10.0.0

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

@@ -0,0 +1,34 @@
+import { WEB3AUTH_STATE_STORAGE_KEY } from './constants.js';
+import { deserialize } from './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, WEB3AUTH_STATE_STORAGE_KEY);
+  if (!parsed) return undefined;
+  return 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);
+}
+
+export { cookieStorage, cookieToWeb3AuthState, parseCookie };

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

@@ -0,0 +1,11 @@
+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;
+  });
+}
+
+export { deserialize };

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

@@ -135,7 +135,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) {
@@ -151,7 +151,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 {

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

@@ -2,15 +2,14 @@ import { CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
 export { cloneDeep } from '@toruslabs/base-controllers';
 import { SIGNER_MAP } from '@toruslabs/constants';
 import { get } from '@toruslabs/http-helpers';
-import { WEB3AUTH_NETWORK, BUILD_ENV } from '@web3auth/auth';
+import { SOLANA_CAIP_CHAIN_MAP } from './constants.js';
+import { Web3AuthError } from './errors/index.js';
+import { WEB3AUTH_NETWORK } from '@web3auth/auth';
 
 const isHexStrict = hex => {
   return (typeof hex === "string" || typeof hex === "number") && /^(-)?0x[0-9a-f]*$/i.test(hex);
 };
-const signerHost = (web3AuthNetwork = WEB3AUTH_NETWORK.SAPPHIRE_MAINNET, authBuildEnv = BUILD_ENV.PRODUCTION) => {
-  if (authBuildEnv === BUILD_ENV.TESTING || authBuildEnv === BUILD_ENV.DEVELOPMENT) {
-    return "https://test-signer.web3auth.io";
-  }
+const signerHost = (web3AuthNetwork = WEB3AUTH_NETWORK.SAPPHIRE_MAINNET) => {
   return SIGNER_MAP[web3AuthNetwork];
 };
 const fetchProjectConfig = async ({
@@ -19,7 +18,7 @@ const fetchProjectConfig = async ({
   aaProvider,
   authBuildEnv
 }) => {
-  const url = new URL(`${signerHost(web3AuthNetwork, authBuildEnv)}/api/v2/configuration`);
+  const url = new URL(`${signerHost(web3AuthNetwork)}/api/v2/configuration`);
   url.searchParams.append("project_id", clientId);
   url.searchParams.append("network", web3AuthNetwork);
   if (authBuildEnv) url.searchParams.append("build_env", authBuildEnv);
@@ -81,6 +80,104 @@ function withAbort(fn, signal, onAbort) {
     });
   });
 }
+const isBrowser = () => typeof window !== "undefined" && typeof document !== "undefined";
 const fromViemChain = fromWagmiChain;
+const getWhitelabelAnalyticsProperties = uiConfig => {
+  var _uiConfig$theme, _uiConfig$theme2;
+  return {
+    whitelabel_app_name: uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.appName,
+    whitelabel_app_url: uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.appUrl,
+    whitelabel_logo_light_enabled: Boolean(uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.logoLight),
+    whitelabel_logo_dark_enabled: Boolean(uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.logoDark),
+    whitelabel_default_language: uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.defaultLanguage,
+    whitelabel_theme_mode: uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.mode,
+    whitelabel_use_logo_loader: uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.useLogoLoader,
+    whitelabel_theme_primary: uiConfig === null || uiConfig === void 0 || (_uiConfig$theme = uiConfig.theme) === null || _uiConfig$theme === void 0 ? void 0 : _uiConfig$theme.primary,
+    whitelabel_theme_on_primary: uiConfig === null || uiConfig === void 0 || (_uiConfig$theme2 = uiConfig.theme) === null || _uiConfig$theme2 === void 0 ? void 0 : _uiConfig$theme2.onPrimary,
+    whitelabel_tnc_link_enabled: Boolean(uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.tncLink),
+    whitelabel_privacy_policy_enabled: Boolean(uiConfig === null || uiConfig === void 0 ? void 0 : uiConfig.privacyPolicy)
+  };
+};
+const getAaAnalyticsProperties = accountAbstractionConfig => {
+  var _accountAbstractionCo, _accountAbstractionCo2, _accountAbstractionCo3, _accountAbstractionCo4, _accountAbstractionCo5;
+  const bundlerHostnames = Array.from(new Set(accountAbstractionConfig === null || accountAbstractionConfig === void 0 || (_accountAbstractionCo = accountAbstractionConfig.chains) === null || _accountAbstractionCo === void 0 ? void 0 : _accountAbstractionCo.map(chain => {
+    var _chain$bundlerConfig;
+    return getHostname((_chain$bundlerConfig = chain.bundlerConfig) === null || _chain$bundlerConfig === void 0 ? void 0 : _chain$bundlerConfig.url);
+  }).filter(Boolean)));
+  const paymasterHostnames = Array.from(new Set(accountAbstractionConfig === null || accountAbstractionConfig === void 0 || (_accountAbstractionCo2 = accountAbstractionConfig.chains) === null || _accountAbstractionCo2 === void 0 ? void 0 : _accountAbstractionCo2.map(chain => {
+    var _chain$paymasterConfi;
+    return getHostname((_chain$paymasterConfi = chain.paymasterConfig) === null || _chain$paymasterConfi === void 0 ? void 0 : _chain$paymasterConfi.url);
+  }).filter(Boolean)));
+  return {
+    aa_smart_account_type: accountAbstractionConfig === null || accountAbstractionConfig === void 0 ? void 0 : accountAbstractionConfig.smartAccountType,
+    aa_chain_ids: accountAbstractionConfig === null || accountAbstractionConfig === void 0 || (_accountAbstractionCo3 = accountAbstractionConfig.chains) === null || _accountAbstractionCo3 === void 0 ? void 0 : _accountAbstractionCo3.map(chain => getCaipChainId({
+      chainId: chain.chainId,
+      chainNamespace: CHAIN_NAMESPACES.EIP155
+    })),
+    aa_bundler_urls: bundlerHostnames,
+    aa_paymaster_urls: paymasterHostnames,
+    aa_paymaster_enabled: paymasterHostnames.length > 0,
+    aa_paymaster_context_enabled: accountAbstractionConfig === null || accountAbstractionConfig === void 0 || (_accountAbstractionCo4 = accountAbstractionConfig.chains) === null || _accountAbstractionCo4 === void 0 ? void 0 : _accountAbstractionCo4.some(chain => {
+      var _chain$bundlerConfig2;
+      return (_chain$bundlerConfig2 = chain.bundlerConfig) === null || _chain$bundlerConfig2 === void 0 ? void 0 : _chain$bundlerConfig2.paymasterContext;
+    }),
+    aa_erc20_paymaster_enabled: accountAbstractionConfig === null || accountAbstractionConfig === void 0 || (_accountAbstractionCo5 = accountAbstractionConfig.chains) === null || _accountAbstractionCo5 === void 0 ? void 0 : _accountAbstractionCo5.some(chain => {
+      var _chain$bundlerConfig3;
+      return (_chain$bundlerConfig3 = chain.bundlerConfig) === null || _chain$bundlerConfig3 === void 0 || (_chain$bundlerConfig3 = _chain$bundlerConfig3.paymasterContext) === null || _chain$bundlerConfig3 === void 0 ? void 0 : _chain$bundlerConfig3.token;
+    })
+  };
+};
+const getWalletServicesAnalyticsProperties = walletServicesConfig => {
+  var _walletServicesConfig, _walletServicesConfig2, _walletServicesConfig3, _walletServicesConfig4, _walletServicesConfig5, _walletServicesConfig6, _walletServicesConfig7, _walletServicesConfig8, _walletServicesConfig9, _walletServicesConfig0, _walletServicesConfig1;
+  return {
+    ws_confirmation_strategy: walletServicesConfig === null || walletServicesConfig === void 0 ? void 0 : walletServicesConfig.confirmationStrategy,
+    ws_enable_key_export: walletServicesConfig === null || walletServicesConfig === void 0 ? void 0 : walletServicesConfig.enableKeyExport,
+    ws_show_widget_button: walletServicesConfig === null || walletServicesConfig === void 0 || (_walletServicesConfig = walletServicesConfig.whiteLabel) === null || _walletServicesConfig === void 0 ? void 0 : _walletServicesConfig.showWidgetButton,
+    ws_button_position: walletServicesConfig === null || walletServicesConfig === void 0 || (_walletServicesConfig2 = walletServicesConfig.whiteLabel) === null || _walletServicesConfig2 === void 0 ? void 0 : _walletServicesConfig2.buttonPosition,
+    ws_hide_nft_display: walletServicesConfig === null || walletServicesConfig === void 0 || (_walletServicesConfig3 = walletServicesConfig.whiteLabel) === null || _walletServicesConfig3 === void 0 ? void 0 : _walletServicesConfig3.hideNftDisplay,
+    ws_hide_token_display: walletServicesConfig === null || walletServicesConfig === void 0 || (_walletServicesConfig4 = walletServicesConfig.whiteLabel) === null || _walletServicesConfig4 === void 0 ? void 0 : _walletServicesConfig4.hideTokenDisplay,
+    ws_hide_transfers: walletServicesConfig === null || walletServicesConfig === void 0 || (_walletServicesConfig5 = walletServicesConfig.whiteLabel) === null || _walletServicesConfig5 === void 0 ? void 0 : _walletServicesConfig5.hideTransfers,
+    ws_hide_topup: walletServicesConfig === null || walletServicesConfig === void 0 || (_walletServicesConfig6 = walletServicesConfig.whiteLabel) === null || _walletServicesConfig6 === void 0 ? void 0 : _walletServicesConfig6.hideTopup,
+    ws_hide_receive: walletServicesConfig === null || walletServicesConfig === void 0 || (_walletServicesConfig7 = walletServicesConfig.whiteLabel) === null || _walletServicesConfig7 === void 0 ? void 0 : _walletServicesConfig7.hideReceive,
+    ws_hide_swap: walletServicesConfig === null || walletServicesConfig === void 0 || (_walletServicesConfig8 = walletServicesConfig.whiteLabel) === null || _walletServicesConfig8 === void 0 ? void 0 : _walletServicesConfig8.hideSwap,
+    ws_hide_show_all_tokens: walletServicesConfig === null || walletServicesConfig === void 0 || (_walletServicesConfig9 = walletServicesConfig.whiteLabel) === null || _walletServicesConfig9 === void 0 ? void 0 : _walletServicesConfig9.hideShowAllTokens,
+    ws_hide_wallet_connect: walletServicesConfig === null || walletServicesConfig === void 0 || (_walletServicesConfig0 = walletServicesConfig.whiteLabel) === null || _walletServicesConfig0 === void 0 ? void 0 : _walletServicesConfig0.hideWalletConnect,
+    ws_default_portfolio: walletServicesConfig === null || walletServicesConfig === void 0 || (_walletServicesConfig1 = walletServicesConfig.whiteLabel) === null || _walletServicesConfig1 === void 0 ? void 0 : _walletServicesConfig1.defaultPortfolio
+  };
+};
+const sdkVersion = "10.0.0";
+const getErrorAnalyticsProperties = error => {
+  try {
+    const code = error instanceof Web3AuthError ? error.code : error === null || error === void 0 ? void 0 : error.code;
+    const message = error instanceof Error ? error.message : (error === null || error === void 0 ? void 0 : error.message) || (error === null || error === void 0 ? void 0 : error.toString());
+    return {
+      error_message: message,
+      error_code: code
+    };
+  } catch {
+    return {
+      error_message: "Unknown error",
+      error_code: undefined
+    };
+  }
+};
+const getHostname = url => {
+  try {
+    return new URL(url).hostname;
+  } catch {
+    return "";
+  }
+};
+const getCaipChainId = chain => {
+  if (chain.chainNamespace === CHAIN_NAMESPACES.EIP155) {
+    return `${chain.chainNamespace}:${parseInt(chain.chainId, 16)}`;
+  }
+  if (chain.chainNamespace === CHAIN_NAMESPACES.SOLANA) {
+    return `${chain.chainNamespace}:${SOLANA_CAIP_CHAIN_MAP[chain.chainId]}`;
+  }
+
+  // for other chain namespaces, we just return the chainId as is
+  return `${chain.chainNamespace}:${chain.chainId}`;
+};
 
-export { fetchProjectConfig, fetchWalletRegistry, fromViemChain, fromWagmiChain, isHexStrict, normalizeWalletName, signerHost, withAbort };
+export { fetchProjectConfig, fetchWalletRegistry, fromViemChain, fromWagmiChain, getAaAnalyticsProperties, getCaipChainId, getErrorAnalyticsProperties, getHostname, getWalletServicesAnalyticsProperties, getWhitelabelAnalyticsProperties, isBrowser, isHexStrict, normalizeWalletName, sdkVersion, signerHost, withAbort };

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

@@ -2,12 +2,12 @@ import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 
 const MULTI_CHAIN_CONNECTORS = {
   AUTH: "auth",
-  WALLET_CONNECT_V2: "wallet-connect-v2"
+  WALLET_CONNECT_V2: "wallet-connect-v2",
+  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 = {

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

@@ -1,18 +1,18 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import { cloneDeep, BUTTON_POSITION, CONFIRMATION_STRATEGY, CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
 import { SecurePubSub } from '@toruslabs/secure-pub-sub';
-import { BUILD_ENV, UX_MODE, Auth, SDK_MODE, SUPPORTED_KEY_CURVES, randomId, createHandler, PopupHandler, getUserId } from '@web3auth/auth';
+import { BUILD_ENV, UX_MODE, Auth, SDK_MODE, SUPPORTED_KEY_CURVES, randomId, version, createHandler, PopupHandler, getUserId } from '@web3auth/auth';
 import deepmerge from 'deepmerge';
 import { parseToken } from '../utils.js';
-import '@toruslabs/constants';
-import '@toruslabs/http-helpers';
 import { BaseConnector } from '../../base/connector/baseConnector.js';
 import { WALLET_CONNECTORS } from '../../base/wallet/index.js';
 import { CONNECTOR_NAMESPACES } from '../../base/chain/IChainInterface.js';
 import { CONNECTOR_CATEGORY, CONNECTOR_STATUS, CONNECTOR_EVENTS } from '../../base/connector/constants.js';
 import { WalletInitializationError, WalletLoginError, Web3AuthError } from '../../base/errors/index.js';
 import { log } from '../../base/loglevel.js';
+import { CHAIN_NAMESPACES, cloneDeep } from '@toruslabs/base-controllers';
+import '@toruslabs/constants';
+import '@toruslabs/http-helpers';
 
 class AuthConnector extends BaseConnector {
   constructor(params) {
@@ -70,13 +70,14 @@ class AuthConnector extends BaseConnector {
     const isRedirectResult = this.authOptions.uxMode === UX_MODE.REDIRECT;
     this.authOptions = _objectSpread(_objectSpread({}, this.authOptions), {}, {
       replaceUrlOnRedirect: isRedirectResult,
-      useCoreKitKey: this.coreOptions.useCoreKitKey
+      useCoreKitKey: this.coreOptions.useSFAKey
     });
     this.authInstance = new Auth(_objectSpread(_objectSpread({}, this.authOptions), {}, {
       clientId: this.coreOptions.clientId,
       network: this.coreOptions.web3AuthNetwork,
       sdkMode: SDK_MODE.IFRAME,
-      authConnectionConfig: this.authConnectionConfig.filter(x => !x.isDefault)
+      authConnectionConfig: this.authConnectionConfig.filter(x => !x.isDefault),
+      mfaSettings: this.coreOptions.mfaSettings
     }));
     log.debug("initializing auth connector init", this.authOptions);
 
@@ -129,11 +130,11 @@ class AuthConnector extends BaseConnector {
     }
 
     // wait for auth instance to be ready.
+    log.debug("initializing auth connector");
     await authInstancePromise;
     this.status = CONNECTOR_STATUS.READY;
     this.emit(CONNECTOR_EVENTS.READY, WALLET_CONNECTORS.AUTH);
     try {
-      log.debug("initializing auth connector");
       const {
         sessionId
       } = this.authInstance || {};
@@ -143,10 +144,14 @@ class AuthConnector extends 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 WalletLoginError.connectionError("Failed to rehydrate");
       }
     } catch (error) {
-      log.error("Failed to connect with cached auth provider", error);
-      this.emit(CONNECTOR_EVENTS.ERRORED, error);
+      this.emit(CONNECTOR_EVENTS.REHYDRATION_ERROR, error);
     }
   }
   async connect(params) {
@@ -224,7 +229,7 @@ class AuthConnector extends BaseConnector {
     this.rehydrated = false;
     this.emit(CONNECTOR_EVENTS.DISCONNECTED);
   }
-  async authenticateUser() {
+  async getIdentityToken() {
     if (this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
     const userInfo = await this.getUserInfo();
     return {
@@ -288,13 +293,13 @@ class AuthConnector extends BaseConnector {
   _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 WalletLoginError.coreKitKeyNotFound();
+        throw WalletLoginError.sfaKeyNotFound();
       }
       finalPrivKey = this.authInstance.coreKitKey;
     }
@@ -311,8 +316,8 @@ class AuthConnector extends BaseConnector {
 
     // if not logged in then login
     const keyAvailable = chainNamespace === CHAIN_NAMESPACES.EIP155 || chainNamespace === CHAIN_NAMESPACES.SOLANA ? (_this$authInstance = this.authInstance) === null || _this$authInstance === void 0 ? void 0 : _this$authInstance.sessionId : this._getFinalPrivKey();
-    if (params.id_token) params.extraLoginOptions = _objectSpread(_objectSpread({}, params.extraLoginOptions), {}, {
-      id_token: params.id_token
+    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;
@@ -378,14 +383,14 @@ class AuthConnector extends BaseConnector {
     });
     if (!(providerConfig !== null && providerConfig !== void 0 && providerConfig.authConnection)) throw 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 = randomId();
 
     // post a message to the auth provider to indicate that login has been initiated.
     const loginParams = 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 = {
@@ -393,7 +398,7 @@ class AuthConnector extends BaseConnector {
       authConnectionId: providerConfig.authConnectionId,
       clientId: providerConfig.clientId || jwtParams.client_id,
       groupedAuthConnectionId: providerConfig.groupedAuthConnectionId,
-      redirect_uri: `${this.authInstance.baseUrl}/auth`,
+      redirect_uri: `${this.authInstance.options.sdkUrl}/auth`,
       jwtParams,
       customState: {
         nonce,
@@ -402,7 +407,8 @@ class AuthConnector extends BaseConnector {
         dapp_redirect_url: this.authInstance.options.redirectUrl,
         uxMode: this.authInstance.options.uxMode,
         whiteLabel: JSON.stringify(this.authInstance.options.whiteLabel),
-        loginParams: JSON.stringify(loginParams)
+        loginParams: JSON.stringify(loginParams),
+        version: version.split(".")[0]
       },
       web3AuthClientId: this.coreOptions.clientId,
       web3AuthNetwork: this.coreOptions.web3AuthNetwork
@@ -448,7 +454,12 @@ class AuthConnector extends BaseConnector {
           reject(WalletLoginError.popupClosed());
         }
       });
-      this.authInstance.postLoginInitiatedMessage(loginParams, nonce).then(resolve).catch(reject);
+      this.authInstance.postLoginInitiatedMessage(loginParams, nonce).then(resolve).catch(error => {
+        if (error instanceof Web3AuthError) {
+          throw error;
+        }
+        reject(WalletLoginError.connectionError(error instanceof Error ? error.message : error || "Failed to login with social"));
+      });
     });
   }
   connectWithJwtLogin(params) {
@@ -472,9 +483,9 @@ class AuthConnector extends BaseConnector {
     const loginParams = cloneDeep(params);
     const finalExtraLoginOptions = _objectSpread(_objectSpread({}, (loginConfig === null || loginConfig === void 0 ? void 0 : loginConfig.jwtParameters) || {}), params.extraLoginOptions || {});
     let finalUserId;
-    if (params.login_hint || (_params$extraLoginOpt5 = params.extraLoginOptions) !== null && _params$extraLoginOpt5 !== void 0 && _params$extraLoginOpt5.login_hint) {
+    if (params.loginHint || (_params$extraLoginOpt5 = params.extraLoginOptions) !== null && _params$extraLoginOpt5 !== void 0 && _params$extraLoginOpt5.login_hint) {
       var _params$extraLoginOpt6;
-      finalUserId = params.login_hint || ((_params$extraLoginOpt6 = params.extraLoginOptions) === null || _params$extraLoginOpt6 === void 0 ? void 0 : _params$extraLoginOpt6.login_hint);
+      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 WalletInitializationError.invalidParams(`isUserIdCaseSensitive is required for this connection: ${finalExtraLoginOptions.authConnection}`);
@@ -523,14 +534,12 @@ const authConnector = params => {
     const connectorSettings = {};
     const {
       whitelist,
-      whitelabel,
       sessionTime
     } = projectConfig;
     if (whitelist) connectorSettings.originData = whitelist.signed_urls;
     if (sessionTime) connectorSettings.sessionTime = sessionTime;
     if ((_coreOptions$uiConfig = coreOptions.uiConfig) !== null && _coreOptions$uiConfig !== void 0 && _coreOptions$uiConfig.uxMode) connectorSettings.uxMode = coreOptions.uiConfig.uxMode;
-    const uiConfig = deepmerge(cloneDeep(whitelabel || {}), coreOptions.uiConfig || {});
-    if (!uiConfig.mode) uiConfig.mode = "light";
+    const uiConfig = coreOptions.uiConfig || {};
     connectorSettings.whiteLabel = uiConfig;
     const finalConnectorSettings = deepmerge.all([{
       uxMode: UX_MODE.POPUP,
@@ -540,56 +549,23 @@ const authConnector = params => {
     connectorSettings, (params === null || params === void 0 ? void 0 : params.connectorSettings) || {}]);
 
     // WS settings
-    const {
-      enableKeyExport,
-      walletUi
-    } = projectConfig;
-    const isKeyExportEnabled = typeof enableKeyExport === "boolean" ? enableKeyExport : true;
-    const {
-      enablePortfolioWidget = false,
-      enableTokenDisplay = true,
-      enableNftDisplay = true,
-      enableWalletConnect = true,
-      enableBuyButton = true,
-      enableSendButton = true,
-      enableSwapButton = true,
-      enableReceiveButton = true,
-      enableShowAllTokensButton = true,
-      enableConfirmationModal = false,
-      portfolioWidgetPosition = BUTTON_POSITION.BOTTOM_LEFT,
-      defaultPortfolio = "token"
-    } = walletUi || {};
-    const projectConfigWhiteLabel = {
-      showWidgetButton: enablePortfolioWidget,
-      hideNftDisplay: !enableNftDisplay,
-      hideTokenDisplay: !enableTokenDisplay,
-      hideTransfers: !enableSendButton,
-      hideTopup: !enableBuyButton,
-      hideReceive: !enableReceiveButton,
-      hideSwap: !enableSwapButton,
-      hideShowAllTokens: !enableShowAllTokensButton,
-      hideWalletConnect: !enableWalletConnect,
-      buttonPosition: portfolioWidgetPosition,
-      defaultPortfolio
-    };
-    const whiteLabel = deepmerge.all([projectConfigWhiteLabel, uiConfig, ((_coreOptions$walletSe = coreOptions.walletServicesConfig) === null || _coreOptions$walletSe === void 0 ? void 0 : _coreOptions$walletSe.whiteLabel) || {}]);
-    const confirmationStrategy = (_coreOptions$walletSe2 = (_coreOptions$walletSe3 = coreOptions.walletServicesConfig) === null || _coreOptions$walletSe3 === void 0 ? void 0 : _coreOptions$walletSe3.confirmationStrategy) !== null && _coreOptions$walletSe2 !== void 0 ? _coreOptions$walletSe2 : enableConfirmationModal ? CONFIRMATION_STRATEGY.MODAL : CONFIRMATION_STRATEGY.AUTO_APPROVE;
+    const whiteLabel = deepmerge.all([uiConfig, ((_coreOptions$walletSe = coreOptions.walletServicesConfig) === null || _coreOptions$walletSe === void 0 ? void 0 : _coreOptions$walletSe.whiteLabel) || {}]);
     const finalWsSettings = _objectSpread(_objectSpread({}, coreOptions.walletServicesConfig), {}, {
-      confirmationStrategy,
       whiteLabel,
       accountAbstractionConfig: coreOptions.accountAbstractionConfig,
-      enableLogging: coreOptions.enableLogging,
-      enableKeyExport: enableKeyExport
+      enableLogging: coreOptions.enableLogging
     });
 
     // Core options
+    const isKeyExportEnabled = (_coreOptions$walletSe2 = (_coreOptions$walletSe3 = coreOptions.walletServicesConfig) === null || _coreOptions$walletSe3 === void 0 ? void 0 : _coreOptions$walletSe3.enableKeyExport) !== null && _coreOptions$walletSe2 !== void 0 ? _coreOptions$walletSe2 : true;
     if (coreOptions.privateKeyProvider) coreOptions.privateKeyProvider.setKeyExportFlag(isKeyExportEnabled);
     return new AuthConnector({
       connectorSettings: finalConnectorSettings,
       walletServicesSettings: finalWsSettings,
-      loginSettings: params === null || params === void 0 ? void 0 : params.loginSettings,
+      loginSettings: _objectSpread(_objectSpread({}, (params === null || params === void 0 ? void 0 : params.loginSettings) || {}), {}, {
+        mfaLevel: coreOptions.mfaLevel
+      }),
       coreOptions,
-      // TODO: check, test this and may need to send modal config here later on.!!
       authConnectionConfig: projectConfig.embeddedWalletAuth
     });
   };

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

@@ -7,7 +7,7 @@ import { WalletLoginError, WalletInitializationError } from '../../base/errors/i
 
 class BaseEvmConnector extends BaseConnector {
   async init(_) {}
-  async authenticateUser() {
+  async getIdentityToken() {
     if (!this.provider || this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError();
     if (!this.coreOptions) throw WalletInitializationError.invalidParams("Please initialize Web3Auth with valid options");
     const accounts = await this.provider.request({

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

@@ -7,7 +7,7 @@ import { getSavedToken, checkIfTokenIsExpired, saveToken, clearToken } from '../
 
 class BaseSolanaConnector extends BaseConnector {
   async init(_) {}
-  async authenticateUser() {
+  async getIdentityToken() {
     if (!this.provider || this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError();
     if (!this.coreOptions) throw WalletInitializationError.invalidParams("Please initialize Web3Auth with a valid options");
     const accounts = await this.provider.request({

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

@@ -53,12 +53,17 @@ class CoinbaseConnector extends 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 WalletLoginError.connectionError("Failed to rehydrate.");
+        }
       }
     } catch (error) {
-      this.emit(CONNECTOR_EVENTS.ERRORED, error);
+      this.emit(CONNECTOR_EVENTS.REHYDRATION_ERROR, error);
     }
   }
   async connect({
@@ -97,8 +102,9 @@ class CoinbaseConnector extends BaseEvmConnector {
     } catch (error) {
       // ready again to be connected
       this.status = CONNECTOR_STATUS.READY;
+      // only throw error if the connector is not rehydrated.
+      if (!this.rehydrated) this.emit(CONNECTOR_EVENTS.ERRORED, error);
       this.rehydrated = false;
-      this.emit(CONNECTOR_EVENTS.ERRORED, error);
       if (error instanceof Web3AuthError) throw error;
       throw WalletLoginError.connectionError("Failed to login with coinbase wallet", error);
     }

package/dist/lib.esm/connectors/injected-evm-connector/injectedEvmConnector.js

@@ -42,12 +42,16 @@ class InjectedEvmConnector extends BaseEvmConnector {
       log.debug(`initializing ${this.name} injected connector`);
       if (options.autoConnect) {
         this.rehydrated = true;
-        await this.connect({
+        const provider = await this.connect({
           chainId: options.chainId
         });
+        if (!provider) {
+          this.rehydrated = false;
+          throw WalletLoginError.connectionError("Failed to rehydrate.");
+        }
       }
     } catch (error) {
-      this.emit(CONNECTOR_EVENTS.ERRORED, error);
+      this.emit(CONNECTOR_EVENTS.REHYDRATION_ERROR, error);
     }
   }
   async connect({
@@ -92,8 +96,8 @@ class InjectedEvmConnector extends BaseEvmConnector {
     } catch (error) {
       // ready again to be connected
       this.status = CONNECTOR_STATUS.READY;
+      if (!this.rehydrated) this.emit(CONNECTOR_EVENTS.ERRORED, error);
       this.rehydrated = false;
-      this.emit(CONNECTOR_EVENTS.ERRORED, error);
       if (error instanceof Web3AuthError) throw error;
       throw WalletLoginError.connectionError(`Failed to login with ${this.name} injected wallet`);
     }

package/dist/lib.esm/connectors/injected-solana-connector/walletStandardConnector.js

@@ -56,13 +56,16 @@ class WalletStandardConnector extends BaseSolanaConnector {
       log.debug("initializing solana injected connector");
       if (options.autoConnect) {
         this.rehydrated = true;
-        await this.connect({
+        const provider = await this.connect({
           chainId: options.chainId
         });
+        if (!provider) {
+          this.rehydrated = false;
+          throw WalletLoginError.connectionError("Failed to rehydrate.");
+        }
       }
     } catch (error) {
-      log.error("Failed to connect with cached solana injected provider", error);
-      this.emit(CONNECTOR_EVENTS.ERRORED, error);
+      this.emit(CONNECTOR_EVENTS.REHYDRATION_ERROR, error);
     }
   }
   async connect({
@@ -92,8 +95,8 @@ class WalletStandardConnector extends BaseSolanaConnector {
     } catch (error) {
       // ready again to be connected
       this.status = CONNECTOR_STATUS.READY;
+      if (!this.rehydrated) this.emit(CONNECTOR_EVENTS.ERRORED, error);
       this.rehydrated = false;
-      this.emit(CONNECTOR_EVENTS.ERRORED, error);
       throw error;
     }
   }

package/dist/lib.esm/connectors/metamask-connector/metamaskConnector.js

@@ -69,12 +69,16 @@ class MetaMaskConnector extends BaseEvmConnector {
     try {
       if (options.autoConnect) {
         this.rehydrated = true;
-        await this.connect({
+        const provider = await this.connect({
           chainId: options.chainId
         });
+        if (!provider) {
+          this.rehydrated = false;
+          throw WalletLoginError.connectionError("Failed to rehydrate.");
+        }
       }
     } catch (error) {
-      this.emit(CONNECTOR_EVENTS.ERRORED, error);
+      this.emit(CONNECTOR_EVENTS.REHYDRATION_ERROR, error);
     }
   }
   async connect({
@@ -130,8 +134,8 @@ class MetaMaskConnector extends BaseEvmConnector {
     } catch (error) {
       // ready again to be connected
       this.status = CONNECTOR_STATUS.READY;
+      if (!this.rehydrated) this.emit(CONNECTOR_EVENTS.ERRORED, error);
       this.rehydrated = false;
-      this.emit(CONNECTOR_EVENTS.ERRORED, error);
       if (error instanceof Web3AuthError) throw error;
       throw WalletLoginError.connectionError("Failed to login with MetaMask wallet", error);
     }
@@ -169,7 +173,7 @@ class MetaMaskConnector extends BaseEvmConnector {
     } catch (error) {
       // If the error code is 4902, the network needs to be added
       if ((error === null || error === void 0 ? void 0 : error.code) === 4902) {
-        const chainConfig = this.coreOptions.chains.find(x => x.chainId === params.chainId && x.chainNamespace === this.connectorNamespace);
+        const chainConfig = this.coreOptions.chains.find(x => x.chainId === params.chainId && [CHAIN_NAMESPACES.EIP155, CHAIN_NAMESPACES.SOLANA].includes(x.chainNamespace));
         await this.addChain(chainConfig);
         await requestSwitchChain();
       } else {