@oxy.so/services 11.2.0-oxy-one.2 → 11.2.0-oxy-one.4

package/src/ui/hooks/useAuth.ts

@@ -114,9 +114,7 @@ export interface UseAuthReturn extends AuthState, AuthActions {
   openAvatarPicker: ReturnType<typeof useOxyAuthActions>['openAvatarPicker'];
 }
 
-export type SignInOutcome =
-  | { status: 'authenticated'; user: User }
-  | { status: 'dialog-opened' };
+export type SignInOutcome = { status: 'authenticated'; user: User } | { status: 'dialog-opened' };
 
 const selectAuthState = (snapshot: OxyRuntimeSnapshot): AuthState => ({
   user: snapshot.account,
@@ -124,26 +122,28 @@ const selectAuthState = (snapshot: OxyRuntimeSnapshot): AuthState => ({
   isLoading: snapshot.isLoading,
   isReady: snapshot.tokenReady,
   hasAccessToken: snapshot.hasAccessToken,
-  canUsePrivateApi: snapshot.authResolved
-    && snapshot.account !== null
-    && snapshot.tokenReady
-    && snapshot.hasAccessToken,
-  isPrivateApiPending: !snapshot.authResolved
-    || (snapshot.account !== null && (!snapshot.tokenReady || !snapshot.hasAccessToken)),
+  canUsePrivateApi:
+    snapshot.authResolved &&
+    snapshot.account !== null &&
+    snapshot.tokenReady &&
+    snapshot.hasAccessToken,
+  isPrivateApiPending:
+    !snapshot.authResolved ||
+    (snapshot.account !== null && (!snapshot.tokenReady || !snapshot.hasAccessToken)),
   isAuthResolved: snapshot.authResolved,
   error: snapshot.error?.message ?? null,
 });
 
 const authStatesEqual = (left: AuthState, right: AuthState): boolean =>
-  left.user === right.user
-  && left.isAuthenticated === right.isAuthenticated
-  && left.isLoading === right.isLoading
-  && left.isReady === right.isReady
-  && left.hasAccessToken === right.hasAccessToken
-  && left.canUsePrivateApi === right.canUsePrivateApi
-  && left.isPrivateApiPending === right.isPrivateApiPending
-  && left.isAuthResolved === right.isAuthResolved
-  && left.error === right.error;
+  left.user === right.user &&
+  left.isAuthenticated === right.isAuthenticated &&
+  left.isLoading === right.isLoading &&
+  left.isReady === right.isReady &&
+  left.hasAccessToken === right.hasAccessToken &&
+  left.canUsePrivateApi === right.canUsePrivateApi &&
+  left.isPrivateApiPending === right.isPrivateApiPending &&
+  left.isAuthResolved === right.isAuthResolved &&
+  left.error === right.error;
 
 /**
  * Unified auth hook for all Oxy apps
@@ -183,32 +183,35 @@ export function useAuth(): UseAuthReturn {
     ensureDeviceSessionLane,
   } = useOxyAuthActions();
 
-  const signIn = useCallback(async (publicKey?: string): Promise<SignInOutcome> => {
-    const classification = ensureDeviceSessionLane();
-    if (classification) await classification;
-    // Native: sign in directly with the cryptographic identity when a public key
-    // is provided, or an existing keychain identity is found.
-    if (publicKey) {
-      return { status: 'authenticated', user: await oxySignIn(publicKey) };
-    }
-    if (!isWebBrowser()) {
-      const hasExisting = await hasIdentity();
-      if (hasExisting) {
-        const existingKey = await getPublicKey();
-        if (existingKey) {
-          return { status: 'authenticated', user: await oxySignIn(existingKey) };
+  const signIn = useCallback(
+    async (publicKey?: string): Promise<SignInOutcome> => {
+      const classification = ensureDeviceSessionLane();
+      if (classification) await classification;
+      // Native: sign in directly with the cryptographic identity when a public key
+      // is provided, or an existing keychain identity is found.
+      if (publicKey) {
+        return { status: 'authenticated', user: await oxySignIn(publicKey) };
+      }
+      if (!isWebBrowser()) {
+        const hasExisting = await hasIdentity();
+        if (hasExisting) {
+          const existingKey = await getPublicKey();
+          if (existingKey) {
+            return { status: 'authenticated', user: await oxySignIn(existingKey) };
+          }
         }
       }
-    }
-
-    // Web, or native without a keychain identity: open the unified account dialog
-    // on its sign-in view (device flow / QR / password hand-off). There is NO
-    // automatic navigation to a login page — the device-first cold boot already
-    // restored a session if one existed. The caller reacts to `isAuthenticated`;
-    // report the initiated UI action instead of leaking a promise that never settles.
-    openAccountDialog('signin');
-    return { status: 'dialog-opened' };
-  }, [oxySignIn, hasIdentity, getPublicKey, openAccountDialog, ensureDeviceSessionLane]);
+
+      // Web, or native without a keychain identity: open the unified account dialog
+      // on its sign-in view (device flow / QR / password hand-off). There is NO
+      // automatic navigation to a login page — the device-first cold boot already
+      // restored a session if one existed. The caller reacts to `isAuthenticated`;
+      // report the initiated UI action instead of leaking a promise that never settles.
+      openAccountDialog('signin');
+      return { status: 'dialog-opened' };
+    },
+    [oxySignIn, hasIdentity, getPublicKey, openAccountDialog, ensureDeviceSessionLane],
+  );
 
   const signOut = useCallback(async (): Promise<void> => {
     const result = await logout();

package/src/ui/hooks/useAvatarPicker.ts

@@ -107,14 +107,11 @@ export function useAvatarPicker({
   const removeAvatar = useCallback(async () => {
     try {
       await updateProfileWithAvatar({ avatar: '' }, oxyServices, activeSessionId, queryClient);
-      toast.success(
-        translate(currentLanguage ?? undefined, 'editProfile.toasts.avatarRemoved'),
-      );
+      toast.success(translate(currentLanguage ?? undefined, 'editProfile.toasts.avatarRemoved'));
     } catch (e: unknown) {
       const message = e instanceof Error ? e.message : undefined;
       toast.error(
-        message ||
-          translate(currentLanguage ?? undefined, 'editProfile.toasts.updateAvatarFailed'),
+        message || translate(currentLanguage ?? undefined, 'editProfile.toasts.updateAvatarFailed'),
       );
     }
   }, [activeSessionId, currentLanguage, oxyServices, queryClient]);

package/src/ui/hooks/useDeviceManagement.ts

@@ -104,5 +104,3 @@ export const useDeviceManagement = ({
     updateDeviceName,
   };
 };
-
-

package/src/ui/hooks/useDeviceSwitcher.ts

@@ -1,39 +1,44 @@
 import { useCallback, useMemo } from 'react';
-import { buildSwitcherRows, projectDevicePrincipals, type DeviceContext, type SwitcherPrincipalRow } from '@oxy.so/core/session';
+import {
+  buildSwitcherRows,
+  projectDevicePrincipals,
+  type DeviceContext,
+  type SwitcherPrincipalRow,
+} from '@oxy.so/core/session';
 import { useOxy } from '../context/OxyContext';
 import { useI18n } from './useI18n';
 import { useAccountDialogSnapshot } from './accountDialogSnapshot';
 
 export interface UseDeviceSwitcherResult {
-    /**
-     * Everyone signed in on this device, each with the accounts they may act as,
-     * with names, handles and avatar URLs already resolved.
-     *
-     * Grouped by PERSON, which is the whole point: the same organization
-     * reachable through two people is two rows under two humans. The flat list
-     * this replaced was keyed by account id and could show only one of them.
-     */
-    principals: SwitcherPrincipalRow[];
-    /** The active `principal acting as account` pair, or `null`. */
-    activeContext: DeviceContext | null;
-    /** True until the first directory read settles with nothing to show. */
-    isLoading: boolean;
-    /** The `contextId` of an activation in flight, or `null`. */
-    activatingContextId: string | null;
-    /** The `contextId` of a context removal in flight, or `null`. */
-    removingContextId: string | null;
-    /** The `principalId` of a principal removal in flight, or `null`. */
-    removingPrincipalId: string | null;
-    /**
-     * Make one pair active. Resolves `false` when it was refused — the reason is
-     * on the dialog controller's `error`, and the row is simply not offered
-     * again after the refresh that follows.
-     */
-    activateContext: (contextId: string) => Promise<boolean>;
-    /** Drop ONE `principal → account` pair, leaving anyone else's route intact. */
-    signOutContext: (contextId: string) => Promise<boolean>;
-    /** Drop ONE PERSON and every context they reach, and nobody else's. */
-    signOutPrincipal: (principalId: string) => Promise<boolean>;
+  /**
+   * Everyone signed in on this device, each with the accounts they may act as,
+   * with names, handles and avatar URLs already resolved.
+   *
+   * Grouped by PERSON, which is the whole point: the same organization
+   * reachable through two people is two rows under two humans. The flat list
+   * this replaced was keyed by account id and could show only one of them.
+   */
+  principals: SwitcherPrincipalRow[];
+  /** The active `principal acting as account` pair, or `null`. */
+  activeContext: DeviceContext | null;
+  /** True until the first directory read settles with nothing to show. */
+  isLoading: boolean;
+  /** The `contextId` of an activation in flight, or `null`. */
+  activatingContextId: string | null;
+  /** The `contextId` of a context removal in flight, or `null`. */
+  removingContextId: string | null;
+  /** The `principalId` of a principal removal in flight, or `null`. */
+  removingPrincipalId: string | null;
+  /**
+   * Make one pair active. Resolves `false` when it was refused — the reason is
+   * on the dialog controller's `error`, and the row is simply not offered
+   * again after the refresh that follows.
+   */
+  activateContext: (contextId: string) => Promise<boolean>;
+  /** Drop ONE `principal → account` pair, leaving anyone else's route intact. */
+  signOutContext: (contextId: string) => Promise<boolean>;
+  /** Drop ONE PERSON and every context they reach, and nobody else's. */
+  signOutPrincipal: (principalId: string) => Promise<boolean>;
 }
 
 /**
@@ -52,46 +57,46 @@ export interface UseDeviceSwitcherResult {
  * a `contextId`, never an `accountId`.
  */
 export function useDeviceSwitcher(): UseDeviceSwitcherResult {
-    const { accountDialogController: controller, oxyServices } = useOxy();
-    const { locale } = useI18n();
+  const { accountDialogController: controller, oxyServices } = useOxy();
+  const { locale } = useI18n();
 
-    const snapshot = useAccountDialogSnapshot(controller);
+  const snapshot = useAccountDialogSnapshot(controller);
 
-    // `directory` is a stable reference between reads (`SessionClient` holds the
-    // one it applied), so this recomputes only when the device actually moved.
-    const principals = useMemo(
-        () =>
-            buildSwitcherRows(
-                projectDevicePrincipals(snapshot.directory),
-                snapshot.activeContext?.contextId ?? null,
-                (avatar) => (avatar ? oxyServices.assets.publicUrl(avatar, 'thumb') : undefined),
-                locale,
-            ),
-        [snapshot.directory, snapshot.activeContext, oxyServices, locale],
-    );
+  // `directory` is a stable reference between reads (`SessionClient` holds the
+  // one it applied), so this recomputes only when the device actually moved.
+  const principals = useMemo(
+    () =>
+      buildSwitcherRows(
+        projectDevicePrincipals(snapshot.directory),
+        snapshot.activeContext?.contextId ?? null,
+        (avatar) => (avatar ? oxyServices.assets.publicUrl(avatar, 'thumb') : undefined),
+        locale,
+      ),
+    [snapshot.directory, snapshot.activeContext, oxyServices, locale],
+  );
 
-    const activateContext = useCallback(
-        async (contextId: string) => (controller ? controller.activateContext(contextId) : false),
-        [controller],
-    );
-    const signOutContext = useCallback(
-        async (contextId: string) => (controller ? controller.signOutContext(contextId) : false),
-        [controller],
-    );
-    const signOutPrincipal = useCallback(
-        async (principalId: string) => (controller ? controller.signOutPrincipal(principalId) : false),
-        [controller],
-    );
+  const activateContext = useCallback(
+    async (contextId: string) => (controller ? controller.activateContext(contextId) : false),
+    [controller],
+  );
+  const signOutContext = useCallback(
+    async (contextId: string) => (controller ? controller.signOutContext(contextId) : false),
+    [controller],
+  );
+  const signOutPrincipal = useCallback(
+    async (principalId: string) => (controller ? controller.signOutPrincipal(principalId) : false),
+    [controller],
+  );
 
-    return {
-        principals,
-        activeContext: snapshot.activeContext,
-        isLoading: snapshot.loading,
-        activatingContextId: snapshot.activatingContextId,
-        removingContextId: snapshot.removingContextId,
-        removingPrincipalId: snapshot.removingPrincipalId,
-        activateContext,
-        signOutContext,
-        signOutPrincipal,
-    };
+  return {
+    principals,
+    activeContext: snapshot.activeContext,
+    isLoading: snapshot.loading,
+    activatingContextId: snapshot.activatingContextId,
+    removingContextId: snapshot.removingContextId,
+    removingPrincipalId: snapshot.removingPrincipalId,
+    activateContext,
+    signOutContext,
+    signOutPrincipal,
+  };
 }

package/src/ui/hooks/useFileFiltering.ts

@@ -61,7 +61,7 @@ export function useFileFiltering({
           file.contentType.includes('excel') ||
           file.contentType.includes('spreadsheet') ||
           file.contentType.includes('presentation') ||
-          file.contentType.includes('powerpoint')
+          file.contentType.includes('powerpoint'),
       );
     } else if (viewMode === 'audio') {
       filteredByMode = files.filter((file) => file.contentType.startsWith('audio/'));
@@ -75,7 +75,7 @@ export function useFileFiltering({
         (file) =>
           file.filename.toLowerCase().includes(query) ||
           file.contentType.toLowerCase().includes(query) ||
-          (file.metadata?.description?.toLowerCase().includes(query))
+          file.metadata?.description?.toLowerCase().includes(query),
       );
     }