@oxyhq/services 5.21.5 → 5.21.7

package/src/ui/utils/avatarUtils.ts

@@ -4,6 +4,7 @@ import { useAccountStore } from '../stores/accountStore';
 import { useAuthStore } from '../stores/authStore';
 import { QueryClient } from '@tanstack/react-query';
 import { queryKeys, invalidateUserQueries, invalidateAccountQueries } from '../hooks/queries/queryKeys';
+import { authenticatedApiCall } from './authHelpers';
 
 /**
  * Updates file visibility to public for avatar use.
@@ -57,7 +58,7 @@ export function refreshAvatarInStore(
 /**
  * Updates user profile with avatar and handles all side effects (query invalidation, accountStore update).
  * This function can be used from within OxyContext provider without requiring useOxy hook.
- * 
+ *
  * @param updates - Profile updates including avatar
  * @param oxyServices - OxyServices instance
  * @param activeSessionId - Active session ID
@@ -72,72 +73,31 @@ export async function updateProfileWithAvatar(
   queryClient: QueryClient,
   syncSession?: () => Promise<User>
 ): Promise<User> {
-  // Ensure we have a valid token before making the request
-  if (!oxyServices.hasValidToken() && activeSessionId) {
-    try {
-      await oxyServices.getTokenBySession(activeSessionId);
-    } catch (tokenError) {
-      const errorMessage = tokenError instanceof Error ? tokenError.message : String(tokenError);
-      if (errorMessage.includes('AUTH_REQUIRED_OFFLINE_SESSION') || errorMessage.includes('offline')) {
-        if (syncSession) {
-          try {
-            await syncSession();
-            await oxyServices.getTokenBySession(activeSessionId);
-          } catch (syncError) {
-            throw new Error('Session needs to be synced. Please try again.');
-          }
-        } else {
-          throw tokenError;
-        }
-      } else {
-        throw tokenError;
-      }
-    }
+  const data = await authenticatedApiCall<User>(
+    oxyServices,
+    activeSessionId,
+    () => oxyServices.updateProfile(updates),
+    syncSession
+  );
+
+  // Update cache with server response
+  queryClient.setQueryData(queryKeys.accounts.current(), data);
+  if (activeSessionId) {
+    queryClient.setQueryData(queryKeys.users.profile(activeSessionId), data);
   }
 
-  try {
-    const data = await oxyServices.updateProfile(updates);
-    
-    // Update cache with server response
-    queryClient.setQueryData(queryKeys.accounts.current(), data);
-    if (activeSessionId) {
-      queryClient.setQueryData(queryKeys.users.profile(activeSessionId), data);
-    }
-    
-    // Update authStore so frontend components see the changes immediately
-    useAuthStore.getState().setUser(data);
-    
-    // If avatar was updated, refresh accountStore with cache-busted URL
-    if (updates.avatar && activeSessionId) {
-      refreshAvatarInStore(activeSessionId, updates.avatar, oxyServices);
-    }
-    
-    // Invalidate all related queries to refresh everywhere
-    invalidateUserQueries(queryClient);
-    invalidateAccountQueries(queryClient);
-    
-    return data;
-  } catch (error: any) {
-    const errorMessage = error?.message || '';
-    const status = error?.status || error?.response?.status;
-    
-    // Handle authentication errors
-    if (status === 401 || errorMessage.includes('Authentication required') || errorMessage.includes('Invalid or missing authorization header')) {
-      if (activeSessionId && syncSession) {
-        try {
-          await syncSession();
-          await oxyServices.getTokenBySession(activeSessionId);
-          // Retry the update after getting token
-          return await updateProfileWithAvatar(updates, oxyServices, activeSessionId, queryClient, syncSession);
-        } catch (retryError) {
-          throw new Error('Authentication failed. Please sign in again.');
-        }
-      } else {
-        throw new Error('No active session. Please sign in.');
-      }
-    }
-    
-    throw error;
+  // Update authStore so frontend components see the changes immediately
+  useAuthStore.getState().setUser(data);
+
+  // If avatar was updated, refresh accountStore with cache-busted URL
+  if (updates.avatar && activeSessionId) {
+    refreshAvatarInStore(activeSessionId, updates.avatar, oxyServices);
   }
+
+  // Invalidate all related queries to refresh everywhere
+  invalidateUserQueries(queryClient);
+  invalidateAccountQueries(queryClient);
+
+  return data;
 }
 

package/lib/commonjs/ui/hooks/use-haptic-press.js

@@ -1,21 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.useHapticPress = useHapticPress;
-var _react = require("react");
-var Haptics = _interopRequireWildcard(require("expo-haptics"));
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
-/**
- * Hook that returns a memoized callback for haptic feedback on press.
- * Provides consistent light haptic feedback across the app.
- * 
- * @returns A stable callback function that triggers haptic feedback
- */
-function useHapticPress() {
-  return (0, _react.useCallback)(() => {
-    Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light);
-  }, []);
-}
-//# sourceMappingURL=use-haptic-press.js.map

package/lib/commonjs/ui/hooks/use-haptic-press.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_react","require","Haptics","_interopRequireWildcard","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","useHapticPress","useCallback","impactAsync","ImpactFeedbackStyle","Light"],"sourceRoot":"../../../../src","sources":["ui/hooks/use-haptic-press.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAC,uBAAA,CAAAF,OAAA;AAAwC,SAAAE,wBAAAC,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAH,uBAAA,YAAAA,CAAAC,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,GAAAM,CAAA,CAAAO,GAAA,CAAAb,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAa,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAU,MAAA,CAAAC,cAAA,KAAAD,MAAA,CAAAE,wBAAA,CAAAlB,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAK,GAAA,IAAAL,CAAA,CAAAM,GAAA,IAAAP,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA;AAExC;AACA;AACA;AACA;AACA;AACA;AACO,SAASkB,cAAcA,CAAA,EAAG;EAC/B,OAAO,IAAAC,kBAAW,EAAC,MAAM;IACvBtB,OAAO,CAACuB,WAAW,CAACvB,OAAO,CAACwB,mBAAmB,CAACC,KAAK,CAAC;EACxD,CAAC,EAAE,EAAE,CAAC;AACR","ignoreList":[]}

package/lib/module/ui/hooks/use-haptic-press.js

@@ -1,17 +0,0 @@
-"use strict";
-
-import { useCallback } from 'react';
-import * as Haptics from 'expo-haptics';
-
-/**
- * Hook that returns a memoized callback for haptic feedback on press.
- * Provides consistent light haptic feedback across the app.
- * 
- * @returns A stable callback function that triggers haptic feedback
- */
-export function useHapticPress() {
-  return useCallback(() => {
-    Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light);
-  }, []);
-}
-//# sourceMappingURL=use-haptic-press.js.map

package/lib/module/ui/hooks/use-haptic-press.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["useCallback","Haptics","useHapticPress","impactAsync","ImpactFeedbackStyle","Light"],"sourceRoot":"../../../../src","sources":["ui/hooks/use-haptic-press.ts"],"mappings":";;AAAA,SAASA,WAAW,QAAQ,OAAO;AACnC,OAAO,KAAKC,OAAO,MAAM,cAAc;;AAEvC;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,cAAcA,CAAA,EAAG;EAC/B,OAAOF,WAAW,CAAC,MAAM;IACvBC,OAAO,CAACE,WAAW,CAACF,OAAO,CAACG,mBAAmB,CAACC,KAAK,CAAC;EACxD,CAAC,EAAE,EAAE,CAAC;AACR","ignoreList":[]}

package/lib/typescript/commonjs/ui/hooks/use-haptic-press.d.ts

@@ -1,8 +0,0 @@
-/**
- * Hook that returns a memoized callback for haptic feedback on press.
- * Provides consistent light haptic feedback across the app.
- *
- * @returns A stable callback function that triggers haptic feedback
- */
-export declare function useHapticPress(): () => void;
-//# sourceMappingURL=use-haptic-press.d.ts.map

package/lib/typescript/commonjs/ui/hooks/use-haptic-press.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"use-haptic-press.d.ts","sourceRoot":"","sources":["../../../../../src/ui/hooks/use-haptic-press.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,wBAAgB,cAAc,eAI7B"}

package/lib/typescript/module/ui/hooks/use-haptic-press.d.ts

@@ -1,8 +0,0 @@
-/**
- * Hook that returns a memoized callback for haptic feedback on press.
- * Provides consistent light haptic feedback across the app.
- *
- * @returns A stable callback function that triggers haptic feedback
- */
-export declare function useHapticPress(): () => void;
-//# sourceMappingURL=use-haptic-press.d.ts.map

package/lib/typescript/module/ui/hooks/use-haptic-press.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"use-haptic-press.d.ts","sourceRoot":"","sources":["../../../../../src/ui/hooks/use-haptic-press.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,wBAAgB,cAAc,eAI7B"}

package/src/ui/hooks/use-haptic-press.ts

@@ -1,15 +0,0 @@
-import { useCallback } from 'react';
-import * as Haptics from 'expo-haptics';
-
-/**
- * Hook that returns a memoized callback for haptic feedback on press.
- * Provides consistent light haptic feedback across the app.
- * 
- * @returns A stable callback function that triggers haptic feedback
- */
-export function useHapticPress() {
-  return useCallback(() => {
-    Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light);
-  }, []);
-}
-