@oxy.so/services 6.2.0 → 8.1.0

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

@@ -1,6 +1,5 @@
 "use strict";
 
-import { useMemo } from 'react';
 import { useQuery } from '@tanstack/react-query';
 import { queryKeys } from "./queryKeys.js";
 import { useOxy } from "../../context/OxyContext.js";
@@ -9,13 +8,9 @@ import { useOxy } from "../../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.
  */
 export const useAuthMethods = options => {
   const {
@@ -24,22 +19,38 @@ export const useAuthMethods = options => {
   } = useOxy();
   const query = useQuery({
     queryKey: 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 = 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).
+ */
+export const useSignInMethods = options => {
+  const {
+    oxyServices,
+    activeSessionId,
+    user
+  } = useOxy();
+  return useQuery({
+    queryKey: queryKeys.signInMethods.current(user?.id),
+    queryFn: () => oxyServices.auth.methods(),
+    enabled: options?.enabled !== false && !!activeSessionId,
+    staleTime: 60 * 1000
+  });
+};
 //# sourceMappingURL=useAuthMethods.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["useMemo","useQuery","queryKeys","useOxy","EMPTY_METHODS","Object","freeze","useAuthMethods","options","oxyServices","activeSessionId","query","queryKey","authMethods","list","queryFn","listAuthMethods","enabled","staleTime","gcTime","methods","data","passkeys","filter","method","type","did"],"sourceRoot":"../../../../../src","sources":["ui/hooks/queries/useAuthMethods.ts"],"mappings":";;AAAA,SAASA,OAAO,QAAQ,OAAO;AAC/B,SAASC,QAAQ,QAAQ,uBAAuB;AAEhD,SAASC,SAAS,QAAQ,gBAAa;AACvC,SAASC,MAAM,QAAQ,6BAA0B;;AAEjD;AACA,MAAMC,aAAyC,GAAGC,MAAM,CAACC,MAAM,CAAC,EAAE,CAAC;;AAEnE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,cAAc,GAAIC,OAA+B,IAAK;EACjE,MAAM;IAAEC,WAAW;IAAEC;EAAgB,CAAC,GAAGP,MAAM,CAAC,CAAC;EAEjD,MAAMQ,KAAK,GAAGV,QAAQ,CAAsB;IAC1CW,QAAQ,EAAEV,SAAS,CAACW,WAAW,CAACC,IAAI,CAAC,CAAC;IACtCC,OAAO,EAAEA,CAAA,KAAMN,WAAW,CAACO,eAAe,CAAC,CAAC;IAC5CC,OAAO,EAAET,OAAO,EAAES,OAAO,KAAK,KAAK,IAAI,CAAC,CAACP,eAAe;IACxDQ,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;IAAE;IAC1BC,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,CAAE;EAC1B,CAAC,CAAC;EAEF,MAAMC,OAAO,GAAGT,KAAK,CAACU,IAAI,EAAED,OAAO,IAAIhB,aAAa;EACpD,MAAMkB,QAAQ,GAAGtB,OAAO,CACtB,MAAMoB,OAAO,CAACG,MAAM,CAAEC,MAAM,IAAKA,MAAM,CAACC,IAAI,KAAK,UAAU,CAAC,EAC5D,CAACL,OAAO,CACV,CAAC;EAED,OAAO;IACL,GAAGT,KAAK;IACR;IACAS,OAAO;IACP;IACAE,QAAQ;IACR;IACAI,GAAG,EAAEf,KAAK,CAACU,IAAI,EAAEK,GAAG,IAAI;EAC1B,CAAC;AACH,CAAC","ignoreList":[]}
+{"version":3,"names":["useQuery","queryKeys","useOxy","EMPTY_METHODS","Object","freeze","useAuthMethods","options","oxyServices","activeSessionId","query","queryKey","authMethods","list","queryFn","identity","enabled","staleTime","gcTime","methods","data","did","useSignInMethods","user","signInMethods","current","id","auth"],"sourceRoot":"../../../../../src","sources":["ui/hooks/queries/useAuthMethods.ts"],"mappings":";;AAAA,SAASA,QAAQ,QAAQ,uBAAuB;AAEhD,SAASC,SAAS,QAAQ,gBAAa;AACvC,SAASC,MAAM,QAAQ,6BAA0B;;AAEjD;AACA,MAAMC,aAAyC,GAAGC,MAAM,CAACC,MAAM,CAAC,EAAE,CAAC;;AAEnE;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,cAAc,GAAIC,OAA+B,IAAK;EACjE,MAAM;IAAEC,WAAW;IAAEC;EAAgB,CAAC,GAAGP,MAAM,CAAC,CAAC;EAEjD,MAAMQ,KAAK,GAAGV,QAAQ,CAAsB;IAC1CW,QAAQ,EAAEV,SAAS,CAACW,WAAW,CAACC,IAAI,CAAC,CAAC;IACtCC,OAAO,EAAEA,CAAA,KAAMN,WAAW,CAACO,QAAQ,CAACH,WAAW,CAAC,CAAC;IACjDI,OAAO,EAAET,OAAO,EAAES,OAAO,KAAK,KAAK,IAAI,CAAC,CAACP,eAAe;IACxDQ,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;IAAE;IAC1BC,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,CAAE;EAC1B,CAAC,CAAC;EAEF,OAAO;IACL,GAAGR,KAAK;IACR;IACAS,OAAO,EAAET,KAAK,CAACU,IAAI,EAAED,OAAO,IAAIhB,aAAa;IAC7C;IACAkB,GAAG,EAAEX,KAAK,CAACU,IAAI,EAAEC,GAAG,IAAI;EAC1B,CAAC;AACH,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,gBAAgB,GAAIf,OAA+B,IAAK;EACnE,MAAM;IAAEC,WAAW;IAAEC,eAAe;IAAEc;EAAK,CAAC,GAAGrB,MAAM,CAAC,CAAC;EACvD,OAAOF,QAAQ,CAAgB;IAC7BW,QAAQ,EAAEV,SAAS,CAACuB,aAAa,CAACC,OAAO,CAACF,IAAI,EAAEG,EAAE,CAAC;IACnDZ,OAAO,EAAEA,CAAA,KAAMN,WAAW,CAACmB,IAAI,CAACR,OAAO,CAAC,CAAC;IACzCH,OAAO,EAAET,OAAO,EAAES,OAAO,KAAK,KAAK,IAAI,CAAC,CAACP,eAAe;IACxDQ,SAAS,EAAE,EAAE,GAAG;EAClB,CAAC,CAAC;AACJ,CAAC","ignoreList":[]}

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

@@ -18,7 +18,7 @@ import { queryKeys } from "./queryKeys.js";
 /** Files fetched per page. */
 export const 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. */
 
@@ -51,7 +51,10 @@ export 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/module/ui/hooks/queries/useFileQueries.js.map

@@ -1 +1 @@
-{"version":3,"names":["useInfiniteQuery","useOxy","queryKeys","FILES_PAGE_SIZE","mapRawFileToMetadata","raw","id","filename","originalName","sha256","contentType","mime","length","size","chunkSize","uploadDate","createdAt","metadata","variants","useUserFilesInfinite","ownerId","oxyServices","queryKey","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":["useInfiniteQuery","useOxy","queryKeys","FILES_PAGE_SIZE","mapRawFileToMetadata","raw","id","filename","originalName","sha256","contentType","mime","length","size","chunkSize","uploadDate","createdAt","metadata","variants","useUserFilesInfinite","ownerId","oxyServices","queryKey","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/module/ui/hooks/queries/usePaymentQueries.js

@@ -24,7 +24,7 @@ import { useOxy } from "../../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.
@@ -39,7 +39,7 @@ export const useUserSubscription = options => {
   return useQuery({
     queryKey: queryKeys.payments.subscription(user?.id),
     queryFn: async () => {
-      return authenticatedApiCall(oxyServices, activeSessionId, () => oxyServices.getCurrentUserSubscription());
+      return authenticatedApiCall(oxyServices, activeSessionId, () => oxyServices.billing.subscription());
     },
     enabled: options?.enabled !== false && isAuthenticated && !!user?.id,
     // Subscription state changes rarely; tolerate a longer fresh window.
@@ -52,7 +52,7 @@ export 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.
  */
 export const useUserPayments = options => {
@@ -65,7 +65,7 @@ export const useUserPayments = options => {
   return useQuery({
     queryKey: queryKeys.payments.history(user?.id),
     queryFn: async () => {
-      return authenticatedApiCall(oxyServices, activeSessionId, () => oxyServices.getUserPayments());
+      return authenticatedApiCall(oxyServices, activeSessionId, () => oxyServices.billing.payments());
     },
     enabled: options?.enabled !== false && isAuthenticated && !!user?.id,
     // Billing history is append-mostly; a short fresh window is fine.
@@ -78,7 +78,7 @@ export 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.
  */
 export const useUserWallet = options => {
@@ -91,7 +91,7 @@ export const useUserWallet = options => {
   return useQuery({
     queryKey: queryKeys.payments.wallet(user?.id),
     queryFn: async () => {
-      return authenticatedApiCall(oxyServices, activeSessionId, () => oxyServices.getCurrentUserWallet());
+      return authenticatedApiCall(oxyServices, activeSessionId, () => oxyServices.billing.wallet());
     },
     enabled: options?.enabled !== false && isAuthenticated && !!user?.id,
     staleTime: 60 * 1000,
@@ -103,7 +103,7 @@ export 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`.
@@ -123,7 +123,7 @@ export const useUserWalletTransactions = (params, options) => {
   return useQuery({
     queryKey: queryKeys.payments.walletTransactions(limit, offset, user?.id),
     queryFn: async () => {
-      return authenticatedApiCall(oxyServices, activeSessionId, () => oxyServices.getCurrentUserWalletTransactions({
+      return authenticatedApiCall(oxyServices, activeSessionId, () => oxyServices.billing.walletTransactions({
         limit,
         offset
       }));

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

@@ -1 +1 @@
-{"version":3,"names":["useQuery","authenticatedApiCall","queryKeys","useOxy","useUserSubscription","options","oxyServices","isAuthenticated","activeSessionId","user","queryKey","payments","subscription","id","queryFn","getCurrentUserSubscription","enabled","staleTime","gcTime","useUserPayments","history","getUserPayments","useUserWallet","wallet","getCurrentUserWallet","useUserWalletTransactions","params","limit","offset","walletTransactions","getCurrentUserWalletTransactions"],"sourceRoot":"../../../../../src","sources":["ui/hooks/queries/usePaymentQueries.ts"],"mappings":";;AAAA,SAASA,QAAQ,QAAQ,uBAAuB;AAChD,SAASC,oBAAoB,QAAQ,cAAc;AACnD,SAASC,SAAS,QAAQ,gBAAa;AACvC,SAASC,MAAM,QAAQ,6BAA0B;AAQjD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,mBAAmB,GAAIC,OAA+B,IAAK;EACtE,MAAM;IAAEC,WAAW;IAAEC,eAAe;IAAEC,eAAe;IAAEC;EAAK,CAAC,GAAGN,MAAM,CAAC,CAAC;EAExE,OAAOH,QAAQ,CAAC;IACdU,QAAQ,EAAER,SAAS,CAACS,QAAQ,CAACC,YAAY,CAACH,IAAI,EAAEI,EAAE,CAAC;IACnDC,OAAO,EAAE,MAAAA,CAAA,KAAY;MACnB,OAAOb,oBAAoB,CACzBK,WAAW,EACXE,eAAe,EACf,MAAMF,WAAW,CAACS,0BAA0B,CAAC,CAC/C,CAAC;IACH,CAAC;IACDC,OAAO,EAAGX,OAAO,EAAEW,OAAO,KAAK,KAAK,IAAKT,eAAe,IAAI,CAAC,CAACE,IAAI,EAAEI,EAAE;IACtE;IACAI,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;AACA;AACA,OAAO,MAAMC,eAAe,GAAId,OAA+B,IAAK;EAClE,MAAM;IAAEC,WAAW;IAAEC,eAAe;IAAEC,eAAe;IAAEC;EAAK,CAAC,GAAGN,MAAM,CAAC,CAAC;EAExE,OAAOH,QAAQ,CAAC;IACdU,QAAQ,EAAER,SAAS,CAACS,QAAQ,CAACS,OAAO,CAACX,IAAI,EAAEI,EAAE,CAAC;IAC9CC,OAAO,EAAE,MAAAA,CAAA,KAAY;MACnB,OAAOb,oBAAoB,CACzBK,WAAW,EACXE,eAAe,EACf,MAAMF,WAAW,CAACe,eAAe,CAAC,CACpC,CAAC;IACH,CAAC;IACDL,OAAO,EAAGX,OAAO,EAAEW,OAAO,KAAK,KAAK,IAAKT,eAAe,IAAI,CAAC,CAACE,IAAI,EAAEI,EAAE;IACtE;IACAI,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;AACA;AACA,OAAO,MAAMI,aAAa,GAAIjB,OAA+B,IAAK;EAChE,MAAM;IAAEC,WAAW;IAAEC,eAAe;IAAEC,eAAe;IAAEC;EAAK,CAAC,GAAGN,MAAM,CAAC,CAAC;EAExE,OAAOH,QAAQ,CAAC;IACdU,QAAQ,EAAER,SAAS,CAACS,QAAQ,CAACY,MAAM,CAACd,IAAI,EAAEI,EAAE,CAAC;IAC7CC,OAAO,EAAE,MAAAA,CAAA,KAAY;MACnB,OAAOb,oBAAoB,CACzBK,WAAW,EACXE,eAAe,EACf,MAAMF,WAAW,CAACkB,oBAAoB,CAAC,CACzC,CAAC;IACH,CAAC;IACDR,OAAO,EAAGX,OAAO,EAAEW,OAAO,KAAK,KAAK,IAAKT,eAAe,IAAI,CAAC,CAACE,IAAI,EAAEI,EAAE;IACtEI,SAAS,EAAE,EAAE,GAAG,IAAI;IAAE;IACtBC,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,CAAE;EAC1B,CAAC,CAAC;AACJ,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMO,yBAAyB,GAAGA,CACvCC,MAA4C,EAC5CrB,OAA+B,KAC5B;EACH,MAAM;IAAEC,WAAW;IAAEC,eAAe;IAAEC,eAAe;IAAEC;EAAK,CAAC,GAAGN,MAAM,CAAC,CAAC;EACxE,MAAMwB,KAAK,GAAGD,MAAM,EAAEC,KAAK;EAC3B,MAAMC,MAAM,GAAGF,MAAM,EAAEE,MAAM;EAE7B,OAAO5B,QAAQ,CAAC;IACdU,QAAQ,EAAER,SAAS,CAACS,QAAQ,CAACkB,kBAAkB,CAACF,KAAK,EAAEC,MAAM,EAAEnB,IAAI,EAAEI,EAAE,CAAC;IACxEC,OAAO,EAAE,MAAAA,CAAA,KAAY;MACnB,OAAOb,oBAAoB,CACzBK,WAAW,EACXE,eAAe,EACf,MAAMF,WAAW,CAACwB,gCAAgC,CAAC;QAAEH,KAAK;QAAEC;MAAO,CAAC,CACtE,CAAC;IACH,CAAC;IACDZ,OAAO,EAAGX,OAAO,EAAEW,OAAO,KAAK,KAAK,IAAKT,eAAe,IAAI,CAAC,CAACE,IAAI,EAAEI,EAAE;IACtEI,SAAS,EAAE,EAAE,GAAG,IAAI;IAAE;IACtBC,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,CAAE;EAC1B,CAAC,CAAC;AACJ,CAAC","ignoreList":[]}
+{"version":3,"names":["useQuery","authenticatedApiCall","queryKeys","useOxy","useUserSubscription","options","oxyServices","isAuthenticated","activeSessionId","user","queryKey","payments","subscription","id","queryFn","billing","enabled","staleTime","gcTime","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/module/ui/hooks/queries/useSecurityQueries.js

@@ -17,7 +17,7 @@ export 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,
@@ -41,7 +41,8 @@ export 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,
@@ -70,7 +71,7 @@ export 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/module/ui/hooks/queries/useSecurityQueries.js.map

@@ -1 +1 @@
-{"version":3,"names":["useQuery","useInfiniteQuery","queryKeys","useOxy","useSecurityActivity","options","oxyServices","activeSessionId","queryKey","security","activity","limit","offset","eventType","queryFn","Error","response","getSecurityActivity","enabled","staleTime","gcTime","useRecentSecurityActivity","recent","getRecentSecurityActivity","useInfiniteSecurityActivity","infinite","pageParam","initialPageParam","getNextPageParam","lastPage","hasMore","undefined"],"sourceRoot":"../../../../../src","sources":["ui/hooks/queries/useSecurityQueries.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useQuery","useInfiniteQuery","queryKeys","useOxy","useSecurityActivity","options","oxyServices","activeSessionId","queryKey","security","activity","limit","offset","eventType","queryFn","Error","response","devices","securityActivity","enabled","staleTime","gcTime","useRecentSecurityActivity","recent","page","data","useInfiniteSecurityActivity","infinite","pageParam","initialPageParam","getNextPageParam","lastPage","hasMore","undefined"],"sourceRoot":"../../../../../src","sources":["ui/hooks/queries/useSecurityQueries.ts"],"mappings":"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","ignoreList":[]}

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

@@ -51,7 +51,7 @@ export 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) {
@@ -88,7 +88,7 @@ export 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,
@@ -108,7 +108,7 @@ export const useUserDevices = options => {
   return useQuery({
     queryKey: queryKeys.devices.list(accountQueryScope(activeSessionId)),
     queryFn: async () => {
-      return authenticatedApiCall(oxyServices, activeSessionId, () => oxyServices.getUserDevices());
+      return authenticatedApiCall(oxyServices, activeSessionId, () => oxyServices.devices.list());
     },
     enabled: options?.enabled !== false && isAuthenticated && !!activeSessionId,
     staleTime: 5 * 60 * 1000,
@@ -127,7 +127,7 @@ export const useSecurityInfo = options => {
   return useQuery({
     queryKey: [...queryKeys.devices.all, 'security'],
     queryFn: async () => {
-      return await oxyServices.getSecurityInfo();
+      return await oxyServices.devices.securityInfo();
     },
     enabled: options?.enabled !== false && isAuthenticated,
     staleTime: 5 * 60 * 1000,
@@ -137,7 +137,7 @@ export 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.
@@ -151,7 +151,7 @@ export const useAccountStorageUsage = options => {
   return useQuery({
     queryKey: queryKeys.storage.usage(accountQueryScope(activeSessionId)),
     queryFn: async () => {
-      return authenticatedApiCall(oxyServices, activeSessionId, () => oxyServices.getAccountStorageUsage());
+      return authenticatedApiCall(oxyServices, activeSessionId, () => oxyServices.assets.usage());
     },
     enabled: options?.enabled !== false && isAuthenticated && !!activeSessionId,
     staleTime: 5 * 60 * 1000,

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

@@ -1 +1 @@
-{"version":3,"names":["useQuery","authenticatedApiCall","queryKeys","useOxy","fetchSessionsWithFallback","mapSessionsToClient","accountQueryScope","activeSessionId","useSessions","userId","options","oxyServices","queryKey","sessions","list","queryFn","Error","fallbackDeviceId","undefined","fallbackUserId","enabled","staleTime","gcTime","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","getUserDevices","useSecurityInfo","all","getSecurityInfo","useAccountStorageUsage","storage","usage","getAccountStorageUsage"],"sourceRoot":"../../../../../src","sources":["ui/hooks/queries/useServicesQueries.ts"],"mappings":";;AAAA,SAASA,QAAQ,QAAQ,uBAAuB;AAChD,SAASC,oBAAoB,QAAQ,cAAc;AAEnD,SAASC,SAAS,QAAQ,gBAAa;AACvC,SAASC,MAAM,QAAQ,6BAA0B;AACjD,SAASC,yBAAyB,EAAEC,mBAAmB,QAAQ,+BAA4B;;AAE3F;AACA;AACA;AACA,MAAMC,iBAAiB,GAAIC,eAA8B,IACvD,GAAGA,eAAe,IAAI,YAAY,EAAE;;AAEtC;AACA;AACA;AACA,OAAO,MAAMC,WAAW,GAAGA,CAACC,MAAe,EAAEC,OAA+B,KAAK;EAC/E,MAAM;IAAEC,WAAW;IAAEJ;EAAgB,CAAC,GAAGJ,MAAM,CAAC,CAAC;EAEjD,OAAOH,QAAQ,CAAC;IACdY,QAAQ,EAAEV,SAAS,CAACW,QAAQ,CAACC,IAAI,CAACL,MAAM,CAAC;IACzCM,OAAO,EAAE,MAAAA,CAAA,KAAY;MACnB,IAAI,CAACR,eAAe,EAAE;QACpB,MAAM,IAAIS,KAAK,CAAC,mBAAmB,CAAC;MACtC;MAEA,MAAMH,QAAQ,GAAG,MAAMT,yBAAyB,CAACO,WAAW,EAAEJ,eAAe,EAAE;QAC7EU,gBAAgB,EAAEC,SAAS;QAC3BC,cAAc,EAAEV;MAClB,CAAC,CAAC;MAEF,OAAOJ,mBAAmB,CAACQ,QAAQ,EAAEN,eAAe,CAAC;IACvD,CAAC;IACDa,OAAO,EAAGV,OAAO,EAAEU,OAAO,KAAK,KAAK,IAAK,CAAC,CAACb,eAAe;IAC1Dc,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,OAAO,MAAMC,UAAU,GAAGA,CAACC,SAAwB,EAAEd,OAA+B,KAAK;EACvF,MAAM;IAAEC;EAAY,CAAC,GAAGR,MAAM,CAAC,CAAC;EAEhC,OAAOH,QAAQ,CAAC;IACdY,QAAQ,EAAEV,SAAS,CAACW,QAAQ,CAACY,MAAM,CAACD,SAAS,IAAI,EAAE,CAAC;IACpDT,OAAO,EAAE,MAAAA,CAAA,KAAY;MACnB,IAAI,CAACS,SAAS,EAAE;QACd,MAAM,IAAIR,KAAK,CAAC,wBAAwB,CAAC;MAC3C;MAEA,MAAMU,UAAU,GAAG,MAAMf,WAAW,CAACgB,eAAe,CAACH,SAAS,EAAE;QAAEI,mBAAmB,EAAE;MAAK,CAAC,CAAC;MAC9F,IAAI,CAACF,UAAU,EAAEG,KAAK,IAAI,CAACH,UAAU,CAACI,IAAI,EAAE;QAC1C,MAAM,IAAId,KAAK,CAAC,8BAA8B,CAAC;MACjD;MAEA,MAAMe,GAAG,GAAG,IAAIC,IAAI,CAAC,CAAC;MACtB,OAAO;QACLR,SAAS;QACTS,QAAQ,EAAE,EAAE;QAAE;QACdC,SAAS,EAAER,UAAU,CAACQ,SAAS,IAAI,IAAIF,IAAI,CAACD,GAAG,CAACI,OAAO,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAACC,WAAW,CAAC,CAAC;QAClGC,UAAU,EAAEX,UAAU,CAACY,YAAY,IAAIP,GAAG,CAACK,WAAW,CAAC,CAAC;QACxD3B,MAAM,EAAEiB,UAAU,CAACI,IAAI,CAACS,EAAE,EAAEC,QAAQ,CAAC,CAAC,IAAI,EAAE;QAC5CC,SAAS,EAAE;MACb,CAAC;IACH,CAAC;IACDrB,OAAO,EAAGV,OAAO,EAAEU,OAAO,KAAK,KAAK,IAAK,CAAC,CAACI,SAAS;IACpDH,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;IACxBC,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG;EACpB,CAAC,CAAC;AACJ,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMoB,iBAAiB,GAAIhC,OAA+B,IAAK;EACpE,MAAM;IAAEC,WAAW;IAAEJ;EAAgB,CAAC,GAAGJ,MAAM,CAAC,CAAC;EAEjD,OAAOH,QAAQ,CAAC;IACdY,QAAQ,EAAEV,SAAS,CAACW,QAAQ,CAAC8B,MAAM,CAAC,CAAC;IACrC5B,OAAO,EAAE,MAAAA,CAAA,KAAY;MACnB,IAAI,CAACR,eAAe,EAAE;QACpB,MAAM,IAAIS,KAAK,CAAC,mBAAmB,CAAC;MACtC;MAEA,OAAO,MAAML,WAAW,CAACiC,iBAAiB,CAACrC,eAAe,CAAC;IAC7D,CAAC;IACDa,OAAO,EAAGV,OAAO,EAAEU,OAAO,KAAK,KAAK,IAAK,CAAC,CAACb,eAAe;IAC1Dc,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;IACxBC,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG;EACpB,CAAC,CAAC;AACJ,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMuB,cAAc,GAAInC,OAA+B,IAAK;EACjE,MAAM;IAAEC,WAAW;IAAEmC,eAAe;IAAEvC;EAAgB,CAAC,GAAGJ,MAAM,CAAC,CAAC;EAElE,OAAOH,QAAQ,CAAC;IACdY,QAAQ,EAAEV,SAAS,CAAC6C,OAAO,CAACjC,IAAI,CAACR,iBAAiB,CAACC,eAAe,CAAC,CAAC;IACpEQ,OAAO,EAAE,MAAAA,CAAA,KAAY;MACnB,OAAOd,oBAAoB,CACzBU,WAAW,EACXJ,eAAe,EACf,MAAMI,WAAW,CAACqC,cAAc,CAAC,CACnC,CAAC;IACH,CAAC;IACD5B,OAAO,EAAGV,OAAO,EAAEU,OAAO,KAAK,KAAK,IAAK0B,eAAe,IAAI,CAAC,CAACvC,eAAe;IAC7Ec,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;IACxBC,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG;EACpB,CAAC,CAAC;AACJ,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAM2B,eAAe,GAAIvC,OAA+B,IAAK;EAClE,MAAM;IAAEC,WAAW;IAAEmC;EAAgB,CAAC,GAAG3C,MAAM,CAAC,CAAC;EAEjD,OAAOH,QAAQ,CAAC;IACdY,QAAQ,EAAE,CAAC,GAAGV,SAAS,CAAC6C,OAAO,CAACG,GAAG,EAAE,UAAU,CAAC;IAChDnC,OAAO,EAAE,MAAAA,CAAA,KAAY;MACnB,OAAO,MAAMJ,WAAW,CAACwC,eAAe,CAAC,CAAC;IAC5C,CAAC;IACD/B,OAAO,EAAGV,OAAO,EAAEU,OAAO,KAAK,KAAK,IAAK0B,eAAe;IACxDzB,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;IACxBC,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG;EACpB,CAAC,CAAC;AACJ,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAM8B,sBAAsB,GAAI1C,OAA+B,IAAK;EACzE,MAAM;IAAEC,WAAW;IAAEmC,eAAe;IAAEvC;EAAgB,CAAC,GAAGJ,MAAM,CAAC,CAAC;EAElE,OAAOH,QAAQ,CAA8B;IAC3CY,QAAQ,EAAEV,SAAS,CAACmD,OAAO,CAACC,KAAK,CAAChD,iBAAiB,CAACC,eAAe,CAAC,CAAC;IACrEQ,OAAO,EAAE,MAAAA,CAAA,KAAY;MACnB,OAAOd,oBAAoB,CACzBU,WAAW,EACXJ,eAAe,EACf,MAAMI,WAAW,CAAC4C,sBAAsB,CAAC,CAC3C,CAAC;IACH,CAAC;IACDnC,OAAO,EAAGV,OAAO,EAAEU,OAAO,KAAK,KAAK,IAAK0B,eAAe,IAAI,CAAC,CAACvC,eAAe;IAC7Ec,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;IACxBC,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG;EACpB,CAAC,CAAC;AACJ,CAAC","ignoreList":[]}
+{"version":3,"names":["useQuery","authenticatedApiCall","queryKeys","useOxy","fetchSessionsWithFallback","mapSessionsToClient","accountQueryScope","activeSessionId","useSessions","userId","options","oxyServices","queryKey","sessions","list","queryFn","Error","fallbackDeviceId","undefined","fallbackUserId","enabled","staleTime","gcTime","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","useSecurityInfo","all","securityInfo","useAccountStorageUsage","storage","usage","assets"],"sourceRoot":"../../../../../src","sources":["ui/hooks/queries/useServicesQueries.ts"],"mappings":"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","ignoreList":[]}

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

@@ -17,7 +17,7 @@ export const useAssets = () => {
     uploadProgress,
     loading,
     errors,
-    setAsset,
+    mergeAsset,
     setAssets,
     removeAsset,
     setUploadProgress,
@@ -46,7 +46,9 @@ export 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) {
@@ -67,7 +69,7 @@ export const useAssets = () => {
 
       // Add asset to store
       if (result.file) {
-        setAsset(result.file);
+        mergeAsset(result.file);
         return result.file;
       }
       return null;
@@ -77,7 +79,7 @@ export const useAssets = () => {
     } finally {
       setUploading(false);
     }
-  }, [clearErrors, setUploading, setUploadProgress, removeUploadProgress, setAsset, setUploadError]);
+  }, [clearErrors, setUploading, setUploadProgress, removeUploadProgress, mergeAsset, setUploadError]);
 
   // Link asset to entity
   const link = useCallback(async (assetId, app, entityType, entityId) => {
@@ -90,9 +92,15 @@ export 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, {
@@ -110,7 +118,7 @@ export const useAssets = () => {
     } finally {
       setLinking(false);
     }
-  }, [clearErrors, setLinking, setAsset, addLink, setLinkError]);
+  }, [clearErrors, setLinking, mergeAsset, addLink, setLinkError]);
 
   // Unlink asset from entity
   const unlink = useCallback(async (assetId, app, entityType, entityId) => {
@@ -120,9 +128,13 @@ export 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);
@@ -133,15 +145,14 @@ export const useAssets = () => {
     } finally {
       setLinking(false);
     }
-  }, [clearErrors, setLinking, setAsset, removeLink, setLinkError]);
+  }, [clearErrors, setLinking, mergeAsset, removeLink, setLinkError]);
 
   // Get asset URL
   const getUrl = 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
@@ -149,13 +160,13 @@ export 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 = useCallback(async (assetId, force = false) => {
@@ -165,7 +176,9 @@ export 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');
@@ -180,18 +193,21 @@ export 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 = 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

package/lib/module/ui/hooks/useAssets.js.map

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useAssetStore","oxyInstance","setOxyAssetInstance","instance","useAssets","assets","uploadProgress","loading","errors","setAsset","setAssets","removeAsset","setUploadProgress","removeUploadProgress","addLink","removeLink","setUploading","setLinking","setDeleting","setUploadError","setLinkError","setDeleteError","clearErrors","getAssetsByApp","getAssetsByEntity","getAssetUsageCount","isAssetLinked","reset","upload","file","metadata","Error","result","assetUpload","undefined","fileId","id","uploaded","size","total","percentage","status","setTimeout","error","message","link","assetId","app","entityType","entityId","visibility","assetLink","createdBy","createdAt","Date","toISOString","unlink","assetUnlink","getUrl","variant","expiresIn","assetGetUrl","url","getAsset","assetGet","deleteAsset","force","assetDelete","restore","assetRestore","getVariants","assetGetVariants","Object","values"],"sourceRoot":"../../../../src","sources":["ui/hooks/useAssets.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useCallback","useAssetStore","oxyInstance","setOxyAssetInstance","instance","useAssets","assets","uploadProgress","loading","errors","mergeAsset","setAssets","removeAsset","setUploadProgress","removeUploadProgress","addLink","removeLink","setUploading","setLinking","setDeleting","setUploadError","setLinkError","setDeleteError","clearErrors","getAssetsByApp","getAssetsByEntity","getAssetUsageCount","isAssetLinked","reset","upload","file","metadata","Error","result","fileId","id","uploaded","size","total","percentage","status","setTimeout","error","message","link","assetId","app","entityType","entityId","visibility","undefined","createdBy","createdAt","Date","toISOString","unlink","getUrl","variant","expiresIn","url","getAsset","get","deleteAsset","force","delete","restore","getVariants","variants","Object","values"],"sourceRoot":"../../../../src","sources":["ui/hooks/useAssets.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/ui/hooks/useAvatarPicker.js

@@ -14,7 +14,7 @@
  *      one entry into it.
  *   2. The surface resolves with the cropped JPEG, with `{ removed: true }` when
  *      the user removed their photo, or `undefined` when they cancelled.
- *   3. A crop is uploaded as a NEW file via `oxyServices.assetUpload` and set as
+ *   3. A crop is uploaded as a NEW file via `oxyServices.assets.upload` and set as
  *      the avatar; a removal clears the avatar field.
  *
  * `expo-image-manipulator` is required for the crop step and `expo-image-picker`
@@ -28,7 +28,7 @@ import { toast } from '@oxy.so/bloom/toast';
 import { updateProfileWithAvatar } from "../utils/avatarUtils.js";
 import { openWithinOrPresent } from "../navigation/surfaces.js";
 
-/** Upload result shape returned by oxyServices.assetUpload (single-file path). */
+/** Upload result shape returned by oxyServices.assets.upload (single-file path). */
 
 function extractUploadedFileId(result) {
   if (!result) return undefined;
@@ -50,11 +50,13 @@ export function useAvatarPicker({
    */
   const finalizeCroppedAvatar = useCallback(async cropped => {
     try {
-      const uploadResult = await oxyServices.assetUpload({
+      const uploadResult = await oxyServices.assets.upload({
         uri: cropped.uri,
         type: cropped.mime,
         name: `avatar-${Date.now()}.jpg`
-      }, 'public');
+      }, {
+        visibility: 'public'
+      });
       const newFileId = extractUploadedFileId(uploadResult);
       if (!newFileId) {
         throw new Error('Avatar upload succeeded but no file ID was returned');

package/lib/module/ui/hooks/useAvatarPicker.js.map

@@ -1 +1 @@
-{"version":3,"names":["useCallback","translate","updateAvatarVisibility","toast","updateProfileWithAvatar","openWithinOrPresent","extractUploadedFileId","result","undefined","id","file","first","files","useAvatarPicker","oxyServices","currentLanguage","activeSessionId","queryClient","finalizeCroppedAvatar","cropped","uploadResult","assetUpload","uri","type","mime","name","Date","now","newFileId","Error","avatar","success","e","message","error","removeAvatar","openAvatarPicker"],"sourceRoot":"../../../../src","sources":["ui/hooks/useAvatarPicker.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useCallback","translate","updateAvatarVisibility","toast","updateProfileWithAvatar","openWithinOrPresent","extractUploadedFileId","result","undefined","id","file","first","files","useAvatarPicker","oxyServices","currentLanguage","activeSessionId","queryClient","finalizeCroppedAvatar","cropped","uploadResult","assets","upload","uri","type","mime","name","Date","now","visibility","newFileId","Error","avatar","success","e","message","error","removeAvatar","openAvatarPicker"],"sourceRoot":"../../../../src","sources":["ui/hooks/useAvatarPicker.ts"],"mappings":"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","ignoreList":[]}