@oxy.so/services 6.2.0 → 8.0.0

package/lib/commonjs/ui/hooks/queries/useAccountQueries.js

@@ -24,7 +24,7 @@ const useUserProfile = (sessionId, options) => {
       if (!sessionId) {
         throw new Error('Session ID is required');
       }
-      return await oxyServices.getUserBySession(sessionId);
+      return await oxyServices.users.bySession(sessionId);
     },
     enabled: options?.enabled !== false && !!sessionId,
     staleTime: 5 * 60 * 1000,
@@ -45,7 +45,7 @@ const useUserProfiles = (sessionIds, options) => {
     queries: sessionIds.map(sessionId => ({
       queryKey: _queryKeys.queryKeys.users.profile(sessionId),
       queryFn: async () => {
-        const results = await oxyServices.getUsersBySessions([sessionId]);
+        const results = await oxyServices.users.bySessions([sessionId]);
         return results[0]?.user || null;
       },
       enabled: options?.enabled !== false && !!sessionId,
@@ -88,7 +88,7 @@ const useCurrentUser = options => {
   const query = (0, _reactQuery.useQuery)({
     queryKey: _queryKeys.queryKeys.accounts.current(activeSessionId),
     queryFn: async () => {
-      return await oxyServices.getCurrentUser();
+      return await oxyServices.users.me();
     },
     enabled: options?.enabled !== false && isAuthenticated && !!activeSessionId,
     staleTime: 1 * 60 * 1000,
@@ -187,7 +187,7 @@ const useUserById = (userId, options) => {
       if (!userId) {
         throw new Error('User ID is required');
       }
-      return await oxyServices.getUserById(userId);
+      return await oxyServices.users.get(userId);
     },
     enabled: options?.enabled !== false && !!userId,
     staleTime: 5 * 60 * 1000,
@@ -224,7 +224,7 @@ const useUserByUsername = (username, options) => {
       // Match queryKeys.users.byUsername normalization so the cache key and
       // the API request agree (case-insensitive local handles).
       const normalizedUsername = username.trim().toLowerCase();
-      return await oxyServices.getProfileByUsername(normalizedUsername);
+      return await oxyServices.users.byUsername(normalizedUsername);
     },
     enabled: options?.enabled !== false && !!username,
     staleTime: 5 * 60 * 1000,
@@ -262,7 +262,7 @@ const useUsersBySessions = (sessionIds, options) => {
       if (sessionIds.length === 0) {
         return [];
       }
-      return await oxyServices.getUsersBySessions(sessionIds);
+      return await oxyServices.users.bySessions(sessionIds);
     },
     enabled: options?.enabled !== false && sessionIds.length > 0,
     staleTime: 5 * 60 * 1000,
@@ -285,7 +285,7 @@ const useConnectedApps = options => {
   return (0, _reactQuery.useQuery)({
     queryKey: _queryKeys.queryKeys.connectedApps.list(),
     queryFn: async () => {
-      return (0, _core.authenticatedApiCall)(oxyServices, activeSessionId, () => oxyServices.listConnectedApps());
+      return (0, _core.authenticatedApiCall)(oxyServices, activeSessionId, () => oxyServices.apps.connected.list());
     },
     enabled: options?.enabled !== false && isAuthenticated,
     staleTime: 30 * 1000,
@@ -314,7 +314,7 @@ const usePrivacySettings = (userId, options) => {
       if (!targetUserId) {
         throw new Error('User ID is required');
       }
-      return (0, _core.authenticatedApiCall)(oxyServices, activeSessionId, () => oxyServices.getPrivacySettings(targetUserId));
+      return (0, _core.authenticatedApiCall)(oxyServices, activeSessionId, () => oxyServices.privacy.settings(targetUserId));
     },
     enabled: options?.enabled !== false && !!targetUserId,
     staleTime: 2 * 60 * 1000,

package/lib/commonjs/ui/hooks/queries/useAccountQueries.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactQuery","_core","_queryKeys","_mutationKeys","_OxyContext","_authStore","useUserProfile","sessionId","options","oxyServices","useOxy","useQuery","queryKey","queryKeys","users","profile","queryFn","Error","getUserBySession","enabled","staleTime","gcTime","exports","useUserProfiles","sessionIds","useQueries","queries","map","results","getUsersBySessions","user","useCurrentUser","activeSessionId","isAuthenticated","queryClient","useQueryClient","query","accounts","current","getCurrentUser","data","useEffect","userWriteMutationsInFlight","isMutating","mutationKey","mutationKeys","account","updateProfile","uploadAvatar","updateSettings","updatePrivacySettings","storedUser","useAuthStore","getState","incomingUpdatedAt","parseUpdatedAt","updatedAt","storedUpdatedAt","setUser","value","Number","isFinite","Date","t","getTime","parse","useUserById","userId","detail","getUserById","useUserByUsername","username","viewerId","id","byUsername","normalizedUsername","trim","toLowerCase","getProfileByUsername","refetchOnMount","useUsersBySessions","list","length","useConnectedApps","connectedApps","authenticatedApiCall","listConnectedApps","usePrivacySettings","targetUserId","privacy","settings","getPrivacySettings"],"sourceRoot":"../../../../../src","sources":["ui/hooks/queries/useAccountQueries.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactQuery","_core","_queryKeys","_mutationKeys","_OxyContext","_authStore","useUserProfile","sessionId","options","oxyServices","useOxy","useQuery","queryKey","queryKeys","users","profile","queryFn","Error","bySession","enabled","staleTime","gcTime","exports","useUserProfiles","sessionIds","useQueries","queries","map","results","bySessions","user","useCurrentUser","activeSessionId","isAuthenticated","queryClient","useQueryClient","query","accounts","current","me","data","useEffect","userWriteMutationsInFlight","isMutating","mutationKey","mutationKeys","account","updateProfile","uploadAvatar","updateSettings","updatePrivacySettings","storedUser","useAuthStore","getState","incomingUpdatedAt","parseUpdatedAt","updatedAt","storedUpdatedAt","setUser","value","Number","isFinite","Date","t","getTime","parse","useUserById","userId","detail","get","useUserByUsername","username","viewerId","id","byUsername","normalizedUsername","trim","toLowerCase","refetchOnMount","useUsersBySessions","list","length","useConnectedApps","connectedApps","authenticatedApiCall","apps","connected","usePrivacySettings","targetUserId","privacy","settings"],"sourceRoot":"../../../../../src","sources":["ui/hooks/queries/useAccountQueries.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/ui/hooks/queries/useAuthMethods.js

@@ -3,8 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useAuthMethods = void 0;
-var _react = require("react");
+exports.useSignInMethods = exports.useAuthMethods = void 0;
 var _reactQuery = require("@tanstack/react-query");
 var _queryKeys = require("./queryKeys.js");
 var _OxyContext = require("../../context/OxyContext.js");
@@ -12,13 +11,9 @@ var _OxyContext = require("../../context/OxyContext.js");
 const EMPTY_METHODS = Object.freeze([]);
 
 /**
- * The current account's linked authentication methods (`GET /auth/methods`),
- * plus convenience projections. Backs the security / account surfaces that let a
- * user see and manage their passwords, identity key, social logins, and passkeys.
- *
- * `passkeys` is the `type === 'webauthn'` subset — one entry per registered
- * credential. Invalidate via `queryKeys.authMethods.all` after linking a passkey
- * (`useOxy().addPasskey()` does this) or removing one.
+ * The current account's linked authentication methods (`GET /auth/methods`).
+ * Backs the security / account surfaces that let a user see their identity key
+ * and social logins.
  */
 const useAuthMethods = options => {
   const {
@@ -27,23 +22,40 @@ const useAuthMethods = options => {
   } = (0, _OxyContext.useOxy)();
   const query = (0, _reactQuery.useQuery)({
     queryKey: _queryKeys.queryKeys.authMethods.list(),
-    queryFn: () => oxyServices.listAuthMethods(),
+    queryFn: () => oxyServices.identity.authMethods(),
     enabled: options?.enabled !== false && !!activeSessionId,
     staleTime: 5 * 60 * 1000,
     // 5 minutes
     gcTime: 10 * 60 * 1000 // 10 minutes
   });
-  const methods = query.data?.methods ?? EMPTY_METHODS;
-  const passkeys = (0, _react.useMemo)(() => methods.filter(method => method.type === 'webauthn'), [methods]);
   return {
     ...query,
     /** Every linked auth method. Empty while loading. */
-    methods,
-    /** The registered passkeys (a `type === 'webauthn'` subset of `methods`). */
-    passkeys,
+    methods: query.data?.methods ?? EMPTY_METHODS,
     /** The account's DID, or `null` while loading. */
     did: query.data?.did ?? null
   };
 };
+
+/**
+ * How the signed-in account signs in (`GET /users/me/sign-in-methods`): whether
+ * it has an email, a password, an authenticator app, and how many backup codes
+ * are left. Invalidate `queryKeys.signInMethods.all` after changing any of them
+ * (the security panels do).
+ */
 exports.useAuthMethods = useAuthMethods;
+const useSignInMethods = options => {
+  const {
+    oxyServices,
+    activeSessionId,
+    user
+  } = (0, _OxyContext.useOxy)();
+  return (0, _reactQuery.useQuery)({
+    queryKey: _queryKeys.queryKeys.signInMethods.current(user?.id),
+    queryFn: () => oxyServices.auth.methods(),
+    enabled: options?.enabled !== false && !!activeSessionId,
+    staleTime: 60 * 1000
+  });
+};
+exports.useSignInMethods = useSignInMethods;
 //# sourceMappingURL=useAuthMethods.js.map

package/lib/commonjs/ui/hooks/queries/useAuthMethods.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactQuery","_queryKeys","_OxyContext","EMPTY_METHODS","Object","freeze","useAuthMethods","options","oxyServices","activeSessionId","useOxy","query","useQuery","queryKey","queryKeys","authMethods","list","queryFn","listAuthMethods","enabled","staleTime","gcTime","methods","data","passkeys","useMemo","filter","method","type","did","exports"],"sourceRoot":"../../../../../src","sources":["ui/hooks/queries/useAuthMethods.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AAEA,IAAAE,UAAA,GAAAF,OAAA;AACA,IAAAG,WAAA,GAAAH,OAAA;AAEA;AACA,MAAMI,aAAyC,GAAGC,MAAM,CAACC,MAAM,CAAC,EAAE,CAAC;;AAEnE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMC,cAAc,GAAIC,OAA+B,IAAK;EACjE,MAAM;IAAEC,WAAW;IAAEC;EAAgB,CAAC,GAAG,IAAAC,kBAAM,EAAC,CAAC;EAEjD,MAAMC,KAAK,GAAG,IAAAC,oBAAQ,EAAsB;IAC1CC,QAAQ,EAAEC,oBAAS,CAACC,WAAW,CAACC,IAAI,CAAC,CAAC;IACtCC,OAAO,EAAEA,CAAA,KAAMT,WAAW,CAACU,eAAe,CAAC,CAAC;IAC5CC,OAAO,EAAEZ,OAAO,EAAEY,OAAO,KAAK,KAAK,IAAI,CAAC,CAACV,eAAe;IACxDW,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;IAAE;IAC1BC,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,CAAE;EAC1B,CAAC,CAAC;EAEF,MAAMC,OAAO,GAAGX,KAAK,CAACY,IAAI,EAAED,OAAO,IAAInB,aAAa;EACpD,MAAMqB,QAAQ,GAAG,IAAAC,cAAO,EACtB,MAAMH,OAAO,CAACI,MAAM,CAAEC,MAAM,IAAKA,MAAM,CAACC,IAAI,KAAK,UAAU,CAAC,EAC5D,CAACN,OAAO,CACV,CAAC;EAED,OAAO;IACL,GAAGX,KAAK;IACR;IACAW,OAAO;IACP;IACAE,QAAQ;IACR;IACAK,GAAG,EAAElB,KAAK,CAACY,IAAI,EAAEM,GAAG,IAAI;EAC1B,CAAC;AACH,CAAC;AAACC,OAAA,CAAAxB,cAAA,GAAAA,cAAA","ignoreList":[]}
+{"version":3,"names":["_reactQuery","require","_queryKeys","_OxyContext","EMPTY_METHODS","Object","freeze","useAuthMethods","options","oxyServices","activeSessionId","useOxy","query","useQuery","queryKey","queryKeys","authMethods","list","queryFn","identity","enabled","staleTime","gcTime","methods","data","did","exports","useSignInMethods","user","signInMethods","current","id","auth"],"sourceRoot":"../../../../../src","sources":["ui/hooks/queries/useAuthMethods.ts"],"mappings":";;;;;;AAAA,IAAAA,WAAA,GAAAC,OAAA;AAEA,IAAAC,UAAA,GAAAD,OAAA;AACA,IAAAE,WAAA,GAAAF,OAAA;AAEA;AACA,MAAMG,aAAyC,GAAGC,MAAM,CAACC,MAAM,CAAC,EAAE,CAAC;;AAEnE;AACA;AACA;AACA;AACA;AACO,MAAMC,cAAc,GAAIC,OAA+B,IAAK;EACjE,MAAM;IAAEC,WAAW;IAAEC;EAAgB,CAAC,GAAG,IAAAC,kBAAM,EAAC,CAAC;EAEjD,MAAMC,KAAK,GAAG,IAAAC,oBAAQ,EAAsB;IAC1CC,QAAQ,EAAEC,oBAAS,CAACC,WAAW,CAACC,IAAI,CAAC,CAAC;IACtCC,OAAO,EAAEA,CAAA,KAAMT,WAAW,CAACU,QAAQ,CAACH,WAAW,CAAC,CAAC;IACjDI,OAAO,EAAEZ,OAAO,EAAEY,OAAO,KAAK,KAAK,IAAI,CAAC,CAACV,eAAe;IACxDW,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;IAAE;IAC1BC,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,CAAE;EAC1B,CAAC,CAAC;EAEF,OAAO;IACL,GAAGV,KAAK;IACR;IACAW,OAAO,EAAEX,KAAK,CAACY,IAAI,EAAED,OAAO,IAAInB,aAAa;IAC7C;IACAqB,GAAG,EAAEb,KAAK,CAACY,IAAI,EAAEC,GAAG,IAAI;EAC1B,CAAC;AACH,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AALAC,OAAA,CAAAnB,cAAA,GAAAA,cAAA;AAMO,MAAMoB,gBAAgB,GAAInB,OAA+B,IAAK;EACnE,MAAM;IAAEC,WAAW;IAAEC,eAAe;IAAEkB;EAAK,CAAC,GAAG,IAAAjB,kBAAM,EAAC,CAAC;EACvD,OAAO,IAAAE,oBAAQ,EAAgB;IAC7BC,QAAQ,EAAEC,oBAAS,CAACc,aAAa,CAACC,OAAO,CAACF,IAAI,EAAEG,EAAE,CAAC;IACnDb,OAAO,EAAEA,CAAA,KAAMT,WAAW,CAACuB,IAAI,CAACT,OAAO,CAAC,CAAC;IACzCH,OAAO,EAAEZ,OAAO,EAAEY,OAAO,KAAK,KAAK,IAAI,CAAC,CAACV,eAAe;IACxDW,SAAS,EAAE,EAAE,GAAG;EAClB,CAAC,CAAC;AACJ,CAAC;AAACK,OAAA,CAAAC,gBAAA,GAAAA,gBAAA","ignoreList":[]}

package/lib/commonjs/ui/hooks/queries/useFileQueries.js

@@ -27,7 +27,7 @@ var _queryKeys = require("./queryKeys.js");
 /** Files fetched per page. */
 const FILES_PAGE_SIZE = exports.FILES_PAGE_SIZE = 40;
 
-/** Raw file record as returned by `oxyServices.listUserFiles` / `assetUpload`. */
+/** Raw file record as returned by `oxyServices.assets.list` / `assetUpload`. */
 
 /** One page of the infinite file list. */
 
@@ -60,7 +60,10 @@ const useUserFilesInfinite = ownerId => {
       pageParam
     }) => {
       const offset = typeof pageParam === 'number' ? pageParam : 0;
-      const response = await oxyServices.listUserFiles(FILES_PAGE_SIZE, offset);
+      const response = await oxyServices.assets.list({
+        limit: FILES_PAGE_SIZE,
+        offset
+      });
       const raw = response.files ?? [];
       const files = raw.map(mapRawFileToMetadata);
       return {

package/lib/commonjs/ui/hooks/queries/useFileQueries.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactQuery","require","_OxyContext","_queryKeys","FILES_PAGE_SIZE","exports","mapRawFileToMetadata","raw","id","filename","originalName","sha256","contentType","mime","length","size","chunkSize","uploadDate","createdAt","metadata","variants","useUserFilesInfinite","ownerId","oxyServices","useOxy","useInfiniteQuery","queryKey","queryKeys","files","list","queryFn","pageParam","offset","response","listUserFiles","map","total","hasMore","Boolean","nextOffset","initialPageParam","getNextPageParam","lastPage","undefined","enabled","staleTime","refetchOnWindowFocus","fileListKey","mapPages","data","fn","pages","page","prependFileToCache","queryClient","file","setQueryData","index","removeFileFromCache","fileId","filter","f","replaceFileInCache","oldId","newFile","patchFileMetadataInCache","metadataPatch"],"sourceRoot":"../../../../../src","sources":["ui/hooks/queries/useFileQueries.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_reactQuery","require","_OxyContext","_queryKeys","FILES_PAGE_SIZE","exports","mapRawFileToMetadata","raw","id","filename","originalName","sha256","contentType","mime","length","size","chunkSize","uploadDate","createdAt","metadata","variants","useUserFilesInfinite","ownerId","oxyServices","useOxy","useInfiniteQuery","queryKey","queryKeys","files","list","queryFn","pageParam","offset","response","assets","limit","map","total","hasMore","Boolean","nextOffset","initialPageParam","getNextPageParam","lastPage","undefined","enabled","staleTime","refetchOnWindowFocus","fileListKey","mapPages","data","fn","pages","page","prependFileToCache","queryClient","file","setQueryData","index","removeFileFromCache","fileId","filter","f","replaceFileInCache","oldId","newFile","patchFileMetadataInCache","metadataPatch"],"sourceRoot":"../../../../../src","sources":["ui/hooks/queries/useFileQueries.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/ui/hooks/queries/usePaymentQueries.js

@@ -28,7 +28,7 @@ var _OxyContext = require("../../context/OxyContext.js");
 /**
  * Get the current user's subscription.
  *
- * Wraps `oxyServices.getCurrentUserSubscription()`
+ * Wraps `oxyServices.billing.subscription()`
  * (`GET /subscription/:userId`, billing-first). Returns the persisted
  * subscription or the API's `{ plan: 'basic' }` fallback when the user has
  * never subscribed.
@@ -43,7 +43,7 @@ const useUserSubscription = options => {
   return (0, _reactQuery.useQuery)({
     queryKey: _queryKeys.queryKeys.payments.subscription(user?.id),
     queryFn: async () => {
-      return (0, _core.authenticatedApiCall)(oxyServices, activeSessionId, () => oxyServices.getCurrentUserSubscription());
+      return (0, _core.authenticatedApiCall)(oxyServices, activeSessionId, () => oxyServices.billing.subscription());
     },
     enabled: options?.enabled !== false && isAuthenticated && !!user?.id,
     // Subscription state changes rarely; tolerate a longer fresh window.
@@ -56,7 +56,7 @@ const useUserSubscription = options => {
 /**
  * Get the current user's payment / billing history.
  *
- * Wraps `oxyServices.getUserPayments()` (`GET /payments/user`), which
+ * Wraps `oxyServices.billing.payments()` (`GET /payments/user`), which
  * returns the user's `deposit` and `purchase` transactions newest-first.
  */
 exports.useUserSubscription = useUserSubscription;
@@ -70,7 +70,7 @@ const useUserPayments = options => {
   return (0, _reactQuery.useQuery)({
     queryKey: _queryKeys.queryKeys.payments.history(user?.id),
     queryFn: async () => {
-      return (0, _core.authenticatedApiCall)(oxyServices, activeSessionId, () => oxyServices.getUserPayments());
+      return (0, _core.authenticatedApiCall)(oxyServices, activeSessionId, () => oxyServices.billing.payments());
     },
     enabled: options?.enabled !== false && isAuthenticated && !!user?.id,
     // Billing history is append-mostly; a short fresh window is fine.
@@ -83,7 +83,7 @@ const useUserPayments = options => {
 /**
  * Get the current user's FairCoin wallet balance.
  *
- * Wraps `oxyServices.getCurrentUserWallet()` (`GET /wallet/:userId`).
+ * Wraps `oxyServices.billing.wallet()` (`GET /wallet/:userId`).
  * Balance changes frequently, so the fresh window is intentionally short.
  */
 exports.useUserPayments = useUserPayments;
@@ -97,7 +97,7 @@ const useUserWallet = options => {
   return (0, _reactQuery.useQuery)({
     queryKey: _queryKeys.queryKeys.payments.wallet(user?.id),
     queryFn: async () => {
-      return (0, _core.authenticatedApiCall)(oxyServices, activeSessionId, () => oxyServices.getCurrentUserWallet());
+      return (0, _core.authenticatedApiCall)(oxyServices, activeSessionId, () => oxyServices.billing.wallet());
     },
     enabled: options?.enabled !== false && isAuthenticated && !!user?.id,
     staleTime: 60 * 1000,
@@ -109,7 +109,7 @@ const useUserWallet = options => {
 /**
  * Get the current user's wallet transaction history (paginated).
  *
- * Wraps `oxyServices.getCurrentUserWalletTransactions(options)`
+ * Wraps `oxyServices.billing.walletTransactions(options)`
  * (`GET /wallet/transactions/:userId`). The API responds with a
  * `{ data, pagination }` envelope, preserved here as
  * `WalletTransactionsResponse`.
@@ -130,7 +130,7 @@ const useUserWalletTransactions = (params, options) => {
   return (0, _reactQuery.useQuery)({
     queryKey: _queryKeys.queryKeys.payments.walletTransactions(limit, offset, user?.id),
     queryFn: async () => {
-      return (0, _core.authenticatedApiCall)(oxyServices, activeSessionId, () => oxyServices.getCurrentUserWalletTransactions({
+      return (0, _core.authenticatedApiCall)(oxyServices, activeSessionId, () => oxyServices.billing.walletTransactions({
         limit,
         offset
       }));

package/lib/commonjs/ui/hooks/queries/usePaymentQueries.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactQuery","require","_core","_queryKeys","_OxyContext","useUserSubscription","options","oxyServices","isAuthenticated","activeSessionId","user","useOxy","useQuery","queryKey","queryKeys","payments","subscription","id","queryFn","authenticatedApiCall","getCurrentUserSubscription","enabled","staleTime","gcTime","exports","useUserPayments","history","getUserPayments","useUserWallet","wallet","getCurrentUserWallet","useUserWalletTransactions","params","limit","offset","walletTransactions","getCurrentUserWalletTransactions"],"sourceRoot":"../../../../../src","sources":["ui/hooks/queries/usePaymentQueries.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_reactQuery","require","_core","_queryKeys","_OxyContext","useUserSubscription","options","oxyServices","isAuthenticated","activeSessionId","user","useOxy","useQuery","queryKey","queryKeys","payments","subscription","id","queryFn","authenticatedApiCall","billing","enabled","staleTime","gcTime","exports","useUserPayments","history","useUserWallet","wallet","useUserWalletTransactions","params","limit","offset","walletTransactions"],"sourceRoot":"../../../../../src","sources":["ui/hooks/queries/usePaymentQueries.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/ui/hooks/queries/useSecurityQueries.js

@@ -21,7 +21,7 @@ const useSecurityActivity = options => {
       if (!activeSessionId) {
         throw new Error('No active session');
       }
-      const response = await oxyServices.getSecurityActivity(options?.limit, options?.offset, options?.eventType);
+      const response = await oxyServices.devices.securityActivity(options?.limit, options?.offset, options?.eventType);
       return response;
     },
     enabled: options?.enabled !== false && !!activeSessionId,
@@ -46,7 +46,8 @@ const useRecentSecurityActivity = (limit = 10) => {
       if (!activeSessionId) {
         throw new Error('No active session');
       }
-      return await oxyServices.getRecentSecurityActivity(limit);
+      const page = await oxyServices.devices.securityActivity(limit, 0);
+      return page.data;
     },
     enabled: !!activeSessionId,
     staleTime: 5 * 60 * 1000,
@@ -76,7 +77,7 @@ const useInfiniteSecurityActivity = options => {
         throw new Error('No active session');
       }
       const offset = typeof pageParam === 'number' ? pageParam : 0;
-      return await oxyServices.getSecurityActivity(limit, offset, options?.eventType);
+      return await oxyServices.devices.securityActivity(limit, offset, options?.eventType);
     },
     initialPageParam: 0,
     getNextPageParam: lastPage => {

package/lib/commonjs/ui/hooks/queries/useSecurityQueries.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactQuery","require","_queryKeys","_OxyContext","useSecurityActivity","options","oxyServices","activeSessionId","useOxy","useQuery","queryKey","queryKeys","security","activity","limit","offset","eventType","queryFn","Error","response","getSecurityActivity","enabled","staleTime","gcTime","exports","useRecentSecurityActivity","recent","getRecentSecurityActivity","useInfiniteSecurityActivity","useInfiniteQuery","infinite","pageParam","initialPageParam","getNextPageParam","lastPage","hasMore","undefined"],"sourceRoot":"../../../../../src","sources":["ui/hooks/queries/useSecurityQueries.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_reactQuery","require","_queryKeys","_OxyContext","useSecurityActivity","options","oxyServices","activeSessionId","useOxy","useQuery","queryKey","queryKeys","security","activity","limit","offset","eventType","queryFn","Error","response","devices","securityActivity","enabled","staleTime","gcTime","exports","useRecentSecurityActivity","recent","page","data","useInfiniteSecurityActivity","useInfiniteQuery","infinite","pageParam","initialPageParam","getNextPageParam","lastPage","hasMore","undefined"],"sourceRoot":"../../../../../src","sources":["ui/hooks/queries/useSecurityQueries.ts"],"mappings":";;;;;;AAAA,IAAAA,WAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AACA,IAAAE,WAAA,GAAAF,OAAA;AAGA;AACA;AACA;AACO,MAAMG,mBAAmB,GAC9BC,OAKC,IACE;EACH,MAAM;IAAEC,WAAW;IAAEC;EAAgB,CAAC,GAAG,IAAAC,kBAAM,EAAC,CAAC;EAEjD,OAAO,IAAAC,oBAAQ,EAAC;IACdC,QAAQ,EAAEC,oBAAS,CAACC,QAAQ,CAACC,QAAQ,CACnCR,OAAO,EAAES,KAAK,EACdT,OAAO,EAAEU,MAAM,EACfV,OAAO,EAAEW,SACX,CAAC;IACDC,OAAO,EAAE,MAAAA,CAAA,KAAY;MACnB,IAAI,CAACV,eAAe,EAAE;QACpB,MAAM,IAAIW,KAAK,CAAC,mBAAmB,CAAC;MACtC;MAEA,MAAMC,QAAQ,GAAG,MAAMb,WAAW,CAACc,OAAO,CAACC,gBAAgB,CACzDhB,OAAO,EAAES,KAAK,EACdT,OAAO,EAAEU,MAAM,EACfV,OAAO,EAAEW,SACX,CAAC;MAED,OAAOG,QAAQ;IACjB,CAAC;IACDG,OAAO,EAAGjB,OAAO,EAAEiB,OAAO,KAAK,KAAK,IAAK,CAAC,CAACf,eAAe;IAC1DgB,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;IAAE;IAC1BC,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,CAAE;EAC1B,CAAC,CAAC;AACJ,CAAC;;AAED;AACA;AACA;AAFAC,OAAA,CAAArB,mBAAA,GAAAA,mBAAA;AAGO,MAAMsB,yBAAyB,GAAGA,CAACZ,KAAK,GAAG,EAAE,KAAK;EACvD,MAAM;IAAER,WAAW;IAAEC;EAAgB,CAAC,GAAG,IAAAC,kBAAM,EAAC,CAAC;EAEjD,OAAO,IAAAC,oBAAQ,EAAqB;IAClCC,QAAQ,EAAEC,oBAAS,CAACC,QAAQ,CAACe,MAAM,CAACb,KAAK,CAAC;IAC1CG,OAAO,EAAE,MAAAA,CAAA,KAAY;MACnB,IAAI,CAACV,eAAe,EAAE;QACpB,MAAM,IAAIW,KAAK,CAAC,mBAAmB,CAAC;MACtC;MAEA,MAAMU,IAAI,GAAG,MAAMtB,WAAW,CAACc,OAAO,CAACC,gBAAgB,CAACP,KAAK,EAAE,CAAC,CAAC;MACjE,OAAOc,IAAI,CAACC,IAAI;IAClB,CAAC;IACDP,OAAO,EAAE,CAAC,CAACf,eAAe;IAC1BgB,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;IAAE;IAC1BC,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,CAAE;EAC1B,CAAC,CAAC;AACJ,CAAC;;AAED;AACA;AACA;AACA;AACA;AAJAC,OAAA,CAAAC,yBAAA,GAAAA,yBAAA;AAKO,MAAMI,2BAA2B,GACtCzB,OAIC,IACE;EACH,MAAM;IAAEC,WAAW;IAAEC;EAAgB,CAAC,GAAG,IAAAC,kBAAM,EAAC,CAAC;EACjD,MAAMM,KAAK,GAAGT,OAAO,EAAES,KAAK,IAAI,EAAE;EAElC,OAAO,IAAAiB,4BAAgB,EAAkC;IACvDrB,QAAQ,EAAEC,oBAAS,CAACC,QAAQ,CAACoB,QAAQ,CAAClB,KAAK,EAAET,OAAO,EAAEW,SAAS,CAAC;IAChEC,OAAO,EAAE,MAAAA,CAAO;MAAEgB;IAAU,CAAC,KAAK;MAChC,IAAI,CAAC1B,eAAe,EAAE;QACpB,MAAM,IAAIW,KAAK,CAAC,mBAAmB,CAAC;MACtC;MAEA,MAAMH,MAAM,GAAG,OAAOkB,SAAS,KAAK,QAAQ,GAAGA,SAAS,GAAG,CAAC;MAC5D,OAAO,MAAM3B,WAAW,CAACc,OAAO,CAACC,gBAAgB,CAC/CP,KAAK,EACLC,MAAM,EACNV,OAAO,EAAEW,SACX,CAAC;IACH,CAAC;IACDkB,gBAAgB,EAAE,CAAC;IACnBC,gBAAgB,EAAGC,QAAQ,IAAK;MAC9B,IAAI,CAACA,QAAQ,CAACC,OAAO,EAAE,OAAOC,SAAS;MACvC,OAAOF,QAAQ,CAACrB,MAAM,GAAGqB,QAAQ,CAACtB,KAAK;IACzC,CAAC;IACDQ,OAAO,EAAGjB,OAAO,EAAEiB,OAAO,KAAK,KAAK,IAAK,CAAC,CAACf,eAAe;IAC1DgB,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;IAAE;IAC1BC,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,CAAE;EAC1B,CAAC,CAAC;AACJ,CAAC;AAACC,OAAA,CAAAK,2BAAA,GAAAA,2BAAA","ignoreList":[]}

package/lib/commonjs/ui/hooks/queries/useServicesQueries.js

@@ -55,7 +55,7 @@ const useSession = (sessionId, options) => {
       if (!sessionId) {
         throw new Error('Session ID is required');
       }
-      const validation = await oxyServices.validateSession(sessionId, {
+      const validation = await oxyServices.session.validate(sessionId, {
         useHeaderValidation: true
       });
       if (!validation?.valid || !validation.user) {
@@ -93,7 +93,7 @@ const useDeviceSessions = options => {
       if (!activeSessionId) {
         throw new Error('No active session');
       }
-      return await oxyServices.getDeviceSessions(activeSessionId);
+      return await oxyServices.devices.sessions(activeSessionId);
     },
     enabled: options?.enabled !== false && !!activeSessionId,
     staleTime: 2 * 60 * 1000,
@@ -114,7 +114,7 @@ const useUserDevices = options => {
   return (0, _reactQuery.useQuery)({
     queryKey: _queryKeys.queryKeys.devices.list(accountQueryScope(activeSessionId)),
     queryFn: async () => {
-      return (0, _core.authenticatedApiCall)(oxyServices, activeSessionId, () => oxyServices.getUserDevices());
+      return (0, _core.authenticatedApiCall)(oxyServices, activeSessionId, () => oxyServices.devices.list());
     },
     enabled: options?.enabled !== false && isAuthenticated && !!activeSessionId,
     staleTime: 5 * 60 * 1000,
@@ -134,7 +134,7 @@ const useSecurityInfo = options => {
   return (0, _reactQuery.useQuery)({
     queryKey: [..._queryKeys.queryKeys.devices.all, 'security'],
     queryFn: async () => {
-      return await oxyServices.getSecurityInfo();
+      return await oxyServices.devices.securityInfo();
     },
     enabled: options?.enabled !== false && isAuthenticated,
     staleTime: 5 * 60 * 1000,
@@ -144,7 +144,7 @@ const useSecurityInfo = options => {
 
 /**
  * Get account storage usage (server-aggregated usage across assets, mail,
- * recordings, etc.). Wraps `oxyServices.getAccountStorageUsage()` in a
+ * recordings, etc.). Wraps `oxyServices.assets.usage()` in a
  * TanStack query so consumers get caching, background refetch, and a
  * consistent `isLoading` / `refetch` surface instead of hand-rolled
  * `useEffect` fetches.
@@ -159,7 +159,7 @@ const useAccountStorageUsage = options => {
   return (0, _reactQuery.useQuery)({
     queryKey: _queryKeys.queryKeys.storage.usage(accountQueryScope(activeSessionId)),
     queryFn: async () => {
-      return (0, _core.authenticatedApiCall)(oxyServices, activeSessionId, () => oxyServices.getAccountStorageUsage());
+      return (0, _core.authenticatedApiCall)(oxyServices, activeSessionId, () => oxyServices.assets.usage());
     },
     enabled: options?.enabled !== false && isAuthenticated && !!activeSessionId,
     staleTime: 5 * 60 * 1000,

package/lib/commonjs/ui/hooks/queries/useServicesQueries.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactQuery","require","_core","_queryKeys","_OxyContext","_sessionHelpers","accountQueryScope","activeSessionId","useSessions","userId","options","oxyServices","useOxy","useQuery","queryKey","queryKeys","sessions","list","queryFn","Error","fetchSessionsWithFallback","fallbackDeviceId","undefined","fallbackUserId","mapSessionsToClient","enabled","staleTime","gcTime","exports","useSession","sessionId","detail","validation","validateSession","useHeaderValidation","valid","user","now","Date","deviceId","expiresAt","getTime","toISOString","lastActive","lastActivity","id","toString","isCurrent","useDeviceSessions","active","getDeviceSessions","useUserDevices","isAuthenticated","devices","authenticatedApiCall","getUserDevices","useSecurityInfo","all","getSecurityInfo","useAccountStorageUsage","storage","usage","getAccountStorageUsage"],"sourceRoot":"../../../../../src","sources":["ui/hooks/queries/useServicesQueries.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_reactQuery","require","_core","_queryKeys","_OxyContext","_sessionHelpers","accountQueryScope","activeSessionId","useSessions","userId","options","oxyServices","useOxy","useQuery","queryKey","queryKeys","sessions","list","queryFn","Error","fetchSessionsWithFallback","fallbackDeviceId","undefined","fallbackUserId","mapSessionsToClient","enabled","staleTime","gcTime","exports","useSession","sessionId","detail","validation","session","validate","useHeaderValidation","valid","user","now","Date","deviceId","expiresAt","getTime","toISOString","lastActive","lastActivity","id","toString","isCurrent","useDeviceSessions","active","devices","useUserDevices","isAuthenticated","authenticatedApiCall","useSecurityInfo","all","securityInfo","useAccountStorageUsage","storage","usage","assets"],"sourceRoot":"../../../../../src","sources":["ui/hooks/queries/useServicesQueries.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/ui/hooks/useAssets.js

@@ -22,7 +22,7 @@ const useAssets = () => {
     uploadProgress,
     loading,
     errors,
-    setAsset,
+    mergeAsset,
     setAssets,
     removeAsset,
     setUploadProgress,
@@ -51,7 +51,9 @@ const useAssets = () => {
     try {
       clearErrors();
       setUploading(true);
-      const result = await oxyInstance.assetUpload(file, undefined, metadata);
+      const result = await oxyInstance.assets.upload(file, {
+        metadata
+      });
 
       // Update progress with final status
       if (result?.file) {
@@ -72,7 +74,7 @@ const useAssets = () => {
 
       // Add asset to store
       if (result.file) {
-        setAsset(result.file);
+        mergeAsset(result.file);
         return result.file;
       }
       return null;
@@ -82,7 +84,7 @@ const useAssets = () => {
     } finally {
       setUploading(false);
     }
-  }, [clearErrors, setUploading, setUploadProgress, removeUploadProgress, setAsset, setUploadError]);
+  }, [clearErrors, setUploading, setUploadProgress, removeUploadProgress, mergeAsset, setUploadError]);
 
   // Link asset to entity
   const link = (0, _react.useCallback)(async (assetId, app, entityType, entityId) => {
@@ -95,9 +97,15 @@ const useAssets = () => {
 
       // Auto-detect visibility for avatars and profile banners
       const visibility = entityType === 'avatar' || entityType === 'profile-banner' ? 'public' : undefined;
-      const result = await oxyInstance.assetLink(assetId, app, entityType, entityId, visibility);
+      const result = await oxyInstance.assets.link(assetId, {
+        app,
+        entityType,
+        entityId
+      }, {
+        visibility
+      });
       if (result.file) {
-        setAsset(result.file);
+        mergeAsset(result.file);
       } else {
         // If API doesn't return full file, update store optimistically
         addLink(assetId, {
@@ -115,7 +123,7 @@ const useAssets = () => {
     } finally {
       setLinking(false);
     }
-  }, [clearErrors, setLinking, setAsset, addLink, setLinkError]);
+  }, [clearErrors, setLinking, mergeAsset, addLink, setLinkError]);
 
   // Unlink asset from entity
   const unlink = (0, _react.useCallback)(async (assetId, app, entityType, entityId) => {
@@ -125,9 +133,13 @@ const useAssets = () => {
     try {
       clearErrors();
       setLinking(true);
-      const result = await oxyInstance.assetUnlink(assetId, app, entityType, entityId);
+      const result = await oxyInstance.assets.unlink(assetId, {
+        app,
+        entityType,
+        entityId
+      });
       if (result.file) {
-        setAsset(result.file);
+        mergeAsset(result.file);
       } else {
         // Update store optimistically
         removeLink(assetId, app, entityType, entityId);
@@ -138,15 +150,14 @@ const useAssets = () => {
     } finally {
       setLinking(false);
     }
-  }, [clearErrors, setLinking, setAsset, removeLink, setLinkError]);
+  }, [clearErrors, setLinking, mergeAsset, removeLink, setLinkError]);
 
   // Get asset URL
   const getUrl = (0, _react.useCallback)(async (assetId, variant, expiresIn) => {
     if (!oxyInstance) {
       throw new Error('OxyServices instance not configured. Call setOxyAssetInstance first.');
     }
-    const result = await oxyInstance.assetGetUrl(assetId, variant, expiresIn);
-    return result.url;
+    return oxyInstance.assets.url(assetId, variant, expiresIn);
   }, []);
 
   // Get asset metadata
@@ -154,13 +165,13 @@ const useAssets = () => {
     if (!oxyInstance) {
       throw new Error('OxyServices instance not configured. Call setOxyAssetInstance first.');
     }
-    const result = await oxyInstance.assetGet(assetId);
+    const result = await oxyInstance.assets.get(assetId);
     if (result.file) {
-      setAsset(result.file);
+      mergeAsset(result.file);
       return result.file;
     }
     throw new Error('Asset not found');
-  }, [setAsset]);
+  }, [mergeAsset]);
 
   // Delete asset
   const deleteAsset = (0, _react.useCallback)(async (assetId, force = false) => {
@@ -170,7 +181,9 @@ const useAssets = () => {
     try {
       clearErrors();
       setDeleting(true);
-      await oxyInstance.assetDelete(assetId, force);
+      await oxyInstance.assets.delete(assetId, {
+        force
+      });
       removeAsset(assetId);
     } catch (error) {
       setDeleteError((error instanceof Error ? error.message : null) || 'Delete failed');
@@ -185,18 +198,21 @@ const useAssets = () => {
     if (!oxyInstance) {
       throw new Error('OxyServices instance not configured. Call setOxyAssetInstance first.');
     }
-    const result = await oxyInstance.assetRestore(assetId);
+    const result = await oxyInstance.assets.restore(assetId);
     if (result.file) {
-      setAsset(result.file);
+      mergeAsset(result.file);
     }
-  }, [setAsset]);
+  }, [mergeAsset]);
 
   // Get variants
   const getVariants = (0, _react.useCallback)(async assetId => {
     if (!oxyInstance) {
       throw new Error('OxyServices instance not configured. Call setOxyAssetInstance first.');
     }
-    return await oxyInstance.assetGetVariants(assetId);
+    const {
+      file
+    } = await oxyInstance.assets.get(assetId);
+    return file?.variants ?? [];
   }, []);
   return {
     // State