@oxyhq/services 5.3.10 → 5.3.11

package/src/core/index.ts

@@ -37,7 +37,12 @@ import {
   FileUploadResponse,
   FileListResponse,
   FileUpdateRequest,
-  FileDeleteResponse
+  FileDeleteResponse,
+  // Device session interfaces
+  DeviceSession,
+  DeviceSessionsResponse,
+  DeviceSessionLogoutResponse,
+  UpdateDeviceNameResponse
 } from '../models/interfaces';
 
 // Import secure session types
@@ -154,8 +159,10 @@ export class OxyServices {
     
     try {
       const decoded = jwtDecode<JwtPayload>(this.accessToken);
-      return decoded.userId;
-    } catch {
+      
+      // Check for both userId (preferred) and id (fallback) for compatibility
+      return decoded.userId || (decoded as any).id || null;
+    } catch (error) {
       return null;
     }
   }
@@ -340,6 +347,69 @@ export class OxyServices {
     }
   }
 
+  /**
+   * Get device sessions for a specific session ID
+   * @param sessionId - The session ID to get device sessions for
+   * @param deviceId - Optional device ID filter
+   * @returns Array of device sessions
+   */
+  async getDeviceSessions(sessionId: string, deviceId?: string): Promise<DeviceSession[]> {
+    try {
+      const params = deviceId ? { deviceId } : {};
+      const res = await this.client.get(`/secure-session/device/sessions/${sessionId}`, { params });
+      
+      // Map backend response to frontend interface
+      return (res.data.sessions || []).map((session: any) => ({
+        sessionId: session.sessionId,
+        deviceId: res.data.deviceId || '',
+        deviceName: session.deviceInfo?.deviceName || 'Unknown Device',
+        isActive: true, // All returned sessions are active
+        lastActive: session.lastActive,
+        expiresAt: session.expiresAt || new Date(Date.now() + 7 * 24 * 60 * 60 * 1000).toISOString(),
+        isCurrent: session.sessionId === sessionId,
+        user: session.user,
+        createdAt: session.createdAt
+      }));
+    } catch (error) {
+      throw this.handleError(error);
+    }
+  }
+
+  /**
+   * Logout all device sessions for a specific device
+   * @param sessionId - The session ID
+   * @param deviceId - Optional device ID (uses current session's device if not provided)
+   * @param excludeCurrent - Whether to exclude the current session from logout
+   * @returns Logout response
+   */
+  async logoutAllDeviceSessions(sessionId: string, deviceId?: string, excludeCurrent?: boolean): Promise<DeviceSessionLogoutResponse> {
+    try {
+      const data: any = {};
+      if (deviceId) data.deviceId = deviceId;
+      if (excludeCurrent !== undefined) data.excludeCurrent = excludeCurrent;
+      
+      const res = await this.client.post(`/secure-session/device/logout-all/${sessionId}`, data);
+      return res.data;
+    } catch (error) {
+      throw this.handleError(error);
+    }
+  }
+
+  /**
+   * Update device name for a session
+   * @param sessionId - The session ID
+   * @param deviceName - The new device name
+   * @returns Update response
+   */
+  async updateDeviceName(sessionId: string, deviceName: string): Promise<UpdateDeviceNameResponse> {
+    try {
+      const res = await this.client.put(`/secure-session/device/name/${sessionId}`, { deviceName });
+      return res.data;
+    } catch (error) {
+      throw this.handleError(error);
+    }
+  }
+
   /* Profile Methods */
 
   /**
@@ -1162,34 +1232,22 @@ export class OxyServices {
   }
 
   /**
-   * Get all active sessions for a specific device
-   * @param sessionId - Current session ID
-   * @param deviceId - Optional device ID (uses current session's device if not provided)
-   * @returns Array of device sessions
+   * Validate session using x-session-id header
+   * @param sessionId - The session ID to validate (sent as header)
+   * @param deviceFingerprint - Optional device fingerprint for enhanced security
+   * @returns Session validation status with user data
    */
-  async getDeviceSessions(sessionId: string, deviceId?: string): Promise<any[]> {
+  async validateSessionFromHeader(sessionId: string, deviceFingerprint?: string): Promise<{ valid: boolean; expiresAt: string; lastActivity: string; user: User; sessionId?: string }> {
     try {
-      const params = deviceId ? `?deviceId=${deviceId}` : '';
-      const res = await this.client.get(`/secure-session/device/sessions/${sessionId}${params}`);
-      return res.data.sessions;
-    } catch (error) {
-      throw this.handleError(error);
-    }
-  }
+      const headers: any = {
+        'x-session-id': sessionId
+      };
+      
+      if (deviceFingerprint) {
+        headers['x-device-fingerprint'] = deviceFingerprint;
+      }
 
-  /**
-   * Logout all sessions on a specific device
-   * @param sessionId - Current session ID
-   * @param deviceId - Optional device ID (uses current session's device if not provided)
-   * @param excludeCurrent - Whether to exclude the current session from logout
-   * @returns Success status
-   */
-  async logoutAllDeviceSessions(sessionId: string, deviceId?: string, excludeCurrent: boolean = true): Promise<{ message: string; sessionsTerminated: number }> {
-    try {
-      const res = await this.client.post(`/secure-session/device/logout-all/${sessionId}`, { 
-        deviceId,
-        excludeCurrent 
-      });
+      const res = await this.client.get('/secure-session/validate-header', { headers });
       return res.data;
     } catch (error) {
       throw this.handleError(error);
@@ -1197,16 +1255,25 @@ export class OxyServices {
   }
 
   /**
-   * Update device name for all sessions on a device
-   * @param sessionId - Current session ID
-   * @param deviceName - New device name
-   * @returns Success status
+   * Validate session using automatic header detection
+   * The validateSession endpoint will automatically read from x-session-id header
+   * @param sessionId - The session ID to validate (sent as header)
+   * @param deviceFingerprint - Optional device fingerprint for enhanced security
+   * @returns Session validation status with user data
    */
-  async updateDeviceName(sessionId: string, deviceName: string): Promise<{ message: string; deviceName: string }> {
+  async validateSessionAuto(sessionId: string, deviceFingerprint?: string): Promise<{ valid: boolean; expiresAt: string; lastActivity: string; user: User; source?: string }> {
     try {
-      const res = await this.client.put(`/secure-session/device/name/${sessionId}`, { 
-        deviceName 
-      });
+      const headers: any = {
+        'x-session-id': sessionId
+      };
+      
+      if (deviceFingerprint) {
+        headers['x-device-fingerprint'] = deviceFingerprint;
+      }
+
+      // Call the regular validateSession endpoint which now auto-reads from headers
+      // Use 'auto' as placeholder since the controller reads from header
+      const res = await this.client.get('/secure-session/validate/auto', { headers });
       return res.data;
     } catch (error) {
       throw this.handleError(error);
@@ -1275,6 +1342,7 @@ export class OxyServices {
         
         // Get user ID from token
         const userId = tempOxyServices.getCurrentUserId();
+        
         if (!userId) {
           const error = {
             message: 'Invalid token payload',

package/src/lib/sonner.ts

@@ -0,0 +1 @@
+export * from 'sonner-native';

package/src/lib/sonner.web.ts

@@ -0,0 +1 @@
+export * from 'sonner';

package/src/models/interfaces.ts

@@ -186,4 +186,33 @@ export interface FileDeleteResponse {
   success: boolean;
   message: string;
   fileId: string;
+}
+
+// Device Session interfaces
+export interface DeviceSession {
+  sessionId: string;
+  deviceId: string;
+  deviceName: string;
+  isActive: boolean;
+  lastActive: string;
+  expiresAt: string;
+  isCurrent: boolean;
+  user?: User;
+  createdAt?: string;
+}
+
+export interface DeviceSessionsResponse {
+  deviceId: string;
+  sessions: DeviceSession[];
+}
+
+export interface DeviceSessionLogoutResponse {
+  message: string;
+  deviceId: string;
+  sessionsTerminated: number;
+}
+
+export interface UpdateDeviceNameResponse {
+  message: string;
+  deviceName: string;
 }

package/src/ui/components/FollowButton.tsx

@@ -19,6 +19,7 @@ import Animated, {
 } from 'react-native-reanimated';
 import { useOxy } from '../context/OxyContext';
 import { fontFamilies } from '../styles/fonts';
+import { toast } from '../../lib/sonner';
 
 export interface FollowButtonProps {
   /**
@@ -64,10 +65,23 @@ export interface FollowButtonProps {
    * @default true
    */
   showLoadingState?: boolean;
+
+  /**
+   * Whether to prevent default action and stop event propagation
+   * Useful when the button is inside links or other pressable containers
+   * @default true
+   */
+  preventParentActions?: boolean;
+
+  /**
+   * Custom onPress handler - if provided, will override default follow/unfollow behavior
+   * Event object is passed to allow for preventDefault/stopPropagation
+   */
+  onPress?: (event: any) => void;
 }
 
 /**
- * An animated follow button with interactive state changes
+ * An animated follow button with interactive state changes and preventDefault support
  * 
  * @example
  * ```tsx
@@ -82,6 +96,26 @@ export interface FollowButtonProps {
  *   style={{ borderRadius: 12 }}
  *   onFollowChange={(isFollowing) => console.log(`User is now ${isFollowing ? 'followed' : 'unfollowed'}`)}
  * />
+ * 
+ * // Inside a pressable container (prevents parent actions)
+ * <TouchableOpacity onPress={() => navigateToProfile()}>
+ *   <View>
+ *     <Text>User Profile</Text>
+ *     <FollowButton 
+ *       userId="123" 
+ *       preventParentActions={true} // Default: true
+ *     />
+ *   </View>
+ * </TouchableOpacity>
+ * 
+ * // Custom onPress handler
+ * <FollowButton 
+ *   userId="123" 
+ *   onPress={(event) => {
+ *     event.preventDefault(); // Custom preventDefault
+ *     // Custom logic here
+ *   }}
+ * />
  * ```
  */
 const FollowButton: React.FC<FollowButtonProps> = ({
@@ -93,6 +127,8 @@ const FollowButton: React.FC<FollowButtonProps> = ({
   textStyle,
   disabled = false,
   showLoadingState = true,
+  preventParentActions = true,
+  onPress,
 }) => {
   const { oxyServices, isAuthenticated } = useOxy();
   const [isFollowing, setIsFollowing] = useState(initiallyFollowing);
@@ -110,8 +146,32 @@ const FollowButton: React.FC<FollowButtonProps> = ({
     });
   }, [isFollowing, animationProgress]);
 
-  // The button press handler
-  const handlePress = async () => {
+  // The button press handler with preventDefault support
+  const handlePress = async (event?: any) => {
+    // Prevent parent actions if enabled (e.g., if inside a link or pressable container)
+    if (preventParentActions && event) {
+      // For React Native Web compatibility
+      if (Platform.OS === 'web' && event.preventDefault) {
+        event.preventDefault();
+      }
+      
+      // Stop event propagation to prevent parent TouchableOpacity/Pressable actions
+      if (event.stopPropagation) {
+        event.stopPropagation();
+      }
+      
+      // For React Native, prevent gesture bubbling
+      if (event.nativeEvent && event.nativeEvent.stopPropagation) {
+        event.nativeEvent.stopPropagation();
+      }
+    }
+
+    // If custom onPress is provided, use it instead of default behavior
+    if (onPress) {
+      onPress(event);
+      return;
+    }
+
     if (disabled || isLoading || !isAuthenticated) return;
     
     // Touch feedback animation
@@ -143,8 +203,12 @@ const FollowButton: React.FC<FollowButtonProps> = ({
       if (onFollowChange) {
         onFollowChange(newFollowingState);
       }
+
+      // Show success toast
+      toast.success(newFollowingState ? 'Following user!' : 'Unfollowed user');
     } catch (error) {
       console.error('Follow action failed:', error);
+      toast.error('Failed to update follow status. Please try again.');
     } finally {
       setIsLoading(false);
     }

package/src/ui/components/OxyProvider.tsx

@@ -11,6 +11,7 @@ import AccountCenterScreen from '../screens/AccountCenterScreen';
 import { OxyContextProvider, useOxy } from '../context/OxyContext';
 import OxyRouter from '../navigation/OxyRouter';
 import { FontLoader, setupFonts } from './FontLoader';
+import { Toaster } from '../../lib/sonner';
 
 // Import bottom sheet components directly - no longer a peer dependency
 import { BottomSheetModal, BottomSheetBackdrop, BottomSheetBackdropProps, BottomSheetModalProvider, BottomSheetView } from './bottomSheet';
@@ -71,6 +72,10 @@ const OxyProvider: React.FC<OxyProviderProps> = (props) => {
                             {children}
                         </SafeAreaProvider>
                     </BottomSheetModalProvider>
+                    {/* Move Toaster outside BottomSheetModalProvider to ensure it appears above the modal backdrop */}
+                    <View style={styles.toasterContainer}>
+                        <Toaster position="top-center" swipeToDismissDirection="left" offset={15} />
+                    </View>
                 </GestureHandlerRootView>
             </FontLoader>
         </OxyContextProvider>
@@ -532,6 +537,16 @@ const styles = StyleSheet.create({
             }
         })
     },
+    toasterContainer: {
+        position: 'absolute',
+        top: 0,
+        left: 0,
+        right: 0,
+        bottom: 0,
+        zIndex: 9999,
+        elevation: 9999, // For Android
+        pointerEvents: 'box-none', // Allow touches to pass through to underlying components
+    },
 });
 
 export default OxyProvider;

package/src/ui/screens/AccountCenterScreen.tsx

@@ -14,6 +14,7 @@ import { BaseScreenProps } from '../navigation/types';
 import { useOxy } from '../context/OxyContext';
 import { fontFamilies } from '../styles/fonts';
 import { packageInfo } from '../../constants/version';
+import { toast } from '../../lib/sonner';
 
 const AccountCenterScreen: React.FC<BaseScreenProps> = ({
     onClose,
@@ -38,7 +39,7 @@ const AccountCenterScreen: React.FC<BaseScreenProps> = ({
             }
         } catch (error) {
             console.error('Logout failed:', error);
-            Alert.alert('Logout Failed', 'There was a problem signing you out. Please try again.');
+            toast.error('There was a problem signing you out. Please try again.');
         }
     };
 
@@ -138,7 +139,7 @@ const AccountCenterScreen: React.FC<BaseScreenProps> = ({
                     {Platform.OS !== 'web' && (
                         <TouchableOpacity
                             style={[styles.actionButton, { borderColor }]}
-                            onPress={() => Alert.alert('Notifications', 'Notifications feature coming soon!')}
+                            onPress={() => toast.info('Notifications feature coming soon!')}
                         >
                             <Text style={[styles.actionButtonText, { color: textColor }]}>Notifications</Text>
                         </TouchableOpacity>
@@ -146,7 +147,7 @@ const AccountCenterScreen: React.FC<BaseScreenProps> = ({
 
                     <TouchableOpacity
                         style={[styles.actionButton, { borderColor }]}
-                        onPress={() => Alert.alert('Help', 'Help & Support feature coming soon!')}
+                        onPress={() => toast.info('Help & Support feature coming soon!')}
                     >
                         <Text style={[styles.actionButtonText, { color: textColor }]}>Help & Support</Text>
                     </TouchableOpacity>

package/src/ui/screens/AccountOverviewScreen.tsx

@@ -16,6 +16,7 @@ import { useOxy } from '../context/OxyContext';
 import OxyLogo from '../components/OxyLogo';
 import Avatar from '../components/Avatar';
 import { fontFamilies } from '../styles/fonts';
+import { toast } from '../../lib/sonner';
 
 const AccountOverviewScreen: React.FC<BaseScreenProps> = ({
     onClose,
@@ -59,7 +60,7 @@ const AccountOverviewScreen: React.FC<BaseScreenProps> = ({
             }
         } catch (error) {
             console.error('Logout failed:', error);
-            Alert.alert('Logout Failed', 'There was a problem signing you out. Please try again.');
+            toast.error('There was a problem signing you out. Please try again.');
         }
     };
 
@@ -83,7 +84,7 @@ const AccountOverviewScreen: React.FC<BaseScreenProps> = ({
     };
 
     const handleAddAccount = () => {
-        Alert.alert('Add Account', 'Add another account feature coming soon!');
+        toast.info('Add another account feature coming soon!');
     };
 
     const handleSignOutAll = () => {
@@ -168,7 +169,7 @@ const AccountOverviewScreen: React.FC<BaseScreenProps> = ({
 
                     <TouchableOpacity
                         style={[styles.manageAccountButton, { borderColor }]}
-                        onPress={() => Alert.alert('Account', 'Manage your Oxy Account feature coming soon!')}
+                        onPress={() => toast.info('Manage your Oxy Account feature coming soon!')}
                     >
                         <Text style={[styles.manageAccountText, { color: textColor }]}>
                             Manage your Oxy Account
@@ -195,7 +196,7 @@ const AccountOverviewScreen: React.FC<BaseScreenProps> = ({
                             <TouchableOpacity
                                 key={account.id}
                                 style={[styles.accountItem, { borderColor }]}
-                                onPress={() => Alert.alert('Switch Account', `Switch to ${account.username}?`)}
+                                onPress={() => toast.info(`Switch to ${account.username}?`)}
                             >
                                 <View style={styles.accountItemLeft}>
                                     {account.avatar.url ? (
@@ -260,42 +261,42 @@ const AccountOverviewScreen: React.FC<BaseScreenProps> = ({
                         <Text style={{ fontSize: 18 }}>🕒</Text>,
                         'History',
                         'Saving',
-                        () => Alert.alert('History', 'View your history feature coming soon!')
+                        () => toast.info('View your history feature coming soon!')
                     )}
 
                     {renderFeatureItem(
                         <Text style={{ fontSize: 18 }}>⏱️</Text>,
                         'Delete last 15 minutes',
                         null,
-                        () => Alert.alert('Delete History', 'Delete recent history feature coming soon!')
+                        () => toast.info('Delete recent history feature coming soon!')
                     )}
 
                     {renderFeatureItem(
                         <Text style={{ fontSize: 18 }}>📋</Text>,
                         'Saves & Collections',
                         null,
-                        () => Alert.alert('Saves', 'Saved items feature coming soon!')
+                        () => toast.info('Saved items feature coming soon!')
                     )}
 
                     {renderFeatureItem(
                         <Text style={{ fontSize: 18 }}>🔍</Text>,
                         'Search personalization',
                         null,
-                        () => Alert.alert('Personalization', 'Search personalization feature coming soon!')
+                        () => toast.info('Search personalization feature coming soon!')
                     )}
 
                     {renderFeatureItem(
                         <Text style={{ fontSize: 18 }}>🛡️</Text>,
                         'SafeSearch',
                         features.safeSearch ? 'On' : 'Off',
-                        () => Alert.alert('SafeSearch', 'SafeSearch settings feature coming soon!')
+                        () => toast.info('SafeSearch settings feature coming soon!')
                     )}
 
                     {renderFeatureItem(
                         <Text style={{ fontSize: 18 }}>🌐</Text>,
                         'Language',
                         features.language,
-                        () => Alert.alert('Language', 'Language settings feature coming soon!')
+                        () => toast.info('Language settings feature coming soon!')
                     )}
                 </View>
 
@@ -303,7 +304,7 @@ const AccountOverviewScreen: React.FC<BaseScreenProps> = ({
                     <View style={styles.footerButtonsRow}>
                         <TouchableOpacity
                             style={styles.footerButton}
-                            onPress={() => Alert.alert('Settings', 'More settings feature coming soon!')}
+                            onPress={() => toast.info('More settings feature coming soon!')}
                         >
                             <Text style={[styles.footerButtonText, { color: textColor }]}>
                                 More settings
@@ -312,7 +313,7 @@ const AccountOverviewScreen: React.FC<BaseScreenProps> = ({
 
                         <TouchableOpacity
                             style={styles.footerButton}
-                            onPress={() => Alert.alert('Help', 'Help & support feature coming soon!')}
+                            onPress={() => toast.info('Help & support feature coming soon!')}
                         >
                             <Text style={[styles.footerButtonText, { color: textColor }]}>
                                 Help
@@ -321,11 +322,11 @@ const AccountOverviewScreen: React.FC<BaseScreenProps> = ({
                     </View>
 
                     <View style={styles.footerLinksRow}>
-                        <TouchableOpacity onPress={() => Alert.alert('Privacy', 'Privacy Policy feature coming soon!')}>
+                        <TouchableOpacity onPress={() => toast.info('Privacy Policy feature coming soon!')}>
                             <Text style={[styles.footerLink, { color: iconColor }]}>Privacy Policy</Text>
                         </TouchableOpacity>
                         <Text style={[{ color: iconColor, marginHorizontal: 5 }]}>•</Text>
-                        <TouchableOpacity onPress={() => Alert.alert('Terms', 'Terms of Service feature coming soon!')}>
+                        <TouchableOpacity onPress={() => toast.info('Terms of Service feature coming soon!')}>
                             <Text style={[styles.footerLink, { color: iconColor }]}>Terms of Service</Text>
                         </TouchableOpacity>
                     </View>

package/src/ui/screens/AccountSettingsScreen.tsx

@@ -14,6 +14,7 @@ import {
 import { BaseScreenProps } from '../navigation/types';
 import { useOxy } from '../context/OxyContext';
 import Avatar from '../components/Avatar';
+import { toast } from '../../lib/sonner';
 
 interface AccountSettingsScreenProps extends BaseScreenProps {
     activeTab?: 'profile' | 'password' | 'notifications';
@@ -104,9 +105,9 @@ const AccountSettingsScreen: React.FC<AccountSettingsScreenProps> = ({
 
             // Call API to update user
             await oxyServices.updateUser(user!.id, updates);
-            setSuccessMessage('Profile updated successfully');
+            toast.success('Profile updated successfully');
         } catch (error: any) {
-            setErrorMessage(error.message || 'Failed to update profile');
+            toast.error(error.message || 'Failed to update profile');
         } finally {
             setIsLoading(false);
         }
@@ -115,17 +116,17 @@ const AccountSettingsScreen: React.FC<AccountSettingsScreenProps> = ({
     const handleChangePassword = async () => {
         // Validate inputs
         if (!currentPassword || !newPassword || !confirmPassword) {
-            setErrorMessage('Please fill in all password fields');
+            toast.error('Please fill in all password fields');
             return;
         }
 
         if (newPassword !== confirmPassword) {
-            setErrorMessage('New passwords do not match');
+            toast.error('New passwords do not match');
             return;
         }
 
         if (newPassword.length < 8) {
-            setErrorMessage('Password must be at least 8 characters long');
+            toast.error('Password must be at least 8 characters long');
             return;
         }
 
@@ -144,9 +145,9 @@ const AccountSettingsScreen: React.FC<AccountSettingsScreenProps> = ({
             setCurrentPassword('');
             setNewPassword('');
             setConfirmPassword('');
-            setSuccessMessage('Password updated successfully');
+            toast.success('Password updated successfully');
         } catch (error: any) {
-            setErrorMessage(error.message || 'Failed to update password');
+            toast.error(error.message || 'Failed to update password');
         } finally {
             setIsLoading(false);
         }
@@ -165,9 +166,9 @@ const AccountSettingsScreen: React.FC<AccountSettingsScreenProps> = ({
                     push: pushNotifications,
                 },
             });
-            setSuccessMessage('Notification preferences updated successfully');
+            toast.success('Notification preferences updated successfully');
         } catch (error: any) {
-            setErrorMessage(error.message || 'Failed to update notification preferences');
+            toast.error(error.message || 'Failed to update notification preferences');
         } finally {
             setIsLoading(false);
         }