@dynamic-labs/sdk-react-core 2.1.0-alpha.9 → 2.1.1

package/src/lib/data/api/mfa/mfa.js

@@ -1,6 +1,7 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { MFADeviceType } from '@dynamic-labs/sdk-api-core';
+import { MfaInvalidOtpError } from '@dynamic-labs/utils';
 import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
@@ -11,13 +12,12 @@ import '@dynamic-labs/wallet-book';
 import '../../../utils/constants/colors.js';
 import '../../../utils/constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
-import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 import { sdkApi } from '../api.js';
 
-const getUserMfaDevices = (_a) => __awaiter(void 0, [_a], void 0, function* ({ environmentId, userJwt, }) {
+const getUserMfaDevices = (_a) => __awaiter(void 0, [_a], void 0, function* ({ environmentId, }) {
     try {
-        const { devices } = yield sdkApi(userJwt).getUserMfaDevices({
+        const { devices } = yield sdkApi().getUserMfaDevices({
             environmentId,
         });
         return devices;
@@ -28,10 +28,10 @@ const getUserMfaDevices = (_a) => __awaiter(void 0, [_a], void 0, function* ({ e
         return [];
     }
 });
-const addMfaDevice = (_b) => __awaiter(void 0, [_b], void 0, function* ({ environmentId, userJwt, type, }) {
+const addMfaDevice = (_b) => __awaiter(void 0, [_b], void 0, function* ({ environmentId, type, }) {
     try {
         if (type === MFADeviceType.Totp) {
-            const response = yield sdkApi(userJwt).registerTotpMfaDevice({
+            const response = yield sdkApi().registerTotpMfaDevice({
                 environmentId,
             });
             return response;
@@ -44,9 +44,9 @@ const addMfaDevice = (_b) => __awaiter(void 0, [_b], void 0, function* ({ enviro
         throw new Error(message);
     }
 });
-const updateUserMfaDevice = (_c) => __awaiter(void 0, [_c], void 0, function* ({ environmentId, userJwt, mfaDeviceId, }) {
+const updateUserMfaDevice = (_c) => __awaiter(void 0, [_c], void 0, function* ({ environmentId, mfaDeviceId, }) {
     try {
-        yield sdkApi(userJwt).updateUserMfaDevice({
+        yield sdkApi().updateUserMfaDevice({
             environmentId,
             mfaDeviceId,
         });
@@ -56,9 +56,9 @@ const updateUserMfaDevice = (_c) => __awaiter(void 0, [_c], void 0, function* ({
         logger.error(data.error);
     }
 });
-const deleteMfaDevice = (_d) => __awaiter(void 0, [_d], void 0, function* ({ environmentId, userJwt, mfaDeviceId, }) {
+const deleteMfaDevice = (_d) => __awaiter(void 0, [_d], void 0, function* ({ environmentId, mfaDeviceId, }) {
     try {
-        yield sdkApi(userJwt).deleteMfaDevice({
+        yield sdkApi().deleteMfaDevice({
             environmentId,
             mfaDeviceId,
         });
@@ -70,14 +70,14 @@ const deleteMfaDevice = (_d) => __awaiter(void 0, [_d], void 0, function* ({ env
 });
 // used when verifying a device added after the user is already logged in
 // no jwt update needed
-const verifyMfaDevice = (_e) => __awaiter(void 0, [_e], void 0, function* ({ environmentId, userJwt, type, code, }) {
+const verifyMfaDevice = (_e) => __awaiter(void 0, [_e], void 0, function* ({ environmentId, type, code, }) {
     try {
         if (type === MFADeviceType.Totp) {
             const request = {
                 code,
                 type,
             };
-            const device = yield sdkApi(userJwt).registerTotpMfaDeviceVerify({
+            const device = yield sdkApi().registerTotpMfaDeviceVerify({
                 environmentId,
                 mFARegisterTotpDevicePostRequest: request,
             });
@@ -93,13 +93,14 @@ const verifyMfaDevice = (_e) => __awaiter(void 0, [_e], void 0, function* ({ env
 });
 // used when verifying a device when user is logging in
 // jwt update needed
-const authMfaDevice = (_f) => __awaiter(void 0, [_f], void 0, function* ({ environmentId, userJwt, type, code, }) {
+const authMfaDevice = (_f) => __awaiter(void 0, [_f], void 0, function* ({ environmentId, type, code, createMfaToken, }) {
     try {
         if (type === MFADeviceType.Totp) {
             const request = {
                 code,
+                createMfaToken,
             };
-            const response = yield sdkApi(userJwt).authMfaTotpDevice({
+            const response = yield sdkApi().authMfaTotpDevice({
                 environmentId,
                 mFAAuthTotpDevicePostRequest: request,
             });
@@ -107,15 +108,20 @@ const authMfaDevice = (_f) => __awaiter(void 0, [_f], void 0, function* ({ envir
         }
         throw new Error('Unsupported MFA device type');
     }
-    catch (e) {
-        const message = e instanceof Error ? e.message : (yield e.json()).error;
-        logger.error(message);
-        return undefined;
+    catch (error) {
+        logger.error(error);
+        if (error instanceof Response) {
+            const responseError = yield error.json();
+            if (responseError.code === 'mfa_invalid_code') {
+                throw new MfaInvalidOtpError();
+            }
+        }
+        throw error;
     }
 });
-const getRecoveryCodes = (_g) => __awaiter(void 0, [_g], void 0, function* ({ environmentId, userJwt, }) {
+const getRecoveryCodes = (_g) => __awaiter(void 0, [_g], void 0, function* ({ environmentId, }) {
     try {
-        const { recoveryCodes } = yield sdkApi(userJwt).getRecoveryCodes({
+        const { recoveryCodes } = yield sdkApi().getRecoveryCodes({
             environmentId,
         });
         return recoveryCodes;
@@ -126,9 +132,9 @@ const getRecoveryCodes = (_g) => __awaiter(void 0, [_g], void 0, function* ({ en
         return [];
     }
 });
-const createNewRecoveryCodes = (_h) => __awaiter(void 0, [_h], void 0, function* ({ environmentId, userJwt, }) {
+const createNewRecoveryCodes = (_h) => __awaiter(void 0, [_h], void 0, function* ({ environmentId, }) {
     try {
-        const { recoveryCodes } = yield sdkApi(userJwt).createNewRecoveryCodes({
+        const { recoveryCodes } = yield sdkApi().createNewRecoveryCodes({
             environmentId,
         });
         return recoveryCodes;
@@ -141,12 +147,12 @@ const createNewRecoveryCodes = (_h) => __awaiter(void 0, [_h], void 0, function*
 });
 // used when verifying a device when user is logging in with recovery code
 // jwt update needed
-const authMfaRecovery = (_j) => __awaiter(void 0, [_j], void 0, function* ({ environmentId, userJwt, code, }) {
+const authMfaRecovery = (_j) => __awaiter(void 0, [_j], void 0, function* ({ environmentId, code, }) {
     try {
         const request = {
             code,
         };
-        const response = yield sdkApi(userJwt).authMfaRecovery({
+        const response = yield sdkApi().authMfaRecovery({
             environmentId,
             mFAAuthRecoveryDevicePostRequest: request,
         });

package/src/lib/data/api/oauth/oauth.cjs

@@ -18,20 +18,22 @@ require('../../../utils/constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('../../../shared/consts/index.cjs');
 var api = require('../api.cjs');
+var storeAuthTokenAndUser = require('../../../store/utils/storeAuthTokenAndUser/storeAuthTokenAndUser.cjs');
 
-const verifyOAuth = (environmentId_1, providerType_1, _a, userJwt_1) => _tslib.__awaiter(void 0, [environmentId_1, providerType_1, _a, userJwt_1], void 0, function* (environmentId, providerType, { code, codeVerifier, state }, userJwt) {
+const verifyOAuth = (environmentId_1, providerType_1, _a) => _tslib.__awaiter(void 0, [environmentId_1, providerType_1, _a], void 0, function* (environmentId, providerType, { code, codeVerifier, state }) {
     const oauthRequest = {
         code,
         codeVerifier,
         state,
     };
     try {
-        const response = yield api.sdkApi(userJwt).oauthVerify({
+        const response = yield api.sdkApi().oauthVerify({
             environmentId,
             oauthRequest,
             providerType,
         });
-        return response;
+        const user = storeAuthTokenAndUser.storeAuthTokenAndUser(response);
+        return user;
     }
     catch (e) {
         logger.logger.error(e);
@@ -42,16 +44,17 @@ const verifyOAuth = (environmentId_1, providerType_1, _a, userJwt_1) => _tslib._
         return undefined;
     }
 });
-const unlinkOAuth = (_b, userJwt_2) => _tslib.__awaiter(void 0, [_b, userJwt_2], void 0, function* ({ environmentId, primaryWalletId, verifiedCrentialId, }, userJwt) {
+const unlinkOAuth = (_b) => _tslib.__awaiter(void 0, [_b], void 0, function* ({ environmentId, primaryWalletId, verifiedCrentialId, }) {
     try {
-        const response = yield api.sdkApi(userJwt).verifyUnlink({
+        const response = yield api.sdkApi().verifyUnlink({
             environmentId,
             verifyUnlinkRequest: {
                 primaryWalletId,
                 verifiedCrentialId,
             },
         });
-        return response;
+        const user = storeAuthTokenAndUser.storeAuthTokenAndUser(response);
+        return user;
     }
     catch (e) {
         return undefined;
@@ -71,7 +74,8 @@ const signInOAuth = (environmentId_2, providerType_2, _c) => _tslib.__awaiter(vo
             oauthRequest,
             providerType,
         });
-        return response;
+        const user = storeAuthTokenAndUser.storeAuthTokenAndUser(response);
+        return user;
     }
     catch (e) {
         logger.logger.error(e);
@@ -113,7 +117,8 @@ const farcasterSignIn = (environmentId, farcasterSignInRequest) => _tslib.__awai
             environmentId,
             farcasterSignInRequest,
         });
-        return response;
+        const user = storeAuthTokenAndUser.storeAuthTokenAndUser(response);
+        return user;
     }
     catch (e) {
         logger.logger.error(e);

package/src/lib/data/api/oauth/oauth.d.ts

@@ -1,11 +1,12 @@
-import { FarcasterSignInRequest, OauthRequest, OauthResultRequest, OauthResultResponse, ProviderEnum, VerifyResponse } from '@dynamic-labs/sdk-api-core';
-export declare const getOauthLoginUrl: (environmentId: string, providerType: ProviderEnum, userJwt: string) => Promise<string | undefined>;
-export declare const verifyOAuth: (environmentId: string, providerType: ProviderEnum, { code, codeVerifier, state }: OauthRequest, userJwt: string) => Promise<VerifyResponse | undefined>;
+import { FarcasterSignInRequest, OauthRequest, OauthResultRequest, OauthResultResponse, ProviderEnum } from '@dynamic-labs/sdk-api-core';
+import { UserProfile } from '../../../..';
+export declare const getOauthLoginUrl: (environmentId: string, providerType: ProviderEnum) => Promise<string | undefined>;
+export declare const verifyOAuth: (environmentId: string, providerType: ProviderEnum, { code, codeVerifier, state }: OauthRequest) => Promise<UserProfile | undefined>;
 export declare const unlinkOAuth: ({ environmentId, primaryWalletId, verifiedCrentialId, }: {
     environmentId: string;
     primaryWalletId: string | undefined;
     verifiedCrentialId: string;
-}, userJwt: string) => Promise<VerifyResponse | undefined>;
-export declare const signInOAuth: (environmentId: string, providerType: ProviderEnum, { code, codeVerifier, state, captchaToken }: OauthRequest) => Promise<VerifyResponse | undefined>;
+}) => Promise<UserProfile | undefined>;
+export declare const signInOAuth: (environmentId: string, providerType: ProviderEnum, { code, codeVerifier, state, captchaToken }: OauthRequest) => Promise<UserProfile | undefined>;
 export declare const getOAuthResult: (environmentId: string, providerType: ProviderEnum, { state }: OauthResultRequest) => Promise<OauthResultResponse | undefined>;
-export declare const farcasterSignIn: (environmentId: string, farcasterSignInRequest: FarcasterSignInRequest) => Promise<VerifyResponse | undefined>;
+export declare const farcasterSignIn: (environmentId: string, farcasterSignInRequest: FarcasterSignInRequest) => Promise<UserProfile | undefined>;

package/src/lib/data/api/oauth/oauth.js

@@ -14,20 +14,22 @@ import '../../../utils/constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import '../../../shared/consts/index.js';
 import { sdkApi } from '../api.js';
+import { storeAuthTokenAndUser } from '../../../store/utils/storeAuthTokenAndUser/storeAuthTokenAndUser.js';
 
-const verifyOAuth = (environmentId_1, providerType_1, _a, userJwt_1) => __awaiter(void 0, [environmentId_1, providerType_1, _a, userJwt_1], void 0, function* (environmentId, providerType, { code, codeVerifier, state }, userJwt) {
+const verifyOAuth = (environmentId_1, providerType_1, _a) => __awaiter(void 0, [environmentId_1, providerType_1, _a], void 0, function* (environmentId, providerType, { code, codeVerifier, state }) {
     const oauthRequest = {
         code,
         codeVerifier,
         state,
     };
     try {
-        const response = yield sdkApi(userJwt).oauthVerify({
+        const response = yield sdkApi().oauthVerify({
             environmentId,
             oauthRequest,
             providerType,
         });
-        return response;
+        const user = storeAuthTokenAndUser(response);
+        return user;
     }
     catch (e) {
         logger.error(e);
@@ -38,16 +40,17 @@ const verifyOAuth = (environmentId_1, providerType_1, _a, userJwt_1) => __awaite
         return undefined;
     }
 });
-const unlinkOAuth = (_b, userJwt_2) => __awaiter(void 0, [_b, userJwt_2], void 0, function* ({ environmentId, primaryWalletId, verifiedCrentialId, }, userJwt) {
+const unlinkOAuth = (_b) => __awaiter(void 0, [_b], void 0, function* ({ environmentId, primaryWalletId, verifiedCrentialId, }) {
     try {
-        const response = yield sdkApi(userJwt).verifyUnlink({
+        const response = yield sdkApi().verifyUnlink({
             environmentId,
             verifyUnlinkRequest: {
                 primaryWalletId,
                 verifiedCrentialId,
             },
         });
-        return response;
+        const user = storeAuthTokenAndUser(response);
+        return user;
     }
     catch (e) {
         return undefined;
@@ -67,7 +70,8 @@ const signInOAuth = (environmentId_2, providerType_2, _c) => __awaiter(void 0, [
             oauthRequest,
             providerType,
         });
-        return response;
+        const user = storeAuthTokenAndUser(response);
+        return user;
     }
     catch (e) {
         logger.error(e);
@@ -109,7 +113,8 @@ const farcasterSignIn = (environmentId, farcasterSignInRequest) => __awaiter(voi
             environmentId,
             farcasterSignInRequest,
         });
-        return response;
+        const user = storeAuthTokenAndUser(response);
+        return user;
     }
     catch (e) {
         logger.error(e);

package/src/lib/data/api/session/session.cjs

@@ -19,9 +19,9 @@ require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('../../../shared/consts/index.cjs');
 var api = require('../api.cjs');
 
-const revokeSession = (_a, userJwt_1) => _tslib.__awaiter(void 0, [_a, userJwt_1], void 0, function* ({ environmentId, sessionId, }, userJwt) {
+const revokeSession = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ environmentId, sessionId, }) {
     try {
-        yield api.sdkApi(userJwt).revokeSession({
+        yield api.sdkApi().revokeSession({
             environmentId,
         });
     }

package/src/lib/data/api/session/session.d.ts

@@ -3,7 +3,7 @@ import { AuthModeType } from '../../../shared/types';
 export declare const revokeSession: ({ environmentId, sessionId, }: {
     environmentId: string;
     sessionId: string;
-}, userJwt: string) => Promise<void>;
+}) => Promise<void>;
 export declare const mapChainToChainEnum: (chain: string) => ChainEnum;
 export declare const mapProviderToProviderEnum: (provider: string) => WalletProviderEnum;
 export declare const mapAuthModeTypeToEnum: (authMode: string) => AuthModeEnum;

package/src/lib/data/api/session/session.js

@@ -15,9 +15,9 @@ import '../../../shared/utils/classes/storage/localStorage.js';
 import '../../../shared/consts/index.js';
 import { sdkApi } from '../api.js';
 
-const revokeSession = (_a, userJwt_1) => __awaiter(void 0, [_a, userJwt_1], void 0, function* ({ environmentId, sessionId, }, userJwt) {
+const revokeSession = (_a) => __awaiter(void 0, [_a], void 0, function* ({ environmentId, sessionId, }) {
     try {
-        yield sdkApi(userJwt).revokeSession({
+        yield sdkApi().revokeSession({
             environmentId,
         });
     }

package/src/lib/data/api/sms/sms.cjs

@@ -80,9 +80,9 @@ const retrySmsVerification = (_d) => _tslib.__awaiter(void 0, [_d], void 0, func
         throw new utils.SmsVerificationError(data.error, data.code);
     }
 });
-const verifySms = (_e, userJwt_1) => _tslib.__awaiter(void 0, [_e, userJwt_1], void 0, function* ({ verificationToken, verificationUUID, environmentId, }, userJwt) {
+const verifySms = (_e) => _tslib.__awaiter(void 0, [_e], void 0, function* ({ verificationToken, verificationUUID, environmentId, }) {
     try {
-        return yield api.sdkApi(userJwt).verifySmsVerification({
+        return yield api.sdkApi().verifySmsVerification({
             environmentId,
             smsVerificationVerifyRequest: {
                 verificationToken,

package/src/lib/data/api/sms/sms.d.ts

@@ -29,4 +29,4 @@ export declare const verifySms: ({ verificationToken, verificationUUID, environm
     environmentId: string;
     verificationToken: string;
     verificationUUID: string;
-}, userJwt: string) => Promise<UpdateSelfResponse>;
+}) => Promise<UpdateSelfResponse>;

package/src/lib/data/api/sms/sms.js

@@ -76,9 +76,9 @@ const retrySmsVerification = (_d) => __awaiter(void 0, [_d], void 0, function* (
         throw new SmsVerificationError(data.error, data.code);
     }
 });
-const verifySms = (_e, userJwt_1) => __awaiter(void 0, [_e, userJwt_1], void 0, function* ({ verificationToken, verificationUUID, environmentId, }, userJwt) {
+const verifySms = (_e) => __awaiter(void 0, [_e], void 0, function* ({ verificationToken, verificationUUID, environmentId, }) {
     try {
-        return yield sdkApi(userJwt).verifySmsVerification({
+        return yield sdkApi().verifySmsVerification({
             environmentId,
             smsVerificationVerifyRequest: {
                 verificationToken,

package/src/lib/data/api/user/user.cjs

@@ -18,16 +18,16 @@ require('../../../utils/constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('../../../shared/consts/index.cjs');
 var api = require('../api.cjs');
+var storeAuthTokenAndUser = require('../../../store/utils/storeAuthTokenAndUser/storeAuthTokenAndUser.cjs');
 
-const updateUserProfileFields = (jwt, environmentId, fields) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+const updateUserProfileFields = (environmentId, fields) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     try {
-        if (!jwt)
-            throw new utils.DynamicError('User not authenticated');
-        const res = yield api.sdkApi(jwt).updateSelf({
+        const response = yield api.sdkApi().updateSelf({
             environmentId,
             userFields: fields,
         });
-        return res;
+        const userProfile = yield storeAuthTokenAndUser.storeAuthTokenAndUser(response);
+        return Object.assign(Object.assign({}, response), { userProfile });
     }
     catch (e) {
         logger.logger.error(e);
@@ -36,58 +36,83 @@ const updateUserProfileFields = (jwt, environmentId, fields) => _tslib.__awaiter
             if (error.code === 'email_already_exists') {
                 throw new utils.EmailAlreadyExistsError();
             }
+            else if (error.code === 'custom_field_data_not_unique') {
+                throw new utils.CustomFieldNotUniqueError();
+            }
             else if (error.code === 'username_already_exists') {
                 throw new utils.UsernameAlreadyExistsError();
             }
             else if (error.code === 'too_many_verification_attempts') {
                 throw new utils.TooManyEmailVerificationsError();
             }
-            else if (error.code === 'invalid_phone') {
-                throw new utils.InvalidPhoneNumberError();
+            else if (error.code === 'invalid_phone' ||
+                error.code === 'invalid_sms_verification') {
+                throw new utils.InvalidPhoneNumberError(error.error);
             }
         }
         throw e;
     }
 });
-const mergeUserAccounts = (userJwt, environmentId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+const mergeUserAccounts = (environmentId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     try {
-        const response = yield api.sdkApi(userJwt).mergeUsers({
+        const response = yield api.sdkApi().mergeUsers({
             environmentId,
         });
-        return response;
+        const user = storeAuthTokenAndUser.storeAuthTokenAndUser(response);
+        return user;
     }
     catch (e) {
         logger.logger.error(e);
         throw e;
     }
 });
-const verifyMergeUsers = (userJwt, environmentId, mergeConflictResolutions) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+const verifyMergeUsers = (environmentId, mergeConflictResolutions) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     try {
-        const response = yield api.sdkApi(userJwt).verifyMergeUsers({
+        const response = yield api.sdkApi().verifyMergeUsers({
             environmentId,
             mergeUserConflictResolutions: {
                 mergeUserResolutions: mergeConflictResolutions,
             },
         });
-        return response;
+        const user = storeAuthTokenAndUser.storeAuthTokenAndUser(response);
+        return user;
     }
     catch (e) {
         logger.logger.error(e);
         throw e;
     }
 });
-const refreshUserJwt = (_a, userJwt_1) => _tslib.__awaiter(void 0, [_a, userJwt_1], void 0, function* ({ environmentId, }, userJwt) {
+const refreshUserJwt = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ environmentId, }) {
+    try {
+        const response = yield api.sdkApi().refreshAuth({
+            environmentId,
+        });
+        const user = storeAuthTokenAndUser.storeAuthTokenAndUser(response);
+        return user;
+    }
+    catch (e) {
+        return undefined;
+    }
+});
+const getAuthenticatedUser = (_b) => _tslib.__awaiter(void 0, [_b], void 0, function* ({ environmentId, }) {
     try {
-        const { jwt, minifiedJwt } = yield api.sdkApi(userJwt).refreshAuth({
+        return yield api.sdkApi().getAuthenticatedUser({
             environmentId,
         });
-        return { jwt, minifiedJwt };
     }
     catch (e) {
+        // only explicitly throw `CookieInvalidError` when we attempt to get the authenticated user
+        // and the backend returns a 401, indicating that there is no valid auth for the request
+        if (e.status === 401) {
+            logger.logger.error('No valid auth for getAuthenticatedUser', e);
+            throw new utils.CookieInvalidError();
+        }
+        logger.logger.error('Other error getting authenticated user', e);
         return undefined;
     }
 });
 
+exports.getAuthenticatedUser = getAuthenticatedUser;
 exports.mergeUserAccounts = mergeUserAccounts;
 exports.refreshUserJwt = refreshUserJwt;
 exports.updateUserProfileFields = updateUserProfileFields;

package/src/lib/data/api/user/user.d.ts

@@ -1,10 +1,14 @@
-import { UserFields, UpdateSelfResponse, VerifyResponse, MergeUserConflictResolution } from '@dynamic-labs/sdk-api-core';
-export declare const updateUserProfileFields: (jwt: string | undefined, environmentId: string, fields: UserFields) => Promise<UpdateSelfResponse>;
-export declare const mergeUserAccounts: (userJwt: string, environmentId: string) => Promise<VerifyResponse | undefined>;
-export declare const verifyMergeUsers: (userJwt: string, environmentId: string, mergeConflictResolutions: MergeUserConflictResolution[]) => Promise<VerifyResponse | undefined>;
+import { UserFields, UpdateSelfResponse, MergeUserConflictResolution, SdkUser } from '@dynamic-labs/sdk-api-core';
+import { UserProfile } from '../../../..';
+export type UpdateUserResponse = UpdateSelfResponse & {
+    userProfile: UserProfile;
+};
+export declare const updateUserProfileFields: (environmentId: string, fields: UserFields) => Promise<UpdateUserResponse>;
+export declare const mergeUserAccounts: (environmentId: string) => Promise<UserProfile>;
+export declare const verifyMergeUsers: (environmentId: string, mergeConflictResolutions: MergeUserConflictResolution[]) => Promise<UserProfile>;
 export declare const refreshUserJwt: ({ environmentId, }: {
     environmentId: string;
-}, userJwt: string) => Promise<{
-    jwt: string;
-    minifiedJwt: string;
-} | undefined>;
+}) => Promise<UserProfile | undefined>;
+export declare const getAuthenticatedUser: ({ environmentId, }: {
+    environmentId: string;
+}) => Promise<SdkUser | undefined>;

package/src/lib/data/api/user/user.js

@@ -1,6 +1,6 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { DynamicError, EmailAlreadyExistsError, UsernameAlreadyExistsError, TooManyEmailVerificationsError, InvalidPhoneNumberError } from '@dynamic-labs/utils';
+import { EmailAlreadyExistsError, CustomFieldNotUniqueError, UsernameAlreadyExistsError, TooManyEmailVerificationsError, InvalidPhoneNumberError, CookieInvalidError } from '@dynamic-labs/utils';
 import '@dynamic-labs/sdk-api-core';
 import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
@@ -14,16 +14,16 @@ import '../../../utils/constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import '../../../shared/consts/index.js';
 import { sdkApi } from '../api.js';
+import { storeAuthTokenAndUser } from '../../../store/utils/storeAuthTokenAndUser/storeAuthTokenAndUser.js';
 
-const updateUserProfileFields = (jwt, environmentId, fields) => __awaiter(void 0, void 0, void 0, function* () {
+const updateUserProfileFields = (environmentId, fields) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        if (!jwt)
-            throw new DynamicError('User not authenticated');
-        const res = yield sdkApi(jwt).updateSelf({
+        const response = yield sdkApi().updateSelf({
             environmentId,
             userFields: fields,
         });
-        return res;
+        const userProfile = yield storeAuthTokenAndUser(response);
+        return Object.assign(Object.assign({}, response), { userProfile });
     }
     catch (e) {
         logger.error(e);
@@ -32,56 +32,80 @@ const updateUserProfileFields = (jwt, environmentId, fields) => __awaiter(void 0
             if (error.code === 'email_already_exists') {
                 throw new EmailAlreadyExistsError();
             }
+            else if (error.code === 'custom_field_data_not_unique') {
+                throw new CustomFieldNotUniqueError();
+            }
             else if (error.code === 'username_already_exists') {
                 throw new UsernameAlreadyExistsError();
             }
             else if (error.code === 'too_many_verification_attempts') {
                 throw new TooManyEmailVerificationsError();
             }
-            else if (error.code === 'invalid_phone') {
-                throw new InvalidPhoneNumberError();
+            else if (error.code === 'invalid_phone' ||
+                error.code === 'invalid_sms_verification') {
+                throw new InvalidPhoneNumberError(error.error);
             }
         }
         throw e;
     }
 });
-const mergeUserAccounts = (userJwt, environmentId) => __awaiter(void 0, void 0, void 0, function* () {
+const mergeUserAccounts = (environmentId) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const response = yield sdkApi(userJwt).mergeUsers({
+        const response = yield sdkApi().mergeUsers({
             environmentId,
         });
-        return response;
+        const user = storeAuthTokenAndUser(response);
+        return user;
     }
     catch (e) {
         logger.error(e);
         throw e;
     }
 });
-const verifyMergeUsers = (userJwt, environmentId, mergeConflictResolutions) => __awaiter(void 0, void 0, void 0, function* () {
+const verifyMergeUsers = (environmentId, mergeConflictResolutions) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const response = yield sdkApi(userJwt).verifyMergeUsers({
+        const response = yield sdkApi().verifyMergeUsers({
             environmentId,
             mergeUserConflictResolutions: {
                 mergeUserResolutions: mergeConflictResolutions,
             },
         });
-        return response;
+        const user = storeAuthTokenAndUser(response);
+        return user;
     }
     catch (e) {
         logger.error(e);
         throw e;
     }
 });
-const refreshUserJwt = (_a, userJwt_1) => __awaiter(void 0, [_a, userJwt_1], void 0, function* ({ environmentId, }, userJwt) {
+const refreshUserJwt = (_a) => __awaiter(void 0, [_a], void 0, function* ({ environmentId, }) {
+    try {
+        const response = yield sdkApi().refreshAuth({
+            environmentId,
+        });
+        const user = storeAuthTokenAndUser(response);
+        return user;
+    }
+    catch (e) {
+        return undefined;
+    }
+});
+const getAuthenticatedUser = (_b) => __awaiter(void 0, [_b], void 0, function* ({ environmentId, }) {
     try {
-        const { jwt, minifiedJwt } = yield sdkApi(userJwt).refreshAuth({
+        return yield sdkApi().getAuthenticatedUser({
             environmentId,
         });
-        return { jwt, minifiedJwt };
     }
     catch (e) {
+        // only explicitly throw `CookieInvalidError` when we attempt to get the authenticated user
+        // and the backend returns a 401, indicating that there is no valid auth for the request
+        if (e.status === 401) {
+            logger.error('No valid auth for getAuthenticatedUser', e);
+            throw new CookieInvalidError();
+        }
+        logger.error('Other error getting authenticated user', e);
         return undefined;
     }
 });
 
-export { mergeUserAccounts, refreshUserJwt, updateUserProfileFields, verifyMergeUsers };
+export { getAuthenticatedUser, mergeUserAccounts, refreshUserJwt, updateUserProfileFields, verifyMergeUsers };