@web3auth/modal 8.0.0-alpha.1 → 8.0.0-alpha.11

package/dist/types/modalManager.d.ts

@@ -1,27 +1,23 @@
-import { IProvider, WALLET_ADAPTER_TYPE, Web3AuthNoModalOptions } from "@web3auth/base";
+import { IBaseProvider, IProvider, WALLET_ADAPTER_TYPE, Web3AuthNoModalOptions } from "@web3auth/base";
 import { Web3AuthNoModal } from "@web3auth/no-modal";
 import { LoginModal, UIConfig } from "@web3auth/ui";
-import { IWeb3AuthModal, ModalConfig } from "./interface";
+import { AdaptersModalConfig, IWeb3AuthModal, ModalConfig } from "./interface";
 export interface Web3AuthOptions extends Web3AuthNoModalOptions {
-    /**
-     * web3auth instance provides different adapters for different type of usages. If you are dapp and want to
-     * use external wallets like metamask, then you can use the `DAPP` authMode.
-     * If you are a wallet and only want to use you own wallet implementations along with openlogin,
-     * then you should use `WALLET` authMode.
-     *
-     * @defaultValue `DAPP`
-     */
-    authMode?: "DAPP" | "WALLET";
     /**
      * Config for configuring modal ui display properties
      */
     uiConfig?: Omit<UIConfig, "adapterListener">;
+    /**
+     * Private key provider for your chain namespace
+     */
+    privateKeyProvider: IBaseProvider<string>;
 }
 export declare class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
     loginModal: LoginModal;
     readonly options: Web3AuthOptions;
     private modalConfig;
     constructor(options: Web3AuthOptions);
+    setModalConfig(modalConfig: AdaptersModalConfig): void;
     initModal(params?: {
         modalConfig?: Record<WALLET_ADAPTER_TYPE, ModalConfig>;
     }): Promise<void>;

package/package.json

@@ -4,18 +4,18 @@
     "url": "https://github.com/Web3Auth/Web3Auth/issues"
   },
   "dependencies": {
-    "@web3auth/base": "^8.0.0-alpha.0",
-    "@web3auth/base-provider": "^8.0.0-alpha.0",
-    "@web3auth/no-modal": "^8.0.0-alpha.1",
-    "@web3auth/ui": "^8.0.0-alpha.0"
+    "@web3auth/base": "^8.0.0-alpha.11",
+    "@web3auth/base-provider": "^8.0.0-alpha.11",
+    "@web3auth/no-modal": "^8.0.0-alpha.11",
+    "@web3auth/openlogin-adapter": "^8.0.0-alpha.11",
+    "@web3auth/ui": "^8.0.0-alpha.11"
   },
   "devDependencies": {
     "@svgr/webpack": "^8.1.0",
     "@toruslabs/isomorphic-style-loader": "^5.3.3",
-    "@toruslabs/openlogin-utils": "^6.2.5",
-    "@web3auth/openlogin-adapter": "^8.0.0-alpha.0",
-    "@web3auth/wallet-connect-v2-adapter": "^8.0.0-alpha.0",
-    "css-loader": "^6.9.1",
+    "@toruslabs/openlogin-utils": "^6.2.9",
+    "@web3auth/wallet-connect-v2-adapter": "^8.0.0-alpha.11",
+    "css-loader": "^6.10.0",
     "postcss-prefix-selector": "^1.16.0",
     "style-loader": "^3.3.4",
     "tailwindcss": "^3.4.1",
@@ -44,13 +44,9 @@
   "name": "@web3auth/modal",
   "peerDependencies": {
     "@babel/runtime": "^7.x",
-    "@web3auth/openlogin-adapter": "^8.x",
     "@web3auth/wallet-connect-v2-adapter": "^8.x"
   },
   "peerDependenciesMeta": {
-    "@web3auth/openlogin-adapter": {
-      "optional": true
-    },
     "@web3auth/wallet-connect-v2-adapter": {
       "optional": true
     }
@@ -73,6 +69,6 @@
   },
   "types": "dist/types/index.d.ts",
   "unpkg": "dist/modal.umd.min.js",
-  "version": "8.0.0-alpha.1",
-  "gitHead": "9d933eb74755a68053de84173c1176a17a40d7a7"
+  "version": "8.0.0-alpha.11",
+  "gitHead": "00efb0e38a6d52de3bb8bc234edc7fca06d10d87"
 }

package/src/modalManager.ts

@@ -3,9 +3,9 @@ import {
   ADAPTER_EVENTS,
   ADAPTER_STATUS,
   BaseAdapterConfig,
-  CHAIN_NAMESPACES,
   CustomChainConfig,
   getChainConfig,
+  IBaseProvider,
   IProvider,
   log,
   LoginMethodConfig,
@@ -16,33 +16,23 @@ import {
 } from "@web3auth/base";
 import { CommonJRPCProvider } from "@web3auth/base-provider";
 import { Web3AuthNoModal } from "@web3auth/no-modal";
-import type { OpenloginAdapter } from "@web3auth/openlogin-adapter";
+import { getOpenloginDefaultOptions, OpenloginAdapter } from "@web3auth/openlogin-adapter";
 import { getAdapterSocialLogins, getUserLanguage, LOGIN_MODAL_EVENTS, LoginModal, OPENLOGIN_PROVIDERS, UIConfig } from "@web3auth/ui";
 import type { WalletConnectV2Adapter } from "@web3auth/wallet-connect-v2-adapter";
 
-import {
-  defaultEvmDappModalConfig,
-  defaultEvmWalletModalConfig,
-  defaultOtherModalConfig,
-  defaultSolanaDappModalConfig,
-  defaultSolanaWalletModalConfig,
-} from "./config";
+import { defaultOtherModalConfig } from "./config";
 import { AdaptersModalConfig, IWeb3AuthModal, ModalConfig } from "./interface";
 
 export interface Web3AuthOptions extends Web3AuthNoModalOptions {
-  /**
-   * web3auth instance provides different adapters for different type of usages. If you are dapp and want to
-   * use external wallets like metamask, then you can use the `DAPP` authMode.
-   * If you are a wallet and only want to use you own wallet implementations along with openlogin,
-   * then you should use `WALLET` authMode.
-   *
-   * @defaultValue `DAPP`
-   */
-  authMode?: "DAPP" | "WALLET";
   /**
    * Config for configuring modal ui display properties
    */
   uiConfig?: Omit<UIConfig, "adapterListener">;
+
+  /**
+   * Private key provider for your chain namespace
+   */
+  privateKeyProvider: IBaseProvider<string>;
 }
 
 export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
@@ -50,37 +40,16 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
 
   readonly options: Web3AuthOptions;
 
-  private modalConfig: AdaptersModalConfig = defaultEvmDappModalConfig;
+  private modalConfig: AdaptersModalConfig = defaultOtherModalConfig;
 
   constructor(options: Web3AuthOptions) {
     super(options);
     this.options = { ...options };
-    const providedChainConfig = this.options.chainConfig;
-    if (providedChainConfig.chainNamespace === CHAIN_NAMESPACES.SOLANA) {
-      if (options.authMode === "WALLET") {
-        // default config for solana wallet modal
-        this.modalConfig = defaultSolanaWalletModalConfig;
-      } else {
-        // default config for solana dapp modal
-        this.modalConfig = defaultSolanaDappModalConfig;
-      }
-    } else if (providedChainConfig.chainNamespace === CHAIN_NAMESPACES.EIP155) {
-      if (options.authMode === "WALLET") {
-        // default config for evm wallet modal
-        this.modalConfig = defaultEvmWalletModalConfig;
-      } else {
-        // default config for evm dapp modal
-        this.modalConfig = defaultEvmDappModalConfig;
-      }
-    } else if (providedChainConfig.chainNamespace === CHAIN_NAMESPACES.OTHER) {
-      this.modalConfig = defaultOtherModalConfig;
-    } else {
-      throw new Error(`Invalid chainNamespace provided: ${providedChainConfig.chainNamespace}`);
-    }
 
     if (!this.options.uiConfig) this.options.uiConfig = {};
     if (!this.options.uiConfig.defaultLanguage) this.options.uiConfig.defaultLanguage = getUserLanguage(this.options.uiConfig.defaultLanguage);
     if (!this.options.uiConfig.mode) this.options.uiConfig.mode = "auto";
+    if (!this.coreOptions.privateKeyProvider) throw WalletInitializationError.invalidParams("privateKeyProvider is required");
 
     this.loginModal = new LoginModal({
       ...this.options.uiConfig,
@@ -89,6 +58,11 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
     this.subscribeToLoginModalEvents();
   }
 
+  public setModalConfig(modalConfig: AdaptersModalConfig): void {
+    super.checkInitRequirements();
+    this.modalConfig = modalConfig;
+  }
+
   public async initModal(params?: { modalConfig?: Record<WALLET_ADAPTER_TYPE, ModalConfig> }): Promise<void> {
     super.checkInitRequirements();
     await this.loginModal.initModal();
@@ -120,6 +94,38 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
       // and if adapter is not hidden by user
       if (!adapter && this.modalConfig.adapters?.[adapterName].showOnModal) {
         // Adapters to be shown on modal should be pre-configured.
+        if (adapterName === WALLET_ADAPTERS.OPENLOGIN) {
+          const defaultOptions = getOpenloginDefaultOptions();
+          const { clientId, useCoreKitKey, chainConfig, web3AuthNetwork, sessionTime, privateKeyProvider } = this.coreOptions;
+          const finalChainConfig = {
+            ...getChainConfig(providedChainConfig.chainNamespace, this.coreOptions.chainConfig?.chainId),
+            ...chainConfig,
+          } as CustomChainConfig;
+          if (!privateKeyProvider) {
+            throw WalletInitializationError.invalidParams("privateKeyProvider is required");
+          }
+          const finalOpenloginAdapterSettings = {
+            ...defaultOptions.adapterSettings,
+            clientId,
+            network: web3AuthNetwork,
+            whiteLabel: this.options.uiConfig,
+          };
+          if (this.options.uiConfig.uxMode) {
+            finalOpenloginAdapterSettings.uxMode = this.options.uiConfig.uxMode;
+          }
+          const openloginAdapter = new OpenloginAdapter({
+            ...defaultOptions,
+            clientId,
+            useCoreKitKey,
+            chainConfig: { ...finalChainConfig },
+            adapterSettings: finalOpenloginAdapterSettings,
+            sessionTime,
+            web3AuthNetwork,
+            privateKeyProvider,
+          });
+          this.walletAdapters[adapterName] = openloginAdapter;
+          return adapterName;
+        }
         throw WalletInitializationError.invalidParams(`Adapter ${adapterName} is not configured`);
       } else if (adapter?.type === ADAPTER_CATEGORY.IN_APP || adapter?.type === ADAPTER_CATEGORY.EXTERNAL || adapterName === this.cachedAdapter) {
         if (!this.modalConfig.adapters?.[adapterName].showOnModal) return;
@@ -152,6 +158,9 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
             }
             openloginAdapter.setAdapterSettings({ privateKeyProvider: this.coreOptions.privateKeyProvider });
           }
+          if (this.options.uiConfig?.uxMode) {
+            openloginAdapter.setAdapterSettings({ uxMode: this.options.uiConfig.uxMode });
+          }
           openloginAdapter.setAdapterSettings({ whiteLabel: this.options.uiConfig });
           if (!openloginAdapter.privateKeyProvider) {
             throw WalletInitializationError.invalidParams("privateKeyProvider is required for openlogin adapter");