@dynamic-labs/sdk-react-core 4.88.1 → 4.88.3

package/src/lib/context/ConnectWithOtpContext/utils/buildEmailOtpHandler/buildEmailOtpHandler.js

@@ -0,0 +1,84 @@
+'use client'
+import { __awaiter } from '../../../../../../_virtual/_tslib.js';
+import '@dynamic-labs-sdk/client/core';
+import '@dynamic-labs/sdk-api-core';
+import 'react';
+import 'eventemitter3';
+import '@dynamic-labs/utils';
+import '@dynamic-labs-sdk/client';
+import '../../../../config/ApiEndpoint.js';
+import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
+import 'react/jsx-runtime';
+import '../../../ViewContext/ViewContext.js';
+import '../../../../shared/logger.js';
+import '@dynamic-labs/wallet-book';
+import '../../../../utils/constants/colors.js';
+import '../../../../utils/constants/values.js';
+import '../../../../shared/consts/index.js';
+import '@dynamic-labs/multi-wallet';
+import 'react-international-phone';
+import '../../../../store/state/nonce/nonce.js';
+import { retryEmailVerification, signInWithEmailVerification } from '../../../../data/api/email/email.js';
+import '@dynamic-labs/locale';
+import '../../../../store/state/dynamicContextProps/dynamicContextProps.js';
+import '../../../../store/state/primaryWalletId/primaryWalletId.js';
+import '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
+import '../../../../utils/functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.js';
+import '../../../../events/dynamicEvents.js';
+import { storeTokenAndUser } from '../../../../client/extension/storeTokenAndUser/storeTokenAndUser.js';
+import { generateSessionKeys } from '../../../../client/extension/functions/generateSessionKeys/generateSessionKeys.js';
+import { persistOtpVerificationState } from '../otpVerificationStorage/otpVerificationStorage.js';
+
+/**
+ * Builds a ProviderVerificationHandler for email OTP from the given parameters.
+ * Used both after creating a new email verification and when restoring a
+ * persisted verification state after a webview remount.
+ */
+const buildEmailOtpHandler = ({ captchaToken, email, embeddedWalletSessionKeys: { shouldRegisterSessionKeysOnSignin, generateSessionKey, }, environmentId, initialVerificationUUID, }) => {
+    // Mutable so retry can update the UUID for subsequent verify calls
+    let verificationUUID = initialVerificationUUID;
+    return {
+        retry: () => __awaiter(void 0, void 0, void 0, function* () {
+            const retryEmailVerificationResponse = yield retryEmailVerification({
+                email,
+                environmentId,
+                verificationUUID,
+            });
+            // eslint-disable-next-line prefer-destructuring
+            verificationUUID = retryEmailVerificationResponse.verificationUUID;
+            persistOtpVerificationState({
+                captchaToken,
+                destination: email,
+                type: 'email',
+                verificationUUID,
+            });
+        }),
+        type: 'email',
+        verify: (oneTimePassword, options) => __awaiter(void 0, void 0, void 0, function* () {
+            let sessionPublicKey = undefined;
+            if (shouldRegisterSessionKeysOnSignin()) {
+                const keypair = yield generateSessionKey();
+                sessionPublicKey = keypair.publicKey;
+            }
+            yield generateSessionKeys();
+            const response = yield signInWithEmailVerification({
+                captchaToken,
+                environmentId,
+                sessionPublicKey,
+                verificationToken: oneTimePassword,
+                verificationUUID,
+            });
+            if (!(options === null || options === void 0 ? void 0 : options.skipSetUserAndAuthToken)) {
+                storeTokenAndUser(response);
+            }
+            return {
+                destination: email,
+                response: response,
+                verified: true,
+            };
+        }),
+    };
+};
+
+export { buildEmailOtpHandler };

package/src/lib/context/ConnectWithOtpContext/utils/buildEmailOtpHandler/index.d.ts

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

package/src/lib/context/ConnectWithOtpContext/utils/buildSmsOtpHandler/buildSmsOtpHandler.cjs

@@ -0,0 +1,67 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../../../../_virtual/_tslib.cjs');
+require('@dynamic-labs-sdk/client/core');
+require('@dynamic-labs/sdk-api-core');
+require('react');
+require('eventemitter3');
+require('@dynamic-labs/utils');
+require('@dynamic-labs-sdk/client');
+require('../../../../config/ApiEndpoint.cjs');
+require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
+require('react/jsx-runtime');
+require('../../../ViewContext/ViewContext.cjs');
+require('../../../../shared/logger.cjs');
+require('@dynamic-labs/wallet-book');
+require('../../../../utils/constants/colors.cjs');
+require('../../../../utils/constants/values.cjs');
+require('../../../../shared/consts/index.cjs');
+require('@dynamic-labs/multi-wallet');
+require('react-international-phone');
+require('../../../../store/state/nonce/nonce.cjs');
+var sms = require('../../../../data/api/sms/sms.cjs');
+require('../../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
+require('../../../../store/state/primaryWalletId/primaryWalletId.cjs');
+require('../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
+require('../../../../utils/functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.cjs');
+require('../../../../events/dynamicEvents.cjs');
+var storeTokenAndUser = require('../../../../client/extension/storeTokenAndUser/storeTokenAndUser.cjs');
+var generateSessionKeys = require('../../../../client/extension/functions/generateSessionKeys/generateSessionKeys.cjs');
+
+/**
+ * Builds a ProviderVerificationHandler for SMS OTP from the given parameters.
+ * Used both after creating a new SMS verification and when restoring a
+ * persisted verification state after a webview remount.
+ */
+const buildSmsOtpHandler = ({ captchaToken, embeddedWalletSessionKeys: { shouldRegisterSessionKeysOnSignin, generateSessionKey, }, environmentId, phone, verificationUUID, }) => ({
+    type: 'sms',
+    verify: (oneTimePassword, options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        let sessionPublicKey = undefined;
+        if (shouldRegisterSessionKeysOnSignin()) {
+            const keypair = yield generateSessionKey();
+            sessionPublicKey = keypair.publicKey;
+        }
+        yield generateSessionKeys.generateSessionKeys();
+        const response = yield sms.signInWithSmsVerification({
+            captchaToken,
+            environmentId,
+            sessionPublicKey,
+            verificationToken: oneTimePassword,
+            verificationUUID,
+        });
+        if (!(options === null || options === void 0 ? void 0 : options.skipSetUserAndAuthToken)) {
+            storeTokenAndUser.storeTokenAndUser(response);
+        }
+        return {
+            destination: phone,
+            response: response,
+            verified: true,
+        };
+    }),
+});
+
+exports.buildSmsOtpHandler = buildSmsOtpHandler;

package/src/lib/context/ConnectWithOtpContext/utils/buildSmsOtpHandler/buildSmsOtpHandler.d.ts

@@ -0,0 +1,17 @@
+import { PhoneData } from '@dynamic-labs/types';
+import { useEmbeddedWalletSessionKeys } from '../../../../utils/hooks';
+import { ProviderVerificationHandler } from '../../types';
+type BuildSmsOtpHandlerParams = {
+    captchaToken: string | undefined;
+    embeddedWalletSessionKeys: ReturnType<typeof useEmbeddedWalletSessionKeys>;
+    environmentId: string;
+    phone: PhoneData;
+    verificationUUID: string;
+};
+/**
+ * Builds a ProviderVerificationHandler for SMS OTP from the given parameters.
+ * Used both after creating a new SMS verification and when restoring a
+ * persisted verification state after a webview remount.
+ */
+export declare const buildSmsOtpHandler: ({ captchaToken, embeddedWalletSessionKeys: { shouldRegisterSessionKeysOnSignin, generateSessionKey, }, environmentId, phone, verificationUUID, }: BuildSmsOtpHandlerParams) => ProviderVerificationHandler<PhoneData>;
+export {};

package/src/lib/context/ConnectWithOtpContext/utils/buildSmsOtpHandler/buildSmsOtpHandler.js

@@ -0,0 +1,63 @@
+'use client'
+import { __awaiter } from '../../../../../../_virtual/_tslib.js';
+import '@dynamic-labs-sdk/client/core';
+import '@dynamic-labs/sdk-api-core';
+import 'react';
+import 'eventemitter3';
+import '@dynamic-labs/utils';
+import '@dynamic-labs-sdk/client';
+import '../../../../config/ApiEndpoint.js';
+import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
+import 'react/jsx-runtime';
+import '../../../ViewContext/ViewContext.js';
+import '../../../../shared/logger.js';
+import '@dynamic-labs/wallet-book';
+import '../../../../utils/constants/colors.js';
+import '../../../../utils/constants/values.js';
+import '../../../../shared/consts/index.js';
+import '@dynamic-labs/multi-wallet';
+import 'react-international-phone';
+import '../../../../store/state/nonce/nonce.js';
+import { signInWithSmsVerification } from '../../../../data/api/sms/sms.js';
+import '../../../../store/state/dynamicContextProps/dynamicContextProps.js';
+import '../../../../store/state/primaryWalletId/primaryWalletId.js';
+import '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
+import '../../../../utils/functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.js';
+import '../../../../events/dynamicEvents.js';
+import { storeTokenAndUser } from '../../../../client/extension/storeTokenAndUser/storeTokenAndUser.js';
+import { generateSessionKeys } from '../../../../client/extension/functions/generateSessionKeys/generateSessionKeys.js';
+
+/**
+ * Builds a ProviderVerificationHandler for SMS OTP from the given parameters.
+ * Used both after creating a new SMS verification and when restoring a
+ * persisted verification state after a webview remount.
+ */
+const buildSmsOtpHandler = ({ captchaToken, embeddedWalletSessionKeys: { shouldRegisterSessionKeysOnSignin, generateSessionKey, }, environmentId, phone, verificationUUID, }) => ({
+    type: 'sms',
+    verify: (oneTimePassword, options) => __awaiter(void 0, void 0, void 0, function* () {
+        let sessionPublicKey = undefined;
+        if (shouldRegisterSessionKeysOnSignin()) {
+            const keypair = yield generateSessionKey();
+            sessionPublicKey = keypair.publicKey;
+        }
+        yield generateSessionKeys();
+        const response = yield signInWithSmsVerification({
+            captchaToken,
+            environmentId,
+            sessionPublicKey,
+            verificationToken: oneTimePassword,
+            verificationUUID,
+        });
+        if (!(options === null || options === void 0 ? void 0 : options.skipSetUserAndAuthToken)) {
+            storeTokenAndUser(response);
+        }
+        return {
+            destination: phone,
+            response: response,
+            verified: true,
+        };
+    }),
+});
+
+export { buildSmsOtpHandler };

package/src/lib/context/ConnectWithOtpContext/utils/buildSmsOtpHandler/index.d.ts

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

package/src/lib/context/ConnectWithOtpContext/utils/createEmailHandler.cjs

@@ -4,15 +4,12 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
-require('@dynamic-labs-sdk/client/core');
+var email = require('../../../data/api/email/email.cjs');
 require('@dynamic-labs/sdk-api-core');
-require('react');
-require('eventemitter3');
 require('@dynamic-labs/utils');
-require('@dynamic-labs-sdk/client');
-require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
+require('react');
 require('react/jsx-runtime');
 require('../../ViewContext/ViewContext.cjs');
 require('../../../shared/logger.cjs');
@@ -20,63 +17,42 @@ require('@dynamic-labs/wallet-book');
 require('../../../utils/constants/colors.cjs');
 require('../../../utils/constants/values.cjs');
 require('../../../shared/consts/index.cjs');
+require('@dynamic-labs-sdk/client/core');
+require('eventemitter3');
+require('@dynamic-labs-sdk/client');
+require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('../../../store/state/nonce/nonce.cjs');
-var email = require('../../../data/api/email/email.cjs');
-require('@dynamic-labs/locale');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
 require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../utils/functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.cjs');
 require('../../../events/dynamicEvents.cjs');
-var storeTokenAndUser = require('../../../client/extension/storeTokenAndUser/storeTokenAndUser.cjs');
-var generateSessionKeys = require('../../../client/extension/functions/generateSessionKeys/generateSessionKeys.cjs');
+require('@dynamic-labs/locale');
+var buildEmailOtpHandler = require('./buildEmailOtpHandler/buildEmailOtpHandler.cjs');
+var otpVerificationStorage = require('./otpVerificationStorage/otpVerificationStorage.cjs');
 
-const createEmailHandler = (environmentId, { shouldRegisterSessionKeysOnSignin, generateSessionKey, }) => (email$1, captchaToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+const createEmailHandler = (environmentId, embeddedWalletSessionKeys) => (email$1, captchaToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     const createEmailVerificationResponse = yield email.createEmailVerification({
         captchaToken,
         email: email$1,
         environmentId,
     });
-    let { verificationUUID } = createEmailVerificationResponse;
-    return {
-        retry: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-            const retryEmailVerificationResponse = yield email.retryEmailVerification({
-                email: email$1,
-                environmentId,
-                verificationUUID,
-            });
-            // eslint-disable-next-line prefer-destructuring
-            verificationUUID = retryEmailVerificationResponse.verificationUUID;
-        }),
+    const { verificationUUID } = createEmailVerificationResponse;
+    otpVerificationStorage.persistOtpVerificationState({
+        captchaToken,
+        destination: email$1,
         type: 'email',
-        verify: (oneTimePassword, options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-            let sessionPublicKey = undefined;
-            if (shouldRegisterSessionKeysOnSignin()) {
-                const keypair = yield generateSessionKey();
-                sessionPublicKey = keypair.publicKey;
-            }
-            yield generateSessionKeys.generateSessionKeys();
-            const response = yield email.signInWithEmailVerification({
-                captchaToken,
-                environmentId,
-                sessionPublicKey,
-                verificationToken: oneTimePassword,
-                verificationUUID,
-            });
-            // Skip setting the user auth token and only return the VerifyResponse
-            // if needed because setUser can trigger view re-renders.
-            if (!(options === null || options === void 0 ? void 0 : options.skipSetUserAndAuthToken)) {
-                storeTokenAndUser.storeTokenAndUser(response);
-            }
-            return {
-                destination: email$1,
-                response: response,
-                verified: true,
-            };
-        }),
-    };
+        verificationUUID,
+    });
+    return buildEmailOtpHandler.buildEmailOtpHandler({
+        captchaToken,
+        email: email$1,
+        embeddedWalletSessionKeys,
+        environmentId,
+        initialVerificationUUID: verificationUUID,
+    });
 });
 
 exports.createEmailHandler = createEmailHandler;

package/src/lib/context/ConnectWithOtpContext/utils/createEmailHandler.d.ts

@@ -1,3 +1,3 @@
 import { useEmbeddedWalletSessionKeys } from '../../../utils/hooks';
 import { ProviderHandler } from '../types';
-export declare const createEmailHandler: (environmentId: string, { shouldRegisterSessionKeysOnSignin, generateSessionKey, }: ReturnType<typeof useEmbeddedWalletSessionKeys>) => ProviderHandler<string>;
+export declare const createEmailHandler: (environmentId: string, embeddedWalletSessionKeys: ReturnType<typeof useEmbeddedWalletSessionKeys>) => ProviderHandler<string>;

package/src/lib/context/ConnectWithOtpContext/utils/createEmailHandler.js

@@ -1,14 +1,11 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import '@dynamic-labs-sdk/client/core';
+import { createEmailVerification } from '../../../data/api/email/email.js';
 import '@dynamic-labs/sdk-api-core';
-import 'react';
-import 'eventemitter3';
 import '@dynamic-labs/utils';
-import '@dynamic-labs-sdk/client';
-import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
+import 'react';
 import 'react/jsx-runtime';
 import '../../ViewContext/ViewContext.js';
 import '../../../shared/logger.js';
@@ -16,63 +13,42 @@ import '@dynamic-labs/wallet-book';
 import '../../../utils/constants/colors.js';
 import '../../../utils/constants/values.js';
 import '../../../shared/consts/index.js';
+import '@dynamic-labs-sdk/client/core';
+import 'eventemitter3';
+import '@dynamic-labs-sdk/client';
+import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import '../../../store/state/nonce/nonce.js';
-import { createEmailVerification, retryEmailVerification, signInWithEmailVerification } from '../../../data/api/email/email.js';
-import '@dynamic-labs/locale';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../utils/functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.js';
 import '../../../events/dynamicEvents.js';
-import { storeTokenAndUser } from '../../../client/extension/storeTokenAndUser/storeTokenAndUser.js';
-import { generateSessionKeys } from '../../../client/extension/functions/generateSessionKeys/generateSessionKeys.js';
+import '@dynamic-labs/locale';
+import { buildEmailOtpHandler } from './buildEmailOtpHandler/buildEmailOtpHandler.js';
+import { persistOtpVerificationState } from './otpVerificationStorage/otpVerificationStorage.js';
 
-const createEmailHandler = (environmentId, { shouldRegisterSessionKeysOnSignin, generateSessionKey, }) => (email, captchaToken) => __awaiter(void 0, void 0, void 0, function* () {
+const createEmailHandler = (environmentId, embeddedWalletSessionKeys) => (email, captchaToken) => __awaiter(void 0, void 0, void 0, function* () {
     const createEmailVerificationResponse = yield createEmailVerification({
         captchaToken,
         email,
         environmentId,
     });
-    let { verificationUUID } = createEmailVerificationResponse;
-    return {
-        retry: () => __awaiter(void 0, void 0, void 0, function* () {
-            const retryEmailVerificationResponse = yield retryEmailVerification({
-                email,
-                environmentId,
-                verificationUUID,
-            });
-            // eslint-disable-next-line prefer-destructuring
-            verificationUUID = retryEmailVerificationResponse.verificationUUID;
-        }),
+    const { verificationUUID } = createEmailVerificationResponse;
+    persistOtpVerificationState({
+        captchaToken,
+        destination: email,
         type: 'email',
-        verify: (oneTimePassword, options) => __awaiter(void 0, void 0, void 0, function* () {
-            let sessionPublicKey = undefined;
-            if (shouldRegisterSessionKeysOnSignin()) {
-                const keypair = yield generateSessionKey();
-                sessionPublicKey = keypair.publicKey;
-            }
-            yield generateSessionKeys();
-            const response = yield signInWithEmailVerification({
-                captchaToken,
-                environmentId,
-                sessionPublicKey,
-                verificationToken: oneTimePassword,
-                verificationUUID,
-            });
-            // Skip setting the user auth token and only return the VerifyResponse
-            // if needed because setUser can trigger view re-renders.
-            if (!(options === null || options === void 0 ? void 0 : options.skipSetUserAndAuthToken)) {
-                storeTokenAndUser(response);
-            }
-            return {
-                destination: email,
-                response: response,
-                verified: true,
-            };
-        }),
-    };
+        verificationUUID,
+    });
+    return buildEmailOtpHandler({
+        captchaToken,
+        email,
+        embeddedWalletSessionKeys,
+        environmentId,
+        initialVerificationUUID: verificationUUID,
+    });
 });
 
 export { createEmailHandler };

package/src/lib/context/ConnectWithOtpContext/utils/createSmsHandler.cjs

@@ -4,12 +4,12 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
-require('@dynamic-labs-sdk/client/core');
+require('@dynamic-labs-sdk/client');
+require('@dynamic-labs/utils');
 require('@dynamic-labs/sdk-api-core');
+require('@dynamic-labs-sdk/client/core');
 require('react');
 require('eventemitter3');
-require('@dynamic-labs/utils');
-require('@dynamic-labs-sdk/client');
 require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
@@ -23,16 +23,16 @@ require('../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('../../../store/state/nonce/nonce.cjs');
-var sms = require('../../../data/api/sms/sms.cjs');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
 require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../utils/functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.cjs');
 require('../../../events/dynamicEvents.cjs');
-var storeTokenAndUser = require('../../../client/extension/storeTokenAndUser/storeTokenAndUser.cjs');
-var generateSessionKeys = require('../../../client/extension/functions/generateSessionKeys/generateSessionKeys.cjs');
+var sms = require('../../../data/api/sms/sms.cjs');
+var buildSmsOtpHandler = require('./buildSmsOtpHandler/buildSmsOtpHandler.cjs');
+var otpVerificationStorage = require('./otpVerificationStorage/otpVerificationStorage.cjs');
 
-const createSmsHandler = (environmentId, { shouldRegisterSessionKeysOnSignin, generateSessionKey, }) => (phone, captchaToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+const createSmsHandler = (environmentId, embeddedWalletSessionKeys) => (phone, captchaToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     const { verificationUUID } = yield sms.createSmsVerification({
         captchaToken,
         environmentId,
@@ -40,34 +40,19 @@ const createSmsHandler = (environmentId, { shouldRegisterSessionKeysOnSignin, ge
         phoneCountryCode: phone.dialCode,
         phoneNumber: phone.phone,
     });
-    return {
+    otpVerificationStorage.persistOtpVerificationState({
+        captchaToken,
+        destination: phone,
         type: 'sms',
-        verify: (oneTimePassword, options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-            let sessionPublicKey = undefined;
-            if (shouldRegisterSessionKeysOnSignin()) {
-                const keypair = yield generateSessionKey();
-                sessionPublicKey = keypair.publicKey;
-            }
-            yield generateSessionKeys.generateSessionKeys();
-            const response = yield sms.signInWithSmsVerification({
-                captchaToken,
-                environmentId,
-                sessionPublicKey,
-                verificationToken: oneTimePassword,
-                verificationUUID,
-            });
-            // Skip setting the user auth token and only return the VerifyResponse
-            // if needed because setUser can trigger view re-renders.
-            if (!(options === null || options === void 0 ? void 0 : options.skipSetUserAndAuthToken)) {
-                storeTokenAndUser.storeTokenAndUser(response);
-            }
-            return {
-                destination: phone,
-                response: response,
-                verified: true,
-            };
-        }),
-    };
+        verificationUUID,
+    });
+    return buildSmsOtpHandler.buildSmsOtpHandler({
+        captchaToken,
+        embeddedWalletSessionKeys,
+        environmentId,
+        phone,
+        verificationUUID,
+    });
 });
 
 exports.createSmsHandler = createSmsHandler;

package/src/lib/context/ConnectWithOtpContext/utils/createSmsHandler.d.ts

@@ -1,4 +1,4 @@
 import { PhoneData } from '@dynamic-labs/types';
 import { useEmbeddedWalletSessionKeys } from '../../../utils/hooks';
 import { ProviderHandler } from '../types';
-export declare const createSmsHandler: (environmentId: string, { shouldRegisterSessionKeysOnSignin, generateSessionKey, }: ReturnType<typeof useEmbeddedWalletSessionKeys>) => ProviderHandler<PhoneData>;
+export declare const createSmsHandler: (environmentId: string, embeddedWalletSessionKeys: ReturnType<typeof useEmbeddedWalletSessionKeys>) => ProviderHandler<PhoneData>;

package/src/lib/context/ConnectWithOtpContext/utils/createSmsHandler.js

@@ -1,11 +1,11 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import '@dynamic-labs-sdk/client/core';
+import '@dynamic-labs-sdk/client';
+import '@dynamic-labs/utils';
 import '@dynamic-labs/sdk-api-core';
+import '@dynamic-labs-sdk/client/core';
 import 'react';
 import 'eventemitter3';
-import '@dynamic-labs/utils';
-import '@dynamic-labs-sdk/client';
 import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
@@ -19,16 +19,16 @@ import '../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import '../../../store/state/nonce/nonce.js';
-import { createSmsVerification, signInWithSmsVerification } from '../../../data/api/sms/sms.js';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../utils/functions/getWaasAddressTypeLabel/getWaasAddressTypeLabel.js';
 import '../../../events/dynamicEvents.js';
-import { storeTokenAndUser } from '../../../client/extension/storeTokenAndUser/storeTokenAndUser.js';
-import { generateSessionKeys } from '../../../client/extension/functions/generateSessionKeys/generateSessionKeys.js';
+import { createSmsVerification } from '../../../data/api/sms/sms.js';
+import { buildSmsOtpHandler } from './buildSmsOtpHandler/buildSmsOtpHandler.js';
+import { persistOtpVerificationState } from './otpVerificationStorage/otpVerificationStorage.js';
 
-const createSmsHandler = (environmentId, { shouldRegisterSessionKeysOnSignin, generateSessionKey, }) => (phone, captchaToken) => __awaiter(void 0, void 0, void 0, function* () {
+const createSmsHandler = (environmentId, embeddedWalletSessionKeys) => (phone, captchaToken) => __awaiter(void 0, void 0, void 0, function* () {
     const { verificationUUID } = yield createSmsVerification({
         captchaToken,
         environmentId,
@@ -36,34 +36,19 @@ const createSmsHandler = (environmentId, { shouldRegisterSessionKeysOnSignin, ge
         phoneCountryCode: phone.dialCode,
         phoneNumber: phone.phone,
     });
-    return {
+    persistOtpVerificationState({
+        captchaToken,
+        destination: phone,
         type: 'sms',
-        verify: (oneTimePassword, options) => __awaiter(void 0, void 0, void 0, function* () {
-            let sessionPublicKey = undefined;
-            if (shouldRegisterSessionKeysOnSignin()) {
-                const keypair = yield generateSessionKey();
-                sessionPublicKey = keypair.publicKey;
-            }
-            yield generateSessionKeys();
-            const response = yield signInWithSmsVerification({
-                captchaToken,
-                environmentId,
-                sessionPublicKey,
-                verificationToken: oneTimePassword,
-                verificationUUID,
-            });
-            // Skip setting the user auth token and only return the VerifyResponse
-            // if needed because setUser can trigger view re-renders.
-            if (!(options === null || options === void 0 ? void 0 : options.skipSetUserAndAuthToken)) {
-                storeTokenAndUser(response);
-            }
-            return {
-                destination: phone,
-                response: response,
-                verified: true,
-            };
-        }),
-    };
+        verificationUUID,
+    });
+    return buildSmsOtpHandler({
+        captchaToken,
+        embeddedWalletSessionKeys,
+        environmentId,
+        phone,
+        verificationUUID,
+    });
 });
 
 export { createSmsHandler };

package/src/lib/context/ConnectWithOtpContext/utils/otpVerificationStorage/index.d.ts

@@ -0,0 +1,2 @@
+export { clearOtpVerificationState, persistOtpVerificationState, restoreOtpVerificationState, } from './otpVerificationStorage';
+export type { PersistedOtpState } from './otpVerificationStorage';