@oxyhq/services 22.5.0 → 22.6.0

package/src/ui/screens/fileManagement/photoGridLayout.ts

@@ -0,0 +1,45 @@
+/**
+ * Column / tile geometry for the "Choose photo" grid.
+ *
+ * CRITICAL: the grid MUST size its tiles from the width of the bottom-sheet
+ * container it actually renders in — NOT the device screen. On wide viewports
+ * the sheet is centered and narrower than the screen (Bloom `<Dialog>` centers
+ * on `md+`), so deriving columns/tiles from `Dimensions.get('window').width`
+ * (or `useWindowDimensions`) overflows / mis-sizes the tiles. The caller
+ * therefore measures the grid container (`onLayout` on a `style`-only wrapper —
+ * RN-Web does not fire `onLayout` for `className`'d nodes) and passes that
+ * measured width here.
+ *
+ * Pure and side-effect free so it is unit-testable in Jest (which cannot catch
+ * layout bugs in the rendered tree).
+ */
+
+/** Inter-tile gutter, in px. Apple Photos-style hairline gap. */
+export const PHOTO_GRID_GUTTER = 2;
+
+/** Container width (px) at/above which the grid switches to 4 columns. */
+export const PHOTO_GRID_WIDE_BREAKPOINT = 600;
+
+export interface PhotoGridLayout {
+    /** Number of columns for the current container width. */
+    columns: number;
+    /**
+     * Square tile edge in px. Floored so a full row (columns tiles + gutters)
+     * never exceeds the container width.
+     */
+    cellSize: number;
+    /** Inter-tile gutter used to derive `cellSize`. */
+    gutter: number;
+}
+
+/**
+ * Derive the column count + square tile size from the measured grid-container
+ * width. Returns `cellSize: 0` for a not-yet-measured (`<= 0`) width so callers
+ * can gate rendering until a real measurement arrives.
+ */
+export function computePhotoGridLayout(containerWidth: number): PhotoGridLayout {
+    const columns = containerWidth >= PHOTO_GRID_WIDE_BREAKPOINT ? 4 : 3;
+    const usable = containerWidth - PHOTO_GRID_GUTTER * (columns - 1);
+    const cellSize = usable > 0 ? Math.floor(usable / columns) : 0;
+    return { columns, cellSize, gutter: PHOTO_GRID_GUTTER };
+}

package/src/ui/session/__tests__/tokenTransport.test.ts

@@ -5,12 +5,14 @@ import { createTokenTransport } from '../tokenTransport';
 // The device-first transport no longer owns a private mint single-flight: it
 // routes through the ONE shared `oxyServices.httpService.refreshAccessToken(...)`
 // the scheduler/preflight/401 use, so concurrent lanes can never double-rotate
-// the device secret. These tests exercise the transport's own no-op / error /
-// swallow contract around that single call.
+// the device secret. It short-circuits ONLY when the planted bearer already
+// identifies the state's active account — a bearer for a DIFFERENT account (an
+// account switch) must still mint the new account's token. These tests exercise
+// that account-match contract and the transport's error/swallow behavior.
 
-function fakeOxy(accessToken: string | null, refreshAccessToken = jest.fn(async () => 'minted-token')) {
+function fakeOxy(currentUserId: string | null, refreshAccessToken = jest.fn(async () => 'minted-token')) {
   return {
-    getAccessToken: jest.fn().mockReturnValue(accessToken),
+    getCurrentUserId: jest.fn().mockReturnValue(currentUserId),
     httpService: { refreshAccessToken },
   };
 }
@@ -24,9 +26,9 @@ const state: DeviceSessionState = {
 };
 
 describe('createTokenTransport', () => {
-  test('no-ops when a token is already present', async () => {
+  test('no-ops when the planted bearer already belongs to the active account', async () => {
     const refreshAccessToken = jest.fn(async () => 'minted-token');
-    const oxy = fakeOxy('tok', refreshAccessToken);
+    const oxy = fakeOxy('a1', refreshAccessToken);
     const transport = createTokenTransport(oxy as never);
 
     await transport.ensureActiveToken(state);
@@ -34,7 +36,20 @@ describe('createTokenTransport', () => {
     expect(refreshAccessToken).not.toHaveBeenCalled();
   });
 
-  test('mints via the shared httpService.refreshAccessToken single-flight when no token is present', async () => {
+  test('mints when the planted bearer belongs to a DIFFERENT account (account switch)', async () => {
+    // The core account-switch 404 fix: a bearer for the PREVIOUS account must
+    // NOT short-circuit — it must mint the new active account's token.
+    const refreshAccessToken = jest.fn(async () => 'minted-token');
+    const oxy = fakeOxy('previous-account', refreshAccessToken);
+    const transport = createTokenTransport(oxy as never);
+
+    await transport.ensureActiveToken(state);
+
+    expect(refreshAccessToken).toHaveBeenCalledTimes(1);
+    expect(refreshAccessToken).toHaveBeenCalledWith('preflight');
+  });
+
+  test('mints via the shared httpService.refreshAccessToken single-flight when no bearer is present', async () => {
     const refreshAccessToken = jest.fn(async () => 'minted-token');
     const oxy = fakeOxy(null, refreshAccessToken);
     const transport = createTokenTransport(oxy as never);
@@ -91,10 +106,10 @@ describe('createTokenTransport', () => {
     await expect(Promise.all([first, second])).resolves.toEqual([undefined, undefined]);
   });
 
-  test('treats a throwing getAccessToken as no-token and still mints', async () => {
+  test('treats a throwing bearer-account check as a mismatch and still mints', async () => {
     const refreshAccessToken = jest.fn(async () => 'minted-token');
     const oxy = fakeOxy(null, refreshAccessToken);
-    oxy.getAccessToken.mockImplementation(() => {
+    oxy.getCurrentUserId.mockImplementation(() => {
       throw new Error('storage unavailable');
     });
     const transport = createTokenTransport(oxy as never);
@@ -103,7 +118,7 @@ describe('createTokenTransport', () => {
     await expect(transport.ensureActiveToken(state)).resolves.toBeUndefined();
 
     expect(warnSpy).toHaveBeenCalledWith(
-      'ensureActiveToken: getAccessToken threw',
+      'ensureActiveToken: bearer-account check threw',
       { component: 'TokenTransport' },
       expect.any(Error),
     );

package/src/ui/session/tokenTransport.ts

@@ -5,14 +5,21 @@ import type { DeviceSessionState } from '@oxyhq/contracts';
  * Platform `TokenTransport` for `SessionClient` (device-first model).
  *
  * `ensureActiveToken` is the fallback the client uses when a `session_state`
- * push arrived WITHOUT an embedded `activeToken` and the app currently holds no
- * bearer. It mints one through the ONE unified single-flight the scheduler, the
- * request-time preflight, and the 401 retry all use —
- * `oxyServices.httpService.refreshAccessToken(...)` — which runs the installed
- * refresh handler (present the persisted zero-cookie `deviceId` + `deviceSecret`
- * at `POST /session/device/token`). Routing through the SAME entry point means
- * this lane can never double-rotate the device secret against the others: it has
- * NO private single-flight of its own.
+ * push arrived WITHOUT an embedded `activeToken` and the planted bearer does not
+ * already belong to the state's active account. It mints one through the ONE
+ * unified single-flight the scheduler, the request-time preflight, and the 401
+ * retry all use — `oxyServices.httpService.refreshAccessToken(...)` — which runs
+ * the installed refresh handler (present the persisted zero-cookie `deviceId` +
+ * `deviceSecret` at `POST /session/device/token`, which mints for the device's
+ * CURRENT active account). Routing through the SAME entry point means this lane
+ * can never double-rotate the device secret against the others: it has NO
+ * private single-flight of its own.
+ *
+ * The short-circuit compares the planted bearer's ACCOUNT against
+ * `state.activeAccountId`, not mere token presence: a bearer for the PREVIOUS
+ * account (an account switch) must still mint the new account's token — skipping
+ * on presence alone would leave a subscriber observing the new active account
+ * under the old account's bearer (the account-switch 404 race).
  *
  * A failure is logged and swallowed: this method must never throw out (it runs
  * inside the socket state handler).
@@ -21,11 +28,15 @@ export function createTokenTransport(oxyServices: OxyServices): TokenTransport {
   return {
     async ensureActiveToken(state: DeviceSessionState): Promise<void> {
       try {
-        if (oxyServices.getAccessToken()) {
+        // Skip the mint ONLY when the planted bearer already identifies the
+        // active account. `getCurrentUserId()` decodes the bearer's `userId`/`id`
+        // (null when absent/opaque), directly comparable to the account id.
+        const activeAccountId = state.activeAccountId;
+        if (activeAccountId !== null && oxyServices.getCurrentUserId() === activeAccountId) {
           return;
         }
       } catch (error) {
-        logger.warn('ensureActiveToken: getAccessToken threw', { component: 'TokenTransport' }, error);
+        logger.warn('ensureActiveToken: bearer-account check threw', { component: 'TokenTransport' }, error);
       }
 
       try {

package/src/ui/utils/fileManagement.ts

@@ -1,5 +1,6 @@
+import type { Ionicons } from '@expo/vector-icons';
 import type { AssetUploadInput, FileMetadata, RNFileDescriptor } from '@oxyhq/core';
-import { File as ExpoFile } from 'expo-file-system';
+import type { ComponentProps } from 'react';
 import { Platform } from 'react-native';
 import { toast } from '@oxyhq/bloom';
 import type { RouteName } from '../navigation/routes';
@@ -54,7 +55,7 @@ export function formatFileSize(bytes: number): string {
 /**
  * Get icon name for file based on content type
  */
-export function getFileIcon(contentType: string): string {
+export function getFileIcon(contentType: string): ComponentProps<typeof Ionicons>['name'] {
     if (contentType.startsWith('image/')) return 'image';
     if (contentType.startsWith('video/')) return 'videocam';
     if (contentType.startsWith('audio/')) return 'musical-notes';
@@ -142,50 +143,6 @@ export async function convertDocumentPickerAssetToFile(
     }
 }
 
-/**
- * Helper to safely request a thumbnail variant only for image mime types.
- * Prevents backend warnings: "Variant thumb not supported for mime application/pdf".
- * 
- * @param file - File metadata
- * @param variant - Variant type (default: 'thumb')
- * @param getFileDownloadUrl - Function to get download URL from oxyServices
- */
-export function getSafeDownloadUrl(
-    file: FileMetadata,
-    variant: string,
-    getFileDownloadUrl: (fileId: string, variant?: string) => string
-): string {
-    const isImage = file.contentType.startsWith('image/');
-    const isVideo = file.contentType.startsWith('video/');
-
-    // Prefer explicit variant key if variants metadata present
-    if (file.variants && file.variants.length > 0) {
-        // For videos, try 'poster' regardless of requested variant
-        if (isVideo) {
-            const poster = file.variants.find(v => v.type === 'poster');
-            if (poster) return getFileDownloadUrl(file.id, 'poster');
-        }
-        if (isImage) {
-            const desired = file.variants.find(v => v.type === variant);
-            if (desired) return getFileDownloadUrl(file.id, variant);
-        }
-    }
-
-    if (isImage) {
-        return getFileDownloadUrl(file.id, variant);
-    }
-    if (isVideo) {
-        // Fallback to poster if backend supports implicit generation
-        try {
-            return getFileDownloadUrl(file.id, 'poster');
-        } catch {
-            return getFileDownloadUrl(file.id);
-        }
-    }
-    // Other mime types: no variant
-    return getFileDownloadUrl(file.id);
-}
-
 /**
  * Upload file raw - helper function for file uploads
  */

package/lib/typescript/types/expo-vector-icons.d.ts

@@ -1,22 +0,0 @@
-declare module '@expo/vector-icons' {
-  import type React from 'react';
-  import type { StyleProp, TextStyle, ImageStyle } from 'react-native';
-
-  type IconStyleProp = StyleProp<TextStyle> | StyleProp<ImageStyle>;
-
-  export const Ionicons: React.ComponentType<{
-    name: string;
-    size?: number;
-    color?: string;
-    style?: IconStyleProp;
-    testID?: string;
-  }>;
-
-  export const MaterialCommunityIcons: React.ComponentType<{
-    name: string;
-    size?: number;
-    color?: string;
-    style?: IconStyleProp;
-    testID?: string;
-  }>;
-}

package/src/types/expo-vector-icons.d.ts

@@ -1,22 +0,0 @@
-declare module '@expo/vector-icons' {
-  import type React from 'react';
-  import type { StyleProp, TextStyle, ImageStyle } from 'react-native';
-
-  type IconStyleProp = StyleProp<TextStyle> | StyleProp<ImageStyle>;
-
-  export const Ionicons: React.ComponentType<{
-    name: string;
-    size?: number;
-    color?: string;
-    style?: IconStyleProp;
-    testID?: string;
-  }>;
-
-  export const MaterialCommunityIcons: React.ComponentType<{
-    name: string;
-    size?: number;
-    color?: string;
-    style?: IconStyleProp;
-    testID?: string;
-  }>;
-}