npm - @dynamic-labs/sdk-react-core - Versions diffs - 0.19.0-alpha.20 → 0.19.0-alpha.22 - Mend

@dynamic-labs/sdk-react-core 0.19.0-alpha.20 → 0.19.0-alpha.22

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (40) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -1,4 +1,36 @@
+## [0.19.0-alpha.22](https://github.com/dynamic-labs/DynamicAuth/compare/v0.19.0-alpha.21...v0.19.0-alpha.22) (2023-10-23)
+### ⚠ BREAKING CHANGES
+* rename unlinkConnectedWallet to disconnectWallet (#3595)
+### Features
+* rename unlinkConnectedWallet to disconnectWallet ([#3595](https://github.com/dynamic-labs/DynamicAuth/issues/3595)) ([ac4a59e](https://github.com/dynamic-labs/DynamicAuth/commit/ac4a59ee5e50814fdb4190f07f5905b0c1499c7d))
+### Bug Fixes
+* add support for apple oauth ([#3568](https://github.com/dynamic-labs/DynamicAuth/issues/3568)) ([10455fd](https://github.com/dynamic-labs/DynamicAuth/commit/10455fd74f22c6a1d66409fc01650d6ec68c2156))
+* only process oauth message coming from the expected origin ([#3653](https://github.com/dynamic-labs/DynamicAuth/issues/3653)) ([3bf48d4](https://github.com/dynamic-labs/DynamicAuth/commit/3bf48d4a61fa624c30ff11861e6f5db4c33ef5c3))
+* **SignMessagePreview:** safely render message to sign ([#3655](https://github.com/dynamic-labs/DynamicAuth/issues/3655)) ([02b520a](https://github.com/dynamic-labs/DynamicAuth/commit/02b520a2ddb6ba4042bf630de4cf80259c4fac37))
+## [0.19.0-alpha.21](https://github.com/dynamic-labs/DynamicAuth/compare/v0.19.0-alpha.20...v0.19.0-alpha.21) (2023-10-23)
+### ⚠ BREAKING CHANGES
+* Restructure the SDK packages (#3623)
+### Features
+* add support for overriding views ([#3649](https://github.com/dynamic-labs/DynamicAuth/issues/3649)) ([a722a1e](https://github.com/dynamic-labs/DynamicAuth/commit/a722a1e48d71373939e5f692bf215985959e1f0b))
+* Restructure the SDK packages ([#3623](https://github.com/dynamic-labs/DynamicAuth/issues/3623)) ([aff5342](https://github.com/dynamic-labs/DynamicAuth/commit/aff5342f469a91b9092128daf74396c3af47f698))
 ## [0.19.0-alpha.20](https://github.com/dynamic-labs/DynamicAuth/compare/v0.19.0-alpha.19...v0.19.0-alpha.20) (2023-10-23)

package/README.md CHANGED Viewed

@@ -13,7 +13,7 @@ Dynamic offers smart and beautiful login flows for crypto-native users, simple o
 Want a quick overview of some of the powerful features Dynamic offers? check out our product walkthrough video below.
 <a href="https://www.youtube.com/watch?v=LKP-aJOTxfw
-" target="_blank"><img src="https://user-images.githubusercontent.com/1596208/224676777-5f6ffad2-f2c3-4f49-bc4e-a8643da777cd.jpg"
+" target="_blank"><img src="https://user-images.githubusercontent.com/1596208/224676777-5f6ffad2-f2c3-4f49-bc4e-a8643da777cd.jpg"
 alt="Product walkthrough video" width="1280" /></a>
 ## Getting started
@@ -27,7 +27,10 @@ Here is a shoterned version of the getting started guide:
 3. Configure the SDK
 ```js
-import { DynamicContextProvider, DynamicWidget } from '@dynamic-labs/sdk-react';
+import {
+  DynamicContextProvider,
+  DynamicWidget,
+} from '@dynamic-labs/sdk-react-core';
 const App = () => (
   <DynamicContextProvider

package/package.cjs CHANGED Viewed

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-var version = "0.19.0-alpha.20";
+var version = "0.19.0-alpha.22";
 var dependencies = {
 	"@dynamic-labs/iconic": "0.1.34",
 	"@dynamic-labs/sdk-api": "0.0.291",

package/package.js CHANGED Viewed

@@ -1,4 +1,4 @@
-var version = "0.19.0-alpha.20";
+var version = "0.19.0-alpha.22";
 var dependencies = {
 	"@dynamic-labs/iconic": "0.1.34",
 	"@dynamic-labs/sdk-api": "0.0.291",

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "0.19.0-alpha.20",
+  "version": "0.19.0-alpha.22",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -17,13 +17,13 @@
     "react-focus-lock": "2.9.2",
     "react-i18next": "^13.2.0",
     "yup": "0.32.11",
-    "@dynamic-labs/logger": "0.19.0-alpha.20",
-    "@dynamic-labs/multi-wallet": "0.19.0-alpha.20",
-    "@dynamic-labs/rpc-providers": "0.19.0-alpha.20",
-    "@dynamic-labs/types": "0.19.0-alpha.20",
-    "@dynamic-labs/utils": "0.19.0-alpha.20",
-    "@dynamic-labs/wallet-book": "0.19.0-alpha.20",
-    "@dynamic-labs/wallet-connector-core": "0.19.0-alpha.20",
+    "@dynamic-labs/logger": "0.19.0-alpha.22",
+    "@dynamic-labs/multi-wallet": "0.19.0-alpha.22",
+    "@dynamic-labs/rpc-providers": "0.19.0-alpha.22",
+    "@dynamic-labs/types": "0.19.0-alpha.22",
+    "@dynamic-labs/utils": "0.19.0-alpha.22",
+    "@dynamic-labs/wallet-book": "0.19.0-alpha.22",
+    "@dynamic-labs/wallet-connector-core": "0.19.0-alpha.22",
     "eventemitter3": "5.0.1"
   },
   "devDependencies": {

package/src/index.cjs CHANGED Viewed

@@ -117,6 +117,7 @@ require('react-focus-lock');
 require('./lib/components/Transition/ZoomTransition/ZoomTransition.cjs');
 require('./lib/components/Transition/SlideInUpTransition/SlideInUpTransition.cjs');
 require('./lib/components/Transition/OpacityTransition/OpacityTransition.cjs');
+var useFetchProjectSettings = require('./lib/utils/hooks/useFetchProjectSettings/useFetchProjectSettings.cjs');
 require('./lib/config/ApiEndpoint.cjs');
 require('./lib/utils/hooks/useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs');
 var isSameWalletName = require('./lib/utils/functions/isSameWalletName/isSameWalletName.cjs');
@@ -291,6 +292,7 @@ Object.defineProperty(exports, 'DynamicJwtFromJSON', {
   get: function () { return sdkApi.DynamicJwtFromJSON; }
 });
 exports.ShadowDOM = ShadowDOM.ShadowDOM;
+exports.useFetchProjectSettings = useFetchProjectSettings.useFetchProjectSettings;
 exports.isSameWalletName = isSameWalletName.isSameWalletName;
 exports.MockContext = MockContext.MockContext;
 exports.MockContextProvider = MockContext.MockContextProvider;

package/src/index.d.ts CHANGED Viewed

@@ -23,7 +23,7 @@ export { classNames } from './lib/utils/functions/classNames';
 export { getNetwork } from './lib/utils/functions/getNetwork';
 export * from './lib/utils/functions/walletFilters';
 export { DynamicWidgetContextProvider } from './lib/widgets/DynamicWidget/context';
-export { useWalletItemActions, useAuthenticateConnectedUser, useSocialAccounts, useEmbeddedWallet, useIsLoggedIn, } from './lib/utils/hooks';
+export { useFetchProjectSettings, useWalletItemActions, useAuthenticateConnectedUser, useSocialAccounts, useEmbeddedWallet, useIsLoggedIn, } from './lib/utils/hooks';
 export { useUserUpdateRequest } from './lib/utils/hooks';
 export { type VerifyEmailCallback, useEmailVerificationRequest, } from './lib/utils/hooks/authenticationHooks/';
 export type { UpdateUserFieldsArg } from './lib/utils/hooks/';

package/src/index.js CHANGED Viewed

@@ -113,6 +113,7 @@ import 'react-focus-lock';
 import './lib/components/Transition/ZoomTransition/ZoomTransition.js';
 import './lib/components/Transition/SlideInUpTransition/SlideInUpTransition.js';
 import './lib/components/Transition/OpacityTransition/OpacityTransition.js';
+export { useFetchProjectSettings } from './lib/utils/hooks/useFetchProjectSettings/useFetchProjectSettings.js';
 import './lib/config/ApiEndpoint.js';
 import './lib/utils/hooks/useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.js';
 export { isSameWalletName } from './lib/utils/functions/isSameWalletName/isSameWalletName.js';

package/src/lib/Main.cjs CHANGED Viewed

@@ -68,7 +68,7 @@ const viewsToDisableCloseOnOverlayClick = [
     'passkey-intro',
 ];
 const Main = () => {
-    const { selectedWalletConnector, linkedWallets, isProjectSettingsLoading, projectSettings, setShowAuthFlow, showAuthFlow, wallets, clearStatesOnBackClick, user, unlinkConnectedWallet, authMode, connectedWallets, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { selectedWalletConnector, linkedWallets, isProjectSettingsLoading, projectSettings, setShowAuthFlow, showAuthFlow, wallets, clearStatesOnBackClick, user, disconnectWallet, authMode, connectedWallets, } = useInternalDynamicContext.useInternalDynamicContext();
     const { view, goToInitialView } = ViewContext.useViewContext();
     const { setDeniedAddress, setDeniedOauthProvider } = AccessDeniedContext.useAccessDeniedContext();
     const { setExistentAccountData } = AccountExistsContext.useAccountExistsContext();
@@ -105,7 +105,7 @@ const Main = () => {
                     network: yield walletByConnectorName.connector.getNetwork(),
                     walletConnector: walletByConnectorName.connector,
                 })) {
-                    unlinkConnectedWallet(walletByConnectorName.id);
+                    disconnectWallet(walletByConnectorName.id);
                 }
             }
         }
@@ -113,7 +113,7 @@ const Main = () => {
         selectedWalletConnector,
         authMode,
         connectedWallets,
-        unlinkConnectedWallet,
+        disconnectWallet,
         user,
         view,
     ]);

package/src/lib/Main.js CHANGED Viewed

@@ -64,7 +64,7 @@ const viewsToDisableCloseOnOverlayClick = [
     'passkey-intro',
 ];
 const Main = () => {
-    const { selectedWalletConnector, linkedWallets, isProjectSettingsLoading, projectSettings, setShowAuthFlow, showAuthFlow, wallets, clearStatesOnBackClick, user, unlinkConnectedWallet, authMode, connectedWallets, } = useInternalDynamicContext();
+    const { selectedWalletConnector, linkedWallets, isProjectSettingsLoading, projectSettings, setShowAuthFlow, showAuthFlow, wallets, clearStatesOnBackClick, user, disconnectWallet, authMode, connectedWallets, } = useInternalDynamicContext();
     const { view, goToInitialView } = useViewContext();
     const { setDeniedAddress, setDeniedOauthProvider } = useAccessDeniedContext();
     const { setExistentAccountData } = useAccountExistsContext();
@@ -101,7 +101,7 @@ const Main = () => {
                     network: yield walletByConnectorName.connector.getNetwork(),
                     walletConnector: walletByConnectorName.connector,
                 })) {
-                    unlinkConnectedWallet(walletByConnectorName.id);
+                    disconnectWallet(walletByConnectorName.id);
                 }
             }
         }
@@ -109,7 +109,7 @@ const Main = () => {
         selectedWalletConnector,
         authMode,
         connectedWallets,
-        unlinkConnectedWallet,
+        disconnectWallet,
         user,
         view,
     ]);

package/src/lib/components/SignMessagePreview/SignMessagePreview.cjs CHANGED Viewed

@@ -21,7 +21,7 @@ const SignMessagePreview = ({ message, }) => {
     if (signTypedData) {
         return (jsxRuntime.jsx(SignTypedDataPreview.SignTypedDataPreview, { currentType: signTypedData.primaryType, types: signTypedData.types, showTypeName: true, data: signTypedData.message }));
     }
-    return (jsxRuntime.jsx(Typography.Typography, { color: 'primary', variant: 'body_normal', children: jsxRuntime.jsx("span", { style: { whiteSpace: 'pre-line' }, dangerouslySetInnerHTML: { __html: message } }) }));
+    return (jsxRuntime.jsx(Typography.Typography, { color: 'primary', variant: 'body_normal', children: jsxRuntime.jsx("span", { style: { whiteSpace: 'pre-line' }, children: message }) }));
 };
 exports.SignMessagePreview = SignMessagePreview;

package/src/lib/components/SignMessagePreview/SignMessagePreview.js CHANGED Viewed

@@ -17,7 +17,7 @@ const SignMessagePreview = ({ message, }) => {
     if (signTypedData) {
         return (jsx(SignTypedDataPreview, { currentType: signTypedData.primaryType, types: signTypedData.types, showTypeName: true, data: signTypedData.message }));
     }
-    return (jsx(Typography, { color: 'primary', variant: 'body_normal', children: jsx("span", { style: { whiteSpace: 'pre-line' }, dangerouslySetInnerHTML: { __html: message } }) }));
+    return (jsx(Typography, { color: 'primary', variant: 'body_normal', children: jsx("span", { style: { whiteSpace: 'pre-line' }, children: message }) }));
 };
 export { SignMessagePreview };

package/src/lib/context/DynamicContext/DynamicContext.cjs CHANGED Viewed

@@ -197,14 +197,14 @@ const DynamicContextProvider = ({ children, theme, settings, locale: locale$1, }
     });
     const [authMode, setAuthMode] = useLocalStorage.useLocalStorage(localStorage$1.AUTH_MODE, initialAuthenticationMode);
     const { clearPrimaryWalletId, primaryWalletId, setPrimaryWalletId } = usePrimaryWalletId.usePrimaryWalletId(internalEventsRef.current);
-    const { connectWallet, removeConnectedWalletsInfo, connectedWalletsInfo, connectedWallet, getConnectedWalletById, connectedWallets, unlinkConnectedWallet, refreshConnectedWallet, } = useConnectWallet.useConnectWallet({
+    const { connectWallet, removeConnectedWalletsInfo, connectedWalletsInfo, connectedWallet, getConnectedWalletById, connectedWallets, disconnectWallet, refreshConnectedWallet, } = useConnectWallet.useConnectWallet({
         authMode,
         clearPrimaryWalletId,
         enableVisitTrackingOnConnectOnly,
         environmentId,
         isBridgeFlow,
         onBeforeConnectSuccessConfirmation: eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onBeforeConnectSuccessConfirmation,
-        onUnlink: (connectedWalletsInfo, wallet) => handleDisconnectWallet.handleDisconnectWallet({
+        onDisconnect: (connectedWalletsInfo, wallet) => handleDisconnectWallet.handleDisconnectWallet({
             connectedWalletsInfo,
             eventsCallbacks,
             setWalletsToConnectByChain,
@@ -485,15 +485,14 @@ const DynamicContextProvider = ({ children, theme, settings, locale: locale$1, }
             decodedOnboardingOnlyToken: decodeJwt.decodeJwt(onboardingOnlyJwt),
             defaultNumberOfWalletsToShow,
             desktopUri,
+            disconnectWallet,
             displaySiweStatement,
             environmentId,
             eventsCallbacks,
             getConnectedWalletById,
             getNameService,
             handleLogOut,
-            handleUnlinkWallet: authMode === 'connect-only'
-                ? unlinkConnectedWallet
-                : handleUnlinkWallet,
+            handleUnlinkWallet: authMode === 'connect-only' ? disconnectWallet : handleUnlinkWallet,
             i18nSDKInstance,
             internalEvents: internalEventsRef,
             internalSetShowAuthFlow: setShowAuthFlow,
@@ -575,7 +574,6 @@ const DynamicContextProvider = ({ children, theme, settings, locale: locale$1, }
             termsOfServiceUrl,
             theme,
             toolkitEnabled,
-            unlinkConnectedWallet,
             user,
             walletConnector: (_c = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector) !== null && _c !== void 0 ? _c : null,
             walletUiUtils,
@@ -614,7 +612,7 @@ const DynamicContextProvider = ({ children, theme, settings, locale: locale$1, }
         getConnectedWalletById,
         getNameService,
         handleLogOut,
-        unlinkConnectedWallet,
+        disconnectWallet,
         handleUnlinkWallet,
         i18nSDKInstance,
         isAuthenticated,
@@ -626,7 +624,6 @@ const DynamicContextProvider = ({ children, theme, settings, locale: locale$1, }
         legacyIsVerifying,
         linkedWallets,
         loadingNetwork,
-        locale$1,
         loginWithEmail,
         multiWallet,
         multiWalletWidgetState,

package/src/lib/context/DynamicContext/DynamicContext.d.ts CHANGED Viewed

@@ -6,11 +6,12 @@ import { Resources } from '../../locale';
 import { AccessDeniedCustomButton, AuthModeType, ChainToWalletMap, DynamicEventsCallbacks, WalletOption } from '../../shared';
 import { SocialNetworkIconType } from '../../utils/functions/getSocialNetworkIcon';
 import { ThemeData, ThemeSetting } from '../ThemeContext';
-import { ChainsToConnect, IDynamicContext } from './types';
+import { ChainsToConnect, IDynamicContext, SettingsOverrides } from './types';
 export declare const PUBLIC_PROJECT_LIVE_ENVIRONMENT_ID = "2762a57b-faa4-41ce-9f16-abff9300e2c9";
 export interface DynamicContextProps {
     children: ReactNode;
     settings: {
+        overrides?: SettingsOverrides;
         walletsByChain?: ChainsToConnect[];
         accessDeniedMessagePrimary?: string;
         accessDeniedMessageSecondary?: string;

package/src/lib/context/DynamicContext/DynamicContext.js CHANGED Viewed

@@ -193,14 +193,14 @@ const DynamicContextProvider = ({ children, theme, settings, locale, }) => {
     });
     const [authMode, setAuthMode] = useLocalStorage(AUTH_MODE, initialAuthenticationMode);
     const { clearPrimaryWalletId, primaryWalletId, setPrimaryWalletId } = usePrimaryWalletId(internalEventsRef.current);
-    const { connectWallet, removeConnectedWalletsInfo, connectedWalletsInfo, connectedWallet, getConnectedWalletById, connectedWallets, unlinkConnectedWallet, refreshConnectedWallet, } = useConnectWallet({
+    const { connectWallet, removeConnectedWalletsInfo, connectedWalletsInfo, connectedWallet, getConnectedWalletById, connectedWallets, disconnectWallet, refreshConnectedWallet, } = useConnectWallet({
         authMode,
         clearPrimaryWalletId,
         enableVisitTrackingOnConnectOnly,
         environmentId,
         isBridgeFlow,
         onBeforeConnectSuccessConfirmation: eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onBeforeConnectSuccessConfirmation,
-        onUnlink: (connectedWalletsInfo, wallet) => handleDisconnectWallet({
+        onDisconnect: (connectedWalletsInfo, wallet) => handleDisconnectWallet({
             connectedWalletsInfo,
             eventsCallbacks,
             setWalletsToConnectByChain,
@@ -481,15 +481,14 @@ const DynamicContextProvider = ({ children, theme, settings, locale, }) => {
             decodedOnboardingOnlyToken: decodeJwt(onboardingOnlyJwt),
             defaultNumberOfWalletsToShow,
             desktopUri,
+            disconnectWallet,
             displaySiweStatement,
             environmentId,
             eventsCallbacks,
             getConnectedWalletById,
             getNameService,
             handleLogOut,
-            handleUnlinkWallet: authMode === 'connect-only'
-                ? unlinkConnectedWallet
-                : handleUnlinkWallet,
+            handleUnlinkWallet: authMode === 'connect-only' ? disconnectWallet : handleUnlinkWallet,
             i18nSDKInstance,
             internalEvents: internalEventsRef,
             internalSetShowAuthFlow: setShowAuthFlow,
@@ -571,7 +570,6 @@ const DynamicContextProvider = ({ children, theme, settings, locale, }) => {
             termsOfServiceUrl,
             theme,
             toolkitEnabled,
-            unlinkConnectedWallet,
             user,
             walletConnector: (_c = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector) !== null && _c !== void 0 ? _c : null,
             walletUiUtils,
@@ -610,7 +608,7 @@ const DynamicContextProvider = ({ children, theme, settings, locale, }) => {
         getConnectedWalletById,
         getNameService,
         handleLogOut,
-        unlinkConnectedWallet,
+        disconnectWallet,
         handleUnlinkWallet,
         i18nSDKInstance,
         isAuthenticated,
@@ -622,7 +620,6 @@ const DynamicContextProvider = ({ children, theme, settings, locale, }) => {
         legacyIsVerifying,
         linkedWallets,
         loadingNetwork,
-        locale,
         loginWithEmail,
         multiWallet,
         multiWalletWidgetState,

package/src/lib/context/DynamicContext/types/index.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { Dispatch, MutableRefObject, ReactNode, SetStateAction } from 'react';
-import { DynamicJwt, NameServiceData, ProjectSettings } from '@dynamic-labs/sdk-api';
+import { DynamicJwt, NameServiceData, ProjectSettings, SdkView } from '@dynamic-labs/sdk-api';
 import { NetworkConfigurationMap, SocialProviderFilter, WalletUiUtils } from '@dynamic-labs/types';
 import { Chain, FetchPublicAddressOpts, WalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { AccessDeniedCustomButton, AccountSwitchState, AuthModeType, AwaitingSignatureState, ChainToWalletMap, DynamicEventsCallbacks, DynamicRPCProviders, MultiWalletWidgetState, UserProfile, Wallet, WalletOption, WalletWithAction } from '../../../shared';
@@ -13,6 +13,9 @@ export type ChainsToConnect = {
     chain: Chain;
     chainId?: number;
 };
+export type SettingsOverrides = {
+    views?: Array<SdkView>;
+};
 export interface IDynamicContext {
     accessDeniedMessagePrimary?: string;
     accessDeniedMessageSecondary?: string;
@@ -130,7 +133,7 @@ export interface IDynamicContext {
     theme?: ThemeData | ThemeSetting;
     toolkitEnabled?: boolean;
     user: UserProfile | undefined;
-    unlinkConnectedWallet: (walletId: string) => void;
+    disconnectWallet: (walletId: string) => void;
     walletConnector: WalletConnector | null;
     walletUiUtils: WalletUiUtils<WalletConnector>;
     wallets: WalletOption[];

package/src/lib/data/api.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import { __awaiter } from '../../../_virtual/_tslib.js';
 import { NoAccessError, AccountExistsError, EmailVerificationError, UserHasAccountWithEmailError, DynamicError, EmailAlreadyExistsError, UsernameAlreadyExistsError, EmailProviderError, WalletUsedError, WalletNotDeployedError, ChainalysisError, GateBlockedError, SocialAccountAlreadyExistsError } from '@dynamic-labs/utils';
-import { UnprocessableEntityErrorCode, ChainEnum, EmbeddedWalletProviderEnum, SDKApi, Configuration, VerifyRequestFromJSON, WalletProviderEnum, AuthModeEnum } from '@dynamic-labs/sdk-api';
+import { SDKApi, Configuration, UnprocessableEntityErrorCode, ChainEnum, EmbeddedWalletProviderEnum, VerifyRequestFromJSON, WalletProviderEnum, AuthModeEnum } from '@dynamic-labs/sdk-api';
 import { VERSION, API_VERSION } from '../../version.js';
 import ApiEndpoint from '../config/ApiEndpoint.js';
 import { logger } from '../shared/logger.js';

package/src/lib/utils/functions/getOauthLoginUrl/getOauthLoginUrl.cjs CHANGED Viewed

@@ -2,9 +2,18 @@
 Object.defineProperty(exports, '__esModule', { value: true });
+var utils = require('@dynamic-labs/utils');
 var stringifyURIQuery = require('../stringifyURIQuery/stringifyURIQuery.cjs');
+var getProviderByType = require('../getProviderByType/getProviderByType.cjs');
 const OAUTH_LOGIN_DATA = {
+    apple: {
+        customMobileUrl: true,
+        response_mode: 'form_post',
+        response_type: ['code', 'id_token'],
+        scope: ['name', 'email'],
+        url: 'https://appleid.apple.com/auth/authorize',
+    },
     discord: {
         scope: ['identify', 'email'],
         url: 'https://discord.com/api/oauth2/authorize',
@@ -44,9 +53,15 @@ const getProviderData = (provider) => {
     }
     return null;
 };
-const getOauthLoginUrl = (providers, providerType, environmentId) => {
+const getMobileOauthUrl = (provider, loginData) => {
+    if (!loginData.customMobileUrl || !utils.isMobile() || !provider.redirectUrl) {
+        return;
+    }
+    return provider.redirectUrl.replace('redirect', 'authorizeHtml');
+};
+const getOauthLoginUrl = (providers, providerType) => {
     var _a;
-    const provider = providers.find((p) => p.provider === providerType);
+    const provider = getProviderByType.getProviderByType(providers, providerType);
     if (!(provider === null || provider === void 0 ? void 0 : provider.clientId)) {
         return '';
     }
@@ -54,6 +69,7 @@ const getOauthLoginUrl = (providers, providerType, environmentId) => {
     if (!loginData) {
         return '';
     }
+    const mobileUrl = getMobileOauthUrl(provider, loginData);
     const baseProps = {
         client_id: provider.clientId,
         redirect_uri: (_a = provider.redirectUrl) !== null && _a !== void 0 ? _a : '',
@@ -65,8 +81,14 @@ const getOauthLoginUrl = (providers, providerType, environmentId) => {
     if (loginData.prompt) {
         baseProps.prompt = loginData.prompt.join(' ');
     }
+    if (loginData.response_mode) {
+        baseProps.response_mode = loginData.response_mode;
+    }
+    if (loginData.response_type) {
+        baseProps.response_type = loginData.response_type.join(' ');
+    }
     const params = stringifyURIQuery.stringifyURIQuery(baseProps);
-    return `${loginData.url}?${params}`;
+    return `${mobileUrl !== null && mobileUrl !== void 0 ? mobileUrl : loginData.url}?${params}`;
 };
 exports.getOauthLoginUrl = getOauthLoginUrl;

package/src/lib/utils/functions/getOauthLoginUrl/getOauthLoginUrl.d.ts CHANGED Viewed

@@ -1,2 +1,2 @@
 import { Provider, ProviderEnum } from '@dynamic-labs/sdk-api';
-export declare const getOauthLoginUrl: (providers: Provider[], providerType: ProviderEnum, environmentId: string) => string;
+export declare const getOauthLoginUrl: (providers: Provider[], providerType: ProviderEnum) => string;

package/src/lib/utils/functions/getOauthLoginUrl/getOauthLoginUrl.js CHANGED Viewed

@@ -1,6 +1,15 @@
+import { isMobile } from '@dynamic-labs/utils';
 import { stringifyURIQuery } from '../stringifyURIQuery/stringifyURIQuery.js';
+import { getProviderByType } from '../getProviderByType/getProviderByType.js';
 const OAUTH_LOGIN_DATA = {
+    apple: {
+        customMobileUrl: true,
+        response_mode: 'form_post',
+        response_type: ['code', 'id_token'],
+        scope: ['name', 'email'],
+        url: 'https://appleid.apple.com/auth/authorize',
+    },
     discord: {
         scope: ['identify', 'email'],
         url: 'https://discord.com/api/oauth2/authorize',
@@ -40,9 +49,15 @@ const getProviderData = (provider) => {
     }
     return null;
 };
-const getOauthLoginUrl = (providers, providerType, environmentId) => {
+const getMobileOauthUrl = (provider, loginData) => {
+    if (!loginData.customMobileUrl || !isMobile() || !provider.redirectUrl) {
+        return;
+    }
+    return provider.redirectUrl.replace('redirect', 'authorizeHtml');
+};
+const getOauthLoginUrl = (providers, providerType) => {
     var _a;
-    const provider = providers.find((p) => p.provider === providerType);
+    const provider = getProviderByType(providers, providerType);
     if (!(provider === null || provider === void 0 ? void 0 : provider.clientId)) {
         return '';
     }
@@ -50,6 +65,7 @@ const getOauthLoginUrl = (providers, providerType, environmentId) => {
     if (!loginData) {
         return '';
     }
+    const mobileUrl = getMobileOauthUrl(provider, loginData);
     const baseProps = {
         client_id: provider.clientId,
         redirect_uri: (_a = provider.redirectUrl) !== null && _a !== void 0 ? _a : '',
@@ -61,8 +77,14 @@ const getOauthLoginUrl = (providers, providerType, environmentId) => {
     if (loginData.prompt) {
         baseProps.prompt = loginData.prompt.join(' ');
     }
+    if (loginData.response_mode) {
+        baseProps.response_mode = loginData.response_mode;
+    }
+    if (loginData.response_type) {
+        baseProps.response_type = loginData.response_type.join(' ');
+    }
     const params = stringifyURIQuery(baseProps);
-    return `${loginData.url}?${params}`;
+    return `${mobileUrl !== null && mobileUrl !== void 0 ? mobileUrl : loginData.url}?${params}`;
 };
 export { getOauthLoginUrl };

package/src/lib/utils/functions/getProviderByType/getProviderByType.cjs ADDED Viewed

@@ -0,0 +1,7 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+const getProviderByType = (providers, providerType) => providers.find((p) => p.provider === providerType);
+exports.getProviderByType = getProviderByType;

package/src/lib/utils/functions/getProviderByType/getProviderByType.d.ts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ import { Provider, ProviderEnum } from '@dynamic-labs/sdk-api';
2	+ export declare const getProviderByType: (providers: Provider[], providerType: ProviderEnum) => Provider \| undefined;

package/src/lib/utils/functions/getProviderByType/getProviderByType.js ADDED Viewed

@@ -0,0 +1,3 @@
+const getProviderByType = (providers, providerType) => providers.find((p) => p.provider === providerType);
+export { getProviderByType };

package/src/lib/utils/functions/getProviderByType/index.d.ts ADDED Viewed

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

package/src/lib/utils/functions/index.d.ts CHANGED Viewed

@@ -41,3 +41,4 @@ export * from './findEmbeddedWalletFromVerifiedCredentials';
 export * from './findTurnkeyWallet';
 export * from './isTestnet';
 export * from './getOrdinalNumber';
+export * from './getProviderByType';

package/src/lib/utils/hooks/useConnectWallet/useConnectWallet.cjs CHANGED Viewed

@@ -23,15 +23,15 @@ var api = require('../../../data/api.cjs');
 require('@dynamic-labs/multi-wallet');
 var shouldManuallyReconnectOnRefresh = require('../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.cjs');
-const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, wallets, onUnlink, onBeforeConnectSuccessConfirmation, setShowAuthFlow, isBridgeFlow, }) => {
+const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, wallets, onDisconnect, onBeforeConnectSuccessConfirmation, setShowAuthFlow, isBridgeFlow, }) => {
     const [connectedWalletsInfo, setConnectedWalletsInfo, removeConnectedWalletsInfo,] = useLocalStorage.useLocalStorage(localStorage.CONNECTED_WALLETS_INFO, []);
     const [connectedWallets, setConnectedWallets] = React.useState([]);
-    const unlinkConnectedWallet = React.useCallback((walletId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    const disconnectWallet = React.useCallback((walletId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const walletToDisconnect = connectedWallets.find((wallet) => wallet.id === walletId);
         yield (walletToDisconnect === null || walletToDisconnect === void 0 ? void 0 : walletToDisconnect.connector.endSession());
         const updatedConnectedWalletsInfo = connectedWalletsInfo.filter((wallet) => wallet.id !== walletId);
         setConnectedWalletsInfo(updatedConnectedWalletsInfo);
-        onUnlink(updatedConnectedWalletsInfo, walletToDisconnect);
+        onDisconnect(updatedConnectedWalletsInfo, walletToDisconnect);
         if (walletId !== primaryWalletId) {
             return;
         }
@@ -47,7 +47,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         connectedWallets,
         connectedWalletsInfo,
         isBridgeFlow,
-        onUnlink,
+        onDisconnect,
         primaryWalletId,
         setConnectedWalletsInfo,
         setPrimaryWalletId,
@@ -67,12 +67,12 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             if (!walletConnector) {
                 walletConnectorCore.logger.error('Could not find walletConnector: ' +
                     storedConnectedWalletInfo.walletConnectorKey);
-                yield unlinkConnectedWallet(storedConnectedWalletInfo.id);
+                yield disconnectWallet(storedConnectedWalletInfo.id);
                 return null;
             }
             const [walletAddress] = yield walletConnector.getConnectedAccounts();
             if (!walletAddress) {
-                yield unlinkConnectedWallet(storedConnectedWalletInfo.id);
+                yield disconnectWallet(storedConnectedWalletInfo.id);
                 return null;
             }
             const walletNetwork = yield walletConnector.getNetwork();
@@ -88,7 +88,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             return walletObject;
         })))).filter((wallet) => Boolean(wallet));
         setConnectedWallets(updatedConnectedWallets);
-    }), [connectedWalletsInfo, unlinkConnectedWallet, wallets]);
+    }), [connectedWalletsInfo, disconnectWallet, wallets]);
     // Generate the connectedWallets list when connectedWalletsInfo (localStorage) or memoized wallet connector updates
     React.useEffect(() => {
         updateConnectedWalletsList();
@@ -140,7 +140,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             });
             if (!shouldProceedWithConnection) {
                 walletConnectorCore.logger.info('Connection was not established because onBeforeConnectSuccessConfirmation returned false');
-                unlinkConnectedWallet(walletId);
+                disconnectWallet(walletId);
                 setShowAuthFlow(false);
                 return;
             }
@@ -210,10 +210,10 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         connectedWallet,
         connectedWallets,
         connectedWalletsInfo,
+        disconnectWallet,
         getConnectedWalletById,
         refreshConnectedWallet,
         removeConnectedWalletsInfo,
-        unlinkConnectedWallet,
     };
 };

package/src/lib/utils/hooks/useConnectWallet/useConnectWallet.d.ts CHANGED Viewed

@@ -15,7 +15,7 @@ type Props = {
     primaryWalletId: string | undefined;
     setPrimaryWalletId: (walletId: string) => void;
     wallets: WalletOption[];
-    onUnlink: (connectedWalletsInfo: ConnectedWalletConnectorType[], wallet?: Wallet) => void;
+    onDisconnect: (connectedWalletsInfo: ConnectedWalletConnectorType[], wallet?: Wallet) => void;
     onBeforeConnectSuccessConfirmation: OnBeforeConnectSuccessConfirmation | undefined;
     setShowAuthFlow: Dispatch<SetStateAction<boolean>>;
     isBridgeFlow: boolean;
@@ -28,7 +28,7 @@ type UseConnectWalletValue = {
     getConnectedWalletById: (walletId: string) => Wallet | undefined;
     refreshConnectedWallet: (walletId: string, walletConnector: WalletConnector) => Promise<void>;
     removeConnectedWalletsInfo: () => void;
-    unlinkConnectedWallet: (walletId: string) => Promise<void>;
+    disconnectWallet: (walletId: string) => Promise<void>;
 };
-export declare const useConnectWallet: ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, wallets, onUnlink, onBeforeConnectSuccessConfirmation, setShowAuthFlow, isBridgeFlow, }: Props) => UseConnectWalletValue;
+export declare const useConnectWallet: ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, wallets, onDisconnect, onBeforeConnectSuccessConfirmation, setShowAuthFlow, isBridgeFlow, }: Props) => UseConnectWalletValue;
 export {};

package/src/lib/utils/hooks/useConnectWallet/useConnectWallet.js CHANGED Viewed

@@ -19,15 +19,15 @@ import { createVisit } from '../../../data/api.js';
 import '@dynamic-labs/multi-wallet';
 import { shouldManuallyReconnectOnRefresh } from '../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.js';
-const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, wallets, onUnlink, onBeforeConnectSuccessConfirmation, setShowAuthFlow, isBridgeFlow, }) => {
+const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, wallets, onDisconnect, onBeforeConnectSuccessConfirmation, setShowAuthFlow, isBridgeFlow, }) => {
     const [connectedWalletsInfo, setConnectedWalletsInfo, removeConnectedWalletsInfo,] = useLocalStorage(CONNECTED_WALLETS_INFO, []);
     const [connectedWallets, setConnectedWallets] = useState([]);
-    const unlinkConnectedWallet = useCallback((walletId) => __awaiter(void 0, void 0, void 0, function* () {
+    const disconnectWallet = useCallback((walletId) => __awaiter(void 0, void 0, void 0, function* () {
         const walletToDisconnect = connectedWallets.find((wallet) => wallet.id === walletId);
         yield (walletToDisconnect === null || walletToDisconnect === void 0 ? void 0 : walletToDisconnect.connector.endSession());
         const updatedConnectedWalletsInfo = connectedWalletsInfo.filter((wallet) => wallet.id !== walletId);
         setConnectedWalletsInfo(updatedConnectedWalletsInfo);
-        onUnlink(updatedConnectedWalletsInfo, walletToDisconnect);
+        onDisconnect(updatedConnectedWalletsInfo, walletToDisconnect);
         if (walletId !== primaryWalletId) {
             return;
         }
@@ -43,7 +43,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         connectedWallets,
         connectedWalletsInfo,
         isBridgeFlow,
-        onUnlink,
+        onDisconnect,
         primaryWalletId,
         setConnectedWalletsInfo,
         setPrimaryWalletId,
@@ -63,12 +63,12 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             if (!walletConnector) {
                 logger.error('Could not find walletConnector: ' +
                     storedConnectedWalletInfo.walletConnectorKey);
-                yield unlinkConnectedWallet(storedConnectedWalletInfo.id);
+                yield disconnectWallet(storedConnectedWalletInfo.id);
                 return null;
             }
             const [walletAddress] = yield walletConnector.getConnectedAccounts();
             if (!walletAddress) {
-                yield unlinkConnectedWallet(storedConnectedWalletInfo.id);
+                yield disconnectWallet(storedConnectedWalletInfo.id);
                 return null;
             }
             const walletNetwork = yield walletConnector.getNetwork();
@@ -84,7 +84,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             return walletObject;
         })))).filter((wallet) => Boolean(wallet));
         setConnectedWallets(updatedConnectedWallets);
-    }), [connectedWalletsInfo, unlinkConnectedWallet, wallets]);
+    }), [connectedWalletsInfo, disconnectWallet, wallets]);
     // Generate the connectedWallets list when connectedWalletsInfo (localStorage) or memoized wallet connector updates
     useEffect(() => {
         updateConnectedWalletsList();
@@ -136,7 +136,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             });
             if (!shouldProceedWithConnection) {
                 logger.info('Connection was not established because onBeforeConnectSuccessConfirmation returned false');
-                unlinkConnectedWallet(walletId);
+                disconnectWallet(walletId);
                 setShowAuthFlow(false);
                 return;
             }
@@ -206,10 +206,10 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         connectedWallet,
         connectedWallets,
         connectedWalletsInfo,
+        disconnectWallet,
         getConnectedWalletById,
         refreshConnectedWallet,
         removeConnectedWalletsInfo,
-        unlinkConnectedWallet,
     };
 };

package/src/lib/utils/hooks/useFetchProjectSettings/useFetchProjectSettings.cjs CHANGED Viewed

@@ -30,6 +30,15 @@ const useFetchProjectSettings = ({ authToken, environmentId, maxRetries = 2, dyn
         lsSettings.environmentId !== environmentId) {
         removeLsSettings();
     }
+    const overrideSettings = (projectSettings, overrides) => {
+        let overrideSettings = projectSettings;
+        if (overrides) {
+            if (overrides.views) {
+                overrideSettings = Object.assign(Object.assign({}, overrideSettings), { sdk: Object.assign(Object.assign({}, projectSettings.sdk), { views: overrides.views }) });
+            }
+        }
+        return overrideSettings;
+    };
     React.useEffect(() => {
         const [connectedWalletData] = localStorage$1.LocalStorage.getFromLS(localStorage.CONNECTED_WALLETS_INFO) || [];
         if (!authToken && !connectedWalletData) {
@@ -56,11 +65,12 @@ const useFetchProjectSettings = ({ authToken, environmentId, maxRetries = 2, dyn
                 .then((response) => {
                 if (!response)
                     throw new utils.DynamicError('Settings are not defined');
+                const settingsWithOverrides = overrideSettings(response, dynamicContextProps.settings.overrides);
                 const expiry = new Date().getTime() + 60000 * 5;
                 setLsSettings({
                     environmentId,
                     expiry: expiry,
-                    settings: response,
+                    settings: settingsWithOverrides,
                 });
             })
                 .catch(() => {

package/src/lib/utils/hooks/useFetchProjectSettings/useFetchProjectSettings.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+import { ProjectSettings } from '@dynamic-labs/sdk-api';
 import { DynamicContextProps } from '../../../context/DynamicContext';
 export type fetchProjectSettingsProps = {
     authToken: string | undefined;
@@ -7,6 +8,6 @@ export type fetchProjectSettingsProps = {
 };
 export declare const useFetchProjectSettings: ({ authToken, environmentId, maxRetries, dynamicContextProps, }: fetchProjectSettingsProps) => {
     isLoading: boolean;
-    projectSettings: import("@dynamic-labs/sdk-api").ProjectSettings | undefined;
+    projectSettings: ProjectSettings | undefined;
     removeLsSettings: () => void;
 };

package/src/lib/utils/hooks/useFetchProjectSettings/useFetchProjectSettings.js CHANGED Viewed

@@ -26,6 +26,15 @@ const useFetchProjectSettings = ({ authToken, environmentId, maxRetries = 2, dyn
         lsSettings.environmentId !== environmentId) {
         removeLsSettings();
     }
+    const overrideSettings = (projectSettings, overrides) => {
+        let overrideSettings = projectSettings;
+        if (overrides) {
+            if (overrides.views) {
+                overrideSettings = Object.assign(Object.assign({}, overrideSettings), { sdk: Object.assign(Object.assign({}, projectSettings.sdk), { views: overrides.views }) });
+            }
+        }
+        return overrideSettings;
+    };
     useEffect(() => {
         const [connectedWalletData] = LocalStorage.getFromLS(CONNECTED_WALLETS_INFO) || [];
         if (!authToken && !connectedWalletData) {
@@ -52,11 +61,12 @@ const useFetchProjectSettings = ({ authToken, environmentId, maxRetries = 2, dyn
                 .then((response) => {
                 if (!response)
                     throw new DynamicError('Settings are not defined');
+                const settingsWithOverrides = overrideSettings(response, dynamicContextProps.settings.overrides);
                 const expiry = new Date().getTime() + 60000 * 5;
                 setLsSettings({
                     environmentId,
                     expiry: expiry,
-                    settings: response,
+                    settings: settingsWithOverrides,
                 });
             })
                 .catch(() => {

package/src/lib/utils/hooks/useSocialAuth/useSocialAuth.cjs CHANGED Viewed

@@ -28,11 +28,13 @@ var stringifyURIQuery = require('../../functions/stringifyURIQuery/stringifyURIQ
 var digestSHA256 = require('../../functions/digestSHA256/digestSHA256.cjs');
 var encodeBase64URL = require('../../functions/encodeBase64URL/encodeBase64URL.cjs');
 var getOauthLoginUrl = require('../../functions/getOauthLoginUrl/getOauthLoginUrl.cjs');
+var getProviderByType = require('../../functions/getProviderByType/getProviderByType.cjs');
 var useCreateUserProfileByJWTCallback = require('../useCreateUserProfileByJWTCallback/useCreateUserProfileByJWTCallback.cjs');
 var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
 var useEmbeddedWallet = require('../useEmbeddedWallet/useEmbeddedWallet.cjs');
 const socialProviders = [
+    'apple',
     'discord',
     'facebook',
     'github',
@@ -182,19 +184,37 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
             providersWaitingOauthMessage.current = Object.assign(Object.assign({}, providersWaitingOauthMessage.current), { [provider]: false });
         };
         const handleAuthWindowMessage = (event) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-            var _d;
+            var _d, _e;
             const message = event.data;
             const isAuthorizationMessage = (message === null || message === void 0 ? void 0 : message.type) === 'authorization_response';
             if (isAuthorizationMessage) {
                 logger.logger.debug('Message received', { data: message });
             }
-            const isValidMessage = isAuthorizationMessage && (message === null || message === void 0 ? void 0 : message.provider) === provider;
+            const apiProvider = getProviderByType.getProviderByType((_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) !== null && _d !== void 0 ? _d : [], provider);
+            if (!(apiProvider === null || apiProvider === void 0 ? void 0 : apiProvider.redirectUrl)) {
+                return;
+            }
+            let expectedOrigin = '';
+            try {
+                const redirectUri = new URL(apiProvider.redirectUrl);
+                expectedOrigin = redirectUri.origin;
+            }
+            catch (e) {
+                logger.logger.error('Failed to parse social provider redirect url', {
+                    error: e,
+                });
+                return;
+            }
+            const isExpectedOrigin = event.origin === expectedOrigin;
+            const isValidMessage = isAuthorizationMessage &&
+                (message === null || message === void 0 ? void 0 : message.provider) === provider &&
+                isExpectedOrigin;
             // don't process invalid messages for provider
             if (!isValidMessage) {
                 return;
             }
             setIsProcessing(true);
-            if (!((_d = providersWaitingOauthMessage.current) === null || _d === void 0 ? void 0 : _d[provider])) {
+            if (!((_e = providersWaitingOauthMessage.current) === null || _e === void 0 ? void 0 : _e[provider])) {
                 handleError(types.SocialOAuthErrorCode.SESSION_TIMEOUT, `Connecting ${provider} account session timeout.`);
                 return;
             }
@@ -221,19 +241,23 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
             handleError(types.SocialOAuthErrorCode.NO_OAUTH_URL, `Failed to get login url to connect social account: ${provider}`);
             return;
         }
-        let oauthLoginUrl = loginUrl;
+        if (!((_c = providersWaitingOauthMessage.current) === null || _c === void 0 ? void 0 : _c[provider])) {
+            window.addEventListener('message', handleAuthWindowMessage);
+            providersWaitingOauthMessage.current = Object.assign(Object.assign({}, providersWaitingOauthMessage.current), { [provider]: true });
+        }
+        // add state param for all providers
+        const stateParam = stringifyURIQuery.stringifyURIQuery({
+            state,
+        });
+        let oauthLoginUrl = `${loginUrl}&${stateParam}`;
+        // only add pkce params for providers that support/require it
         if (providersRequiringPkce.includes(provider)) {
             const digest = yield digestSHA256.digestSHA256(verifier);
             const pkceParams = stringifyURIQuery.stringifyURIQuery({
                 code_challenge: encodeBase64URL.encodeBase64URL(digest),
                 code_challenge_method: 'S256',
-                state: state,
             });
-            oauthLoginUrl = `${loginUrl}&${pkceParams}`;
-        }
-        if (!((_c = providersWaitingOauthMessage.current) === null || _c === void 0 ? void 0 : _c[provider])) {
-            window.addEventListener('message', handleAuthWindowMessage);
-            providersWaitingOauthMessage.current = Object.assign(Object.assign({}, providersWaitingOauthMessage.current), { [provider]: true });
+            oauthLoginUrl = `${oauthLoginUrl}&${pkceParams}`;
         }
         authWindow === null || authWindow === void 0 ? void 0 : authWindow.location.assign(oauthLoginUrl);
         if (!providersWithoutWindowOpenerRefence.includes(provider)) {
@@ -260,10 +284,10 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
             shouldPool.current = true;
             poolOauthResult(provider, state);
             authWindowInterval.current = setInterval(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-                var _e;
+                var _f;
                 shouldPool.current = false;
                 // clear all states/listeners, assuming user closed the window before completing oauth
-                if ((_e = providersWaitingOauthMessage.current) === null || _e === void 0 ? void 0 : _e[provider]) {
+                if ((_f = providersWaitingOauthMessage.current) === null || _f === void 0 ? void 0 : _f[provider]) {
                     clearListeners();
                     handleError(types.SocialOAuthErrorCode.OAUTH_WINDOW_TIMEOUT, `Connecting ${provider} account window timeout.`);
                 }

package/src/lib/utils/hooks/useSocialAuth/useSocialAuth.js CHANGED Viewed

@@ -24,11 +24,13 @@ import { stringifyURIQuery } from '../../functions/stringifyURIQuery/stringifyUR
 import { digestSHA256 } from '../../functions/digestSHA256/digestSHA256.js';
 import { encodeBase64URL } from '../../functions/encodeBase64URL/encodeBase64URL.js';
 import { getOauthLoginUrl } from '../../functions/getOauthLoginUrl/getOauthLoginUrl.js';
+import { getProviderByType } from '../../functions/getProviderByType/getProviderByType.js';
 import { useCreateUserProfileByJWTCallback } from '../useCreateUserProfileByJWTCallback/useCreateUserProfileByJWTCallback.js';
 import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
 import { useEmbeddedWallet } from '../useEmbeddedWallet/useEmbeddedWallet.js';
 const socialProviders = [
+    'apple',
     'discord',
     'facebook',
     'github',
@@ -178,19 +180,37 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
             providersWaitingOauthMessage.current = Object.assign(Object.assign({}, providersWaitingOauthMessage.current), { [provider]: false });
         };
         const handleAuthWindowMessage = (event) => __awaiter(void 0, void 0, void 0, function* () {
-            var _d;
+            var _d, _e;
             const message = event.data;
             const isAuthorizationMessage = (message === null || message === void 0 ? void 0 : message.type) === 'authorization_response';
             if (isAuthorizationMessage) {
                 logger.debug('Message received', { data: message });
             }
-            const isValidMessage = isAuthorizationMessage && (message === null || message === void 0 ? void 0 : message.provider) === provider;
+            const apiProvider = getProviderByType((_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) !== null && _d !== void 0 ? _d : [], provider);
+            if (!(apiProvider === null || apiProvider === void 0 ? void 0 : apiProvider.redirectUrl)) {
+                return;
+            }
+            let expectedOrigin = '';
+            try {
+                const redirectUri = new URL(apiProvider.redirectUrl);
+                expectedOrigin = redirectUri.origin;
+            }
+            catch (e) {
+                logger.error('Failed to parse social provider redirect url', {
+                    error: e,
+                });
+                return;
+            }
+            const isExpectedOrigin = event.origin === expectedOrigin;
+            const isValidMessage = isAuthorizationMessage &&
+                (message === null || message === void 0 ? void 0 : message.provider) === provider &&
+                isExpectedOrigin;
             // don't process invalid messages for provider
             if (!isValidMessage) {
                 return;
             }
             setIsProcessing(true);
-            if (!((_d = providersWaitingOauthMessage.current) === null || _d === void 0 ? void 0 : _d[provider])) {
+            if (!((_e = providersWaitingOauthMessage.current) === null || _e === void 0 ? void 0 : _e[provider])) {
                 handleError(SocialOAuthErrorCode.SESSION_TIMEOUT, `Connecting ${provider} account session timeout.`);
                 return;
             }
@@ -217,19 +237,23 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
             handleError(SocialOAuthErrorCode.NO_OAUTH_URL, `Failed to get login url to connect social account: ${provider}`);
             return;
         }
-        let oauthLoginUrl = loginUrl;
+        if (!((_c = providersWaitingOauthMessage.current) === null || _c === void 0 ? void 0 : _c[provider])) {
+            window.addEventListener('message', handleAuthWindowMessage);
+            providersWaitingOauthMessage.current = Object.assign(Object.assign({}, providersWaitingOauthMessage.current), { [provider]: true });
+        }
+        // add state param for all providers
+        const stateParam = stringifyURIQuery({
+            state,
+        });
+        let oauthLoginUrl = `${loginUrl}&${stateParam}`;
+        // only add pkce params for providers that support/require it
         if (providersRequiringPkce.includes(provider)) {
             const digest = yield digestSHA256(verifier);
             const pkceParams = stringifyURIQuery({
                 code_challenge: encodeBase64URL(digest),
                 code_challenge_method: 'S256',
-                state: state,
             });
-            oauthLoginUrl = `${loginUrl}&${pkceParams}`;
-        }
-        if (!((_c = providersWaitingOauthMessage.current) === null || _c === void 0 ? void 0 : _c[provider])) {
-            window.addEventListener('message', handleAuthWindowMessage);
-            providersWaitingOauthMessage.current = Object.assign(Object.assign({}, providersWaitingOauthMessage.current), { [provider]: true });
+            oauthLoginUrl = `${oauthLoginUrl}&${pkceParams}`;
         }
         authWindow === null || authWindow === void 0 ? void 0 : authWindow.location.assign(oauthLoginUrl);
         if (!providersWithoutWindowOpenerRefence.includes(provider)) {
@@ -256,10 +280,10 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
             shouldPool.current = true;
             poolOauthResult(provider, state);
             authWindowInterval.current = setInterval(() => __awaiter(void 0, void 0, void 0, function* () {
-                var _e;
+                var _f;
                 shouldPool.current = false;
                 // clear all states/listeners, assuming user closed the window before completing oauth
-                if ((_e = providersWaitingOauthMessage.current) === null || _e === void 0 ? void 0 : _e[provider]) {
+                if ((_f = providersWaitingOauthMessage.current) === null || _f === void 0 ? void 0 : _f[provider]) {
                     clearListeners();
                     handleError(SocialOAuthErrorCode.OAUTH_WINDOW_TIMEOUT, `Connecting ${provider} account window timeout.`);
                 }

package/src/lib/widgets/DynamicBridgeWidget/components/DynamicBridgeWalletCardBody/DynamicBridgeWalletCardBody.cjs CHANGED Viewed

@@ -59,7 +59,7 @@ var WalletInformationCard = require('../../../../components/WalletInformationCar
 require('../../../../components/MenuList/Dropdown/Dropdown.cjs');
 var useFetchNameService = require('../../../DynamicWidget/hooks/useFetchNameService/useFetchNameService.cjs');
-const DynamicBridgeWalletCardBody = ({ walletAddress, walletBalance, walletKey, onUnlinkClick }) => {
+const DynamicBridgeWalletCardBody = ({ walletAddress, walletBalance, walletKey, onDisconnectClick }) => {
     const nameService = useFetchNameService.useFetchNameService(walletAddress);
     const options = [
         {
@@ -76,8 +76,8 @@ const DynamicBridgeWalletCardBody = ({ walletAddress, walletBalance, walletKey,
         },
         {
             Icon: null,
-            callback: () => onUnlinkClick === null || onUnlinkClick === void 0 ? void 0 : onUnlinkClick(),
-            hide: !onUnlinkClick,
+            callback: () => onDisconnectClick === null || onDisconnectClick === void 0 ? void 0 : onDisconnectClick(),
+            hide: !onDisconnectClick,
             text: 'Disconnect',
         },
     ];

package/src/lib/widgets/DynamicBridgeWidget/components/DynamicBridgeWalletCardBody/DynamicBridgeWalletCardBody.d.ts CHANGED Viewed

@@ -3,6 +3,6 @@ export type DynamicBridgeWalletCardBodyProps = {
     walletKey: string;
     walletAddress: string;
     walletBalance?: ReactElement;
-    onUnlinkClick?: () => void;
+    onDisconnectClick?: () => void;
 };
 export declare const DynamicBridgeWalletCardBody: FC<DynamicBridgeWalletCardBodyProps>;

package/src/lib/widgets/DynamicBridgeWidget/components/DynamicBridgeWalletCardBody/DynamicBridgeWalletCardBody.js CHANGED Viewed

@@ -55,7 +55,7 @@ import { WalletInformationCard } from '../../../../components/WalletInformationC
 import '../../../../components/MenuList/Dropdown/Dropdown.js';
 import { useFetchNameService } from '../../../DynamicWidget/hooks/useFetchNameService/useFetchNameService.js';
-const DynamicBridgeWalletCardBody = ({ walletAddress, walletBalance, walletKey, onUnlinkClick }) => {
+const DynamicBridgeWalletCardBody = ({ walletAddress, walletBalance, walletKey, onDisconnectClick }) => {
     const nameService = useFetchNameService(walletAddress);
     const options = [
         {
@@ -72,8 +72,8 @@ const DynamicBridgeWalletCardBody = ({ walletAddress, walletBalance, walletKey,
         },
         {
             Icon: null,
-            callback: () => onUnlinkClick === null || onUnlinkClick === void 0 ? void 0 : onUnlinkClick(),
-            hide: !onUnlinkClick,
+            callback: () => onDisconnectClick === null || onDisconnectClick === void 0 ? void 0 : onDisconnectClick(),
+            hide: !onDisconnectClick,
             text: 'Disconnect',
         },
     ];

package/src/lib/widgets/DynamicBridgeWidget/views/WalletsView/WalletsView.cjs CHANGED Viewed

@@ -64,7 +64,7 @@ var DynamicBridgeWalletCardBody = require('../../components/DynamicBridgeWalletC
 var DynamicBridgeWidgetEmptyCard = require('../../components/DynamicBridgeWidgetEmptyCard/DynamicBridgeWidgetEmptyCard.cjs');
 const WalletsView = () => {
-    const { unlinkConnectedWallet, walletsByChain, connectedWallets } = useInternalDynamicContext.useInternalDynamicContext();
+    const { disconnectWallet, walletsByChain, connectedWallets } = useInternalDynamicContext.useInternalDynamicContext();
     return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx("div", { className: 'dynamic-bridge-widget-wallets-view', "data-testid": 'dynamic-bridge-wget-wallets-view', children: walletsByChain === null || walletsByChain === void 0 ? void 0 : walletsByChain.map(({ chain }) => {
                     const chainWallets = connectedWallets.filter(({ chain: walletChain }) => chain === walletChain);
                     // "Connect wallet" for empty chains
@@ -73,7 +73,7 @@ const WalletsView = () => {
                     const WalletIcon = getChainIcon.getChainIcon(chain);
                     const walletInfo = walletConnectorCore.getChainInfo(chain);
                     // Wallets info for chains with connected wallets
-                    return chainWallets.map(({ connector, address, id }) => (jsxRuntime.jsx(DynamicBridgeWalletCard.DynamicBridgeWalletCard, { networkIcon: jsxRuntime.jsx(WalletIcon, {}), networkName: walletInfo === null || walletInfo === void 0 ? void 0 : walletInfo.displayName, children: jsxRuntime.jsx(DynamicBridgeWalletCardBody.DynamicBridgeWalletCardBody, { walletKey: connector.key, walletAddress: address, walletBalance: jsxRuntime.jsx(Balance.Balance, { address: address, connector: connector, network: chain }), onUnlinkClick: () => unlinkConnectedWallet(id) }) }, `${id}-${connector.name}`)));
+                    return chainWallets.map(({ connector, address, id }) => (jsxRuntime.jsx(DynamicBridgeWalletCard.DynamicBridgeWalletCard, { networkIcon: jsxRuntime.jsx(WalletIcon, {}), networkName: walletInfo === null || walletInfo === void 0 ? void 0 : walletInfo.displayName, children: jsxRuntime.jsx(DynamicBridgeWalletCardBody.DynamicBridgeWalletCardBody, { walletKey: connector.key, walletAddress: address, walletBalance: jsxRuntime.jsx(Balance.Balance, { address: address, connector: connector, network: chain }), onDisconnectClick: () => disconnectWallet(id) }) }, `${id}-${connector.name}`)));
                 }) }), jsxRuntime.jsx(DynamicWidgetFooter.DynamicWidgetFooter, { children: jsxRuntime.jsx(LogoutButton.LogoutButton, { buttonClassName: 'dynamic-bridge-widget-wallets-view__logout-button', isTextButton: true }) })] }));
 };

package/src/lib/widgets/DynamicBridgeWidget/views/WalletsView/WalletsView.js CHANGED Viewed

@@ -60,7 +60,7 @@ import { DynamicBridgeWalletCardBody } from '../../components/DynamicBridgeWalle
 import { DynamicBridgeWidgetEmptyCard } from '../../components/DynamicBridgeWidgetEmptyCard/DynamicBridgeWidgetEmptyCard.js';
 const WalletsView = () => {
-    const { unlinkConnectedWallet, walletsByChain, connectedWallets } = useInternalDynamicContext();
+    const { disconnectWallet, walletsByChain, connectedWallets } = useInternalDynamicContext();
     return (jsxs(Fragment, { children: [jsx("div", { className: 'dynamic-bridge-widget-wallets-view', "data-testid": 'dynamic-bridge-wget-wallets-view', children: walletsByChain === null || walletsByChain === void 0 ? void 0 : walletsByChain.map(({ chain }) => {
                     const chainWallets = connectedWallets.filter(({ chain: walletChain }) => chain === walletChain);
                     // "Connect wallet" for empty chains
@@ -69,7 +69,7 @@ const WalletsView = () => {
                     const WalletIcon = getChainIcon(chain);
                     const walletInfo = getChainInfo(chain);
                     // Wallets info for chains with connected wallets
-                    return chainWallets.map(({ connector, address, id }) => (jsx(DynamicBridgeWalletCard, { networkIcon: jsx(WalletIcon, {}), networkName: walletInfo === null || walletInfo === void 0 ? void 0 : walletInfo.displayName, children: jsx(DynamicBridgeWalletCardBody, { walletKey: connector.key, walletAddress: address, walletBalance: jsx(Balance, { address: address, connector: connector, network: chain }), onUnlinkClick: () => unlinkConnectedWallet(id) }) }, `${id}-${connector.name}`)));
+                    return chainWallets.map(({ connector, address, id }) => (jsx(DynamicBridgeWalletCard, { networkIcon: jsx(WalletIcon, {}), networkName: walletInfo === null || walletInfo === void 0 ? void 0 : walletInfo.displayName, children: jsx(DynamicBridgeWalletCardBody, { walletKey: connector.key, walletAddress: address, walletBalance: jsx(Balance, { address: address, connector: connector, network: chain }), onDisconnectClick: () => disconnectWallet(id) }) }, `${id}-${connector.name}`)));
                 }) }), jsx(DynamicWidgetFooter, { children: jsx(LogoutButton, { buttonClassName: 'dynamic-bridge-widget-wallets-view__logout-button', isTextButton: true }) })] }));
 };

package/src/lib/widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs CHANGED Viewed

@@ -27,15 +27,13 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 const SecondaryWallets = ({ hideUnlinkAction = false }) => {
-    const { unlinkConnectedWallet, getConnectedWalletById, walletsByChain } = useInternalDynamicContext.useInternalDynamicContext();
+    const { disconnectWallet, getConnectedWalletById, walletsByChain } = useInternalDynamicContext.useInternalDynamicContext();
     const wallet = getConnectedWalletById('connect-wallet-1');
     const NetworkIcon = wallet && getChainIcon.getChainIcon(wallet === null || wallet === void 0 ? void 0 : wallet.chain);
     const networkInfo = wallet && walletConnectorCore.getChainInfo(wallet === null || wallet === void 0 ? void 0 : wallet.chain);
     return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [!wallet && (jsxRuntime.jsx(DynamicBridgeWidgetEmptyCard.DynamicBridgeWidgetEmptyCard, { chain: walletsByChain === null || walletsByChain === void 0 ? void 0 : walletsByChain[1].chain })), wallet && NetworkIcon && (jsxRuntime.jsx(DynamicBridgeWalletCard.DynamicBridgeWalletCard, { networkIcon: jsxRuntime.jsx(NetworkIcon, {}), networkName: networkInfo === null || networkInfo === void 0 ? void 0 : networkInfo.displayName, children: jsxRuntime.jsx(DynamicBridgeWalletCardBody.DynamicBridgeWalletCardBody, { walletKey: wallet.connector.key, walletAddress: wallet.address, walletBalance:
                     // eslint-disable-next-line react/jsx-wrap-multilines
-                    jsxRuntime.jsx(Balance.Balance, { address: wallet.address, connector: wallet.connector, network: wallet.chain }), onUnlinkClick: !hideUnlinkAction
-                        ? () => unlinkConnectedWallet(wallet.id)
-                        : undefined }, wallet.id) }))] }));
+                    jsxRuntime.jsx(Balance.Balance, { address: wallet.address, connector: wallet.connector, network: wallet.chain }), onDisconnectClick: !hideUnlinkAction ? () => disconnectWallet(wallet.id) : undefined }, wallet.id) }))] }));
 };
 const MemoSecondaryWallets = React__default["default"].memo(SecondaryWallets);

package/src/lib/widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js CHANGED Viewed

@@ -19,15 +19,13 @@ import { useInternalDynamicContext } from '../../../../../../context/DynamicCont
 import { DynamicBridgeWidgetEmptyCard } from '../../../../components/DynamicBridgeWidgetEmptyCard/DynamicBridgeWidgetEmptyCard.js';
 const SecondaryWallets = ({ hideUnlinkAction = false }) => {
-    const { unlinkConnectedWallet, getConnectedWalletById, walletsByChain } = useInternalDynamicContext();
+    const { disconnectWallet, getConnectedWalletById, walletsByChain } = useInternalDynamicContext();
     const wallet = getConnectedWalletById('connect-wallet-1');
     const NetworkIcon = wallet && getChainIcon(wallet === null || wallet === void 0 ? void 0 : wallet.chain);
     const networkInfo = wallet && getChainInfo(wallet === null || wallet === void 0 ? void 0 : wallet.chain);
     return (jsxs(Fragment, { children: [!wallet && (jsx(DynamicBridgeWidgetEmptyCard, { chain: walletsByChain === null || walletsByChain === void 0 ? void 0 : walletsByChain[1].chain })), wallet && NetworkIcon && (jsx(DynamicBridgeWalletCard, { networkIcon: jsx(NetworkIcon, {}), networkName: networkInfo === null || networkInfo === void 0 ? void 0 : networkInfo.displayName, children: jsx(DynamicBridgeWalletCardBody, { walletKey: wallet.connector.key, walletAddress: wallet.address, walletBalance:
                     // eslint-disable-next-line react/jsx-wrap-multilines
-                    jsx(Balance, { address: wallet.address, connector: wallet.connector, network: wallet.chain }), onUnlinkClick: !hideUnlinkAction
-                        ? () => unlinkConnectedWallet(wallet.id)
-                        : undefined }, wallet.id) }))] }));
+                    jsx(Balance, { address: wallet.address, connector: wallet.connector, network: wallet.chain }), onDisconnectClick: !hideUnlinkAction ? () => disconnectWallet(wallet.id) : undefined }, wallet.id) }))] }));
 };
 const MemoSecondaryWallets = React__default.memo(SecondaryWallets);