@oxyhq/services 5.17.13 → 5.17.15
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 +23 -27
- package/lib/commonjs/ui/context/OxyContext.js.map +1 -1
- package/lib/commonjs/ui/hooks/mutations/useAccountMutations.js +36 -13
- package/lib/commonjs/ui/hooks/mutations/useAccountMutations.js.map +1 -1
- package/lib/commonjs/ui/hooks/queries/useAccountQueries.js +36 -22
- package/lib/commonjs/ui/hooks/queries/useAccountQueries.js.map +1 -1
- package/lib/commonjs/ui/screens/AccountSettingsScreen.js +9 -3
- package/lib/commonjs/ui/screens/AccountSettingsScreen.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 +34 -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 +29 -33
- package/lib/module/ui/context/OxyContext.js.map +1 -1
- package/lib/module/ui/hooks/mutations/useAccountMutations.js +37 -14
- package/lib/module/ui/hooks/mutations/useAccountMutations.js.map +1 -1
- package/lib/module/ui/hooks/queries/useAccountQueries.js +36 -22
- package/lib/module/ui/hooks/queries/useAccountQueries.js.map +1 -1
- package/lib/module/ui/screens/AccountSettingsScreen.js +9 -3
- package/lib/module/ui/screens/AccountSettingsScreen.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 +33 -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/hooks/mutations/useAccountMutations.d.ts.map +1 -1
- package/lib/typescript/ui/hooks/queries/useAccountQueries.d.ts.map +1 -1
- package/lib/typescript/ui/screens/AccountSettingsScreen.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 +25 -32
- package/src/ui/hooks/mutations/useAccountMutations.ts +38 -16
- package/src/ui/hooks/queries/useAccountQueries.ts +27 -15
- package/src/ui/screens/AccountSettingsScreen.tsx +17 -3
- package/src/ui/stores/accountStore.ts +11 -1
- package/src/ui/utils/avatarUtils.ts +40 -3
package/lib/commonjs/index.js
CHANGED
|
@@ -74,7 +74,11 @@ var _exportNames = {
|
|
|
74
74
|
logUser: true,
|
|
75
75
|
logDevice: true,
|
|
76
76
|
logPayment: true,
|
|
77
|
-
logPerformance: true
|
|
77
|
+
logPerformance: true,
|
|
78
|
+
refreshAvatarInStore: true,
|
|
79
|
+
refreshAccountInStore: true,
|
|
80
|
+
updateAvatarVisibility: true,
|
|
81
|
+
updateProfileWithAvatar: true
|
|
78
82
|
};
|
|
79
83
|
Object.defineProperty(exports, "DeviceManager", {
|
|
80
84
|
enumerable: true,
|
|
@@ -250,6 +254,18 @@ Object.defineProperty(exports, "oxyClient", {
|
|
|
250
254
|
return _core.oxyClient;
|
|
251
255
|
}
|
|
252
256
|
});
|
|
257
|
+
Object.defineProperty(exports, "refreshAccountInStore", {
|
|
258
|
+
enumerable: true,
|
|
259
|
+
get: function () {
|
|
260
|
+
return _avatarUtils.refreshAccountInStore;
|
|
261
|
+
}
|
|
262
|
+
});
|
|
263
|
+
Object.defineProperty(exports, "refreshAvatarInStore", {
|
|
264
|
+
enumerable: true,
|
|
265
|
+
get: function () {
|
|
266
|
+
return _avatarUtils.refreshAvatarInStore;
|
|
267
|
+
}
|
|
268
|
+
});
|
|
253
269
|
Object.defineProperty(exports, "setOxyAssetInstance", {
|
|
254
270
|
enumerable: true,
|
|
255
271
|
get: function () {
|
|
@@ -262,6 +278,18 @@ Object.defineProperty(exports, "setOxyFileUrlInstance", {
|
|
|
262
278
|
return _useFileDownloadUrl.setOxyFileUrlInstance;
|
|
263
279
|
}
|
|
264
280
|
});
|
|
281
|
+
Object.defineProperty(exports, "updateAvatarVisibility", {
|
|
282
|
+
enumerable: true,
|
|
283
|
+
get: function () {
|
|
284
|
+
return _avatarUtils.updateAvatarVisibility;
|
|
285
|
+
}
|
|
286
|
+
});
|
|
287
|
+
Object.defineProperty(exports, "updateProfileWithAvatar", {
|
|
288
|
+
enumerable: true,
|
|
289
|
+
get: function () {
|
|
290
|
+
return _avatarUtils.updateProfileWithAvatar;
|
|
291
|
+
}
|
|
292
|
+
});
|
|
265
293
|
Object.defineProperty(exports, "useAsset", {
|
|
266
294
|
enumerable: true,
|
|
267
295
|
get: function () {
|
|
@@ -568,5 +596,6 @@ Object.keys(_hookUtils).forEach(function (key) {
|
|
|
568
596
|
}
|
|
569
597
|
});
|
|
570
598
|
});
|
|
599
|
+
var _avatarUtils = require("./ui/utils/avatarUtils");
|
|
571
600
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
572
601
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["require","_core","_OxyContext","_OxyProvider","_interopRequireDefault","_deviceManager","_languageUtils","_interfaces","_authStore","_assetStore","_useSessionSocket","_useAssets","_useFileDownloadUrl","_queries","_mutations","_OxySignInButton","_ui","_apiUtils","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","_errorUtils","_validationUtils","_loggerUtils","_asyncUtils","_hookUtils","e","__esModule","default"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":"
|
|
1
|
+
{"version":3,"names":["require","_core","_OxyContext","_OxyProvider","_interopRequireDefault","_deviceManager","_languageUtils","_interfaces","_authStore","_assetStore","_useSessionSocket","_useAssets","_useFileDownloadUrl","_queries","_mutations","_OxySignInButton","_ui","_apiUtils","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","_errorUtils","_validationUtils","_loggerUtils","_asyncUtils","_hookUtils","_avatarUtils","e","__esModule","default"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -35,7 +35,7 @@ var _queryClient = require("../hooks/queryClient");
|
|
|
35
35
|
var _bottomSheetManager = require("../navigation/bottomSheetManager");
|
|
36
36
|
var _storageHelpers = require("../utils/storageHelpers");
|
|
37
37
|
var _errorHandlers = require("../utils/errorHandlers");
|
|
38
|
-
var
|
|
38
|
+
var _useAccountMutations = require("../hooks/mutations/useAccountMutations");
|
|
39
39
|
var _shallow = require("zustand/react/shallow");
|
|
40
40
|
var _OxyContextBase = require("./OxyContextBase");
|
|
41
41
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
@@ -166,42 +166,38 @@ const OxyProvider = ({
|
|
|
166
166
|
queryClient
|
|
167
167
|
});
|
|
168
168
|
const {
|
|
169
|
-
data: userData
|
|
169
|
+
data: userData,
|
|
170
|
+
refetch: refetchUser
|
|
170
171
|
} = (0, _reactQuery.useQuery)({
|
|
171
172
|
queryKey: _queryKeys.queryKeys.accounts.current(),
|
|
172
173
|
queryFn: async () => {
|
|
174
|
+
_loggerUtils.logger.debug('Fetching current user', {
|
|
175
|
+
component: 'OxyContext',
|
|
176
|
+
sessionId: activeSessionId ?? undefined
|
|
177
|
+
});
|
|
173
178
|
if (!activeSessionId) {
|
|
174
179
|
throw new Error('No active session');
|
|
175
180
|
}
|
|
176
|
-
|
|
181
|
+
const data = await oxyServices.getUserBySession(activeSessionId);
|
|
182
|
+
_loggerUtils.logger.debug('Current user fetched', {
|
|
183
|
+
component: 'OxyContext',
|
|
184
|
+
username: data.username
|
|
185
|
+
});
|
|
186
|
+
return data;
|
|
177
187
|
},
|
|
178
188
|
enabled: isAuthenticated && !!activeSessionId && tokenReady,
|
|
179
|
-
staleTime:
|
|
180
|
-
|
|
181
|
-
|
|
189
|
+
staleTime: 30000,
|
|
190
|
+
// 30 seconds - reduces unnecessary refetches
|
|
191
|
+
gcTime: 5 * 60 * 1000,
|
|
192
|
+
// 5 minutes - keeps data in cache longer
|
|
193
|
+
retry: false,
|
|
194
|
+
refetchOnMount: 'always',
|
|
195
|
+
refetchOnWindowFocus: false
|
|
182
196
|
});
|
|
183
197
|
const user = userData ?? null;
|
|
184
198
|
|
|
185
|
-
//
|
|
186
|
-
const updateProfileMutation = (0,
|
|
187
|
-
mutationFn: async updates => {
|
|
188
|
-
return await oxyServices.updateProfile(updates);
|
|
189
|
-
},
|
|
190
|
-
onSuccess: (data, updates) => {
|
|
191
|
-
// Update cache with server response
|
|
192
|
-
queryClient.setQueryData(_queryKeys.queryKeys.accounts.current(), data);
|
|
193
|
-
if (activeSessionId) {
|
|
194
|
-
queryClient.setQueryData(_queryKeys.queryKeys.users.profile(activeSessionId), data);
|
|
195
|
-
}
|
|
196
|
-
// If avatar was updated, refresh accountStore with cache-busted URL
|
|
197
|
-
if (updates.avatar && activeSessionId && oxyServices) {
|
|
198
|
-
(0, _avatarUtils.refreshAvatarInStore)(activeSessionId, updates.avatar, oxyServices);
|
|
199
|
-
}
|
|
200
|
-
// Invalidate all related queries to refresh everywhere
|
|
201
|
-
(0, _queryKeys.invalidateUserQueries)(queryClient);
|
|
202
|
-
(0, _queryKeys.invalidateAccountQueries)(queryClient);
|
|
203
|
-
}
|
|
204
|
-
});
|
|
199
|
+
// Use the shared profile update mutation hook
|
|
200
|
+
const updateProfileMutation = (0, _useAccountMutations.useUpdateProfile)();
|
|
205
201
|
const updateProfile = (0, _react.useCallback)(async updates => {
|
|
206
202
|
return await updateProfileMutation.mutateAsync(updates);
|
|
207
203
|
}, [updateProfileMutation]);
|
|
@@ -377,7 +373,7 @@ const OxyProvider = ({
|
|
|
377
373
|
}
|
|
378
374
|
} catch (error) {
|
|
379
375
|
if (__DEV__) {
|
|
380
|
-
_loggerUtils.logger.error('Auth init error', error
|
|
376
|
+
_loggerUtils.logger.error('Auth init error', error, {
|
|
381
377
|
component: 'OxyContext',
|
|
382
378
|
method: 'restoreSessionsFromStorage'
|
|
383
379
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","require","_reactQuery","_sonner","_core","_loggerUtils","_useAuthOperations","_useAvatarPicker","_useSessionSocket","_useDeviceManagement","_useLanguageManagement","_useSessionManagement","_useStorage","_accountStore","_authStore","_queryKeys","_queryClient","_bottomSheetManager","_storageHelpers","_errorHandlers","_avatarUtils","_shallow","_OxyContextBase","_jsxRuntime","cachedUseFollowHook","loadUseFollowHook","useFollow","error","__DEV__","loggerUtil","warn","component","method","fallback","Error","OxyProvider","children","oxyServices","providedOxyServices","baseURL","storageKeyPrefix","onAuthStateChange","onError","oxyServicesRef","useRef","current","OxyServices","isAuthenticated","isOnline","isLoading","setOnline","loginSuccess","loginFailure","logoutStore","useAuthStore","useShallow","state","logout","tokenReady","setTokenReady","useState","initializedRef","setAuthState","setState","logger","useCallback","message","err","undefined","console","storageKeys","useMemo","getStorageKeys","storage","isReady","isStorageReady","useStorage","currentLanguage","metadata","currentLanguageMetadata","languageName","currentLanguageName","nativeLanguageName","currentNativeLanguageName","setLanguage","applyLanguagePreference","useLanguageManagement","languageKey","language","queryClient","useQueryClient","sessions","activeSessionId","setActiveSessionId","updateSessions","switchSession","refreshSessions","clearSessionState","saveActiveSessionId","trackRemovedSession","useSessionManagement","setAuthError","data","userData","useQuery","queryKey","queryKeys","accounts","queryFn","getUserBySession","enabled","staleTime","gcTime","retry","user","updateProfileMutation","useMutation","mutationFn","updates","updateProfile","onSuccess","setQueryData","users","profile","avatar","refreshAvatarInStore","invalidateUserQueries","invalidateAccountQueries","mutateAsync","completeSignIn","logoutAll","useAuthOperations","clearAllAccountData","clear","clearQueryCache","useAccountStore","getState","reset","clearCache","useEffect","wasOffline","checkTimeout","scheduleNextCheck","clearTimeout","setTimeout","checkNetworkStatus","healthCheck","getDeviceSessions","logoutAllDeviceSessions","updateDeviceName","useDeviceManagement","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","isInvalidSessionError","isTimeoutOrNetworkError","debug","merge","switchError","removeItem","filter","session","String","activeSession","find","currentDeviceId","getCurrentUserId","refreshSessionsWithUser","handleSessionRemoved","handleRemoteSignOut","toast","info","catch","remoteError","useSessionSocket","getBaseURL","getAccessToken","onRemoteSignOut","onSessionRemoved","switchSessionForContext","showBottomSheetForContext","screenOrConfig","globalShowBottomSheet","openAvatarPicker","useAvatarPicker","showBottomSheet","contextValue","isTokenReady","removeSession","jsx","OxyContext","Provider","value","exports","OxyContextProvider","_default","default"],"sourceRoot":"../../../../src","sources":["ui/context/OxyContext.tsx"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["_react","require","_reactQuery","_sonner","_core","_loggerUtils","_useAuthOperations","_useAvatarPicker","_useSessionSocket","_useDeviceManagement","_useLanguageManagement","_useSessionManagement","_useStorage","_accountStore","_authStore","_queryKeys","_queryClient","_bottomSheetManager","_storageHelpers","_errorHandlers","_useAccountMutations","_shallow","_OxyContextBase","_jsxRuntime","cachedUseFollowHook","loadUseFollowHook","useFollow","error","__DEV__","appLogger","warn","component","method","fallback","Error","OxyProvider","children","oxyServices","providedOxyServices","baseURL","storageKeyPrefix","onAuthStateChange","onError","oxyServicesRef","useRef","current","OxyServices","isAuthenticated","isOnline","isLoading","setOnline","loginSuccess","loginFailure","logoutStore","useAuthStore","useShallow","state","logout","tokenReady","setTokenReady","useState","initializedRef","setAuthState","setState","logger","useCallback","message","err","undefined","console","storageKeys","useMemo","getStorageKeys","storage","isReady","isStorageReady","useStorage","currentLanguage","metadata","currentLanguageMetadata","languageName","currentLanguageName","nativeLanguageName","currentNativeLanguageName","setLanguage","applyLanguagePreference","useLanguageManagement","languageKey","language","queryClient","useQueryClient","sessions","activeSessionId","setActiveSessionId","updateSessions","switchSession","refreshSessions","clearSessionState","saveActiveSessionId","trackRemovedSession","useSessionManagement","setAuthError","data","userData","refetch","refetchUser","useQuery","queryKey","queryKeys","accounts","queryFn","debug","sessionId","getUserBySession","username","enabled","staleTime","gcTime","retry","refetchOnMount","refetchOnWindowFocus","user","updateProfileMutation","useUpdateProfileMutation","updateProfile","updates","mutateAsync","completeSignIn","logoutAll","useAuthOperations","clearAllAccountData","clear","clearQueryCache","useAccountStore","getState","reset","clearCache","useEffect","wasOffline","checkTimeout","scheduleNextCheck","clearTimeout","setTimeout","checkNetworkStatus","healthCheck","getDeviceSessions","logoutAllDeviceSessions","updateDeviceName","useDeviceManagement","useFollowHook","restoreSessionsFromStorage","storedSessionIdsJson","getItem","sessionIds","storedSessionIds","JSON","parse","storedActiveSessionId","validSessions","length","validation","validateSession","useHeaderValidation","valid","now","Date","push","deviceId","expiresAt","getTime","toISOString","lastActive","userId","id","toString","isCurrent","validationError","isInvalidSessionError","isTimeoutOrNetworkError","merge","switchError","removeItem","filter","session","activeSession","find","currentDeviceId","getCurrentUserId","refreshSessionsWithUser","handleSessionRemoved","handleRemoteSignOut","toast","info","catch","remoteError","useSessionSocket","getBaseURL","getAccessToken","onRemoteSignOut","onSessionRemoved","switchSessionForContext","showBottomSheetForContext","screenOrConfig","globalShowBottomSheet","openAvatarPicker","useAvatarPicker","showBottomSheet","contextValue","isTokenReady","removeSession","jsx","OxyContext","Provider","value","exports","OxyContextProvider","_default","default"],"sourceRoot":"../../../../src","sources":["ui/context/OxyContext.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -9,6 +9,7 @@ var _queryKeys = require("../queries/queryKeys");
|
|
|
9
9
|
var _OxyContext = require("../../context/OxyContext");
|
|
10
10
|
var _sonner = require("../../../lib/sonner");
|
|
11
11
|
var _avatarUtils = require("../../utils/avatarUtils");
|
|
12
|
+
var _loggerUtils = require("../../../utils/loggerUtils");
|
|
12
13
|
const getDeviceIdForSession = (sessions = [], sessionId) => sessionId ? sessions.find(s => s.sessionId === sessionId)?.deviceId : undefined;
|
|
13
14
|
|
|
14
15
|
/**
|
|
@@ -87,22 +88,30 @@ const useUpdateProfile = () => {
|
|
|
87
88
|
}
|
|
88
89
|
_sonner.toast.error(error instanceof Error ? error.message : 'Failed to update profile');
|
|
89
90
|
},
|
|
90
|
-
// On success,
|
|
91
|
-
onSuccess: (data, updates) => {
|
|
91
|
+
// On success, update cache and sync to store
|
|
92
|
+
onSuccess: async (data, updates) => {
|
|
93
|
+
_loggerUtils.logger.debug('Profile update successful', {
|
|
94
|
+
component: 'useUpdateProfile',
|
|
95
|
+
username: data.username,
|
|
96
|
+
updatedFields: Object.keys(updates)
|
|
97
|
+
});
|
|
98
|
+
|
|
92
99
|
// Update cache with server response
|
|
93
100
|
queryClient.setQueryData(_queryKeys.queryKeys.accounts.current(), data);
|
|
94
101
|
if (activeSessionId) {
|
|
95
102
|
queryClient.setQueryData(_queryKeys.queryKeys.users.profile(activeSessionId), data);
|
|
96
103
|
}
|
|
97
104
|
|
|
98
|
-
//
|
|
99
|
-
if (
|
|
100
|
-
(0, _avatarUtils.
|
|
105
|
+
// Refresh accountStore with all updated profile data (synchronizes immediately)
|
|
106
|
+
if (activeSessionId && oxyServices) {
|
|
107
|
+
(0, _avatarUtils.refreshAccountInStore)(activeSessionId, data, oxyServices);
|
|
101
108
|
}
|
|
102
109
|
|
|
103
|
-
//
|
|
104
|
-
(0, _queryKeys.invalidateUserQueries)(queryClient);
|
|
110
|
+
// Only invalidate specific queries that need refresh (not everything)
|
|
105
111
|
(0, _queryKeys.invalidateAccountQueries)(queryClient);
|
|
112
|
+
_loggerUtils.logger.debug('Profile update complete', {
|
|
113
|
+
component: 'useUpdateProfile'
|
|
114
|
+
});
|
|
106
115
|
}
|
|
107
116
|
});
|
|
108
117
|
};
|
|
@@ -183,21 +192,35 @@ const useUploadAvatar = () => {
|
|
|
183
192
|
}
|
|
184
193
|
_sonner.toast.error(error instanceof Error ? error.message : 'Failed to upload avatar');
|
|
185
194
|
},
|
|
186
|
-
onSuccess: data => {
|
|
195
|
+
onSuccess: async data => {
|
|
196
|
+
_loggerUtils.logger.debug('Avatar upload successful', {
|
|
197
|
+
component: 'useUploadAvatar',
|
|
198
|
+
method: 'onSuccess',
|
|
199
|
+
data
|
|
200
|
+
});
|
|
187
201
|
queryClient.setQueryData(_queryKeys.queryKeys.accounts.current(), data);
|
|
188
202
|
if (activeSessionId) {
|
|
189
203
|
queryClient.setQueryData(_queryKeys.queryKeys.users.profile(activeSessionId), data);
|
|
190
204
|
}
|
|
191
205
|
|
|
192
|
-
// Refresh accountStore with
|
|
193
|
-
if (
|
|
194
|
-
(0, _avatarUtils.
|
|
206
|
+
// Refresh accountStore with all updated profile data (including avatar)
|
|
207
|
+
if (activeSessionId && oxyServices) {
|
|
208
|
+
(0, _avatarUtils.refreshAccountInStore)(activeSessionId, data, oxyServices);
|
|
195
209
|
}
|
|
196
210
|
|
|
197
211
|
// Invalidate all related queries to refresh everywhere
|
|
198
|
-
(0, _queryKeys.invalidateUserQueries)(queryClient);
|
|
199
|
-
(0, _queryKeys.invalidateAccountQueries)(queryClient);
|
|
212
|
+
await (0, _queryKeys.invalidateUserQueries)(queryClient);
|
|
213
|
+
await (0, _queryKeys.invalidateAccountQueries)(queryClient);
|
|
214
|
+
|
|
215
|
+
// Explicitly refetch to ensure UI updates
|
|
216
|
+
await queryClient.refetchQueries({
|
|
217
|
+
queryKey: _queryKeys.queryKeys.accounts.current()
|
|
218
|
+
});
|
|
200
219
|
_sonner.toast.success('Avatar updated successfully');
|
|
220
|
+
_loggerUtils.logger.debug('Avatar update complete - cache invalidated and refetched', {
|
|
221
|
+
component: 'useUploadAvatar',
|
|
222
|
+
method: 'onSuccess'
|
|
223
|
+
});
|
|
201
224
|
}
|
|
202
225
|
});
|
|
203
226
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_reactQuery","require","_queryKeys","_OxyContext","_sonner","_avatarUtils","getDeviceIdForSession","sessions","sessionId","find","s","deviceId","undefined","useUpdateProfile","oxyServices","activeSessionId","user","useOxy","queryClient","useQueryClient","useMutation","mutationFn","updates","hasValidToken","getTokenBySession","tokenError","updateProfile","error","errorMessage","message","status","response","includes","onMutate","cancelQueries","queryKey","queryKeys","accounts","current","previousUser","getQueryData","setQueryData","users","profile","onError","context","toast","Error","onSuccess","data","avatar","refreshAvatarInStore","invalidateUserQueries","invalidateAccountQueries","exports","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":["_reactQuery","require","_queryKeys","_OxyContext","_sonner","_avatarUtils","_loggerUtils","getDeviceIdForSession","sessions","sessionId","find","s","deviceId","undefined","useUpdateProfile","oxyServices","activeSessionId","user","useOxy","queryClient","useQueryClient","useMutation","mutationFn","updates","hasValidToken","getTokenBySession","tokenError","updateProfile","error","errorMessage","message","status","response","includes","onMutate","cancelQueries","queryKey","queryKeys","accounts","current","previousUser","getQueryData","setQueryData","users","profile","onError","context","toast","Error","onSuccess","data","logger","debug","component","username","updatedFields","Object","keys","refreshAccountInStore","invalidateAccountQueries","exports","useUploadAvatar","file","uploadResult","assetUpload","fileId","id","avatar","optimisticUser","uri","method","invalidateUserQueries","refetchQueries","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":[]}
|
|
@@ -7,6 +7,7 @@ exports.useUsersBySessions = exports.useUserProfiles = exports.useUserProfile =
|
|
|
7
7
|
var _reactQuery = require("@tanstack/react-query");
|
|
8
8
|
var _queryKeys = require("./queryKeys");
|
|
9
9
|
var _OxyContextBase = require("../../context/OxyContextBase");
|
|
10
|
+
var _loggerUtils = require("../../../utils/loggerUtils");
|
|
10
11
|
/**
|
|
11
12
|
* Get user profile by session ID
|
|
12
13
|
*/
|
|
@@ -23,9 +24,9 @@ const useUserProfile = (sessionId, options) => {
|
|
|
23
24
|
return await oxyServices.getUserBySession(sessionId);
|
|
24
25
|
},
|
|
25
26
|
enabled: options?.enabled !== false && !!sessionId,
|
|
26
|
-
staleTime:
|
|
27
|
-
//
|
|
28
|
-
gcTime:
|
|
27
|
+
staleTime: 30000,
|
|
28
|
+
// 30 seconds - reasonable freshness without constant refetching
|
|
29
|
+
gcTime: 5 * 60 * 1000 // 5 minutes - keep in cache for quick access
|
|
29
30
|
});
|
|
30
31
|
};
|
|
31
32
|
|
|
@@ -45,9 +46,9 @@ const useUserProfiles = (sessionIds, options) => {
|
|
|
45
46
|
return results[0]?.user || null;
|
|
46
47
|
},
|
|
47
48
|
enabled: options?.enabled !== false && !!sessionId,
|
|
48
|
-
staleTime:
|
|
49
|
-
//
|
|
50
|
-
gcTime:
|
|
49
|
+
staleTime: 30000,
|
|
50
|
+
// 30 seconds
|
|
51
|
+
gcTime: 5 * 60 * 1000 // 5 minutes
|
|
51
52
|
}))
|
|
52
53
|
});
|
|
53
54
|
};
|
|
@@ -65,15 +66,28 @@ const useCurrentUser = options => {
|
|
|
65
66
|
return (0, _reactQuery.useQuery)({
|
|
66
67
|
queryKey: _queryKeys.queryKeys.accounts.current(),
|
|
67
68
|
queryFn: async () => {
|
|
69
|
+
_loggerUtils.logger.debug('Fetching current user', {
|
|
70
|
+
component: 'useCurrentUser',
|
|
71
|
+
sessionId: activeSessionId ?? undefined
|
|
72
|
+
});
|
|
68
73
|
if (!activeSessionId) {
|
|
69
74
|
throw new Error('No active session');
|
|
70
75
|
}
|
|
71
|
-
|
|
76
|
+
const userData = await oxyServices.getUserBySession(activeSessionId);
|
|
77
|
+
_loggerUtils.logger.debug('Current user fetched', {
|
|
78
|
+
component: 'useCurrentUser',
|
|
79
|
+
username: userData.username
|
|
80
|
+
});
|
|
81
|
+
return userData;
|
|
72
82
|
},
|
|
73
83
|
enabled: options?.enabled !== false && isAuthenticated && !!activeSessionId,
|
|
74
|
-
staleTime:
|
|
75
|
-
//
|
|
76
|
-
gcTime:
|
|
84
|
+
staleTime: 30000,
|
|
85
|
+
// 30 seconds - balances freshness with performance
|
|
86
|
+
gcTime: 5 * 60 * 1000,
|
|
87
|
+
// 5 minutes
|
|
88
|
+
refetchOnMount: 'always',
|
|
89
|
+
// Always refetch on mount
|
|
90
|
+
refetchOnWindowFocus: false
|
|
77
91
|
});
|
|
78
92
|
};
|
|
79
93
|
|
|
@@ -94,9 +108,9 @@ const useUserById = (userId, options) => {
|
|
|
94
108
|
return await oxyServices.getUserById(userId);
|
|
95
109
|
},
|
|
96
110
|
enabled: options?.enabled !== false && !!userId,
|
|
97
|
-
staleTime:
|
|
98
|
-
//
|
|
99
|
-
gcTime:
|
|
111
|
+
staleTime: 60000,
|
|
112
|
+
// 1 minute - other users' profiles change less frequently
|
|
113
|
+
gcTime: 10 * 60 * 1000 // 10 minutes
|
|
100
114
|
});
|
|
101
115
|
};
|
|
102
116
|
|
|
@@ -117,9 +131,9 @@ const useUserByUsername = (username, options) => {
|
|
|
117
131
|
return await oxyServices.getProfileByUsername(username);
|
|
118
132
|
},
|
|
119
133
|
enabled: options?.enabled !== false && !!username,
|
|
120
|
-
staleTime:
|
|
121
|
-
//
|
|
122
|
-
gcTime:
|
|
134
|
+
staleTime: 60000,
|
|
135
|
+
// 1 minute
|
|
136
|
+
gcTime: 10 * 60 * 1000 // 10 minutes
|
|
123
137
|
});
|
|
124
138
|
};
|
|
125
139
|
|
|
@@ -140,9 +154,9 @@ const useUsersBySessions = (sessionIds, options) => {
|
|
|
140
154
|
return await oxyServices.getUsersBySessions(sessionIds);
|
|
141
155
|
},
|
|
142
156
|
enabled: options?.enabled !== false && sessionIds.length > 0,
|
|
143
|
-
staleTime:
|
|
144
|
-
//
|
|
145
|
-
gcTime:
|
|
157
|
+
staleTime: 30000,
|
|
158
|
+
// 30 seconds
|
|
159
|
+
gcTime: 5 * 60 * 1000 // 5 minutes
|
|
146
160
|
});
|
|
147
161
|
};
|
|
148
162
|
|
|
@@ -192,9 +206,9 @@ const usePrivacySettings = (userId, options) => {
|
|
|
192
206
|
}
|
|
193
207
|
},
|
|
194
208
|
enabled: options?.enabled !== false && !!targetUserId,
|
|
195
|
-
staleTime:
|
|
196
|
-
//
|
|
197
|
-
gcTime:
|
|
209
|
+
staleTime: 60000,
|
|
210
|
+
// 1 minute - privacy settings don't change frequently
|
|
211
|
+
gcTime: 10 * 60 * 1000 // 10 minutes
|
|
198
212
|
});
|
|
199
213
|
};
|
|
200
214
|
exports.usePrivacySettings = usePrivacySettings;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_reactQuery","require","_queryKeys","_OxyContextBase","useUserProfile","sessionId","options","oxyServices","useOxy","useQuery","queryKey","queryKeys","users","profile","queryFn","Error","getUserBySession","enabled","staleTime","gcTime","exports","useUserProfiles","sessionIds","useQueries","queries","map","results","getUsersBySessions","user","useCurrentUser","activeSessionId","isAuthenticated","accounts","current","useUserById","userId","detail","getUserById","useUserByUsername","
|
|
1
|
+
{"version":3,"names":["_reactQuery","require","_queryKeys","_OxyContextBase","_loggerUtils","useUserProfile","sessionId","options","oxyServices","useOxy","useQuery","queryKey","queryKeys","users","profile","queryFn","Error","getUserBySession","enabled","staleTime","gcTime","exports","useUserProfiles","sessionIds","useQueries","queries","map","results","getUsersBySessions","user","useCurrentUser","activeSessionId","isAuthenticated","accounts","current","logger","debug","component","undefined","userData","username","refetchOnMount","refetchOnWindowFocus","useUserById","userId","detail","getUserById","useUserByUsername","details","getProfileByUsername","useUsersBySessions","list","length","usePrivacySettings","sessions","targetUserId","getCurrentUserId","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":[]}
|
|
@@ -180,7 +180,8 @@ const AccountSettingsScreen = ({
|
|
|
180
180
|
// Only reset all fields if it's a new user or first load
|
|
181
181
|
// Skip reset if it's just an avatar update
|
|
182
182
|
if (shouldInitialize && !isAvatarOnlyUpdate) {
|
|
183
|
-
|
|
183
|
+
// Prioritize name.full over name.first for display name
|
|
184
|
+
const userDisplayName = typeof finalUser.name === 'string' ? finalUser.name : finalUser.name?.full || finalUser.name?.first || '';
|
|
184
185
|
const userLastName = typeof finalUser.name === 'object' ? finalUser.name?.last || '' : '';
|
|
185
186
|
setDisplayName(userDisplayName);
|
|
186
187
|
setLastName(userLastName);
|
|
@@ -321,10 +322,13 @@ const AccountSettingsScreen = ({
|
|
|
321
322
|
try {
|
|
322
323
|
switch (field) {
|
|
323
324
|
case 'displayName':
|
|
325
|
+
// Send both first/last AND full name for proper synchronization
|
|
326
|
+
const fullName = [tempDisplayName, tempLastName].filter(Boolean).join(' ').trim() || tempDisplayName;
|
|
324
327
|
await updateProfileMutation.mutateAsync({
|
|
325
328
|
name: {
|
|
326
329
|
first: tempDisplayName,
|
|
327
|
-
last: tempLastName
|
|
330
|
+
last: tempLastName,
|
|
331
|
+
full: fullName
|
|
328
332
|
}
|
|
329
333
|
});
|
|
330
334
|
setDisplayName(tempDisplayName);
|
|
@@ -438,9 +442,11 @@ const AccountSettingsScreen = ({
|
|
|
438
442
|
|
|
439
443
|
// Handle name field
|
|
440
444
|
if (displayName || lastName) {
|
|
445
|
+
const fullName = [displayName, lastName].filter(Boolean).join(' ').trim() || displayName;
|
|
441
446
|
updates.name = {
|
|
442
447
|
first: displayName,
|
|
443
|
-
last: lastName
|
|
448
|
+
last: lastName,
|
|
449
|
+
full: fullName
|
|
444
450
|
};
|
|
445
451
|
}
|
|
446
452
|
|