@oxyhq/services 5.21.6 → 5.21.7

package/src/ui/hooks/queries/useAccountQueries.ts

@@ -1,8 +1,8 @@
 import { useQuery, useQueries } from '@tanstack/react-query';
 import type { User } from '../../../models/interfaces';
-import type { OxyServices } from '../../../core';
 import { queryKeys } from './queryKeys';
 import { useOxy } from '../../context/OxyContext';
+import { authenticatedApiCall } from '../../utils/authHelpers';
 
 /**
  * Get user profile by session ID
@@ -138,38 +138,11 @@ export const usePrivacySettings = (userId?: string, options?: { enabled?: boolea
         throw new Error('User ID is required');
       }
 
-      // Ensure we have a valid token before making the request
-      if (!oxyServices.hasValidToken() && activeSessionId) {
-        try {
-          // Try to get token for the session
-          await oxyServices.getTokenBySession(activeSessionId);
-        } catch (tokenError) {
-          // If getting token fails, might be an offline session - try syncing
-          const errorMessage = tokenError instanceof Error ? tokenError.message : String(tokenError);
-          if (errorMessage.includes('AUTH_REQUIRED_OFFLINE_SESSION') || errorMessage.includes('offline')) {
-            // Session sync should be handled by the app layer (e.g., accounts app's useIdentity hook)
-            throw new Error('Session needs to be synced. Please try again.');
-          } else {
-            throw tokenError;
-          }
-        }
-      }
-
-      try {
-        return await oxyServices.getPrivacySettings(targetUserId);
-      } 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')) {
-          // Session sync should be handled by the app layer
-          throw new Error('Authentication failed. Please sign in again.');
-        }
-        
-        // TanStack Query will automatically retry on network errors
-        throw error;
-      }
+      return authenticatedApiCall(
+        oxyServices,
+        activeSessionId,
+        () => oxyServices.getPrivacySettings(targetUserId)
+      );
     },
     enabled: (options?.enabled !== false) && !!targetUserId,
     staleTime: 2 * 60 * 1000, // 2 minutes

package/src/ui/hooks/queries/useServicesQueries.ts

@@ -3,6 +3,7 @@ import type { ClientSession } from '../../../models/session';
 import { queryKeys } from './queryKeys';
 import { useOxy } from '../../context/OxyContext';
 import { fetchSessionsWithFallback, mapSessionsToClient } from '../../utils/sessionHelpers';
+import { authenticatedApiCall } from '../../utils/authHelpers';
 
 /**
  * Get all active sessions for the current user
@@ -94,38 +95,11 @@ export const useUserDevices = (options?: { enabled?: boolean }) => {
   return useQuery({
     queryKey: queryKeys.devices.list(),
     queryFn: async () => {
-      // Ensure we have a valid token before making the request
-      if (!oxyServices.hasValidToken() && activeSessionId) {
-        try {
-          // Try to get token for the session
-          await oxyServices.getTokenBySession(activeSessionId);
-        } catch (tokenError) {
-          // If getting token fails, might be an offline session - try syncing
-          const errorMessage = tokenError instanceof Error ? tokenError.message : String(tokenError);
-          if (errorMessage.includes('AUTH_REQUIRED_OFFLINE_SESSION') || errorMessage.includes('offline')) {
-            // Session sync should be handled by the app layer
-            throw new Error('Session needs to be synced. Please try again.');
-          } else {
-            throw tokenError;
-          }
-        }
-      }
-
-      try {
-        return await oxyServices.getUserDevices();
-      } 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')) {
-          // Session sync should be handled by the app layer
-          throw new Error('Authentication failed. Please sign in again.');
-        }
-        
-        // TanStack Query will automatically retry on network errors
-        throw error;
-      }
+      return authenticatedApiCall(
+        oxyServices,
+        activeSessionId,
+        () => oxyServices.getUserDevices()
+      );
     },
     enabled: (options?.enabled !== false) && isAuthenticated,
     staleTime: 5 * 60 * 1000,

package/src/ui/hooks/useFileFiltering.ts

@@ -0,0 +1,115 @@
+import { useMemo, useState, useCallback } from 'react';
+import type { FileMetadata } from '../../models/interfaces';
+
+export type ViewMode = 'all' | 'photos' | 'videos' | 'documents' | 'audio';
+export type SortBy = 'date' | 'size' | 'name' | 'type';
+export type SortOrder = 'asc' | 'desc';
+
+interface UseFileFilteringOptions {
+  files: FileMetadata[];
+  initialViewMode?: ViewMode;
+  initialSortBy?: SortBy;
+  initialSortOrder?: SortOrder;
+}
+
+interface UseFileFilteringReturn {
+  filteredFiles: FileMetadata[];
+  viewMode: ViewMode;
+  setViewMode: (mode: ViewMode) => void;
+  searchQuery: string;
+  setSearchQuery: (query: string) => void;
+  sortBy: SortBy;
+  setSortBy: (sort: SortBy) => void;
+  sortOrder: SortOrder;
+  setSortOrder: (order: SortOrder) => void;
+  toggleSortOrder: () => void;
+}
+
+/**
+ * Hook for file filtering, sorting, and search functionality
+ * Extracts common file management logic for reuse across components
+ */
+export function useFileFiltering({
+  files,
+  initialViewMode = 'all',
+  initialSortBy = 'date',
+  initialSortOrder = 'desc',
+}: UseFileFilteringOptions): UseFileFilteringReturn {
+  const [viewMode, setViewMode] = useState<ViewMode>(initialViewMode);
+  const [searchQuery, setSearchQuery] = useState('');
+  const [sortBy, setSortBy] = useState<SortBy>(initialSortBy);
+  const [sortOrder, setSortOrder] = useState<SortOrder>(initialSortOrder);
+
+  const toggleSortOrder = useCallback(() => {
+    setSortOrder((prev) => (prev === 'asc' ? 'desc' : 'asc'));
+  }, []);
+
+  const filteredFiles = useMemo(() => {
+    // Filter by view mode
+    let filteredByMode = files;
+    if (viewMode === 'photos') {
+      filteredByMode = files.filter((file) => file.contentType.startsWith('image/'));
+    } else if (viewMode === 'videos') {
+      filteredByMode = files.filter((file) => file.contentType.startsWith('video/'));
+    } else if (viewMode === 'documents') {
+      filteredByMode = files.filter(
+        (file) =>
+          file.contentType.includes('pdf') ||
+          file.contentType.includes('document') ||
+          file.contentType.includes('text') ||
+          file.contentType.includes('msword') ||
+          file.contentType.includes('excel') ||
+          file.contentType.includes('spreadsheet') ||
+          file.contentType.includes('presentation') ||
+          file.contentType.includes('powerpoint')
+      );
+    } else if (viewMode === 'audio') {
+      filteredByMode = files.filter((file) => file.contentType.startsWith('audio/'));
+    }
+
+    // Filter by search query
+    let filtered = filteredByMode;
+    if (searchQuery.trim()) {
+      const query = searchQuery.toLowerCase();
+      filtered = filteredByMode.filter(
+        (file) =>
+          file.filename.toLowerCase().includes(query) ||
+          file.contentType.toLowerCase().includes(query) ||
+          (file.metadata?.description &&
+            file.metadata.description.toLowerCase().includes(query))
+      );
+    }
+
+    // Sort files
+    const sorted = [...filtered].sort((a, b) => {
+      let comparison = 0;
+      if (sortBy === 'date') {
+        const dateA = new Date(a.uploadDate || 0).getTime();
+        const dateB = new Date(b.uploadDate || 0).getTime();
+        comparison = dateA - dateB;
+      } else if (sortBy === 'size') {
+        comparison = (a.length || 0) - (b.length || 0);
+      } else if (sortBy === 'name') {
+        comparison = (a.filename || '').localeCompare(b.filename || '');
+      } else if (sortBy === 'type') {
+        comparison = (a.contentType || '').localeCompare(b.contentType || '');
+      }
+      return sortOrder === 'asc' ? comparison : -comparison;
+    });
+
+    return sorted;
+  }, [files, searchQuery, viewMode, sortBy, sortOrder]);
+
+  return {
+    filteredFiles,
+    viewMode,
+    setViewMode,
+    searchQuery,
+    setSearchQuery,
+    sortBy,
+    setSortBy,
+    sortOrder,
+    setSortOrder,
+    toggleSortOrder,
+  };
+}

package/src/ui/screens/FileManagementScreen.tsx

@@ -549,8 +549,8 @@ const FileManagementScreen: React.FC<FileManagementScreenProps> = ({
                     });
 
                     // Attempt to refresh file list incrementally – fetch single file metadata if API allows
-                    if (result?.file || result?.files?.[0]) {
-                        const f = result.file || result.files[0];
+                    const f = result?.file ?? result?.files?.[0];
+                    if (f) {
                         const merged: FileMetadata = {
                             id: f.id,
                             filename: f.originalName || f.sha256 || raw.name,

package/src/ui/utils/authHelpers.ts

@@ -0,0 +1,183 @@
+/**
+ * Authentication helper utilities to reduce code duplication across hooks and utilities.
+ * These functions handle common token validation and authentication error patterns.
+ */
+
+import type { OxyServices } from '../../core';
+
+/**
+ * Error thrown when session sync is required
+ */
+export class SessionSyncRequiredError extends Error {
+  constructor(message = 'Session needs to be synced. Please try again.') {
+    super(message);
+    this.name = 'SessionSyncRequiredError';
+  }
+}
+
+/**
+ * Error thrown when authentication fails
+ */
+export class AuthenticationFailedError extends Error {
+  constructor(message = 'Authentication failed. Please sign in again.') {
+    super(message);
+    this.name = 'AuthenticationFailedError';
+  }
+}
+
+/**
+ * Ensures a valid token exists before making authenticated API calls.
+ * If no valid token exists and an active session ID is available,
+ * attempts to refresh the token using the session.
+ *
+ * @param oxyServices - The OxyServices instance
+ * @param activeSessionId - The active session ID (if available)
+ * @throws {SessionSyncRequiredError} If the session needs to be synced (offline session)
+ * @throws {Error} If token refresh fails for other reasons
+ *
+ * @example
+ * ```ts
+ * // In a mutation or query function:
+ * await ensureValidToken(oxyServices, activeSessionId);
+ * return await oxyServices.updateProfile(updates);
+ * ```
+ */
+export async function ensureValidToken(
+  oxyServices: OxyServices,
+  activeSessionId: string | null | undefined
+): Promise<void> {
+  if (oxyServices.hasValidToken() || !activeSessionId) {
+    return;
+  }
+
+  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')) {
+      throw new SessionSyncRequiredError();
+    }
+
+    throw tokenError;
+  }
+}
+
+/**
+ * Options for handling API authentication errors
+ */
+export interface HandleApiErrorOptions {
+  /** Optional callback to attempt session sync and retry */
+  syncSession?: () => Promise<unknown>;
+  /** The active session ID for retry attempts */
+  activeSessionId?: string | null;
+  /** The OxyServices instance for retry attempts */
+  oxyServices?: OxyServices;
+}
+
+/**
+ * Checks if an error is an authentication error (401 or auth-related message)
+ *
+ * @param error - The error to check
+ * @returns True if the error is an authentication error
+ */
+export function isAuthenticationError(error: unknown): boolean {
+  if (!error || typeof error !== 'object') {
+    return false;
+  }
+
+  const errorObj = error as { message?: string; status?: number; response?: { status?: number } };
+  const errorMessage = errorObj.message || '';
+  const status = errorObj.status || errorObj.response?.status;
+
+  return (
+    status === 401 ||
+    errorMessage.includes('Authentication required') ||
+    errorMessage.includes('Invalid or missing authorization header')
+  );
+}
+
+/**
+ * Wraps an API call with authentication error handling.
+ * If an authentication error occurs, it can optionally attempt to sync the session and retry.
+ *
+ * @param apiCall - The API call function to execute
+ * @param options - Optional error handling configuration
+ * @returns The result of the API call
+ * @throws {AuthenticationFailedError} If authentication fails and cannot be recovered
+ * @throws {Error} If the API call fails for non-auth reasons
+ *
+ * @example
+ * ```ts
+ * // Simple usage:
+ * const result = await withAuthErrorHandling(
+ *   () => oxyServices.updateProfile(updates)
+ * );
+ *
+ * // With retry on auth failure:
+ * const result = await withAuthErrorHandling(
+ *   () => oxyServices.updateProfile(updates),
+ *   { syncSession, activeSessionId, oxyServices }
+ * );
+ * ```
+ */
+export async function withAuthErrorHandling<T>(
+  apiCall: () => Promise<T>,
+  options?: HandleApiErrorOptions
+): Promise<T> {
+  try {
+    return await apiCall();
+  } catch (error) {
+    if (!isAuthenticationError(error)) {
+      throw error;
+    }
+
+    // If we have sync capabilities, try to recover
+    if (options?.syncSession && options?.activeSessionId && options?.oxyServices) {
+      try {
+        await options.syncSession();
+        await options.oxyServices.getTokenBySession(options.activeSessionId);
+        // Retry the API call after refreshing token
+        return await apiCall();
+      } catch {
+        throw new AuthenticationFailedError();
+      }
+    }
+
+    throw new AuthenticationFailedError();
+  }
+}
+
+/**
+ * Combines token validation and auth error handling for a complete authenticated API call.
+ * This is the recommended helper for most authenticated API operations.
+ *
+ * @param oxyServices - The OxyServices instance
+ * @param activeSessionId - The active session ID
+ * @param apiCall - The API call function to execute
+ * @param syncSession - Optional callback to sync session on auth failure
+ * @returns The result of the API call
+ *
+ * @example
+ * ```ts
+ * return await authenticatedApiCall(
+ *   oxyServices,
+ *   activeSessionId,
+ *   () => oxyServices.updateProfile(updates)
+ * );
+ * ```
+ */
+export async function authenticatedApiCall<T>(
+  oxyServices: OxyServices,
+  activeSessionId: string | null | undefined,
+  apiCall: () => Promise<T>,
+  syncSession?: () => Promise<unknown>
+): Promise<T> {
+  await ensureValidToken(oxyServices, activeSessionId);
+
+  return withAuthErrorHandling(apiCall, {
+    syncSession,
+    activeSessionId,
+    oxyServices,
+  });
+}

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;
 }