@dynamic-labs/sdk-react-core 4.10.0 → 4.10.1

package/CHANGELOG.md

@@ -1,4 +1,6 @@
 
+### [4.10.1](https://github.com/dynamic-labs/dynamic-auth/compare/v4.10.0...v4.10.1) (2025-03-31)
+
 ## [4.10.0](https://github.com/dynamic-labs/dynamic-auth/compare/v4.9.12...v4.10.0) (2025-03-30)
 
 

package/package.cjs

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

package/package.js

@@ -1,5 +1,5 @@
 'use client'
-var version = "4.10.0";
+var version = "4.10.1";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.650",
 	"@hcaptcha/react-hcaptcha": "1.4.4",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "4.10.0",
+  "version": "4.10.1",
   "dependencies": {
     "@dynamic-labs/sdk-api-core": "0.0.650",
     "@hcaptcha/react-hcaptcha": "1.4.4",
@@ -14,16 +14,16 @@
     "yup": "0.32.11",
     "react-international-phone": "4.2.5",
     "bs58": "5.0.0",
-    "@dynamic-labs/assert-package-version": "4.10.0",
-    "@dynamic-labs/iconic": "4.10.0",
-    "@dynamic-labs/logger": "4.10.0",
-    "@dynamic-labs/multi-wallet": "4.10.0",
-    "@dynamic-labs/rpc-providers": "4.10.0",
-    "@dynamic-labs/store": "4.10.0",
-    "@dynamic-labs/types": "4.10.0",
-    "@dynamic-labs/utils": "4.10.0",
-    "@dynamic-labs/wallet-book": "4.10.0",
-    "@dynamic-labs/wallet-connector-core": "4.10.0",
+    "@dynamic-labs/assert-package-version": "4.10.1",
+    "@dynamic-labs/iconic": "4.10.1",
+    "@dynamic-labs/logger": "4.10.1",
+    "@dynamic-labs/multi-wallet": "4.10.1",
+    "@dynamic-labs/rpc-providers": "4.10.1",
+    "@dynamic-labs/store": "4.10.1",
+    "@dynamic-labs/types": "4.10.1",
+    "@dynamic-labs/utils": "4.10.1",
+    "@dynamic-labs/wallet-book": "4.10.1",
+    "@dynamic-labs/wallet-connector-core": "4.10.1",
     "eventemitter3": "5.0.1"
   },
   "devDependencies": {

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

@@ -109,44 +109,13 @@ const useMfa = () => {
         const environmentId = dynamicContextProps.getEnvironmentId();
         return environmentId;
     }, []);
-    const getUserDevices = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        const environmentId = checkUserIsVerifiedAndGetEnvironmentId();
-        const devices = yield mfa.getUserMfaDevices({ environmentId });
-        return devices;
-    }), [checkUserIsVerifiedAndGetEnvironmentId]);
-    const updateUserDevice = React.useCallback((deviceId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        const environmentId = checkUserIsVerifiedAndGetEnvironmentId();
-        yield mfa.updateUserMfaDevice({
-            environmentId,
-            mfaDeviceId: deviceId,
-        });
-    }), [checkUserIsVerifiedAndGetEnvironmentId]);
-    const deleteUserDevice = React.useCallback((deviceId, mfaAuthToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        const environmentId = checkUserIsVerifiedAndGetEnvironmentId();
-        yield mfa.deleteMfaDevice({
-            environmentId,
-            mfaAuthToken,
-            mfaDeviceId: deviceId,
-        });
-        // Refresh the user JWT to get the updated MFA acknowledgement
-        // since if it is completed we won't show the QR code again
-        yield user$1.refreshUserJwt({ environmentId });
-    }), [checkUserIsVerifiedAndGetEnvironmentId]);
-    const addDevice = React.useCallback((...args_1) => _tslib.__awaiter(void 0, [...args_1], void 0, function* (type = sdkApiCore.MFADeviceType.Totp) {
-        const environmentId = checkUserIsVerifiedAndGetEnvironmentId();
-        const { id, secret, uri } = yield mfa.addMfaDevice({
-            environmentId,
-            type,
-        });
-        return { id, secret, uri };
-    }), [checkUserIsVerifiedAndGetEnvironmentId]);
-    const authDevice = React.useCallback((code_1, ...args_2) => _tslib.__awaiter(void 0, [code_1, ...args_2], void 0, function* (code, type = sdkApiCore.MFADeviceType.Totp, deviceId) {
+    const handleMfaAuth = React.useCallback((code_1, ...args_1) => _tslib.__awaiter(void 0, [code_1, ...args_1], void 0, function* (code, type = sdkApiCore.MFADeviceType.Totp, deviceId, resultHandler) {
         try {
             const environmentId = checkUserIsVerifiedAndGetEnvironmentId();
-            let isValid = false;
+            let result;
             yield completeAuth({
                 onValidUpdatedJwt: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-                    isValid = true;
+                    // This callback is used by authDevice
                 }),
                 updateJwtFunction: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
                     const response = yield mfa.authMfaDevice({
@@ -161,22 +130,69 @@ const useMfa = () => {
                     dynamicEvents.dynamicEvents.emit('mfaCompletionSuccess', {
                         mfaToken: response.mfaToken,
                     });
+                    result = resultHandler(response);
                     return {
                         isEmailVerificationRequired: false,
                         isSmsVerificationRequired: false,
                         missingFields: [],
-                        // in the mfa flow, we only care about the user in the response
                         updateUserProfileResponse: response,
                     };
                 }),
             });
-            return isValid;
+            return result;
         }
         catch (error) {
             dynamicEvents.dynamicEvents.emit('mfaCompletionFailure', { error });
             throw error;
         }
     }), [checkUserIsVerifiedAndGetEnvironmentId, completeAuth]);
+    const getUserDevices = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        const environmentId = checkUserIsVerifiedAndGetEnvironmentId();
+        const devices = yield mfa.getUserMfaDevices({ environmentId });
+        return devices;
+    }), [checkUserIsVerifiedAndGetEnvironmentId]);
+    const updateUserDevice = React.useCallback((deviceId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        const environmentId = checkUserIsVerifiedAndGetEnvironmentId();
+        yield mfa.updateUserMfaDevice({
+            environmentId,
+            mfaDeviceId: deviceId,
+        });
+    }), [checkUserIsVerifiedAndGetEnvironmentId]);
+    const deleteUserDevice = React.useCallback((deviceId, mfaAuthToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        const environmentId = checkUserIsVerifiedAndGetEnvironmentId();
+        yield mfa.deleteMfaDevice({
+            environmentId,
+            mfaAuthToken,
+            mfaDeviceId: deviceId,
+        });
+        // Refresh the user JWT to get the updated MFA acknowledgement
+        // since if it is completed we won't show the QR code again
+        yield user$1.refreshUserJwt({ environmentId });
+    }), [checkUserIsVerifiedAndGetEnvironmentId]);
+    const addDevice = React.useCallback((...args_2) => _tslib.__awaiter(void 0, [...args_2], void 0, function* (type = sdkApiCore.MFADeviceType.Totp) {
+        const environmentId = checkUserIsVerifiedAndGetEnvironmentId();
+        const { id, secret, uri } = yield mfa.addMfaDevice({
+            environmentId,
+            type,
+        });
+        return { id, secret, uri };
+    }), [checkUserIsVerifiedAndGetEnvironmentId]);
+    // @deprecated Use authenticateDevice instead.
+    // This function authenticates a device and returns a boolean value
+    // indicating if the authentication was successful.
+    const authDevice = React.useCallback((code_2, ...args_3) => _tslib.__awaiter(void 0, [code_2, ...args_3], void 0, function* (code, type = sdkApiCore.MFADeviceType.Totp, deviceId) {
+        let isValid = false;
+        yield handleMfaAuth(code, type, deviceId, () => {
+            isValid = true;
+            return true;
+        });
+        return isValid;
+    }), [handleMfaAuth]);
+    /**
+     * Authenticates a device and returns a single use MFA token
+     * if the authentication is successful.
+     */
+    const authenticateDevice = React.useCallback((_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ code, type = sdkApiCore.MFADeviceType.Totp, deviceId, }) { return handleMfaAuth(code, type, deviceId, (response) => response.mfaToken); }), [handleMfaAuth]);
     const authRecoveryCode = React.useCallback((code) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const environmentId = checkUserIsVerifiedAndGetEnvironmentId();
         let isValid = false;
@@ -203,7 +219,7 @@ const useMfa = () => {
         });
         return isValid;
     }), [checkUserIsVerifiedAndGetEnvironmentId, completeAuth]);
-    const verifyDevice = React.useCallback((code_2, ...args_3) => _tslib.__awaiter(void 0, [code_2, ...args_3], void 0, function* (code, type = sdkApiCore.MFADeviceType.Totp) {
+    const verifyDevice = React.useCallback((code_3, ...args_4) => _tslib.__awaiter(void 0, [code_3, ...args_4], void 0, function* (code, type = sdkApiCore.MFADeviceType.Totp) {
         const environmentId = checkUserIsVerifiedAndGetEnvironmentId();
         const device = yield mfa.verifyMfaDevice({
             code,
@@ -215,7 +231,7 @@ const useMfa = () => {
         }
         return device;
     }), [checkUserIsVerifiedAndGetEnvironmentId]);
-    const getRecoveryCodes = React.useCallback((...args_4) => _tslib.__awaiter(void 0, [...args_4], void 0, function* (generateNewCodes = false) {
+    const getRecoveryCodes = React.useCallback((...args_5) => _tslib.__awaiter(void 0, [...args_5], void 0, function* (generateNewCodes = false) {
         const environmentId = checkUserIsVerifiedAndGetEnvironmentId();
         const getRecoveryCodesFunc = generateNewCodes
             ? mfa.createNewRecoveryCodes
@@ -240,6 +256,7 @@ const useMfa = () => {
         addDevice,
         authDevice,
         authRecoveryCode,
+        authenticateDevice,
         completeAcknowledgement,
         deleteUserDevice,
         getRecoveryCodes,

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

@@ -7,6 +7,11 @@ export declare const useMfa: () => {
     }>;
     readonly authDevice: (code: string, type?: MFADeviceType, deviceId?: string) => Promise<boolean>;
     readonly authRecoveryCode: (code: string) => Promise<boolean>;
+    readonly authenticateDevice: ({ code, type, deviceId, }: {
+        code: string;
+        type?: MFADeviceType;
+        deviceId?: string;
+    }) => Promise<string | undefined>;
     readonly completeAcknowledgement: () => Promise<void>;
     readonly deleteUserDevice: (deviceId: string, mfaAuthToken: string) => Promise<void>;
     readonly getRecoveryCodes: (generateNewCodes?: boolean) => Promise<string[]>;

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

@@ -21,7 +21,7 @@ import '../../../store/state/projectSettings/projectSettings.js';
 import { getEnvironmentId } from '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
 import { getUser } from '../../../store/state/user/user.js';
-import { getUserMfaDevices, updateUserMfaDevice, deleteMfaDevice, addMfaDevice, authMfaDevice, authMfaRecovery, verifyMfaDevice, createNewRecoveryCodes, getRecoveryCodes } from '../../../data/api/mfa/mfa.js';
+import { authMfaDevice, getUserMfaDevices, updateUserMfaDevice, deleteMfaDevice, addMfaDevice, authMfaRecovery, verifyMfaDevice, createNewRecoveryCodes, getRecoveryCodes } from '../../../data/api/mfa/mfa.js';
 import '../../../locale/locale.js';
 import { refreshUserJwt } from '../../../data/api/user/user.js';
 import { useUserAuth } from '../useUserAuth/useUserAuth.js';
@@ -105,44 +105,13 @@ const useMfa = () => {
         const environmentId = getEnvironmentId();
         return environmentId;
     }, []);
-    const getUserDevices = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-        const environmentId = checkUserIsVerifiedAndGetEnvironmentId();
-        const devices = yield getUserMfaDevices({ environmentId });
-        return devices;
-    }), [checkUserIsVerifiedAndGetEnvironmentId]);
-    const updateUserDevice = useCallback((deviceId) => __awaiter(void 0, void 0, void 0, function* () {
-        const environmentId = checkUserIsVerifiedAndGetEnvironmentId();
-        yield updateUserMfaDevice({
-            environmentId,
-            mfaDeviceId: deviceId,
-        });
-    }), [checkUserIsVerifiedAndGetEnvironmentId]);
-    const deleteUserDevice = useCallback((deviceId, mfaAuthToken) => __awaiter(void 0, void 0, void 0, function* () {
-        const environmentId = checkUserIsVerifiedAndGetEnvironmentId();
-        yield deleteMfaDevice({
-            environmentId,
-            mfaAuthToken,
-            mfaDeviceId: deviceId,
-        });
-        // Refresh the user JWT to get the updated MFA acknowledgement
-        // since if it is completed we won't show the QR code again
-        yield refreshUserJwt({ environmentId });
-    }), [checkUserIsVerifiedAndGetEnvironmentId]);
-    const addDevice = useCallback((...args_1) => __awaiter(void 0, [...args_1], void 0, function* (type = MFADeviceType.Totp) {
-        const environmentId = checkUserIsVerifiedAndGetEnvironmentId();
-        const { id, secret, uri } = yield addMfaDevice({
-            environmentId,
-            type,
-        });
-        return { id, secret, uri };
-    }), [checkUserIsVerifiedAndGetEnvironmentId]);
-    const authDevice = useCallback((code_1, ...args_2) => __awaiter(void 0, [code_1, ...args_2], void 0, function* (code, type = MFADeviceType.Totp, deviceId) {
+    const handleMfaAuth = useCallback((code_1, ...args_1) => __awaiter(void 0, [code_1, ...args_1], void 0, function* (code, type = MFADeviceType.Totp, deviceId, resultHandler) {
         try {
             const environmentId = checkUserIsVerifiedAndGetEnvironmentId();
-            let isValid = false;
+            let result;
             yield completeAuth({
                 onValidUpdatedJwt: () => __awaiter(void 0, void 0, void 0, function* () {
-                    isValid = true;
+                    // This callback is used by authDevice
                 }),
                 updateJwtFunction: () => __awaiter(void 0, void 0, void 0, function* () {
                     const response = yield authMfaDevice({
@@ -157,22 +126,69 @@ const useMfa = () => {
                     dynamicEvents.emit('mfaCompletionSuccess', {
                         mfaToken: response.mfaToken,
                     });
+                    result = resultHandler(response);
                     return {
                         isEmailVerificationRequired: false,
                         isSmsVerificationRequired: false,
                         missingFields: [],
-                        // in the mfa flow, we only care about the user in the response
                         updateUserProfileResponse: response,
                     };
                 }),
             });
-            return isValid;
+            return result;
         }
         catch (error) {
             dynamicEvents.emit('mfaCompletionFailure', { error });
             throw error;
         }
     }), [checkUserIsVerifiedAndGetEnvironmentId, completeAuth]);
+    const getUserDevices = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
+        const environmentId = checkUserIsVerifiedAndGetEnvironmentId();
+        const devices = yield getUserMfaDevices({ environmentId });
+        return devices;
+    }), [checkUserIsVerifiedAndGetEnvironmentId]);
+    const updateUserDevice = useCallback((deviceId) => __awaiter(void 0, void 0, void 0, function* () {
+        const environmentId = checkUserIsVerifiedAndGetEnvironmentId();
+        yield updateUserMfaDevice({
+            environmentId,
+            mfaDeviceId: deviceId,
+        });
+    }), [checkUserIsVerifiedAndGetEnvironmentId]);
+    const deleteUserDevice = useCallback((deviceId, mfaAuthToken) => __awaiter(void 0, void 0, void 0, function* () {
+        const environmentId = checkUserIsVerifiedAndGetEnvironmentId();
+        yield deleteMfaDevice({
+            environmentId,
+            mfaAuthToken,
+            mfaDeviceId: deviceId,
+        });
+        // Refresh the user JWT to get the updated MFA acknowledgement
+        // since if it is completed we won't show the QR code again
+        yield refreshUserJwt({ environmentId });
+    }), [checkUserIsVerifiedAndGetEnvironmentId]);
+    const addDevice = useCallback((...args_2) => __awaiter(void 0, [...args_2], void 0, function* (type = MFADeviceType.Totp) {
+        const environmentId = checkUserIsVerifiedAndGetEnvironmentId();
+        const { id, secret, uri } = yield addMfaDevice({
+            environmentId,
+            type,
+        });
+        return { id, secret, uri };
+    }), [checkUserIsVerifiedAndGetEnvironmentId]);
+    // @deprecated Use authenticateDevice instead.
+    // This function authenticates a device and returns a boolean value
+    // indicating if the authentication was successful.
+    const authDevice = useCallback((code_2, ...args_3) => __awaiter(void 0, [code_2, ...args_3], void 0, function* (code, type = MFADeviceType.Totp, deviceId) {
+        let isValid = false;
+        yield handleMfaAuth(code, type, deviceId, () => {
+            isValid = true;
+            return true;
+        });
+        return isValid;
+    }), [handleMfaAuth]);
+    /**
+     * Authenticates a device and returns a single use MFA token
+     * if the authentication is successful.
+     */
+    const authenticateDevice = useCallback((_a) => __awaiter(void 0, [_a], void 0, function* ({ code, type = MFADeviceType.Totp, deviceId, }) { return handleMfaAuth(code, type, deviceId, (response) => response.mfaToken); }), [handleMfaAuth]);
     const authRecoveryCode = useCallback((code) => __awaiter(void 0, void 0, void 0, function* () {
         const environmentId = checkUserIsVerifiedAndGetEnvironmentId();
         let isValid = false;
@@ -199,7 +215,7 @@ const useMfa = () => {
         });
         return isValid;
     }), [checkUserIsVerifiedAndGetEnvironmentId, completeAuth]);
-    const verifyDevice = useCallback((code_2, ...args_3) => __awaiter(void 0, [code_2, ...args_3], void 0, function* (code, type = MFADeviceType.Totp) {
+    const verifyDevice = useCallback((code_3, ...args_4) => __awaiter(void 0, [code_3, ...args_4], void 0, function* (code, type = MFADeviceType.Totp) {
         const environmentId = checkUserIsVerifiedAndGetEnvironmentId();
         const device = yield verifyMfaDevice({
             code,
@@ -211,7 +227,7 @@ const useMfa = () => {
         }
         return device;
     }), [checkUserIsVerifiedAndGetEnvironmentId]);
-    const getRecoveryCodes$1 = useCallback((...args_4) => __awaiter(void 0, [...args_4], void 0, function* (generateNewCodes = false) {
+    const getRecoveryCodes$1 = useCallback((...args_5) => __awaiter(void 0, [...args_5], void 0, function* (generateNewCodes = false) {
         const environmentId = checkUserIsVerifiedAndGetEnvironmentId();
         const getRecoveryCodesFunc = generateNewCodes
             ? createNewRecoveryCodes
@@ -236,6 +252,7 @@ const useMfa = () => {
         addDevice,
         authDevice,
         authRecoveryCode,
+        authenticateDevice,
         completeAcknowledgement,
         deleteUserDevice,
         getRecoveryCodes: getRecoveryCodes$1,

package/src/lib/utils/hooks/useSocialAuth/farcaster/farcaster.cjs

@@ -56,8 +56,8 @@ const status = (connectStatusRequest_1, ...args_1) => _tslib.__awaiter(void 0, [
         return yield response.json();
     }
     catch (error) {
-        logger.logger.warn(`Error fetching farcaster connect status trying again attempt: ${count}`, error);
-        return { state: 'retry' };
+        logger.logger.warn(`Error fetching farcaster connect status, trying again. Attempt: ${count}`, error);
+        return { error: JSON.stringify(error), state: 'retry' };
     }
 });
 const watchStatus = (connectStatusRequest_2, ...args_2) => _tslib.__awaiter(void 0, [connectStatusRequest_2, ...args_2], void 0, function* (connectStatusRequest, { timeout = STATUS_TIMEOUT, interval = STATUS_INTERVAL } = {}) {
@@ -76,19 +76,26 @@ const watchStatus = (connectStatusRequest_2, ...args_2) => _tslib.__awaiter(void
         setTimeout(resolve, interval);
     };
     let count = 0;
+    let timeoutError = 'Unknown error';
     while (shouldPoll && Date.now() < deadline) {
         count++;
         const response = yield status(connectStatusRequest, count);
         if (response.state === 'completed') {
-            return response;
+            return { data: response, type: 'success' };
         }
+        else if (response.state === 'retry') {
+            timeoutError = response.error;
+        }
+        // response.state === 'pending'
+        else
+            timeoutError = 'Timed out: Farcaster connection status still pending';
         yield new Promise(timeoutCallback);
     }
     if (!shouldPoll) {
-        return 'cancelled';
+        return { type: 'cancelled' };
     }
-    logger.logger.error(`Polling farcaster connect status timed out after ${STATUS_TIMEOUT}ms`);
-    return 'timeout';
+    logger.logger.error(`Polling farcaster connect status timed out after ${timeout}ms`);
+    return { error: timeoutError, type: 'timeout' };
 });
 
 exports.connect = connect;

package/src/lib/utils/hooks/useSocialAuth/farcaster/farcaster.d.ts

@@ -16,7 +16,7 @@ interface FarcasterConnectResponse {
 interface FarcasterConnectStatusRequest {
     channelToken: string;
 }
-interface FarcasterConnectStatusResponse {
+interface FarcasterConnectStatusSuccessResponse {
     bio: string;
     custody: string;
     displayName: string;
@@ -28,12 +28,22 @@ interface FarcasterConnectStatusResponse {
     state: 'pending' | 'completed';
     username: string;
 }
+type FarcasterConnectStatusResponse = {
+    type: 'success';
+    data: FarcasterConnectStatusSuccessResponse;
+} | {
+    type: 'timeout';
+    error: string;
+} | {
+    type: 'cancelled';
+};
 export declare const connect: (connectRequest: FarcasterConnectRequest) => Promise<FarcasterConnectResponse | undefined>;
-export declare const status: (connectStatusRequest: FarcasterConnectStatusRequest, count?: number) => Promise<FarcasterConnectStatusResponse | {
+export declare const status: (connectStatusRequest: FarcasterConnectStatusRequest, count?: number) => Promise<FarcasterConnectStatusSuccessResponse | {
+    error: string;
     state: 'retry';
 }>;
 export declare const watchStatus: (connectStatusRequest: FarcasterConnectStatusRequest, { timeout, interval }?: {
     timeout?: number | undefined;
     interval?: number | undefined;
-}) => Promise<FarcasterConnectStatusResponse | 'timeout' | 'rejected' | 'cancelled'>;
+}) => Promise<FarcasterConnectStatusResponse>;
 export {};

package/src/lib/utils/hooks/useSocialAuth/farcaster/farcaster.js

@@ -52,8 +52,8 @@ const status = (connectStatusRequest_1, ...args_1) => __awaiter(void 0, [connect
         return yield response.json();
     }
     catch (error) {
-        logger.warn(`Error fetching farcaster connect status trying again attempt: ${count}`, error);
-        return { state: 'retry' };
+        logger.warn(`Error fetching farcaster connect status, trying again. Attempt: ${count}`, error);
+        return { error: JSON.stringify(error), state: 'retry' };
     }
 });
 const watchStatus = (connectStatusRequest_2, ...args_2) => __awaiter(void 0, [connectStatusRequest_2, ...args_2], void 0, function* (connectStatusRequest, { timeout = STATUS_TIMEOUT, interval = STATUS_INTERVAL } = {}) {
@@ -72,19 +72,26 @@ const watchStatus = (connectStatusRequest_2, ...args_2) => __awaiter(void 0, [co
         setTimeout(resolve, interval);
     };
     let count = 0;
+    let timeoutError = 'Unknown error';
     while (shouldPoll && Date.now() < deadline) {
         count++;
         const response = yield status(connectStatusRequest, count);
         if (response.state === 'completed') {
-            return response;
+            return { data: response, type: 'success' };
         }
+        else if (response.state === 'retry') {
+            timeoutError = response.error;
+        }
+        // response.state === 'pending'
+        else
+            timeoutError = 'Timed out: Farcaster connection status still pending';
         yield new Promise(timeoutCallback);
     }
     if (!shouldPoll) {
-        return 'cancelled';
+        return { type: 'cancelled' };
     }
-    logger.error(`Polling farcaster connect status timed out after ${STATUS_TIMEOUT}ms`);
-    return 'timeout';
+    logger.error(`Polling farcaster connect status timed out after ${timeout}ms`);
+    return { error: timeoutError, type: 'timeout' };
 });
 
 export { connect, status, watchStatus };

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

@@ -292,24 +292,25 @@ const useSocialAuth = ({ onSettled, onError, onFarcasterUrl, }) => {
             setShowAuthFlow(true);
             onFarcasterUrl === null || onFarcasterUrl === void 0 ? void 0 : onFarcasterUrl(data.url);
         }
-        const status = yield farcaster.watchStatus({
+        const statusResponse = yield farcaster.watchStatus({
             channelToken: data.channelToken,
         });
-        if (status === 'cancelled') {
+        if (statusResponse.type === 'cancelled') {
             setIsProcessing(false);
             return;
         }
-        // Error
-        if (status === 'timeout' ||
-            status === 'rejected' ||
-            !(status === null || status === void 0 ? void 0 : status.message) ||
-            !(status === null || status === void 0 ? void 0 : status.custody) ||
-            !(status === null || status === void 0 ? void 0 : status.signature) ||
-            !(status === null || status === void 0 ? void 0 : status.nonce)) {
-            handleError(sdkApiCore.ProviderEnum.Farcaster, types.SocialOAuthErrorCode.GENERAL_ERROR, "Farcaster didn't return valid data.", { raiseAuthFailure: authMode === 'signin' });
+        if (statusResponse.type === 'timeout') {
+            handleError(sdkApiCore.ProviderEnum.Farcaster, types.SocialOAuthErrorCode.GENERAL_ERROR, `Farcaster timed out while waiting for connection status. Error: ${statusResponse.error}`, { raiseAuthFailure: authMode === 'signin' });
             return;
         }
-        const { custody: address, message, signature, nonce: nonce$1 } = status;
+        if (!statusResponse.data.message ||
+            !statusResponse.data.custody ||
+            !statusResponse.data.signature ||
+            !statusResponse.data.nonce) {
+            handleError(sdkApiCore.ProviderEnum.Farcaster, types.SocialOAuthErrorCode.GENERAL_ERROR, `Farcaster returned invalid data. Expected to be defined: message, custody, signature, nonce. Received: ${JSON.stringify(statusResponse.data)}`, { raiseAuthFailure: authMode === 'signin' });
+            return;
+        }
+        const { custody: address, message, signature, nonce: nonce$1, } = statusResponse.data;
         if (authMode === 'signin') {
             let sessionPublicKey = undefined;
             if (shouldRegisterSessionKeysOnSignin()) {

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

@@ -288,24 +288,25 @@ const useSocialAuth = ({ onSettled, onError, onFarcasterUrl, }) => {
             setShowAuthFlow(true);
             onFarcasterUrl === null || onFarcasterUrl === void 0 ? void 0 : onFarcasterUrl(data.url);
         }
-        const status = yield watchStatus({
+        const statusResponse = yield watchStatus({
             channelToken: data.channelToken,
         });
-        if (status === 'cancelled') {
+        if (statusResponse.type === 'cancelled') {
             setIsProcessing(false);
             return;
         }
-        // Error
-        if (status === 'timeout' ||
-            status === 'rejected' ||
-            !(status === null || status === void 0 ? void 0 : status.message) ||
-            !(status === null || status === void 0 ? void 0 : status.custody) ||
-            !(status === null || status === void 0 ? void 0 : status.signature) ||
-            !(status === null || status === void 0 ? void 0 : status.nonce)) {
-            handleError(ProviderEnum.Farcaster, SocialOAuthErrorCode.GENERAL_ERROR, "Farcaster didn't return valid data.", { raiseAuthFailure: authMode === 'signin' });
+        if (statusResponse.type === 'timeout') {
+            handleError(ProviderEnum.Farcaster, SocialOAuthErrorCode.GENERAL_ERROR, `Farcaster timed out while waiting for connection status. Error: ${statusResponse.error}`, { raiseAuthFailure: authMode === 'signin' });
             return;
         }
-        const { custody: address, message, signature, nonce } = status;
+        if (!statusResponse.data.message ||
+            !statusResponse.data.custody ||
+            !statusResponse.data.signature ||
+            !statusResponse.data.nonce) {
+            handleError(ProviderEnum.Farcaster, SocialOAuthErrorCode.GENERAL_ERROR, `Farcaster returned invalid data. Expected to be defined: message, custody, signature, nonce. Received: ${JSON.stringify(statusResponse.data)}`, { raiseAuthFailure: authMode === 'signin' });
+            return;
+        }
+        const { custody: address, message, signature, nonce, } = statusResponse.data;
         if (authMode === 'signin') {
             let sessionPublicKey = undefined;
             if (shouldRegisterSessionKeysOnSignin()) {

package/src/lib/views/MfaVerificationView/MfaVerificationView.cjs

@@ -102,14 +102,14 @@ require('../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
 const MfaVerificationView = ({ type, isInitialSetup = false, showBackButton = false, deviceId, }) => {
     const { t } = reactI18next.useTranslation();
     const { clearStackAndPush, pushView, goBack, canGoBack } = ViewContext.useViewContext();
-    const { authDevice } = useMfa.useMfa();
+    const { authenticateDevice } = useMfa.useMfa();
     const [code, setCode] = React.useState('');
     const [error, setError] = React.useState();
     const [isRateLimited, setIsRateLimited] = React.useState(false);
-    const { data: isValid, isLoading } = usePromise.usePromise(() => authDevice(code, type, deviceId), {
+    const { data: mfaToken, isLoading } = usePromise.usePromise(() => authenticateDevice({ code, deviceId, type }), {
         deps: [code],
         enabled: (code === null || code === void 0 ? void 0 : code.length) === 6,
-        initialData: false,
+        initialData: undefined,
         onReject: (err) => {
             if (err instanceof utils.MfaRateLimitedError) {
                 setIsRateLimited(true);
@@ -135,7 +135,7 @@ const MfaVerificationView = ({ type, isInitialSetup = false, showBackButton = fa
         setCode(code);
     };
     const onClickBack = canGoBack && showBackButton ? goBack : undefined;
-    return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(OTPVerificationView.OTPVerificationView, { MainIcon: passwordHero.ReactComponent, error: error, isLoading: isLoading, onPinComplete: onSubmit, isValid: Boolean(isValid), onPinChange: onCodeChange, description: t('dyn_mfa.otp_verification_view.body'), onClickBack: onClickBack, disabled: isRateLimited }), !isInitialSetup && (jsxRuntime.jsx("div", { className: 'mfa-verification-view__choose-another-method', children: jsxRuntime.jsx(TextButton.TextButton, { className: 'mfa-verification-view__choose-another-method-button', onClick: () => pushView('mfa-choose-device', { isInitialSetup }), copykey: 'dyn_mfa.otp_verification_view.choose_another_method', children: t('dyn_mfa.otp_verification_view.choose_another_method') }) }))] }));
+    return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(OTPVerificationView.OTPVerificationView, { MainIcon: passwordHero.ReactComponent, error: error, isLoading: isLoading, onPinComplete: onSubmit, isValid: Boolean(mfaToken), onPinChange: onCodeChange, description: t('dyn_mfa.otp_verification_view.body'), onClickBack: onClickBack, disabled: isRateLimited }), !isInitialSetup && (jsxRuntime.jsx("div", { className: 'mfa-verification-view__choose-another-method', children: jsxRuntime.jsx(TextButton.TextButton, { className: 'mfa-verification-view__choose-another-method-button', onClick: () => pushView('mfa-choose-device', { isInitialSetup }), copykey: 'dyn_mfa.otp_verification_view.choose_another_method', children: t('dyn_mfa.otp_verification_view.choose_another_method') }) }))] }));
 };
 
 exports.MfaVerificationView = MfaVerificationView;

package/src/lib/views/MfaVerificationView/MfaVerificationView.js

@@ -98,14 +98,14 @@ import '../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
 const MfaVerificationView = ({ type, isInitialSetup = false, showBackButton = false, deviceId, }) => {
     const { t } = useTranslation();
     const { clearStackAndPush, pushView, goBack, canGoBack } = useViewContext();
-    const { authDevice } = useMfa();
+    const { authenticateDevice } = useMfa();
     const [code, setCode] = useState('');
     const [error, setError] = useState();
     const [isRateLimited, setIsRateLimited] = useState(false);
-    const { data: isValid, isLoading } = usePromise(() => authDevice(code, type, deviceId), {
+    const { data: mfaToken, isLoading } = usePromise(() => authenticateDevice({ code, deviceId, type }), {
         deps: [code],
         enabled: (code === null || code === void 0 ? void 0 : code.length) === 6,
-        initialData: false,
+        initialData: undefined,
         onReject: (err) => {
             if (err instanceof MfaRateLimitedError) {
                 setIsRateLimited(true);
@@ -131,7 +131,7 @@ const MfaVerificationView = ({ type, isInitialSetup = false, showBackButton = fa
         setCode(code);
     };
     const onClickBack = canGoBack && showBackButton ? goBack : undefined;
-    return (jsxs(Fragment, { children: [jsx(OTPVerificationView, { MainIcon: SvgPasswordHero, error: error, isLoading: isLoading, onPinComplete: onSubmit, isValid: Boolean(isValid), onPinChange: onCodeChange, description: t('dyn_mfa.otp_verification_view.body'), onClickBack: onClickBack, disabled: isRateLimited }), !isInitialSetup && (jsx("div", { className: 'mfa-verification-view__choose-another-method', children: jsx(TextButton, { className: 'mfa-verification-view__choose-another-method-button', onClick: () => pushView('mfa-choose-device', { isInitialSetup }), copykey: 'dyn_mfa.otp_verification_view.choose_another_method', children: t('dyn_mfa.otp_verification_view.choose_another_method') }) }))] }));
+    return (jsxs(Fragment, { children: [jsx(OTPVerificationView, { MainIcon: SvgPasswordHero, error: error, isLoading: isLoading, onPinComplete: onSubmit, isValid: Boolean(mfaToken), onPinChange: onCodeChange, description: t('dyn_mfa.otp_verification_view.body'), onClickBack: onClickBack, disabled: isRateLimited }), !isInitialSetup && (jsx("div", { className: 'mfa-verification-view__choose-another-method', children: jsx(TextButton, { className: 'mfa-verification-view__choose-another-method-button', onClick: () => pushView('mfa-choose-device', { isInitialSetup }), copykey: 'dyn_mfa.otp_verification_view.choose_another_method', children: t('dyn_mfa.otp_verification_view.choose_another_method') }) }))] }));
 };
 
 export { MfaVerificationView };