diff --git a/src/entities/user/lib/use-user-info.ts b/src/entities/user/lib/use-user-info.ts index 7ccee1b..68a4a75 100644 --- a/src/entities/user/lib/use-user-info.ts +++ b/src/entities/user/lib/use-user-info.ts @@ -55,6 +55,11 @@ export const useUserInfo = () => { setLocalStorage(StorageKeys.Requires2FA, data.requires2FA); setLocalStorage(StorageKeys.Usrid, data.usrid); + if(isNativeEnvironment){ + setLocalStorage(StorageKeys.DeviceId, data.deviceId); + setLocalStorage(StorageKeys.AppVersion, data.appVersion); + } + useStore.getState().UserStore.setUserInfo({ ...data }); diff --git a/src/entities/user/model/types.ts b/src/entities/user/model/types.ts index 59998b1..17c28c5 100644 --- a/src/entities/user/model/types.ts +++ b/src/entities/user/model/types.ts @@ -26,6 +26,8 @@ export interface LoginResponse { tempTokenExpiresIn?: number; available2FAMethod?: Array; requires2FA?: boolean; + deviceId?: string; + appVersion: string; }; export interface UserFavorite { diff --git a/src/shared/constants/local-storage.ts b/src/shared/constants/local-storage.ts index dc44820..8a0895d 100644 --- a/src/shared/constants/local-storage.ts +++ b/src/shared/constants/local-storage.ts @@ -11,7 +11,9 @@ export enum StorageKeys { Requires2FA = 'REQUIRES_2FA', BottomBannerClose = 'BOTTOM_BANNER_CLOSE', RootStore = 'ROOT_STORE', - + DeviceId = 'DEVICE_ID', + AppVersion = 'APP_VERSION', + LogOut = 'LOGOUT', requestId = 'REQUEST_ID', @@ -20,15 +22,14 @@ export enum StorageKeys { HasBioHardware = 'HAS_BIO_HARDWARE', DeviceUniqueId = 'DEVICE_UNIQUE_ID', - AppVersion = 'APP_VERSION', + AppColor = 'APP_COLOR', RedirectPath = 'REDIRECT_PATH', Platform = 'PLATFORM', - AppPagingSpeed = 'APP_PAGING_SPEED', // deprecated ScannedQrCode = 'SCANNED_QR_CODE', HasPushTokenSent = 'HAS_PUSH_TOKEN_SENT', SetFont = 'SET_FONT', - LogOut = 'LOGOUT', + } diff --git a/src/shared/constants/url.ts b/src/shared/constants/url.ts index f4ade2a..1976a76 100644 --- a/src/shared/constants/url.ts +++ b/src/shared/constants/url.ts @@ -1,4 +1,6 @@ import { UAParser } from 'ua-parser-js'; +import { getLocalStorage } from '../lib'; +import { StorageKeys } from './local-storage'; const { origin } = window.location; export const CURRENT_URL = `${origin}`; @@ -28,8 +30,8 @@ export const getHeaderUserAgent = (options?: { let os = result.os.name; let deviceType = result.device.type; - let deviceID = 'uuid'; - let appVersion = '1.0.0'; + let deviceID = getLocalStorage(StorageKeys.DeviceId); + let appVersion = getLocalStorage(StorageKeys.AppVersion); let browserInformation = result.browser.name; return `${os} ${deviceType} ${deviceID} ${appVersion} ${browserInformation} ${options?.menuId || ''} ${options?.apiType || ''}`;