fix review comments

Author: tanguyenvn

packages/modal/src/modalManager.ts

@@ -24,15 +24,7 @@ import deepmerge from "deepmerge";
 
 import { defaultConnectorsModalConfig, walletRegistryUrl } from "./config";
 import { type ConnectorsModalConfig, type IWeb3AuthModal, type ModalConfig } from "./interface";
-import {
-  AUTH_PROVIDERS,
-  capitalizeFirstLetter,
-  getConnectorSocialLogins,
-  getUserLanguage,
-  LOGIN_MODAL_EVENTS,
-  LoginModal,
-  type UIConfig,
-} from "./ui";
+import { AUTH_PROVIDERS, capitalizeFirstLetter, getUserLanguage, LOGIN_MODAL_EVENTS, LoginModal, type UIConfig } from "./ui";
 
 export interface Web3AuthOptions extends IWeb3AuthCoreOptions {
   /**
@@ -293,8 +285,7 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
       if (connector.type !== CONNECTOR_CATEGORY.IN_APP) return false;
       if (this.modalConfig.connectors?.[connector.name]?.showOnModal !== true) return false;
       if (!this.modalConfig.connectors?.[connector.name]?.loginMethods) return true;
-      const mergedLoginMethods = getConnectorSocialLogins(connector.name, this.modalConfig.connectors[connector.name]?.loginMethods);
-      if (Object.values(mergedLoginMethods).some((method: LoginMethodConfig[keyof LoginMethodConfig]) => method.showOnModal)) return true;
+      if (Object.values(this.modalConfig.connectors[connector.name].loginMethods).some((method) => method.showOnModal)) return true;
       return false;
     });
     log.debug(hasInAppConnectors, this.connectors, connectorNames, "hasInAppWallets");
@@ -330,7 +321,7 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
           // adding it later if no in-app wallets are available.
           if (connector.type === CONNECTOR_CATEGORY.IN_APP) {
             log.info("connectorInitResults", connectorName);
-            const loginMethods = getConnectorSocialLogins(connectorName, this.modalConfig.connectors[connectorName]?.loginMethods);
+            const loginMethods = this.modalConfig.connectors[connectorName]?.loginMethods || {};
             this.loginModal.addSocialLogins(connectorName, loginMethods, this.options.uiConfig?.loginMethodsOrder || AUTH_PROVIDERS, {
               ...this.options.uiConfig,
               loginGridCol: this.options.uiConfig?.loginGridCol || 3,

packages/modal/src/ui/utils.ts

@@ -1,23 +1,6 @@
 import { get, post } from "@toruslabs/http-helpers";
 import { LANGUAGE_MAP, type LANGUAGE_TYPE, LANGUAGES } from "@web3auth/auth";
-import { log, type LoginMethodConfig, WALLET_CONNECTORS, WalletInitializationError } from "@web3auth/no-modal";
-
-import { AUTH_PROVIDERS, AUTH_PROVIDERS_NAMES } from "./config";
-
-export const getConnectorSocialLogins = (connectorName: string, loginMethodsConfig: LoginMethodConfig = {}): LoginMethodConfig => {
-  const finalLoginMethodsConfig: LoginMethodConfig = {};
-  if (connectorName === WALLET_CONNECTORS.AUTH) {
-    AUTH_PROVIDERS.forEach((loginMethod) => {
-      if (!loginMethodsConfig[loginMethod]) return;
-      const currentLoginMethodConfig = { name: AUTH_PROVIDERS_NAMES[loginMethod], ...loginMethodsConfig[loginMethod] };
-      finalLoginMethodsConfig[loginMethod] = { ...currentLoginMethodConfig };
-    });
-    log.debug("auth login method ui config", finalLoginMethodsConfig);
-  } else {
-    throw WalletInitializationError.invalidParams(`${connectorName} is not a valid connector`);
-  }
-  return finalLoginMethodsConfig;
-};
+import { log } from "@web3auth/no-modal";
 
 export async function validateImageUrl(url: string): Promise<boolean> {
   return new Promise((resolve, reject) => {

packages/no-modal/src/connectors/auth-connector/authConnector.ts

@@ -504,23 +504,17 @@ class AuthConnector extends BaseConnector<AuthLoginParams> {
 
   private getOAuthProviderConfig(params: Pick<AuthLoginParams, "authConnection" | "authConnectionId" | "groupedAuthConnectionId">) {
     const { authConnection, authConnectionId, groupedAuthConnectionId } = params;
-    // if groupedAuthConnectionId or authConnectionId, then use the specific auth connection
-    if (groupedAuthConnectionId || authConnectionId) {
-      const authConnectionItem = this.authConnectionConfig.find((x) => {
-        if (groupedAuthConnectionId) return x.authConnection === authConnection && x.groupedAuthConnectionId === groupedAuthConnectionId;
-        if (authConnectionId) return x.authConnection === authConnection && x.authConnectionId === authConnectionId;
-        return false;
-      });
-      // if no auth connection item found, then return undefined
-      return authConnectionItem;
-    } else {
-      // if no groupedAuthConnectionId or authConnectionId, then use the default auth connection
-      const defaultAuthConnectionItem = this.authConnectionConfig.find((x) => x.authConnection === authConnection && x.isDefault);
-      if (defaultAuthConnectionItem) return defaultAuthConnectionItem;
-
-      // if no default auth connection, then use the first auth connection
-      return this.authConnectionConfig.find((x) => x.authConnection === authConnection);
-    }
+    const providerConfig = this.authConnectionConfig.find((x) => {
+      if (groupedAuthConnectionId) {
+        return x.authConnection === authConnection && x.groupedAuthConnectionId === groupedAuthConnectionId;
+      }
+      if (authConnectionId) {
+        return x.authConnection === authConnection && x.authConnectionId === authConnectionId;
+      }
+      // return the default auth connection, if not found, return undefined
+      return x.authConnection === authConnection && x.isDefault;
+    });
+    return providerConfig;
   }
 }