@oxyhq/services 5.17.12 → 5.17.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/commonjs/index.js +30 -1
- package/lib/commonjs/index.js.map +1 -1
- package/lib/commonjs/ui/context/OxyContext.js +64 -5
- package/lib/commonjs/ui/context/OxyContext.js.map +1 -1
- package/lib/commonjs/ui/context/OxyContextBase.js.map +1 -1
- package/lib/commonjs/ui/hooks/mutations/useAccountMutations.js +40 -12
- package/lib/commonjs/ui/hooks/mutations/useAccountMutations.js.map +1 -1
- package/lib/commonjs/ui/hooks/queries/useAccountQueries.js +13 -2
- package/lib/commonjs/ui/hooks/queries/useAccountQueries.js.map +1 -1
- package/lib/commonjs/ui/stores/accountStore.js +4 -2
- package/lib/commonjs/ui/stores/accountStore.js.map +1 -1
- package/lib/commonjs/ui/utils/avatarUtils.js +35 -3
- package/lib/commonjs/ui/utils/avatarUtils.js.map +1 -1
- package/lib/module/index.js +3 -0
- package/lib/module/index.js.map +1 -1
- package/lib/module/ui/context/OxyContext.js +66 -7
- package/lib/module/ui/context/OxyContext.js.map +1 -1
- package/lib/module/ui/context/OxyContextBase.js.map +1 -1
- package/lib/module/ui/hooks/mutations/useAccountMutations.js +41 -13
- package/lib/module/ui/hooks/mutations/useAccountMutations.js.map +1 -1
- package/lib/module/ui/hooks/queries/useAccountQueries.js +13 -2
- package/lib/module/ui/hooks/queries/useAccountQueries.js.map +1 -1
- package/lib/module/ui/stores/accountStore.js +4 -2
- package/lib/module/ui/stores/accountStore.js.map +1 -1
- package/lib/module/ui/utils/avatarUtils.js +34 -3
- package/lib/module/ui/utils/avatarUtils.js.map +1 -1
- package/lib/typescript/index.d.ts +1 -0
- package/lib/typescript/index.d.ts.map +1 -1
- package/lib/typescript/ui/context/OxyContext.d.ts.map +1 -1
- package/lib/typescript/ui/context/OxyContextBase.d.ts +1 -0
- package/lib/typescript/ui/context/OxyContextBase.d.ts.map +1 -1
- package/lib/typescript/ui/hooks/mutations/useAccountMutations.d.ts.map +1 -1
- package/lib/typescript/ui/hooks/queries/useAccountQueries.d.ts.map +1 -1
- package/lib/typescript/ui/stores/accountStore.d.ts.map +1 -1
- package/lib/typescript/ui/utils/avatarUtils.d.ts +10 -0
- package/lib/typescript/ui/utils/avatarUtils.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/index.ts +9 -1
- package/src/ui/context/OxyContext.tsx +71 -4
- package/src/ui/context/OxyContextBase.tsx +1 -0
- package/src/ui/hooks/mutations/useAccountMutations.ts +46 -13
- package/src/ui/hooks/queries/useAccountQueries.ts +10 -1
- package/src/ui/stores/accountStore.ts +11 -1
- package/src/ui/utils/avatarUtils.ts +41 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_accountStore","require","_queryKeys","updateAvatarVisibility","fileId","oxyServices","contextName","startsWith","assetUpdateVisibility","visError","refreshAvatarInStore","sessionId","avatarFileId","updateAccount","useAccountStore","getState","cacheBustedUrl","getFileDownloadUrl","Date","now","avatar","avatarUrl","updateProfileWithAvatar","updates","activeSessionId","queryClient","options","deviceId","hasValidToken","getTokenBySession","tokenError","data","updateProfile","setQueryData","queryKeys","accounts","current","users","profile","invalidateUserQueries","invalidateAccountQueries","error","errorMessage","message","status","response","includes","Error"],"sourceRoot":"../../../../src","sources":["ui/utils/avatarUtils.ts"],"mappings":"
|
|
1
|
+
{"version":3,"names":["_accountStore","require","_queryKeys","updateAvatarVisibility","fileId","oxyServices","contextName","startsWith","assetUpdateVisibility","visError","refreshAvatarInStore","sessionId","avatarFileId","updateAccount","useAccountStore","getState","cacheBustedUrl","getFileDownloadUrl","Date","now","avatar","avatarUrl","refreshAccountInStore","userData","displayName","name","full","first","username","undefined","__DEV__","console","log","updateProfileWithAvatar","updates","activeSessionId","queryClient","options","deviceId","hasValidToken","getTokenBySession","tokenError","data","updateProfile","setQueryData","queryKeys","accounts","current","users","profile","invalidateUserQueries","invalidateAccountQueries","error","errorMessage","message","status","response","includes","Error"],"sourceRoot":"../../../../src","sources":["ui/utils/avatarUtils.ts"],"mappings":"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","ignoreList":[]}
|
package/lib/module/index.js
CHANGED
|
@@ -72,4 +72,7 @@ export * from './utils/validationUtils';
|
|
|
72
72
|
export { logger, LogLevel, LogContext, logAuth, logApi, logSession, logUser, logDevice, logPayment, logPerformance } from './utils/loggerUtils';
|
|
73
73
|
export * from './utils/asyncUtils';
|
|
74
74
|
export * from './utils/hookUtils';
|
|
75
|
+
|
|
76
|
+
// Avatar and account utilities
|
|
77
|
+
export { refreshAvatarInStore, refreshAccountInStore, updateAvatarVisibility, updateProfileWithAvatar } from './ui/utils/avatarUtils';
|
|
75
78
|
//# sourceMappingURL=index.js.map
|
package/lib/module/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["OxyServices","OxyAuthenticationError","OxyAuthenticationTimeoutError","OXY_CLOUD_URL","oxyClient","useOxy","default","OxyProvider","DeviceManager","SUPPORTED_LANGUAGES","getLanguageMetadata","getLanguageName","getNativeLanguageName","normalizeLanguageCode","SECURITY_EVENT_SEVERITY_MAP","useAuthStore","useAssetStore","useAssets","useAssetsStore","useAsset","useUploadProgress","useAssetLoading","useAssetErrors","useAssetsByApp","useAssetsByEntity","useAssetUsageCount","useIsAssetLinked","useSessionSocket","setOxyAssetInstance","useFileDownloadUrl","setOxyFileUrlInstance","useUserProfile","useUserProfiles","useCurrentUser","useUserById","useUserByUsername","useUsersBySessions","usePrivacySettings","useSessions","useSession","useDeviceSessions","useUserDevices","useSecurityInfo","useSecurityActivity","useRecentSecurityActivity","useUpdateProfile","useUploadAvatar","useUpdateAccountSettings","useUpdatePrivacySettings","useUploadFile","useSwitchSession","useLogoutSession","useLogoutAll","useUpdateDeviceName","useRemoveDevice","OxySignInButton","OxyLogo","FollowButton","ErrorCodes","createApiError","handleHttpError","validateRequiredFields","logger","LogLevel","LogContext","logAuth","logApi","logSession","logUser","logDevice","logPayment","logPerformance"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA,OAAO,mBAAmB;;AAE1B;AACA,SAASA,WAAW,EAAEC,sBAAsB,EAAEC,6BAA6B,QAAQ,QAAQ;AAC3F,SAASC,aAAa,EAAEC,SAAS,QAAQ,QAAQ;;AAEjD;;AAGA;AACA,SAASC,MAAM,QAAQ,yBAAyB;;AAEhD;AACA,SAASC,OAAO,IAAIC,WAAW,QAAQ,6BAA6B;;AAEpE;AACA,SAASC,aAAa,QAAQ,uBAAuB;AAGrD;AACA,SACEC,mBAAmB,EACnBC,mBAAmB,EACnBC,eAAe,EACfC,qBAAqB,EACrBC,qBAAqB,QAChB,uBAAuB;;AAG9B;;AA6DA;AACA,SAASC,2BAA2B,QAAQ,qBAAqB;AAQjE;AACA,SAASC,YAAY,QAAQ,uBAAuB;AACpD,SACEC,aAAa,EACbC,SAAS,IAAIC,cAAc,EAC3BC,QAAQ,EACRC,iBAAiB,EACjBC,eAAe,EACfC,cAAc,EACdC,cAAc,EACdC,iBAAiB,EACjBC,kBAAkB,EAClBC,gBAAgB,QACX,wBAAwB;;AAE/B;AACA,SAASC,gBAAgB,QAAQ,6BAA6B;AAC9D,SAASV,SAAS,EAAEW,mBAAmB,QAAQ,sBAAsB;AACrE,SAASC,kBAAkB,EAAEC,qBAAqB,QAAQ,+BAA+B;;AAEzF;AACA;AACE;AACAC,cAAc,EACdC,eAAe,EACfC,cAAc,EACdC,WAAW,EACXC,iBAAiB,EACjBC,kBAAkB,EAClBC,kBAAkB;AAClB;AACAC,WAAW,EACXC,UAAU,EACVC,iBAAiB,EACjBC,cAAc,EACdC,eAAe;AACf;AACAC,mBAAmB,EACnBC,yBAAyB,QACpB,oBAAoB;;AAE3B;AACA;AACE;AACAC,gBAAgB,EAChBC,eAAe,EACfC,wBAAwB,EACxBC,wBAAwB,EACxBC,aAAa;AACb;AACAC,gBAAgB,EAChBC,gBAAgB,EAChBC,YAAY,EACZC,mBAAmB,EACnBC,eAAe,QACV,sBAAsB;;AAE7B;AACA,SAASC,eAAe,QAAQ,iCAAiC;AACjE,SAASC,OAAO,EAAEC,YAAY,QAAQ,MAAM;;AAE5C;AACA,cAAc,kBAAkB;AAChC,SACEC,UAAU,EACVC,cAAc,EACdC,eAAe,EACfC,sBAAsB,QACjB,oBAAoB;AAC3B,cAAc,yBAAyB;AACvC,SACEC,MAAM,EACNC,QAAQ,EACRC,UAAU,EACVC,OAAO,EACPC,MAAM,EACNC,UAAU,EACVC,OAAO,EACPC,SAAS,EACTC,UAAU,EACVC,cAAc,QACT,qBAAqB;AAC5B,cAAc,oBAAoB;AAClC,cAAc,mBAAmB","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["OxyServices","OxyAuthenticationError","OxyAuthenticationTimeoutError","OXY_CLOUD_URL","oxyClient","useOxy","default","OxyProvider","DeviceManager","SUPPORTED_LANGUAGES","getLanguageMetadata","getLanguageName","getNativeLanguageName","normalizeLanguageCode","SECURITY_EVENT_SEVERITY_MAP","useAuthStore","useAssetStore","useAssets","useAssetsStore","useAsset","useUploadProgress","useAssetLoading","useAssetErrors","useAssetsByApp","useAssetsByEntity","useAssetUsageCount","useIsAssetLinked","useSessionSocket","setOxyAssetInstance","useFileDownloadUrl","setOxyFileUrlInstance","useUserProfile","useUserProfiles","useCurrentUser","useUserById","useUserByUsername","useUsersBySessions","usePrivacySettings","useSessions","useSession","useDeviceSessions","useUserDevices","useSecurityInfo","useSecurityActivity","useRecentSecurityActivity","useUpdateProfile","useUploadAvatar","useUpdateAccountSettings","useUpdatePrivacySettings","useUploadFile","useSwitchSession","useLogoutSession","useLogoutAll","useUpdateDeviceName","useRemoveDevice","OxySignInButton","OxyLogo","FollowButton","ErrorCodes","createApiError","handleHttpError","validateRequiredFields","logger","LogLevel","LogContext","logAuth","logApi","logSession","logUser","logDevice","logPayment","logPerformance","refreshAvatarInStore","refreshAccountInStore","updateAvatarVisibility","updateProfileWithAvatar"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA,OAAO,mBAAmB;;AAE1B;AACA,SAASA,WAAW,EAAEC,sBAAsB,EAAEC,6BAA6B,QAAQ,QAAQ;AAC3F,SAASC,aAAa,EAAEC,SAAS,QAAQ,QAAQ;;AAEjD;;AAGA;AACA,SAASC,MAAM,QAAQ,yBAAyB;;AAEhD;AACA,SAASC,OAAO,IAAIC,WAAW,QAAQ,6BAA6B;;AAEpE;AACA,SAASC,aAAa,QAAQ,uBAAuB;AAGrD;AACA,SACEC,mBAAmB,EACnBC,mBAAmB,EACnBC,eAAe,EACfC,qBAAqB,EACrBC,qBAAqB,QAChB,uBAAuB;;AAG9B;;AA6DA;AACA,SAASC,2BAA2B,QAAQ,qBAAqB;AAQjE;AACA,SAASC,YAAY,QAAQ,uBAAuB;AACpD,SACEC,aAAa,EACbC,SAAS,IAAIC,cAAc,EAC3BC,QAAQ,EACRC,iBAAiB,EACjBC,eAAe,EACfC,cAAc,EACdC,cAAc,EACdC,iBAAiB,EACjBC,kBAAkB,EAClBC,gBAAgB,QACX,wBAAwB;;AAE/B;AACA,SAASC,gBAAgB,QAAQ,6BAA6B;AAC9D,SAASV,SAAS,EAAEW,mBAAmB,QAAQ,sBAAsB;AACrE,SAASC,kBAAkB,EAAEC,qBAAqB,QAAQ,+BAA+B;;AAEzF;AACA;AACE;AACAC,cAAc,EACdC,eAAe,EACfC,cAAc,EACdC,WAAW,EACXC,iBAAiB,EACjBC,kBAAkB,EAClBC,kBAAkB;AAClB;AACAC,WAAW,EACXC,UAAU,EACVC,iBAAiB,EACjBC,cAAc,EACdC,eAAe;AACf;AACAC,mBAAmB,EACnBC,yBAAyB,QACpB,oBAAoB;;AAE3B;AACA;AACE;AACAC,gBAAgB,EAChBC,eAAe,EACfC,wBAAwB,EACxBC,wBAAwB,EACxBC,aAAa;AACb;AACAC,gBAAgB,EAChBC,gBAAgB,EAChBC,YAAY,EACZC,mBAAmB,EACnBC,eAAe,QACV,sBAAsB;;AAE7B;AACA,SAASC,eAAe,QAAQ,iCAAiC;AACjE,SAASC,OAAO,EAAEC,YAAY,QAAQ,MAAM;;AAE5C;AACA,cAAc,kBAAkB;AAChC,SACEC,UAAU,EACVC,cAAc,EACdC,eAAe,EACfC,sBAAsB,QACjB,oBAAoB;AAC3B,cAAc,yBAAyB;AACvC,SACEC,MAAM,EACNC,QAAQ,EACRC,UAAU,EACVC,OAAO,EACPC,MAAM,EACNC,UAAU,EACVC,OAAO,EACPC,SAAS,EACTC,UAAU,EACVC,cAAc,QACT,qBAAqB;AAC5B,cAAc,oBAAoB;AAClC,cAAc,mBAAmB;;AAEjC;AACA,SACEC,oBAAoB,EACpBC,qBAAqB,EACrBC,sBAAsB,EACtBC,uBAAuB,QAClB,wBAAwB","ignoreList":[]}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
|
4
|
-
import { useQueryClient, useQuery } from '@tanstack/react-query';
|
|
4
|
+
import { useQueryClient, useQuery, useMutation } from '@tanstack/react-query';
|
|
5
5
|
import { toast } from '../../lib/sonner';
|
|
6
6
|
import { OxyServices } from '../../core';
|
|
7
7
|
import { logger as loggerUtil } from '../../utils/loggerUtils';
|
|
@@ -14,11 +14,12 @@ import { useSessionManagement } from '../hooks/useSessionManagement';
|
|
|
14
14
|
import { useStorage } from '../hooks/useStorage';
|
|
15
15
|
import { useAccountStore } from '../stores/accountStore';
|
|
16
16
|
import { useAuthStore } from '../stores/authStore';
|
|
17
|
-
import { queryKeys } from '../hooks/queries/queryKeys';
|
|
17
|
+
import { queryKeys, invalidateAccountQueries, invalidateUserQueries } from '../hooks/queries/queryKeys';
|
|
18
18
|
import { clearQueryCache } from '../hooks/queryClient';
|
|
19
19
|
import { showBottomSheet as globalShowBottomSheet } from '../navigation/bottomSheetManager';
|
|
20
20
|
import { getStorageKeys } from '../utils/storageHelpers';
|
|
21
21
|
import { isInvalidSessionError, isTimeoutOrNetworkError } from '../utils/errorHandlers';
|
|
22
|
+
import { refreshAccountInStore } from '../utils/avatarUtils';
|
|
22
23
|
import { useShallow } from 'zustand/react/shallow';
|
|
23
24
|
import { OxyContext, useOxy } from './OxyContextBase';
|
|
24
25
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
@@ -150,21 +151,78 @@ export const OxyProvider = ({
|
|
|
150
151
|
queryClient
|
|
151
152
|
});
|
|
152
153
|
const {
|
|
153
|
-
data: userData
|
|
154
|
+
data: userData,
|
|
155
|
+
refetch: refetchUser
|
|
154
156
|
} = useQuery({
|
|
155
157
|
queryKey: queryKeys.accounts.current(),
|
|
156
158
|
queryFn: async () => {
|
|
159
|
+
if (__DEV__) {
|
|
160
|
+
console.log('[OxyContext] Fetching user data for session:', activeSessionId);
|
|
161
|
+
}
|
|
157
162
|
if (!activeSessionId) {
|
|
158
163
|
throw new Error('No active session');
|
|
159
164
|
}
|
|
160
|
-
|
|
165
|
+
const data = await oxyServices.getUserBySession(activeSessionId);
|
|
166
|
+
if (__DEV__) {
|
|
167
|
+
console.log('[OxyContext] User data fetched:', data.username, data.name);
|
|
168
|
+
}
|
|
169
|
+
return data;
|
|
161
170
|
},
|
|
162
171
|
enabled: isAuthenticated && !!activeSessionId && tokenReady,
|
|
163
172
|
staleTime: 0,
|
|
164
173
|
gcTime: 0,
|
|
165
|
-
retry: false
|
|
174
|
+
retry: false,
|
|
175
|
+
refetchOnMount: 'always',
|
|
176
|
+
refetchOnWindowFocus: false
|
|
166
177
|
});
|
|
167
178
|
const user = userData ?? null;
|
|
179
|
+
|
|
180
|
+
// Update profile mutation - handles cache invalidation automatically
|
|
181
|
+
const updateProfileMutation = useMutation({
|
|
182
|
+
mutationFn: async updates => {
|
|
183
|
+
if (__DEV__) {
|
|
184
|
+
console.log('[OxyContext] Updating profile:', updates);
|
|
185
|
+
}
|
|
186
|
+
return await oxyServices.updateProfile(updates);
|
|
187
|
+
},
|
|
188
|
+
onSuccess: async (data, updates) => {
|
|
189
|
+
if (__DEV__) {
|
|
190
|
+
console.log('[OxyContext] Profile update successful:', data);
|
|
191
|
+
}
|
|
192
|
+
|
|
193
|
+
// Update cache with server response
|
|
194
|
+
queryClient.setQueryData(queryKeys.accounts.current(), data);
|
|
195
|
+
if (activeSessionId) {
|
|
196
|
+
queryClient.setQueryData(queryKeys.users.profile(activeSessionId), data);
|
|
197
|
+
}
|
|
198
|
+
|
|
199
|
+
// Refresh accountStore with all updated profile data (not just avatar)
|
|
200
|
+
if (activeSessionId && oxyServices) {
|
|
201
|
+
refreshAccountInStore(activeSessionId, data, oxyServices);
|
|
202
|
+
}
|
|
203
|
+
|
|
204
|
+
// Invalidate all related queries to refresh everywhere
|
|
205
|
+
await Promise.all([invalidateUserQueries(queryClient), invalidateAccountQueries(queryClient)]);
|
|
206
|
+
|
|
207
|
+
// Force immediate refetch to update UI
|
|
208
|
+
await Promise.all([queryClient.refetchQueries({
|
|
209
|
+
queryKey: queryKeys.accounts.current(),
|
|
210
|
+
type: 'active'
|
|
211
|
+
}), refetchUser?.()]);
|
|
212
|
+
if (__DEV__) {
|
|
213
|
+
console.log('[OxyContext] Profile update complete - cache invalidated and refetched');
|
|
214
|
+
console.log('[OxyContext] Updated user data:', data);
|
|
215
|
+
}
|
|
216
|
+
},
|
|
217
|
+
onError: error => {
|
|
218
|
+
if (__DEV__) {
|
|
219
|
+
console.error('[OxyContext] Profile update failed:', error);
|
|
220
|
+
}
|
|
221
|
+
}
|
|
222
|
+
});
|
|
223
|
+
const updateProfile = useCallback(async updates => {
|
|
224
|
+
return await updateProfileMutation.mutateAsync(updates);
|
|
225
|
+
}, [updateProfileMutation]);
|
|
168
226
|
const {
|
|
169
227
|
completeSignIn,
|
|
170
228
|
logout,
|
|
@@ -426,8 +484,9 @@ export const OxyProvider = ({
|
|
|
426
484
|
oxyServices,
|
|
427
485
|
useFollow: useFollowHook,
|
|
428
486
|
showBottomSheet: showBottomSheetForContext,
|
|
429
|
-
openAvatarPicker
|
|
430
|
-
|
|
487
|
+
openAvatarPicker,
|
|
488
|
+
updateProfile
|
|
489
|
+
}), [activeSessionId, currentDeviceId, completeSignIn, currentLanguage, currentLanguageMetadata, currentLanguageName, currentNativeLanguageName, error, getDeviceSessions, isAuthenticated, isLoading, logout, logoutAll, logoutAllDeviceSessions, oxyServices, refreshSessionsWithUser, sessions, setLanguage, switchSessionForContext, tokenReady, isStorageReady, updateDeviceName, clearAllAccountData, useFollowHook, user, showBottomSheetForContext, openAvatarPicker, updateProfile]);
|
|
431
490
|
return /*#__PURE__*/_jsx(OxyContext.Provider, {
|
|
432
491
|
value: contextValue,
|
|
433
492
|
children: children
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useCallback","useEffect","useMemo","useRef","useState","useQueryClient","useQuery","toast","OxyServices","logger","loggerUtil","useAuthOperations","useAvatarPicker","useSessionSocket","useDeviceManagement","useLanguageManagement","useSessionManagement","useStorage","useAccountStore","useAuthStore","queryKeys","clearQueryCache","showBottomSheet","globalShowBottomSheet","getStorageKeys","isInvalidSessionError","isTimeoutOrNetworkError","useShallow","OxyContext","useOxy","jsx","_jsx","cachedUseFollowHook","loadUseFollowHook","useFollow","require","error","__DEV__","warn","component","method","fallback","Error","OxyProvider","children","oxyServices","providedOxyServices","baseURL","storageKeyPrefix","onAuthStateChange","onError","oxyServicesRef","current","isAuthenticated","isOnline","isLoading","setOnline","loginSuccess","loginFailure","logoutStore","state","logout","tokenReady","setTokenReady","initializedRef","setAuthState","setState","message","err","undefined","console","storageKeys","storage","isReady","isStorageReady","currentLanguage","metadata","currentLanguageMetadata","languageName","currentLanguageName","nativeLanguageName","currentNativeLanguageName","setLanguage","applyLanguagePreference","languageKey","language","queryClient","sessions","activeSessionId","setActiveSessionId","updateSessions","switchSession","refreshSessions","clearSessionState","saveActiveSessionId","trackRemovedSession","setAuthError","data","userData","queryKey","accounts","queryFn","getUserBySession","enabled","staleTime","gcTime","retry","user","completeSignIn","logoutAll","clearAllAccountData","clear","getState","reset","clearCache","wasOffline","checkTimeout","scheduleNextCheck","clearTimeout","setTimeout","checkNetworkStatus","healthCheck","getDeviceSessions","logoutAllDeviceSessions","updateDeviceName","useFollowHook","restoreSessionsFromStorage","storedSessionIdsJson","getItem","sessionIds","storedSessionIds","JSON","parse","storedActiveSessionId","validSessions","length","sessionId","validation","validateSession","useHeaderValidation","valid","now","Date","push","deviceId","expiresAt","getTime","toISOString","lastActive","userId","id","toString","isCurrent","validationError","debug","merge","switchError","removeItem","filter","session","String","activeSession","find","currentDeviceId","getCurrentUserId","refreshSessionsWithUser","handleSessionRemoved","handleRemoteSignOut","info","catch","remoteError","getBaseURL","getAccessToken","onRemoteSignOut","onSessionRemoved","switchSessionForContext","showBottomSheetForContext","screenOrConfig","openAvatarPicker","contextValue","isTokenReady","removeSession","Provider","value","OxyContextProvider"],"sourceRoot":"../../../../src","sources":["ui/context/OxyContext.tsx"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["useCallback","useEffect","useMemo","useRef","useState","useQueryClient","useQuery","useMutation","toast","OxyServices","logger","loggerUtil","useAuthOperations","useAvatarPicker","useSessionSocket","useDeviceManagement","useLanguageManagement","useSessionManagement","useStorage","useAccountStore","useAuthStore","queryKeys","invalidateAccountQueries","invalidateUserQueries","clearQueryCache","showBottomSheet","globalShowBottomSheet","getStorageKeys","isInvalidSessionError","isTimeoutOrNetworkError","refreshAccountInStore","useShallow","OxyContext","useOxy","jsx","_jsx","cachedUseFollowHook","loadUseFollowHook","useFollow","require","error","__DEV__","warn","component","method","fallback","Error","OxyProvider","children","oxyServices","providedOxyServices","baseURL","storageKeyPrefix","onAuthStateChange","onError","oxyServicesRef","current","isAuthenticated","isOnline","isLoading","setOnline","loginSuccess","loginFailure","logoutStore","state","logout","tokenReady","setTokenReady","initializedRef","setAuthState","setState","message","err","undefined","console","storageKeys","storage","isReady","isStorageReady","currentLanguage","metadata","currentLanguageMetadata","languageName","currentLanguageName","nativeLanguageName","currentNativeLanguageName","setLanguage","applyLanguagePreference","languageKey","language","queryClient","sessions","activeSessionId","setActiveSessionId","updateSessions","switchSession","refreshSessions","clearSessionState","saveActiveSessionId","trackRemovedSession","setAuthError","data","userData","refetch","refetchUser","queryKey","accounts","queryFn","log","getUserBySession","username","name","enabled","staleTime","gcTime","retry","refetchOnMount","refetchOnWindowFocus","user","updateProfileMutation","mutationFn","updates","updateProfile","onSuccess","setQueryData","users","profile","Promise","all","refetchQueries","type","mutateAsync","completeSignIn","logoutAll","clearAllAccountData","clear","getState","reset","clearCache","wasOffline","checkTimeout","scheduleNextCheck","clearTimeout","setTimeout","checkNetworkStatus","healthCheck","getDeviceSessions","logoutAllDeviceSessions","updateDeviceName","useFollowHook","restoreSessionsFromStorage","storedSessionIdsJson","getItem","sessionIds","storedSessionIds","JSON","parse","storedActiveSessionId","validSessions","length","sessionId","validation","validateSession","useHeaderValidation","valid","now","Date","push","deviceId","expiresAt","getTime","toISOString","lastActive","userId","id","toString","isCurrent","validationError","debug","merge","switchError","removeItem","filter","session","String","activeSession","find","currentDeviceId","getCurrentUserId","refreshSessionsWithUser","handleSessionRemoved","handleRemoteSignOut","info","catch","remoteError","getBaseURL","getAccessToken","onRemoteSignOut","onSessionRemoved","switchSessionForContext","showBottomSheetForContext","screenOrConfig","openAvatarPicker","contextValue","isTokenReady","removeSession","Provider","value","OxyContextProvider"],"sourceRoot":"../../../../src","sources":["ui/context/OxyContext.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["createContext","useContext","OxyContext","useOxy","context","Error"],"sourceRoot":"../../../../src","sources":["ui/context/OxyContextBase.tsx"],"mappings":";;AAAA,SAASA,aAAa,EAAEC,UAAU,QAAQ,OAAO;
|
|
1
|
+
{"version":3,"names":["createContext","useContext","OxyContext","useOxy","context","Error"],"sourceRoot":"../../../../src","sources":["ui/context/OxyContextBase.tsx"],"mappings":";;AAAA,SAASA,aAAa,EAAEC,UAAU,QAAQ,OAAO;AAwDjD,OAAO,MAAMC,UAAU,gBAAGF,aAAa,CAAyB,IAAI,CAAC;AAWrE;AACA;AACA;AACA;AACA,OAAO,MAAMG,MAAM,GAAGA,CAAA,KAAuB;EACzC,MAAMC,OAAO,GAAGH,UAAU,CAACC,UAAU,CAAC;EACtC,IAAI,CAACE,OAAO,EAAE;IACV,MAAM,IAAIC,KAAK,CAAC,kDAAkD,CAAC;EACvE;EACA,OAAOD,OAAO;AAClB,CAAC","ignoreList":[]}
|
|
@@ -4,7 +4,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query';
|
|
|
4
4
|
import { queryKeys, invalidateAccountQueries, invalidateUserQueries } from '../queries/queryKeys';
|
|
5
5
|
import { useOxy } from '../../context/OxyContext';
|
|
6
6
|
import { toast } from '../../../lib/sonner';
|
|
7
|
-
import {
|
|
7
|
+
import { refreshAccountInStore } from '../../utils/avatarUtils';
|
|
8
8
|
const getDeviceIdForSession = (sessions = [], sessionId) => sessionId ? sessions.find(s => s.sessionId === sessionId)?.deviceId : undefined;
|
|
9
9
|
|
|
10
10
|
/**
|
|
@@ -84,21 +84,38 @@ export const useUpdateProfile = () => {
|
|
|
84
84
|
toast.error(error instanceof Error ? error.message : 'Failed to update profile');
|
|
85
85
|
},
|
|
86
86
|
// On success, invalidate and refetch
|
|
87
|
-
onSuccess: (data, updates) => {
|
|
87
|
+
onSuccess: async (data, updates) => {
|
|
88
|
+
if (__DEV__) {
|
|
89
|
+
console.log('[useUpdateProfile] Profile update successful:', data);
|
|
90
|
+
console.log('[useUpdateProfile] Updated fields:', Object.keys(updates));
|
|
91
|
+
}
|
|
92
|
+
|
|
88
93
|
// Update cache with server response
|
|
89
94
|
queryClient.setQueryData(queryKeys.accounts.current(), data);
|
|
90
95
|
if (activeSessionId) {
|
|
91
96
|
queryClient.setQueryData(queryKeys.users.profile(activeSessionId), data);
|
|
92
97
|
}
|
|
93
98
|
|
|
94
|
-
//
|
|
95
|
-
if (
|
|
96
|
-
|
|
99
|
+
// Refresh accountStore with all updated profile data (not just avatar)
|
|
100
|
+
if (activeSessionId && oxyServices) {
|
|
101
|
+
refreshAccountInStore(activeSessionId, data, oxyServices);
|
|
97
102
|
}
|
|
98
103
|
|
|
99
104
|
// Invalidate all related queries to refresh everywhere
|
|
100
|
-
invalidateUserQueries(queryClient);
|
|
101
|
-
|
|
105
|
+
await Promise.all([invalidateUserQueries(queryClient), invalidateAccountQueries(queryClient)]);
|
|
106
|
+
|
|
107
|
+
// Force immediate refetch to update UI - refetch ALL active queries
|
|
108
|
+
await queryClient.refetchQueries({
|
|
109
|
+
queryKey: queryKeys.accounts.current(),
|
|
110
|
+
type: 'active',
|
|
111
|
+
exact: false // Also refetch derived queries
|
|
112
|
+
});
|
|
113
|
+
if (__DEV__) {
|
|
114
|
+
console.log('[useUpdateProfile] Profile update complete - cache invalidated and refetched');
|
|
115
|
+
// Log current cache state
|
|
116
|
+
const currentUser = queryClient.getQueryData(queryKeys.accounts.current());
|
|
117
|
+
console.log('[useUpdateProfile] Current cached user:', currentUser);
|
|
118
|
+
}
|
|
102
119
|
}
|
|
103
120
|
});
|
|
104
121
|
};
|
|
@@ -178,21 +195,32 @@ export const useUploadAvatar = () => {
|
|
|
178
195
|
}
|
|
179
196
|
toast.error(error instanceof Error ? error.message : 'Failed to upload avatar');
|
|
180
197
|
},
|
|
181
|
-
onSuccess: data => {
|
|
198
|
+
onSuccess: async data => {
|
|
199
|
+
if (__DEV__) {
|
|
200
|
+
console.log('[useUploadAvatar] Avatar upload successful:', data);
|
|
201
|
+
}
|
|
182
202
|
queryClient.setQueryData(queryKeys.accounts.current(), data);
|
|
183
203
|
if (activeSessionId) {
|
|
184
204
|
queryClient.setQueryData(queryKeys.users.profile(activeSessionId), data);
|
|
185
205
|
}
|
|
186
206
|
|
|
187
|
-
// Refresh accountStore with
|
|
188
|
-
if (
|
|
189
|
-
|
|
207
|
+
// Refresh accountStore with all updated profile data (including avatar)
|
|
208
|
+
if (activeSessionId && oxyServices) {
|
|
209
|
+
refreshAccountInStore(activeSessionId, data, oxyServices);
|
|
190
210
|
}
|
|
191
211
|
|
|
192
212
|
// Invalidate all related queries to refresh everywhere
|
|
193
|
-
invalidateUserQueries(queryClient);
|
|
194
|
-
invalidateAccountQueries(queryClient);
|
|
213
|
+
await invalidateUserQueries(queryClient);
|
|
214
|
+
await invalidateAccountQueries(queryClient);
|
|
215
|
+
|
|
216
|
+
// Explicitly refetch to ensure UI updates
|
|
217
|
+
await queryClient.refetchQueries({
|
|
218
|
+
queryKey: queryKeys.accounts.current()
|
|
219
|
+
});
|
|
195
220
|
toast.success('Avatar updated successfully');
|
|
221
|
+
if (__DEV__) {
|
|
222
|
+
console.log('[useUploadAvatar] Avatar update complete - cache invalidated and refetched');
|
|
223
|
+
}
|
|
196
224
|
}
|
|
197
225
|
});
|
|
198
226
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useMutation","useQueryClient","queryKeys","invalidateAccountQueries","invalidateUserQueries","useOxy","toast","refreshAvatarInStore","getDeviceIdForSession","sessions","sessionId","find","s","deviceId","undefined","useUpdateProfile","oxyServices","activeSessionId","user","queryClient","mutationFn","updates","hasValidToken","getTokenBySession","tokenError","updateProfile","error","errorMessage","message","status","response","includes","onMutate","cancelQueries","queryKey","accounts","current","previousUser","getQueryData","setQueryData","users","profile","onError","context","Error","onSuccess","data","avatar","useUploadAvatar","file","uploadResult","assetUpload","fileId","id","optimisticUser","uri","success","useUpdateAccountSettings","settings","privacySettings","onSettled","invalidateQueries","useUpdatePrivacySettings","userId","targetUserId","getCurrentUserId","updatePrivacySettings","privacy","previousPrivacySettings","currentUser","updatedUser","useUploadFile","visibility","metadata","onProgress"],"sourceRoot":"../../../../../src","sources":["ui/hooks/mutations/useAccountMutations.ts"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["useMutation","useQueryClient","queryKeys","invalidateAccountQueries","invalidateUserQueries","useOxy","toast","refreshAccountInStore","getDeviceIdForSession","sessions","sessionId","find","s","deviceId","undefined","useUpdateProfile","oxyServices","activeSessionId","user","queryClient","mutationFn","updates","hasValidToken","getTokenBySession","tokenError","updateProfile","error","errorMessage","message","status","response","includes","onMutate","cancelQueries","queryKey","accounts","current","previousUser","getQueryData","setQueryData","users","profile","onError","context","Error","onSuccess","data","__DEV__","console","log","Object","keys","Promise","all","refetchQueries","type","exact","currentUser","useUploadAvatar","file","uploadResult","assetUpload","fileId","id","avatar","optimisticUser","uri","success","useUpdateAccountSettings","settings","privacySettings","onSettled","invalidateQueries","useUpdatePrivacySettings","userId","targetUserId","getCurrentUserId","updatePrivacySettings","privacy","previousPrivacySettings","updatedUser","useUploadFile","visibility","metadata","onProgress"],"sourceRoot":"../../../../../src","sources":["ui/hooks/mutations/useAccountMutations.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -60,15 +60,26 @@ export const useCurrentUser = options => {
|
|
|
60
60
|
return useQuery({
|
|
61
61
|
queryKey: queryKeys.accounts.current(),
|
|
62
62
|
queryFn: async () => {
|
|
63
|
+
if (__DEV__) {
|
|
64
|
+
console.log('[useCurrentUser] Fetching user data for session:', activeSessionId);
|
|
65
|
+
}
|
|
63
66
|
if (!activeSessionId) {
|
|
64
67
|
throw new Error('No active session');
|
|
65
68
|
}
|
|
66
|
-
|
|
69
|
+
const userData = await oxyServices.getUserBySession(activeSessionId);
|
|
70
|
+
if (__DEV__) {
|
|
71
|
+
console.log('[useCurrentUser] Fetched user:', userData.username, userData.name);
|
|
72
|
+
}
|
|
73
|
+
return userData;
|
|
67
74
|
},
|
|
68
75
|
enabled: options?.enabled !== false && isAuthenticated && !!activeSessionId,
|
|
69
76
|
staleTime: 0,
|
|
70
77
|
// Always fetch fresh - Services never caches profile
|
|
71
|
-
gcTime: 0
|
|
78
|
+
gcTime: 0,
|
|
79
|
+
// No garbage collection time - always fetch fresh
|
|
80
|
+
refetchOnMount: 'always',
|
|
81
|
+
// Always refetch on mount
|
|
82
|
+
refetchOnWindowFocus: false
|
|
72
83
|
});
|
|
73
84
|
};
|
|
74
85
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useQuery","useQueries","queryKeys","useOxy","useUserProfile","sessionId","options","oxyServices","queryKey","users","profile","queryFn","Error","getUserBySession","enabled","staleTime","gcTime","useUserProfiles","sessionIds","queries","map","results","getUsersBySessions","user","useCurrentUser","activeSessionId","isAuthenticated","accounts","current","useUserById","userId","detail","getUserById","useUserByUsername","
|
|
1
|
+
{"version":3,"names":["useQuery","useQueries","queryKeys","useOxy","useUserProfile","sessionId","options","oxyServices","queryKey","users","profile","queryFn","Error","getUserBySession","enabled","staleTime","gcTime","useUserProfiles","sessionIds","queries","map","results","getUsersBySessions","user","useCurrentUser","activeSessionId","isAuthenticated","accounts","current","__DEV__","console","log","userData","username","name","refetchOnMount","refetchOnWindowFocus","useUserById","userId","detail","getUserById","useUserByUsername","details","getProfileByUsername","useUsersBySessions","list","length","usePrivacySettings","sessions","targetUserId","getCurrentUserId","undefined","deviceId","find","s","privacy","settings","hasValidToken","getTokenBySession","tokenError","getPrivacySettings","error","errorMessage","message","status","response","includes"],"sourceRoot":"../../../../../src","sources":["ui/hooks/queries/useAccountQueries.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -58,7 +58,7 @@ export const useAccountStore = create((set, get) => ({
|
|
|
58
58
|
const sameAccounts = sameOrder && order.every(id => {
|
|
59
59
|
const existing = state.accounts[id];
|
|
60
60
|
const newAccount = accountMap[id];
|
|
61
|
-
return existing && existing.sessionId === newAccount.sessionId && existing.userId === newAccount.userId && existing.avatar === newAccount.avatar && existing.avatarUrl === newAccount.avatarUrl;
|
|
61
|
+
return existing && existing.sessionId === newAccount.sessionId && existing.userId === newAccount.userId && existing.username === newAccount.username && existing.displayName === newAccount.displayName && existing.avatar === newAccount.avatar && existing.avatarUrl === newAccount.avatarUrl;
|
|
62
62
|
});
|
|
63
63
|
if (sameAccounts) return {};
|
|
64
64
|
return {
|
|
@@ -102,7 +102,9 @@ export const useAccountStore = create((set, get) => ({
|
|
|
102
102
|
...existing,
|
|
103
103
|
...updates
|
|
104
104
|
};
|
|
105
|
-
|
|
105
|
+
// Check if any meaningful field has changed
|
|
106
|
+
const hasChanges = existing.username !== updated.username || existing.displayName !== updated.displayName || existing.avatar !== updated.avatar || existing.avatarUrl !== updated.avatarUrl || existing.userId !== updated.userId;
|
|
107
|
+
if (!hasChanges) {
|
|
106
108
|
return {}; // No change
|
|
107
109
|
}
|
|
108
110
|
const newAccounts = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["create","initialState","accounts","accountOrder","accountsArray","loading","loadingSessionIds","Set","error","buildAccountsArray","order","result","id","account","push","createQuickAccount","sessionId","userData","existingAccount","oxyServices","displayName","name","full","first","username","userId","_id","toString","avatarUrl","avatar","getFileDownloadUrl","useAccountStore","set","get","setAccounts","state","accountMap","seenSessionIds","has","add","sameOrder","length","every","i","sameAccounts","existing","newAccount","addAccount","newAccounts","newOrder","updateAccount","updates","updated","removeAccount","_removed","rest","filter","moveAccountToTop","filtered","setLoading","setLoadingSession","newSet","delete","setError","loadAccounts","sessionIds","existingAccounts","preserveOrder","uniqueSessionIds","Array","from","existingMap","Map","map","a","Object","values","missingSessionIds","ordered","acc","undefined","batchResults","getUsersBySessions","user","orderToUse","seen","errorMessage","Error","message","__DEV__","console","reset","useAccounts","useAccountLoading","s","useAccountError","useAccountLoadingSession"],"sourceRoot":"../../../../src","sources":["ui/stores/accountStore.ts"],"mappings":"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
|
|
1
|
+
{"version":3,"names":["create","initialState","accounts","accountOrder","accountsArray","loading","loadingSessionIds","Set","error","buildAccountsArray","order","result","id","account","push","createQuickAccount","sessionId","userData","existingAccount","oxyServices","displayName","name","full","first","username","userId","_id","toString","avatarUrl","avatar","getFileDownloadUrl","useAccountStore","set","get","setAccounts","state","accountMap","seenSessionIds","has","add","sameOrder","length","every","i","sameAccounts","existing","newAccount","addAccount","newAccounts","newOrder","updateAccount","updates","updated","hasChanges","removeAccount","_removed","rest","filter","moveAccountToTop","filtered","setLoading","setLoadingSession","newSet","delete","setError","loadAccounts","sessionIds","existingAccounts","preserveOrder","uniqueSessionIds","Array","from","existingMap","Map","map","a","Object","values","missingSessionIds","ordered","acc","undefined","batchResults","getUsersBySessions","user","orderToUse","seen","errorMessage","Error","message","__DEV__","console","reset","useAccounts","useAccountLoading","s","useAccountError","useAccountLoadingSession"],"sourceRoot":"../../../../src","sources":["ui/stores/accountStore.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -28,6 +28,7 @@ export async function updateAvatarVisibility(fileId, oxyServices, contextName =
|
|
|
28
28
|
}
|
|
29
29
|
|
|
30
30
|
/**
|
|
31
|
+
* @deprecated Use refreshAccountInStore instead for full profile sync
|
|
31
32
|
* Refreshes avatar in accountStore with cache-busted URL to force image reload.
|
|
32
33
|
*
|
|
33
34
|
* @param sessionId - The session ID for the account to update
|
|
@@ -45,6 +46,36 @@ export function refreshAvatarInStore(sessionId, avatarFileId, oxyServices) {
|
|
|
45
46
|
});
|
|
46
47
|
}
|
|
47
48
|
|
|
49
|
+
/**
|
|
50
|
+
* Refreshes all user profile data in accountStore (username, displayName, avatar).
|
|
51
|
+
* This ensures accountStore stays in sync with profile changes.
|
|
52
|
+
*
|
|
53
|
+
* @param sessionId - The session ID for the account to update
|
|
54
|
+
* @param userData - The updated user data
|
|
55
|
+
* @param oxyServices - OxyServices instance to generate download URL
|
|
56
|
+
*/
|
|
57
|
+
export function refreshAccountInStore(sessionId, userData, oxyServices) {
|
|
58
|
+
const {
|
|
59
|
+
updateAccount
|
|
60
|
+
} = useAccountStore.getState();
|
|
61
|
+
const displayName = userData.name?.full || userData.name?.first || userData.username || 'Account';
|
|
62
|
+
const avatarUrl = userData.avatar ? oxyServices.getFileDownloadUrl(userData.avatar, 'thumb') + `?t=${Date.now()}` : undefined;
|
|
63
|
+
if (__DEV__) {
|
|
64
|
+
console.log('[AccountStore] Refreshing account in store:', {
|
|
65
|
+
sessionId,
|
|
66
|
+
username: userData.username,
|
|
67
|
+
displayName,
|
|
68
|
+
avatar: userData.avatar
|
|
69
|
+
});
|
|
70
|
+
}
|
|
71
|
+
updateAccount(sessionId, {
|
|
72
|
+
username: userData.username,
|
|
73
|
+
displayName,
|
|
74
|
+
avatar: userData.avatar,
|
|
75
|
+
avatarUrl
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
|
|
48
79
|
/**
|
|
49
80
|
* Updates user profile with avatar and handles all side effects (query invalidation, accountStore update).
|
|
50
81
|
* This function can be used from within OxyContext provider without requiring useOxy hook.
|
|
@@ -76,9 +107,9 @@ export async function updateProfileWithAvatar(updates, oxyServices, activeSessio
|
|
|
76
107
|
queryClient.setQueryData(queryKeys.users.profile(activeSessionId), data);
|
|
77
108
|
}
|
|
78
109
|
|
|
79
|
-
//
|
|
80
|
-
if (
|
|
81
|
-
|
|
110
|
+
// Refresh accountStore with all updated profile data
|
|
111
|
+
if (activeSessionId) {
|
|
112
|
+
refreshAccountInStore(activeSessionId, data, oxyServices);
|
|
82
113
|
}
|
|
83
114
|
|
|
84
115
|
// Invalidate all related queries to refresh everywhere
|