@oxyhq/services 5.9.2 → 5.9.3

package/lib/module/core/users/UserService.js

@@ -0,0 +1,230 @@
+"use strict";
+
+import { OxyServices } from '../OxyServices';
+import { buildSearchParams, buildPaginationParams } from '../../utils/apiUtils';
+
+/**
+ * User service for handling user operations, profiles, and social features
+ */
+export class UserService extends OxyServices {
+  /**
+   * Get profile by username
+   */
+  async getProfileByUsername(username) {
+    try {
+      const res = await this.getClient().get(`/users/profile/${username}`);
+      return res.data;
+    } catch (error) {
+      throw this.handleError(error);
+    }
+  }
+
+  /**
+   * Search user profiles
+   */
+  async searchProfiles(query, pagination) {
+    try {
+      const params = {
+        query,
+        ...pagination
+      };
+      const searchParams = buildSearchParams(params);
+      const res = await this.getClient().get(`/users/search?${searchParams.toString()}`);
+      return res.data;
+    } catch (error) {
+      throw this.handleError(error);
+    }
+  }
+
+  /**
+   * Get profile recommendations
+   */
+  async getProfileRecommendations() {
+    try {
+      const res = await this.getClient().get('/users/recommendations');
+      return res.data;
+    } catch (error) {
+      throw this.handleError(error);
+    }
+  }
+
+  /**
+   * Get user by ID
+   */
+  async getUserById(userId) {
+    try {
+      const res = await this.getClient().get(`/users/${userId}`);
+      return res.data;
+    } catch (error) {
+      throw this.handleError(error);
+    }
+  }
+
+  /**
+   * Get current user
+   */
+  async getCurrentUser() {
+    try {
+      const res = await this.getClient().get('/users/me');
+      return res.data;
+    } catch (error) {
+      throw this.handleError(error);
+    }
+  }
+
+  /**
+   * Update user profile
+   */
+  async updateProfile(updates) {
+    try {
+      const res = await this.getClient().put('/users/profile', updates);
+      return res.data;
+    } catch (error) {
+      throw this.handleError(error);
+    }
+  }
+
+  /**
+   * Update user by ID (admin function)
+   */
+  async updateUser(userId, updates) {
+    try {
+      const res = await this.getClient().put(`/users/${userId}`, updates);
+      return res.data;
+    } catch (error) {
+      throw this.handleError(error);
+    }
+  }
+
+  /**
+   * Follow a user
+   */
+  async followUser(userId) {
+    try {
+      const res = await this.getClient().post(`/users/${userId}/follow`);
+      return res.data;
+    } catch (error) {
+      throw this.handleError(error);
+    }
+  }
+
+  /**
+   * Unfollow a user
+   */
+  async unfollowUser(userId) {
+    try {
+      const res = await this.getClient().delete(`/users/${userId}/follow`);
+      return res.data;
+    } catch (error) {
+      throw this.handleError(error);
+    }
+  }
+
+  /**
+   * Get follow status
+   */
+  async getFollowStatus(userId) {
+    try {
+      const res = await this.getClient().get(`/users/${userId}/follow-status`);
+      return res.data;
+    } catch (error) {
+      throw this.handleError(error);
+    }
+  }
+
+  /**
+   * Get user followers
+   */
+  async getUserFollowers(userId, pagination) {
+    try {
+      const searchParams = buildPaginationParams(pagination || {});
+      const res = await this.getClient().get(`/users/${userId}/followers?${searchParams.toString()}`);
+      return res.data;
+    } catch (error) {
+      throw this.handleError(error);
+    }
+  }
+
+  /**
+   * Get user following
+   */
+  async getUserFollowing(userId, pagination) {
+    try {
+      const searchParams = buildPaginationParams(pagination || {});
+      const res = await this.getClient().get(`/users/${userId}/following?${searchParams.toString()}`);
+      return res.data;
+    } catch (error) {
+      throw this.handleError(error);
+    }
+  }
+
+  /**
+   * Get notifications
+   */
+  async getNotifications() {
+    try {
+      const res = await this.getClient().get('/notifications');
+      return res.data;
+    } catch (error) {
+      throw this.handleError(error);
+    }
+  }
+
+  /**
+   * Get unread notification count
+   */
+  async getUnreadCount() {
+    try {
+      const res = await this.getClient().get('/notifications/unread-count');
+      return res.data.count;
+    } catch (error) {
+      throw this.handleError(error);
+    }
+  }
+
+  /**
+   * Create notification
+   */
+  async createNotification(data) {
+    try {
+      const res = await this.getClient().post('/notifications', data);
+      return res.data;
+    } catch (error) {
+      throw this.handleError(error);
+    }
+  }
+
+  /**
+   * Mark notification as read
+   */
+  async markNotificationAsRead(notificationId) {
+    try {
+      await this.getClient().put(`/notifications/${notificationId}/read`);
+    } catch (error) {
+      throw this.handleError(error);
+    }
+  }
+
+  /**
+   * Mark all notifications as read
+   */
+  async markAllNotificationsAsRead() {
+    try {
+      await this.getClient().put('/notifications/read-all');
+    } catch (error) {
+      throw this.handleError(error);
+    }
+  }
+
+  /**
+   * Delete notification
+   */
+  async deleteNotification(notificationId) {
+    try {
+      await this.getClient().delete(`/notifications/${notificationId}`);
+    } catch (error) {
+      throw this.handleError(error);
+    }
+  }
+}
+//# sourceMappingURL=UserService.js.map

package/lib/module/core/users/UserService.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["OxyServices","buildSearchParams","buildPaginationParams","UserService","getProfileByUsername","username","res","getClient","get","data","error","handleError","searchProfiles","query","pagination","params","searchParams","toString","getProfileRecommendations","getUserById","userId","getCurrentUser","updateProfile","updates","put","updateUser","followUser","post","unfollowUser","delete","getFollowStatus","getUserFollowers","getUserFollowing","getNotifications","getUnreadCount","count","createNotification","markNotificationAsRead","notificationId","markAllNotificationsAsRead","deleteNotification"],"sourceRoot":"../../../../src","sources":["core/users/UserService.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/index.js

@@ -12,10 +12,6 @@
 export { OxyServices } from './core';
 export { OXY_CLOUD_URL } from './core';
 
-// Middleware exports (for server-side use)
-
-export { createAuthMiddleware } from './middleware';
-
 // React context
 export { OxyContextProvider,
 // Backward compatibility
@@ -36,4 +32,12 @@ export { useSessionSocket } from './ui/hooks/useSessionSocket';
 // UI components
 export { OxySignInButton } from './ui/components/OxySignInButton';
 export { OxyLogo, FollowButton } from './ui';
+
+// New consolidated utilities
+export * from './utils/apiUtils';
+export { ErrorCodes, createApiError, handleHttpError, validateRequiredFields, retryWithBackoff } from './utils/errorUtils';
+export * from './utils/validationUtils';
+export { logger, LogLevel, LogContext, logAuth, logApi, logSession, logUser, logDevice, logPayment, logPerformance } from './utils/loggerUtils';
+export * from './utils/asyncUtils';
+export * from './utils/hookUtils';
 //# sourceMappingURL=index.js.map

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["OxyServices","OXY_CLOUD_URL","createAuthMiddleware","OxyContextProvider","useOxy","default","OxyProvider","DeviceManager","useAuthStore","useSessionSocket","OxySignInButton","OxyLogo","FollowButton"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA,SAASA,WAAW,QAAQ,QAAQ;AACpC,SAASC,aAAa,QAAQ,QAAQ;;AAEtC;;AAEA,SAASC,oBAAoB,QAAQ,cAAc;;AAEnD;AACA,SACEC,kBAAkB;AAAE;AACpBC,MAAM,QACD,yBAAyB;;AAEhC;AACA,SAASC,OAAO,IAAIC,WAAW,QAAQ,6BAA6B;;AAEpE;AACA,SAASC,aAAa,QAAQ,uBAAuB;;AAGrD;;AAwCA;AACA,SAASC,YAAY,QAAQ,uBAAuB;AACpD,SAASC,gBAAgB,QAAQ,6BAA6B;;AAE9D;AACA,SAASC,eAAe,QAAQ,iCAAiC;AACjE,SAASC,OAAO,EAAEC,YAAY,QAAQ,MAAM","ignoreList":[]}
+{"version":3,"names":["OxyServices","OXY_CLOUD_URL","OxyContextProvider","useOxy","default","OxyProvider","DeviceManager","useAuthStore","useSessionSocket","OxySignInButton","OxyLogo","FollowButton","ErrorCodes","createApiError","handleHttpError","validateRequiredFields","retryWithBackoff","logger","LogLevel","LogContext","logAuth","logApi","logSession","logUser","logDevice","logPayment","logPerformance"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA,SAASA,WAAW,QAAQ,QAAQ;AACpC,SAASC,aAAa,QAAQ,QAAQ;;AAEtC;AACA,SACEC,kBAAkB;AAAE;AACpBC,MAAM,QACD,yBAAyB;;AAEhC;AACA,SAASC,OAAO,IAAIC,WAAW,QAAQ,6BAA6B;;AAEpE;AACA,SAASC,aAAa,QAAQ,uBAAuB;;AAGrD;;AAwCA;AACA,SAASC,YAAY,QAAQ,uBAAuB;AACpD,SAASC,gBAAgB,QAAQ,6BAA6B;;AAE9D;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,EACtBC,gBAAgB,QACX,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":[]}

package/lib/module/models/session.js

@@ -0,0 +1,2 @@
+"use strict";
+//# sourceMappingURL=session.js.map

package/lib/module/{types/middleware.js.map → models/session.js.map}

@@ -1 +1 @@
-{"version":3,"names":[],"sourceRoot":"../../../src","sources":["types/middleware.ts"],"mappings":"","ignoreList":[]}
+{"version":3,"names":[],"sourceRoot":"../../../src","sources":["models/session.ts"],"mappings":"","ignoreList":[]}

package/lib/module/ui/context/OxyContext.js

@@ -58,15 +58,15 @@ const getStorage = async () => {
   return new WebStorage();
 };
 
-// Storage keys for secure sessions
-const getSecureStorageKeys = (prefix = 'oxy_secure') => ({
+// Storage keys for sessions
+const getStorageKeys = (prefix = 'oxy_session') => ({
   activeSessionId: `${prefix}_active_session_id` // Only store the active session ID
 });
 export const OxyProvider = ({
   children,
   oxyServices: providedOxyServices,
   baseURL,
-  storageKeyPrefix = 'oxy_secure',
+  storageKeyPrefix = 'oxy_session',
   onAuthStateChange,
   onError,
   bottomSheetRef
@@ -104,7 +104,7 @@ export const OxyProvider = ({
   const [tokenReady, setTokenReady] = React.useState(false);
 
   // Storage keys (memoized to prevent infinite loops)
-  const keys = useMemo(() => getSecureStorageKeys(storageKeyPrefix), [storageKeyPrefix]);
+  const keys = useMemo(() => getStorageKeys(storageKeyPrefix), [storageKeyPrefix]);
 
   // Clear all storage - defined before initAuth to avoid dependency issues
   const clearAllStorage = useCallback(async () => {
@@ -112,7 +112,7 @@ export const OxyProvider = ({
     try {
       await storage.removeItem(keys.activeSessionId);
     } catch (err) {
-      console.error('Clear secure storage error:', err);
+      console.error('Clear storage error:', err);
     }
   }, [storage, keys]);
 
@@ -142,15 +142,17 @@ export const OxyProvider = ({
       try {
         // Only load the active session ID from storage
         const storedActiveSessionId = await storage.getItem(keys.activeSessionId);
-        console.log('SecureAuth - activeSessionId:', storedActiveSessionId);
-        console.log('SecureAuth - storage available:', !!storage);
-        console.log('SecureAuth - oxyServices available:', !!oxyServices);
+        console.log('Auth - activeSessionId:', storedActiveSessionId);
+        console.log('Auth - storage available:', !!storage);
+        console.log('Auth - oxyServices available:', !!oxyServices);
         if (storedActiveSessionId) {
           // Validate the stored session with the backend
           try {
-            const validation = await oxyServices.validateSession(storedActiveSessionId);
+            const validation = await oxyServices.validateSession(storedActiveSessionId, {
+              useHeaderValidation: true
+            });
             if (validation.valid) {
-              console.log('SecureAuth - session validated successfully');
+              console.log('Auth - session validated successfully');
               setActiveSessionId(storedActiveSessionId);
 
               // Get access token for API calls
@@ -179,18 +181,18 @@ export const OxyProvider = ({
                 onAuthStateChange(fullUser);
               }
             } else {
-              console.log('SecureAuth - session invalid, clearing storage');
+              console.log('Auth - session invalid, clearing storage');
               await clearAllStorage();
             }
           } catch (error) {
-            console.error('SecureAuth - session validation error:', error);
+            console.error('Auth - session validation error:', error);
             await clearAllStorage();
           }
         } else {
-          console.log('SecureAuth - no stored session found, user needs to login');
+          console.log('Auth - no stored session found, user needs to login');
         }
       } catch (err) {
-        console.error('Secure auth initialization error:', err);
+        console.error('Auth initialization error:', err);
         await clearAllStorage();
       } finally {
         useAuthStore.setState({
@@ -265,7 +267,7 @@ export const OxyProvider = ({
     }
   }, [oxyServices, onAuthStateChange, loginSuccess, saveActiveSessionId]);
 
-  // Secure login method - only store session ID, retrieve data from backend
+  // Login method - only store session ID, retrieve data from backend
   const login = useCallback(async (username, password, deviceName) => {
     if (!storage) throw new Error('Storage not initialized');
     useAuthStore.setState({
@@ -278,9 +280,9 @@ export const OxyProvider = ({
 
       // Get or generate persistent device info
       const deviceInfo = await DeviceManager.getDeviceInfo();
-      console.log('SecureAuth - Using device fingerprint:', deviceFingerprint);
-      console.log('SecureAuth - Using device ID:', deviceInfo.deviceId);
-      const response = await oxyServices.secureLogin(username, password, deviceName || deviceInfo.deviceName || DeviceManager.getDefaultDeviceName(), deviceFingerprint);
+      console.log('Auth - Using device fingerprint:', deviceFingerprint);
+      console.log('Auth - Using device ID:', deviceInfo.deviceId);
+      const response = await oxyServices.signIn(username, password, deviceName || deviceInfo.deviceName || DeviceManager.getDefaultDeviceName(), deviceFingerprint);
 
       // Set as active session (only store session ID)
       setActiveSessionId(response.sessionId);
@@ -323,7 +325,7 @@ export const OxyProvider = ({
     if (!activeSessionId) return;
     try {
       const sessionToLogout = targetSessionId || activeSessionId;
-      await oxyServices.logoutSecureSession(activeSessionId, sessionToLogout);
+      await oxyServices.logoutSession(activeSessionId, sessionToLogout);
 
       // Remove session from local state
       const filteredSessions = sessions.filter(s => s.sessionId !== sessionToLogout);
@@ -371,9 +373,9 @@ export const OxyProvider = ({
       throw new Error('Service not available');
     }
     try {
-      console.log('Calling oxyServices.logoutAllSecureSessions with sessionId:', activeSessionId);
-      await oxyServices.logoutAllSecureSessions(activeSessionId);
-      console.log('logoutAllSecureSessions completed successfully');
+      console.log('Calling oxyServices.logoutAllSessions with sessionId:', activeSessionId);
+      await oxyServices.logoutAllSessions(activeSessionId);
+      console.log('logoutAllSessions completed successfully');
 
       // Clear all local data
       setSessions([]);
@@ -427,7 +429,7 @@ export const OxyProvider = ({
       const response = await oxyServices.signUp(username, email, password);
       console.log('SignUp successful:', response);
 
-      // Now log the user in securely to create a session
+      // Now log the user in to create a session
       // This will handle the session creation and device registration
       const user = await login(username, password);
       return user;
@@ -484,7 +486,9 @@ export const OxyProvider = ({
         for (const session of otherSessions) {
           try {
             // Try to validate this session
-            await oxyServices.validateSession(session.sessionId);
+            await oxyServices.validateSession(session.sessionId, {
+              useHeaderValidation: true
+            });
             console.log('Found valid session, switching to:', session.sessionId);
             await switchToSession(session.sessionId);
             return; // Successfully switched to another session

package/lib/module/ui/context/OxyContext.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","createContext","useContext","useEffect","useCallback","useMemo","useRef","View","Text","OxyServices","DeviceManager","useSessionSocket","toast","useAuthStore","jsx","_jsx","OxyContext","WebStorage","getItem","key","localStorage","setItem","value","removeItem","clear","AsyncStorage","isReactNative","navigator","product","getStorage","asyncStorageModule","default","error","console","Error","getSecureStorageKeys","prefix","activeSessionId","OxyProvider","children","oxyServices","providedOxyServices","baseURL","storageKeyPrefix","onAuthStateChange","onError","bottomSheetRef","oxyServicesRef","current","user","state","isAuthenticated","isLoading","loginSuccess","loginFailure","logoutStore","logout","minimalUser","setMinimalUser","useState","sessions","setSessions","setActiveSessionId","storage","setStorage","tokenReady","setTokenReady","keys","clearAllStorage","err","initStorage","platformStorage","setState","initAuth","storedActiveSessionId","log","validation","validateSession","valid","getTokenBySession","fullUser","getUserBySession","id","username","avatar","serverSessions","getSessionsBySessionId","clientSessions","map","serverSession","sessionId","deviceId","expiresAt","Date","toISOString","lastActive","userId","removeInvalidSession","filteredSessions","filter","s","length","switchToSession","saveActiveSessionId","login","password","deviceName","deviceFingerprint","getDeviceFingerprint","deviceInfo","getDeviceInfo","response","secureLogin","getDefaultDeviceName","message","targetSessionId","sessionToLogout","logoutSecureSession","logoutAll","logoutAllSecureSessions","restoreToken","signUp","email","switchSession","removeSession","refreshSessions","updatedSessions","otherSessions","session","sessionError","getDeviceSessions","logoutAllDeviceSessions","updateDeviceName","showBottomSheet","screenOrConfig","expand","present","warn","Object","setTimeout","_navigateToScreen","screen","props","hideBottomSheet","dismiss","getBaseURL","onRemoteSignOut","info","contextValue","style","flex","justifyContent","alignItems","Provider","OxyContextProvider","useOxy","context"],"sourceRoot":"../../../../src","sources":["ui/context/OxyContext.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","createContext","useContext","useEffect","useCallback","useMemo","useRef","View","Text","OxyServices","DeviceManager","useSessionSocket","toast","useAuthStore","jsx","_jsx","OxyContext","WebStorage","getItem","key","localStorage","setItem","value","removeItem","clear","AsyncStorage","isReactNative","navigator","product","getStorage","asyncStorageModule","default","error","console","Error","getStorageKeys","prefix","activeSessionId","OxyProvider","children","oxyServices","providedOxyServices","baseURL","storageKeyPrefix","onAuthStateChange","onError","bottomSheetRef","oxyServicesRef","current","user","state","isAuthenticated","isLoading","loginSuccess","loginFailure","logoutStore","logout","minimalUser","setMinimalUser","useState","sessions","setSessions","setActiveSessionId","storage","setStorage","tokenReady","setTokenReady","keys","clearAllStorage","err","initStorage","platformStorage","setState","initAuth","storedActiveSessionId","log","validation","validateSession","useHeaderValidation","valid","getTokenBySession","fullUser","getUserBySession","id","username","avatar","serverSessions","getSessionsBySessionId","clientSessions","map","serverSession","sessionId","deviceId","expiresAt","Date","toISOString","lastActive","userId","removeInvalidSession","filteredSessions","filter","s","length","switchToSession","saveActiveSessionId","login","password","deviceName","deviceFingerprint","getDeviceFingerprint","deviceInfo","getDeviceInfo","response","signIn","getDefaultDeviceName","message","targetSessionId","sessionToLogout","logoutSession","logoutAll","logoutAllSessions","restoreToken","signUp","email","switchSession","removeSession","refreshSessions","updatedSessions","otherSessions","session","sessionError","getDeviceSessions","logoutAllDeviceSessions","updateDeviceName","showBottomSheet","screenOrConfig","expand","present","warn","Object","setTimeout","_navigateToScreen","screen","props","hideBottomSheet","dismiss","getBaseURL","onRemoteSignOut","info","contextValue","style","flex","justifyContent","alignItems","Provider","OxyContextProvider","useOxy","context"],"sourceRoot":"../../../../src","sources":["ui/context/OxyContext.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/ui/screens/AccountSwitcherScreen.js

@@ -163,7 +163,7 @@ const ModernAccountSwitcherScreen = ({
     confirmAction(`Are you sure you want to sign out from "${deviceName}"? This will end the session on that device.`, async () => {
       setRemoteLogoutSessionId(sessionId);
       try {
-        await oxyServices?.logoutSecureSession(user?.sessionId || '', sessionId);
+        await oxyServices?.logoutSession(user?.sessionId || '', sessionId);
         // Refresh device sessions list
         await loadAllDeviceSessions();
         toast.success(`Signed out from ${deviceName} successfully!`);
@@ -184,7 +184,7 @@ const ModernAccountSwitcherScreen = ({
     confirmAction(`Are you sure you want to sign out from all ${otherDevicesCount} other device(s)? This will end sessions on all other devices except this one.`, async () => {
       setLoggingOutAllDevices(true);
       try {
-        await oxyServices?.logoutAllDeviceSessions(user?.sessionId || '', undefined, true);
+        await oxyServices?.logoutAllDeviceSessions(user?.sessionId || '');
         // Refresh device sessions list
         await loadAllDeviceSessions();
         toast.success('Signed out from all other devices successfully!');