@dynamic-labs/sdk-react-core 4.0.0-alpha.30 → 4.0.0-alpha.31

package/CHANGELOG.md

@@ -1,4 +1,11 @@
 
+## [4.0.0-alpha.31](https://github.com/dynamic-labs/dynamic-auth/compare/v4.0.0-alpha.30...v4.0.0-alpha.31) (2024-11-13)
+
+
+### Features
+
+* allow passing telegram auth token into telegramSignIn function ([#7423](https://github.com/dynamic-labs/dynamic-auth/issues/7423)) ([4b8d594](https://github.com/dynamic-labs/dynamic-auth/commit/4b8d594984d1ac7851ce8d94fe4329ba94730f35))
+
 ## [4.0.0-alpha.30](https://github.com/dynamic-labs/dynamic-auth/compare/v4.0.0-alpha.29...v4.0.0-alpha.30) (2024-11-13)
 
 

package/package.cjs

@@ -3,7 +3,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "4.0.0-alpha.30";
+var version = "4.0.0-alpha.31";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.563",
 	"@hcaptcha/react-hcaptcha": "1.4.4",

package/package.js

@@ -1,5 +1,5 @@
 'use client'
-var version = "4.0.0-alpha.30";
+var version = "4.0.0-alpha.31";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.563",
 	"@hcaptcha/react-hcaptcha": "1.4.4",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "4.0.0-alpha.30",
+  "version": "4.0.0-alpha.31",
   "dependencies": {
     "@dynamic-labs/sdk-api-core": "0.0.563",
     "@hcaptcha/react-hcaptcha": "1.4.4",
@@ -13,16 +13,16 @@
     "react-i18next": "13.5.0",
     "yup": "0.32.11",
     "react-international-phone": "4.2.5",
-    "@dynamic-labs/assert-package-version": "4.0.0-alpha.30",
-    "@dynamic-labs/iconic": "4.0.0-alpha.30",
-    "@dynamic-labs/logger": "4.0.0-alpha.30",
-    "@dynamic-labs/multi-wallet": "4.0.0-alpha.30",
-    "@dynamic-labs/rpc-providers": "4.0.0-alpha.30",
-    "@dynamic-labs/store": "4.0.0-alpha.30",
-    "@dynamic-labs/types": "4.0.0-alpha.30",
-    "@dynamic-labs/utils": "4.0.0-alpha.30",
-    "@dynamic-labs/wallet-book": "4.0.0-alpha.30",
-    "@dynamic-labs/wallet-connector-core": "4.0.0-alpha.30",
+    "@dynamic-labs/assert-package-version": "4.0.0-alpha.31",
+    "@dynamic-labs/iconic": "4.0.0-alpha.31",
+    "@dynamic-labs/logger": "4.0.0-alpha.31",
+    "@dynamic-labs/multi-wallet": "4.0.0-alpha.31",
+    "@dynamic-labs/rpc-providers": "4.0.0-alpha.31",
+    "@dynamic-labs/store": "4.0.0-alpha.31",
+    "@dynamic-labs/types": "4.0.0-alpha.31",
+    "@dynamic-labs/utils": "4.0.0-alpha.31",
+    "@dynamic-labs/wallet-book": "4.0.0-alpha.31",
+    "@dynamic-labs/wallet-connector-core": "4.0.0-alpha.31",
     "bs58": "5.0.0",
     "eventemitter3": "5.0.1"
   },

package/src/lib/utils/functions/walletListBuilder/utils/applyMultiWalletFilters/applyMultiWalletFilters.cjs

@@ -5,13 +5,13 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var filterConnectedWallets = require('../filterConnectedWallets/filterConnectedWallets.cjs');
 var staticLinkedWalletFilter = require('../staticLinkedWalletFilter/staticLinkedWalletFilter.cjs');
-var filterWalletConnectWallets = require('../filterWalletConnectWallets/filterWalletConnectWallets.cjs');
+var createWalletConnectWalletsFilter = require('../createWalletConnectWalletsFilter/createWalletConnectWalletsFilter.cjs');
+var createMetaMaskMobileFilter = require('../createMetaMaskMobileFilter/createMetaMaskMobileFilter.cjs');
 
 const applyMultiWalletFilters = ({ authMode, userWallets, walletOptions, }) => {
-    const walletList = filterWalletConnectWallets.filterWalletConnectWallets({
-        userWallets,
-        walletOptions,
-    });
+    const walletList = walletOptions
+        .filter(createWalletConnectWalletsFilter.createWalletConnectWalletsFilter(userWallets))
+        .filter(createMetaMaskMobileFilter.createMetaMaskMobileFilter(userWallets));
     if (authMode === 'connect-only') {
         return filterConnectedWallets.filterConnectedWallets({
             userWallets,

package/src/lib/utils/functions/walletListBuilder/utils/applyMultiWalletFilters/applyMultiWalletFilters.js

@@ -1,13 +1,13 @@
 'use client'
 import { filterConnectedWallets } from '../filterConnectedWallets/filterConnectedWallets.js';
 import { staticWalletFilter } from '../staticLinkedWalletFilter/staticLinkedWalletFilter.js';
-import { filterWalletConnectWallets } from '../filterWalletConnectWallets/filterWalletConnectWallets.js';
+import { createWalletConnectWalletsFilter } from '../createWalletConnectWalletsFilter/createWalletConnectWalletsFilter.js';
+import { createMetaMaskMobileFilter } from '../createMetaMaskMobileFilter/createMetaMaskMobileFilter.js';
 
 const applyMultiWalletFilters = ({ authMode, userWallets, walletOptions, }) => {
-    const walletList = filterWalletConnectWallets({
-        userWallets,
-        walletOptions,
-    });
+    const walletList = walletOptions
+        .filter(createWalletConnectWalletsFilter(userWallets))
+        .filter(createMetaMaskMobileFilter(userWallets));
     if (authMode === 'connect-only') {
         return filterConnectedWallets({
             userWallets,

package/src/lib/utils/functions/walletListBuilder/utils/createMetaMaskMobileFilter/createMetaMaskMobileFilter.cjs

@@ -0,0 +1,25 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var utils = require('@dynamic-labs/utils');
+
+const metaMaskConnectorKey = 'metamask';
+/**
+ * Creates a filter for MetaMask Mobile wallets
+ * If user has MetaMask Mobile wallet, filter out all other wallets
+ * because MetaMask Mobile doesn't support multiwallet
+ */
+const createMetaMaskMobileFilter = (userWallets) => {
+    if (!utils.isMobile()) {
+        return () => true;
+    }
+    const hasMetaMaskWallet = userWallets.some((wallet) => wallet.key === metaMaskConnectorKey);
+    if (!hasMetaMaskWallet) {
+        return () => true;
+    }
+    return (walletOption) => walletOption.walletConnector.key !== metaMaskConnectorKey;
+};
+
+exports.createMetaMaskMobileFilter = createMetaMaskMobileFilter;

package/src/lib/utils/functions/walletListBuilder/utils/createMetaMaskMobileFilter/createMetaMaskMobileFilter.d.ts

@@ -0,0 +1,7 @@
+import { Wallet, WalletOption } from '../../../../../shared/types/wallets';
+/**
+ * Creates a filter for MetaMask Mobile wallets
+ * If user has MetaMask Mobile wallet, filter out all other wallets
+ * because MetaMask Mobile doesn't support multiwallet
+ */
+export declare const createMetaMaskMobileFilter: (userWallets: Wallet[]) => (walletOption: WalletOption) => boolean;

package/src/lib/utils/functions/walletListBuilder/utils/createMetaMaskMobileFilter/createMetaMaskMobileFilter.js

@@ -0,0 +1,21 @@
+'use client'
+import { isMobile } from '@dynamic-labs/utils';
+
+const metaMaskConnectorKey = 'metamask';
+/**
+ * Creates a filter for MetaMask Mobile wallets
+ * If user has MetaMask Mobile wallet, filter out all other wallets
+ * because MetaMask Mobile doesn't support multiwallet
+ */
+const createMetaMaskMobileFilter = (userWallets) => {
+    if (!isMobile()) {
+        return () => true;
+    }
+    const hasMetaMaskWallet = userWallets.some((wallet) => wallet.key === metaMaskConnectorKey);
+    if (!hasMetaMaskWallet) {
+        return () => true;
+    }
+    return (walletOption) => walletOption.walletConnector.key !== metaMaskConnectorKey;
+};
+
+export { createMetaMaskMobileFilter };

package/src/lib/utils/functions/walletListBuilder/utils/createMetaMaskMobileFilter/index.d.ts

@@ -0,0 +1 @@
+export { createMetaMaskMobileFilter } from './createMetaMaskMobileFilter';

package/src/lib/utils/functions/walletListBuilder/utils/{filterWalletConnectWallets/filterWalletConnectWallets.cjs → createWalletConnectWalletsFilter/createWalletConnectWalletsFilter.cjs}

@@ -7,14 +7,14 @@ Object.defineProperty(exports, '__esModule', { value: true });
  * Used to filter out WalletConnect wallets if user has already a WalletConnect wallet connected/linked
  * This is useful for multi-wallet on mobile, since WalletConnect doesn't work very well with multiwallet
  */
-const filterWalletConnectWallets = ({ walletOptions, userWallets, }) => {
+const createWalletConnectWalletsFilter = (userWallets) => {
     const hasWCWallet = userWallets.some((wallet) => wallet.connector.isWalletConnect);
-    // user doesn't have any WalletConnect wallet connected/linked, so we don't need to filter anything
+    // If user doesn't have WC wallet, keep all wallets (return true)
     if (!hasWCWallet) {
-        return walletOptions;
+        return () => true;
     }
-    // filter out WalletConnect wallets
-    return walletOptions.filter((walletOption) => !walletOption.walletConnector.isWalletConnect);
+    // If user has WC wallet, filter out other WC wallets
+    return (walletOption) => !walletOption.walletConnector.isWalletConnect;
 };
 
-exports.filterWalletConnectWallets = filterWalletConnectWallets;
+exports.createWalletConnectWalletsFilter = createWalletConnectWalletsFilter;

package/src/lib/utils/functions/walletListBuilder/utils/{filterWalletConnectWallets/filterWalletConnectWallets.d.ts → createWalletConnectWalletsFilter/createWalletConnectWalletsFilter.d.ts}

@@ -3,7 +3,4 @@ import { Wallet, WalletOption } from '../../../../../shared';
  * Used to filter out WalletConnect wallets if user has already a WalletConnect wallet connected/linked
  * This is useful for multi-wallet on mobile, since WalletConnect doesn't work very well with multiwallet
  */
-export declare const filterWalletConnectWallets: ({ walletOptions, userWallets, }: {
-    walletOptions: WalletOption[];
-    userWallets: Wallet[];
-}) => WalletOption[];
+export declare const createWalletConnectWalletsFilter: (userWallets: Wallet[]) => (walletOption: WalletOption) => boolean;

package/src/lib/utils/functions/walletListBuilder/utils/createWalletConnectWalletsFilter/createWalletConnectWalletsFilter.js

@@ -0,0 +1,16 @@
+'use client'
+/**
+ * Used to filter out WalletConnect wallets if user has already a WalletConnect wallet connected/linked
+ * This is useful for multi-wallet on mobile, since WalletConnect doesn't work very well with multiwallet
+ */
+const createWalletConnectWalletsFilter = (userWallets) => {
+    const hasWCWallet = userWallets.some((wallet) => wallet.connector.isWalletConnect);
+    // If user doesn't have WC wallet, keep all wallets (return true)
+    if (!hasWCWallet) {
+        return () => true;
+    }
+    // If user has WC wallet, filter out other WC wallets
+    return (walletOption) => !walletOption.walletConnector.isWalletConnect;
+};
+
+export { createWalletConnectWalletsFilter };

package/src/lib/utils/functions/walletListBuilder/utils/createWalletConnectWalletsFilter/index.d.ts

@@ -0,0 +1 @@
+export { createWalletConnectWalletsFilter } from './createWalletConnectWalletsFilter';

package/src/lib/utils/hooks/useTelegramLogin/useTelegramLogin.cjs

@@ -101,20 +101,43 @@ const useTelegramLogin = () => {
         }
         return telegramAuthToken;
     };
-    const canProceedWithTelegram = (telegramAuthToken) => isProviderEnabled.isProviderEnabled(providers, sdkApiCore.ProviderEnum.Telegram) &&
-        sdkHasLoaded &&
-        !user &&
-        telegramAuthToken;
-    const isAuthWithTelegram = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        const telegramAuthToken = getTelegramAuthToken();
+    const canProceedWithTelegram = (telegramAuthToken) => {
+        let failureReason;
+        if (!isProviderEnabled.isProviderEnabled(providers, sdkApiCore.ProviderEnum.Telegram)) {
+            failureReason = 'Telegram provider is not enabled';
+        }
+        else if (!sdkHasLoaded) {
+            failureReason = 'SDK has not loaded';
+        }
+        else if (user) {
+            failureReason = 'User is already logged in';
+        }
+        else if (!telegramAuthToken) {
+            failureReason = 'Telegram auth token is missing';
+        }
+        if (failureReason) {
+            logger.logger.error(`Failed to check user Telegram authentication status due to reason: ${failureReason}`);
+        }
+        return !failureReason;
+    };
+    /**
+     * Returns whether or not this telegram user has been authenticated with Dynamic.
+     * @param authToken (Optional) the Telegram auth token of the user to check.
+     *                  If not provided, the SDK will attempt to grab the auth token from the URL if exists.
+     * @returns Promise<boolean> of whether or not the Telegram user has authenticated with Dynamic.
+     */
+    const isAuthWithTelegram = (authToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        const telegramAuthToken = authToken || getTelegramAuthToken();
         if (!canProceedWithTelegram(telegramAuthToken)) {
-            return;
+            return false;
         }
-        return oauth.isUserLinkedWithTelegram(environmentId, { telegramAuthToken });
+        return Boolean(oauth.isUserLinkedWithTelegram(environmentId, { telegramAuthToken }));
     });
-    const telegramSignIn = (...args_1) => _tslib.__awaiter(void 0, [...args_1], void 0, function* ({ forceCreateUser = false, } = {}) {
-        const telegramAuthToken = getTelegramAuthToken();
-        if (!canProceedWithTelegram(telegramAuthToken)) {
+    const telegramSignIn = (...args_1) => _tslib.__awaiter(void 0, [...args_1], void 0, function* ({ forceCreateUser = false, authToken, } = {}) {
+        if (!authToken) {
+            authToken = getTelegramAuthToken();
+        }
+        if (!canProceedWithTelegram(authToken)) {
             return;
         }
         yield completeConnection({
@@ -122,7 +145,7 @@ const useTelegramLogin = () => {
             forceCreateUser,
             provider: sdkApiCore.ProviderEnum.Telegram,
             state: '',
-            telegramAuthToken,
+            telegramAuthToken: authToken,
         });
     });
     return {

package/src/lib/utils/hooks/useTelegramLogin/useTelegramLogin.d.ts

@@ -1,8 +1,9 @@
 interface TelegramConfig {
     forceCreateUser?: boolean;
+    authToken?: string;
 }
 export declare const useTelegramLogin: () => {
-    isAuthWithTelegram: () => Promise<boolean | undefined>;
-    telegramSignIn: ({ forceCreateUser, }?: TelegramConfig) => Promise<void>;
+    isAuthWithTelegram: (authToken?: string) => Promise<boolean>;
+    telegramSignIn: ({ forceCreateUser, authToken, }?: TelegramConfig) => Promise<void>;
 };
 export {};

package/src/lib/utils/hooks/useTelegramLogin/useTelegramLogin.js

@@ -97,20 +97,43 @@ const useTelegramLogin = () => {
         }
         return telegramAuthToken;
     };
-    const canProceedWithTelegram = (telegramAuthToken) => isProviderEnabled(providers, ProviderEnum.Telegram) &&
-        sdkHasLoaded &&
-        !user &&
-        telegramAuthToken;
-    const isAuthWithTelegram = () => __awaiter(void 0, void 0, void 0, function* () {
-        const telegramAuthToken = getTelegramAuthToken();
+    const canProceedWithTelegram = (telegramAuthToken) => {
+        let failureReason;
+        if (!isProviderEnabled(providers, ProviderEnum.Telegram)) {
+            failureReason = 'Telegram provider is not enabled';
+        }
+        else if (!sdkHasLoaded) {
+            failureReason = 'SDK has not loaded';
+        }
+        else if (user) {
+            failureReason = 'User is already logged in';
+        }
+        else if (!telegramAuthToken) {
+            failureReason = 'Telegram auth token is missing';
+        }
+        if (failureReason) {
+            logger.error(`Failed to check user Telegram authentication status due to reason: ${failureReason}`);
+        }
+        return !failureReason;
+    };
+    /**
+     * Returns whether or not this telegram user has been authenticated with Dynamic.
+     * @param authToken (Optional) the Telegram auth token of the user to check.
+     *                  If not provided, the SDK will attempt to grab the auth token from the URL if exists.
+     * @returns Promise<boolean> of whether or not the Telegram user has authenticated with Dynamic.
+     */
+    const isAuthWithTelegram = (authToken) => __awaiter(void 0, void 0, void 0, function* () {
+        const telegramAuthToken = authToken || getTelegramAuthToken();
         if (!canProceedWithTelegram(telegramAuthToken)) {
-            return;
+            return false;
         }
-        return isUserLinkedWithTelegram(environmentId, { telegramAuthToken });
+        return Boolean(isUserLinkedWithTelegram(environmentId, { telegramAuthToken }));
     });
-    const telegramSignIn = (...args_1) => __awaiter(void 0, [...args_1], void 0, function* ({ forceCreateUser = false, } = {}) {
-        const telegramAuthToken = getTelegramAuthToken();
-        if (!canProceedWithTelegram(telegramAuthToken)) {
+    const telegramSignIn = (...args_1) => __awaiter(void 0, [...args_1], void 0, function* ({ forceCreateUser = false, authToken, } = {}) {
+        if (!authToken) {
+            authToken = getTelegramAuthToken();
+        }
+        if (!canProceedWithTelegram(authToken)) {
             return;
         }
         yield completeConnection({
@@ -118,7 +141,7 @@ const useTelegramLogin = () => {
             forceCreateUser,
             provider: ProviderEnum.Telegram,
             state: '',
-            telegramAuthToken,
+            telegramAuthToken: authToken,
         });
     });
     return {

package/src/lib/utils/functions/walletListBuilder/utils/filterWalletConnectWallets/filterWalletConnectWallets.js

@@ -1,16 +0,0 @@
-'use client'
-/**
- * Used to filter out WalletConnect wallets if user has already a WalletConnect wallet connected/linked
- * This is useful for multi-wallet on mobile, since WalletConnect doesn't work very well with multiwallet
- */
-const filterWalletConnectWallets = ({ walletOptions, userWallets, }) => {
-    const hasWCWallet = userWallets.some((wallet) => wallet.connector.isWalletConnect);
-    // user doesn't have any WalletConnect wallet connected/linked, so we don't need to filter anything
-    if (!hasWCWallet) {
-        return walletOptions;
-    }
-    // filter out WalletConnect wallets
-    return walletOptions.filter((walletOption) => !walletOption.walletConnector.isWalletConnect);
-};
-
-export { filterWalletConnectWallets };

package/src/lib/utils/functions/walletListBuilder/utils/filterWalletConnectWallets/index.d.ts

@@ -1 +0,0 @@
-export * from './filterWalletConnectWallets';