@oxyhq/services 5.17.17 → 5.18.0

package/lib/commonjs/core/OxyServices.base.js

@@ -4,10 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.OxyServicesBase = void 0;
+var _jwtDecode = require("jwt-decode");
 var _errorUtils = require("../utils/errorUtils");
 var _HttpService = require("./HttpService");
 var _OxyServices = require("./OxyServices.errors");
-var _TokenService = require("./services/TokenService");
 /**
  * OxyServices Base Class
  * 
@@ -119,10 +119,18 @@ class OxyServicesBase {
 
   /**
    * Get the current user ID from the access token
-   * Returns MongoDB ObjectId (never publicKey)
    */
   getCurrentUserId() {
-    return _TokenService.tokenService.getUserIdFromToken();
+    const accessToken = this.httpService.getAccessToken();
+    if (!accessToken) {
+      return null;
+    }
+    try {
+      const decoded = (0, _jwtDecode.jwtDecode)(accessToken);
+      return decoded.userId || decoded.id || null;
+    } catch (error) {
+      return null;
+    }
   }
 
   /**

package/lib/commonjs/core/OxyServices.base.js.map

@@ -1 +1 @@
-{"version":3,"names":["_errorUtils","require","_HttpService","_OxyServices","_TokenService","OxyServicesBase","constructor","args","config","Error","cloudURL","httpService","HttpService","__resetTokensForTests","makeRequest","method","url","data","options","request","undefined","params","getBaseURL","getClient","getMetrics","clearCache","clearCacheEntry","key","getCacheStats","getCloudURL","setTokens","accessToken","refreshToken","clearTokens","getCurrentUserId","tokenService","getUserIdFromToken","hasValidToken","hasAccessToken","getAccessToken","waitForAuth","timeoutMs","startTime","performance","now","maxTime","pollInterval","Promise","resolve","setTimeout","Math","min","withAuthRetry","operation","operationName","maxRetries","retryDelay","authTimeoutMs","attempt","authReady","OxyAuthenticationTimeoutError","OxyAuthenticationError","error","isLastAttempt","errorObj","isAuthError","response","status","code","message","includes","handleError","validate","res","cache","retry","valid","api","handleHttpError","trim","err","details","healthCheck","timeout","exports"],"sourceRoot":"../../../src","sources":["core/OxyServices.base.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_jwtDecode","require","_errorUtils","_HttpService","_OxyServices","OxyServicesBase","constructor","args","config","Error","cloudURL","httpService","HttpService","__resetTokensForTests","makeRequest","method","url","data","options","request","undefined","params","getBaseURL","getClient","getMetrics","clearCache","clearCacheEntry","key","getCacheStats","getCloudURL","setTokens","accessToken","refreshToken","clearTokens","getCurrentUserId","getAccessToken","decoded","jwtDecode","userId","id","error","hasValidToken","hasAccessToken","waitForAuth","timeoutMs","startTime","performance","now","maxTime","pollInterval","Promise","resolve","setTimeout","Math","min","withAuthRetry","operation","operationName","maxRetries","retryDelay","authTimeoutMs","attempt","authReady","OxyAuthenticationTimeoutError","OxyAuthenticationError","isLastAttempt","errorObj","isAuthError","response","status","code","message","includes","handleError","validate","res","cache","retry","valid","api","handleHttpError","trim","err","details","healthCheck","timeout","exports"],"sourceRoot":"../../../src","sources":["core/OxyServices.base.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/core/OxyServices.js

@@ -123,10 +123,13 @@ class OxyServices extends OxyServicesComposed {
   }
 }
 
+// Type augmentation to expose mixin methods to TypeScript
+// This allows proper type checking while avoiding complex mixin type inference
+
 // Re-export error classes for convenience
 exports.OxyServices = OxyServices;
 /**
- * Default Oxy Cloud URL
+ * Export the default Oxy Cloud URL (for backward compatibility)
  */
 const OXY_CLOUD_URL = exports.OXY_CLOUD_URL = 'https://cloud.oxy.so';
 

package/lib/commonjs/core/OxyServices.js.map

@@ -1 +1 @@
-{"version":3,"names":["_OxyServices","require","_mixins","OxyServicesComposed","composeOxyServices","OxyServices","constructor","config","exports","OXY_CLOUD_URL","OXY_API_URL","process","env","oxyClient","baseURL","cloudURL"],"sourceRoot":"../../../src","sources":["core/OxyServices.ts"],"mappings":";;;;;;;;;;;;;;;;;;;AA2DA,IAAAA,YAAA,GAAAC,OAAA;AAGA,IAAAC,OAAA,GAAAD,OAAA;AA9DA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAIA;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAME,mBAA0D,GAAG,IAAAC,0BAAkB,EAAC,CAAC;;AAEvF;AACO,MAAMC,WAAW,SAASF,mBAAmB,CAAC;EACnDG,WAAWA,CAACC,MAAiB,EAAE;IAC7B,KAAK,CAACA,MAAM,CAAC;EACf;AACF;;AAEA;AAAAC,OAAA,CAAAH,WAAA,GAAAA,WAAA;AAGA;AACA;AACA;AACO,MAAMI,aAAa,GAAAD,OAAA,CAAAC,aAAA,GAAG,sBAAsB;;AAEnD;AACA;AACA;AACO,MAAMC,WAAW,GAAAF,OAAA,CAAAE,WAAA,GAAI,OAAOC,OAAO,KAAK,WAAW,IAAIA,OAAO,CAACC,GAAG,IAAID,OAAO,CAACC,GAAG,CAACF,WAAW,IAAK,oBAAoB;;AAE7H;AACA;AACA;AACA;AACO,MAAMG,SAAS,GAAAL,OAAA,CAAAK,SAAA,GAAG,IAAIR,WAAW,CAAC;EAAES,OAAO,EAAEJ,WAAW;EAAEK,QAAQ,EAAEN;AAAc,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["_OxyServices","require","_mixins","OxyServicesComposed","composeOxyServices","OxyServices","constructor","config","exports","OXY_CLOUD_URL","OXY_API_URL","process","env","oxyClient","baseURL","cloudURL"],"sourceRoot":"../../../src","sources":["core/OxyServices.ts"],"mappings":";;;;;;;;;;;;;;;;;;;AA2DA,IAAAA,YAAA,GAAAC,OAAA;AAGA,IAAAC,OAAA,GAAAD,OAAA;AA9DA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAIA;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAME,mBAAmB,GAAG,IAAAC,0BAAkB,EAAC,CAAC;;AAEhD;AACO,MAAMC,WAAW,SAAUF,mBAAmB,CAAS;EAC5DG,WAAWA,CAACC,MAAiB,EAAE;IAC7B,KAAK,CAACA,MAAM,CAAC;EACf;AACF;;AAEA;AACA;;AAGA;AAAAC,OAAA,CAAAH,WAAA,GAAAA,WAAA;AAGA;AACA;AACA;AACO,MAAMI,aAAa,GAAAD,OAAA,CAAAC,aAAA,GAAG,sBAAsB;;AAEnD;AACA;AACA;AACO,MAAMC,WAAW,GAAAF,OAAA,CAAAE,WAAA,GAAI,OAAOC,OAAO,KAAK,WAAW,IAAIA,OAAO,CAACC,GAAG,IAAID,OAAO,CAACC,GAAG,CAACF,WAAW,IAAK,oBAAoB;;AAE7H;AACA;AACA;AACA;AACO,MAAMG,SAAS,GAAAL,OAAA,CAAAK,SAAA,GAAG,IAAIR,WAAW,CAAC;EAAES,OAAO,EAAEJ,WAAW;EAAEK,QAAQ,EAAEN;AAAc,CAAC,CAAC","ignoreList":[]}

package/lib/commonjs/core/index.js

@@ -9,6 +9,8 @@ var _exportNames = {
   OxyAuthenticationTimeoutError: true,
   OXY_CLOUD_URL: true,
   oxyClient: true,
+  CrossDomainAuth: true,
+  createCrossDomainAuth: true,
   DeviceManager: true,
   SUPPORTED_LANGUAGES: true,
   getLanguageMetadata: true,
@@ -16,6 +18,12 @@ var _exportNames = {
   getNativeLanguageName: true,
   normalizeLanguageCode: true
 };
+Object.defineProperty(exports, "CrossDomainAuth", {
+  enumerable: true,
+  get: function () {
+    return _CrossDomainAuth.CrossDomainAuth;
+  }
+});
 Object.defineProperty(exports, "DeviceManager", {
   enumerable: true,
   get: function () {
@@ -52,6 +60,13 @@ Object.defineProperty(exports, "SUPPORTED_LANGUAGES", {
     return _languageUtils.SUPPORTED_LANGUAGES;
   }
 });
+Object.defineProperty(exports, "createCrossDomainAuth", {
+  enumerable: true,
+  get: function () {
+    return _CrossDomainAuth.createCrossDomainAuth;
+  }
+});
+exports.default = void 0;
 Object.defineProperty(exports, "getLanguageMetadata", {
   enumerable: true,
   get: function () {
@@ -83,6 +98,7 @@ Object.defineProperty(exports, "oxyClient", {
   }
 });
 var _OxyServices = require("./OxyServices");
+var _CrossDomainAuth = require("./CrossDomainAuth");
 var _interfaces = require("../models/interfaces");
 Object.keys(_interfaces).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -109,4 +125,18 @@ Object.keys(_session).forEach(function (key) {
 });
 var _deviceManager = require("../utils/deviceManager");
 var _languageUtils = require("../utils/languageUtils");
+/**
+ * OxyServices Core Module - Unified Architecture
+ * 
+ * This module exports the unified OxyServices class that provides all API functionality
+ * in one simple, easy-to-use interface.
+ */
+// Main OxyServices class (unified)
+// Cross-domain authentication
+// Re-export all models and types for convenience
+// Export device management utilities
+// Export language utilities
+// Import for default export
+// Default export for backward compatibility
+var _default = exports.default = _OxyServices.OxyServices;
 //# sourceMappingURL=index.js.map

package/lib/commonjs/core/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_OxyServices","require","_interfaces","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","_session","_deviceManager","_languageUtils"],"sourceRoot":"../../../src","sources":["core/index.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,IAAAA,YAAA,GAAAC,OAAA;AAIA,IAAAC,WAAA,GAAAD,OAAA;AAAAE,MAAA,CAAAC,IAAA,CAAAF,WAAA,EAAAG,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAJ,WAAA,CAAAI,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAZ,WAAA,CAAAI,GAAA;IAAA;EAAA;AAAA;AACA,IAAAS,QAAA,GAAAd,OAAA;AAAAE,MAAA,CAAAC,IAAA,CAAAW,QAAA,EAAAV,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAS,QAAA,CAAAT,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAC,QAAA,CAAAT,GAAA;IAAA;EAAA;AAAA;AAGA,IAAAU,cAAA,GAAAf,OAAA;AAIA,IAAAgB,cAAA,GAAAhB,OAAA","ignoreList":[]}
+{"version":3,"names":["_OxyServices","require","_CrossDomainAuth","_interfaces","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","_session","_deviceManager","_languageUtils","_default","default","OxyServices"],"sourceRoot":"../../../src","sources":["core/index.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,IAAAA,YAAA,GAAAC,OAAA;AAIA,IAAAC,gBAAA,GAAAD,OAAA;AAIA,IAAAE,WAAA,GAAAF,OAAA;AAAAG,MAAA,CAAAC,IAAA,CAAAF,WAAA,EAAAG,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAJ,WAAA,CAAAI,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAZ,WAAA,CAAAI,GAAA;IAAA;EAAA;AAAA;AACA,IAAAS,QAAA,GAAAf,OAAA;AAAAG,MAAA,CAAAC,IAAA,CAAAW,QAAA,EAAAV,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAS,QAAA,CAAAT,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAC,QAAA,CAAAT,GAAA;IAAA;EAAA;AAAA;AAGA,IAAAU,cAAA,GAAAhB,OAAA;AAIA,IAAAiB,cAAA,GAAAjB,OAAA;AAxBA;AACA;AACA;AACA;AACA;AACA;AAEA;AAIA;AAIA;AAIA;AAIA;AAUA;AAGA;AAAA,IAAAkB,QAAA,GAAAP,OAAA,CAAAQ,OAAA,GACeC,wBAAW","ignoreList":[]}

package/lib/commonjs/core/mixins/OxyServices.assets.js

@@ -153,9 +153,22 @@ function OxyServicesAssetsMixin(Base) {
       const fileSize = file.size;
       try {
         const formData = new FormData();
-        // In React Native, pass filename as third parameter to avoid read-only name property error
-        // This prevents "Cannot assign to property 'name' which has only a getter" error
-        formData.append('file', file, fileName);
+        // Convert File to Blob to avoid read-only 'name' property error in Expo 54
+        // This is a known issue in Expo SDK 52+ where FormData tries to set the read-only 'name' property
+        let fileBlob;
+        if (file instanceof Blob) {
+          // Already a Blob, use directly
+          fileBlob = file;
+        } else if (typeof file.blob === 'function') {
+          // Use async blob() method if available (Expo 54+ recommended approach)
+          fileBlob = await file.blob();
+        } else {
+          // Fallback: create Blob from File (works in all environments)
+          fileBlob = new Blob([file], {
+            type: file.type || 'application/octet-stream'
+          });
+        }
+        formData.append('file', fileBlob, fileName);
         if (visibility) {
           formData.append('visibility', visibility);
         }

package/lib/commonjs/core/mixins/OxyServices.assets.js.map

@@ -1 +1 @@
-{"version":3,"names":["OxyServicesAssetsMixin","Base","constructor","args","deleteFile","fileId","makeRequest","encodeURIComponent","undefined","cache","error","handleError","getFileDownloadUrl","variant","expiresIn","base","getBaseURL","params","URLSearchParams","set","String","token","getClient","getAccessToken","qs","toString","getFileDownloadUrlAsync","url","fetchAssetDownloadUrl","getAssetUrlCacheTTL","listUserFiles","limit","offset","paramsObj","getAccountStorageUsage","getFileContentAsText","downloadUrl","Error","fetchAssetContent","getFileContentAsBlob","getBatchFileAccess","fileIds","context","getFileDownloadUrls","response","urls","results","id","result","Object","entries","allowed","uploadRawFile","file","visibility","metadata","assetUpload","onProgress","fileName","name","fileSize","size","formData","FormData","append","JSON","stringify","request","method","data","console","errorMessage","message","contextError","fileContext","handledError","trim","newError","assetLink","app","entityType","entityId","webhookUrl","body","assetUnlink","assetGet","cacheTTL","assetGetUrl","assetRestore","assetDelete","force","assetGetVariants","assetData","variants","assetUpdateVisibility","uploadAvatar","userId","asset","uploadProfileBanner","desiredTtlMs","Math","min","urlRes","keys","length","type","fetch","ok","status","text","blob"],"sourceRoot":"../../../../src","sources":["core/mixins/OxyServices.assets.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["OxyServicesAssetsMixin","Base","constructor","args","deleteFile","fileId","makeRequest","encodeURIComponent","undefined","cache","error","handleError","getFileDownloadUrl","variant","expiresIn","base","getBaseURL","params","URLSearchParams","set","String","token","getClient","getAccessToken","qs","toString","getFileDownloadUrlAsync","url","fetchAssetDownloadUrl","getAssetUrlCacheTTL","listUserFiles","limit","offset","paramsObj","getAccountStorageUsage","getFileContentAsText","downloadUrl","Error","fetchAssetContent","getFileContentAsBlob","getBatchFileAccess","fileIds","context","getFileDownloadUrls","response","urls","results","id","result","Object","entries","allowed","uploadRawFile","file","visibility","metadata","assetUpload","onProgress","fileName","name","fileSize","size","formData","FormData","fileBlob","Blob","blob","type","append","JSON","stringify","request","method","data","console","errorMessage","message","contextError","fileContext","handledError","trim","newError","assetLink","app","entityType","entityId","webhookUrl","body","assetUnlink","assetGet","cacheTTL","assetGetUrl","assetRestore","assetDelete","force","assetGetVariants","assetData","variants","assetUpdateVisibility","uploadAvatar","userId","asset","uploadProfileBanner","desiredTtlMs","Math","min","urlRes","keys","length","fetch","ok","status","text"],"sourceRoot":"../../../../src","sources":["core/mixins/OxyServices.assets.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/core/mixins/OxyServices.auth.js

@@ -8,8 +8,7 @@ var _OxyServices = require("../OxyServices.errors");
 /**
  * Authentication Methods Mixin
  * 
- * Public key authentication using ECDSA signatures.
- * No passwords required - authentication is done via challenge-response.
+ * Supports password-based login (email/username) and public key challenge-response.
  */
 
 function OxyServicesAuthMixin(Base) {
@@ -19,22 +18,23 @@ function OxyServicesAuthMixin(Base) {
     }
 
     /**
-     * Register a new identity (bootstrap - no session required)
-     * 
-     * Register a new identity (public key only).
-     * Profile data should be synced separately via updateProfile after sign-in.
+     * Register a new identity with public key authentication
+     * Identity is purely cryptographic - username and profile data are optional
      * 
      * @param publicKey - The user's ECDSA public key (hex)
-     * @returns Object containing userId and user data
+     * @param signature - Signature of the registration request
+     * @param timestamp - Timestamp when the signature was created
      */
-    async registerIdentity(publicKey) {
+    async register(publicKey, signature, timestamp) {
       try {
-        const res = await this.makeRequest('POST', '/api/identity/register', {
-          publicKey
+        const res = await this.makeRequest('POST', '/api/auth/register', {
+          publicKey,
+          signature,
+          timestamp
         }, {
           cache: false
         });
-        if (!res || !res.userId) {
+        if (!res || typeof res === 'object' && Object.keys(res).length === 0) {
           throw new _OxyServices.OxyAuthenticationError('Registration failed', 'REGISTER_FAILED', 400);
         }
         return res;
@@ -47,12 +47,12 @@ function OxyServicesAuthMixin(Base) {
      * Request an authentication challenge
      * The client must sign this challenge with their private key
      * 
-     * @param userId - The user's ID (ObjectId)
+     * @param publicKey - The user's public key
      */
-    async requestChallenge(userId) {
+    async requestChallenge(publicKey) {
       try {
         return await this.makeRequest('POST', '/api/auth/challenge', {
-          userId
+          publicKey
         }, {
           cache: false
         });
@@ -64,18 +64,18 @@ function OxyServicesAuthMixin(Base) {
     /**
      * Verify a signed challenge and create a session
      * 
-     * @param userId - The user's ID (ObjectId)
-     * @param nonce - The nonce (challenge) string from requestChallenge
+     * @param publicKey - The user's public key
+     * @param challenge - The challenge string from requestChallenge
      * @param signature - Signature of the auth message
      * @param timestamp - Timestamp when the signature was created
      * @param deviceName - Optional device name
      * @param deviceFingerprint - Optional device fingerprint
      */
-    async verifyChallenge(userId, nonce, signature, timestamp, deviceName, deviceFingerprint) {
+    async verifyChallenge(publicKey, challenge, signature, timestamp, deviceName, deviceFingerprint) {
       try {
         return await this.makeRequest('POST', '/api/auth/verify', {
-          userId,
-          nonce,
+          publicKey,
+          challenge,
           signature,
           timestamp,
           deviceName,
@@ -103,14 +103,13 @@ function OxyServicesAuthMixin(Base) {
 
     /**
      * Get user by public key
-     * Services never caches profile - always fetch fresh from backend
      */
     async getUserByPublicKey(publicKey) {
       try {
         return await this.makeRequest('GET', `/api/auth/user/${encodeURIComponent(publicKey)}`, undefined, {
-          cache: false
-        } // Services never caches profile - only tokens
-        );
+          cache: true,
+          cacheTTL: 2 * 60 * 1000
+        });
       } catch (error) {
         throw this.handleError(error);
       }
@@ -118,12 +117,12 @@ function OxyServicesAuthMixin(Base) {
 
     /**
      * Get user by session ID
-     * Services never caches profile - always fetch fresh from backend
      */
     async getUserBySession(sessionId) {
       try {
         return await this.makeRequest('GET', `/api/session/user/${sessionId}`, undefined, {
-          cache: false // Services never caches profile - only tokens
+          cache: true,
+          cacheTTL: 2 * 60 * 1000
         });
       } catch (error) {
         throw this.handleError(error);
@@ -142,7 +141,8 @@ function OxyServicesAuthMixin(Base) {
         return await this.makeRequest('POST', '/api/session/users/batch', {
           sessionIds: uniqueSessionIds
         }, {
-          cache: false,
+          cache: true,
+          cacheTTL: 2 * 60 * 1000,
           deduplicate: true
         });
       } catch (error) {
@@ -153,16 +153,13 @@ function OxyServicesAuthMixin(Base) {
     /**
      * Get access token by session ID
      */
-    async getTokenBySession(sessionId, deviceId) {
+    async getTokenBySession(sessionId) {
       try {
         const res = await this.makeRequest('GET', `/api/session/token/${sessionId}`, undefined, {
           cache: false,
-          retry: false,
-          headers: deviceId ? {
-            'x-device-id': deviceId
-          } : undefined
+          retry: false
         });
-        this.setTokens(res.accessToken, res.refreshToken);
+        this.setTokens(res.accessToken);
         return res;
       } catch (error) {
         throw this.handleError(error);
@@ -250,6 +247,50 @@ function OxyServicesAuthMixin(Base) {
         throw this.handleError(error);
       }
     }
+
+    /**
+     * Register a new user with email/username and password
+     */
+    async signUp(username, email, password, deviceName, deviceFingerprint) {
+      try {
+        return await this.makeRequest('POST', '/api/auth/signup', {
+          username,
+          email,
+          password,
+          deviceName,
+          deviceFingerprint
+        }, {
+          cache: false
+        });
+      } catch (error) {
+        throw this.handleError(error);
+      }
+    }
+
+    /**
+     * Sign in with email or username and password
+     */
+    async signIn(identifier, password, deviceName, deviceFingerprint) {
+      try {
+        return await this.makeRequest('POST', '/api/auth/login', {
+          identifier,
+          password,
+          deviceName,
+          deviceFingerprint
+        }, {
+          cache: false
+        });
+      } catch (error) {
+        throw this.handleError(error);
+      }
+    }
+
+    /**
+     * Convenience helper for email sign-in
+     */
+    async signInWithEmail(email, password, deviceName, deviceFingerprint) {
+      return this.signIn(email, password, deviceName, deviceFingerprint);
+    }
   };
 }
 //# sourceMappingURL=OxyServices.auth.js.map

package/lib/commonjs/core/mixins/OxyServices.auth.js.map

@@ -1 +1 @@
-{"version":3,"names":["_OxyServices","require","OxyServicesAuthMixin","Base","constructor","args","registerIdentity","publicKey","res","makeRequest","cache","userId","OxyAuthenticationError","error","handleError","requestChallenge","verifyChallenge","nonce","signature","timestamp","deviceName","deviceFingerprint","checkPublicKeyRegistered","encodeURIComponent","undefined","getUserByPublicKey","getUserBySession","sessionId","getUsersBySessions","sessionIds","Array","isArray","length","uniqueSessionIds","from","Set","sort","deduplicate","getTokenBySession","deviceId","retry","headers","setTokens","accessToken","refreshToken","getSessionsBySessionId","logoutSession","targetSessionId","url","logoutAllSessions","validateSession","options","urlParams","useHeaderValidation","checkUsernameAvailability","username","checkEmailAvailability","email"],"sourceRoot":"../../../../src","sources":["core/mixins/OxyServices.auth.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_OxyServices","require","OxyServicesAuthMixin","Base","constructor","args","register","publicKey","signature","timestamp","res","makeRequest","cache","Object","keys","length","OxyAuthenticationError","error","handleError","requestChallenge","verifyChallenge","challenge","deviceName","deviceFingerprint","checkPublicKeyRegistered","encodeURIComponent","undefined","getUserByPublicKey","cacheTTL","getUserBySession","sessionId","getUsersBySessions","sessionIds","Array","isArray","uniqueSessionIds","from","Set","sort","deduplicate","getTokenBySession","retry","setTokens","accessToken","getSessionsBySessionId","logoutSession","targetSessionId","url","logoutAllSessions","validateSession","options","urlParams","useHeaderValidation","checkUsernameAvailability","username","checkEmailAvailability","email","signUp","password","signIn","identifier","signInWithEmail"],"sourceRoot":"../../../../src","sources":["core/mixins/OxyServices.auth.ts"],"mappings":"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","ignoreList":[]}