@oxyhq/services 22.5.0 → 22.6.1

package/src/ui/components/fileManagement/styles.ts

@@ -382,43 +382,6 @@ export const fileManagementStyles = StyleSheet.create({
         flex: 1,
         padding: 16,
     },
-    fileDetailCard: {
-        padding: 18,
-        borderRadius: 14,
-        borderWidth: 1,
-        alignItems: 'center',
-    },
-    fileDetailIcon: {
-        marginBottom: 16,
-    },
-    fileDetailName: {
-        fontSize: 20,
-        fontWeight: 'bold',
-        textAlign: 'center',
-        marginBottom: 24,
-    },
-    fileDetailInfo: {
-        width: '100%',
-        marginBottom: 32,
-    },
-    detailRow: {
-        flexDirection: 'row',
-        justifyContent: 'space-between',
-        alignItems: 'flex-start',
-        marginBottom: 12,
-        flexWrap: 'wrap',
-    },
-    detailLabel: {
-        fontSize: 16,
-        fontWeight: '500',
-        flex: 1,
-        minWidth: 100,
-    },
-    detailValue: {
-        fontSize: 16,
-        flex: 2,
-        textAlign: 'right',
-    },
     modalActions: {
         flexDirection: 'row',
         gap: 12,
@@ -858,191 +821,3 @@ export const fileManagementStyles = StyleSheet.create({
         borderRadius: 8,
     },
 });
-
-/**
- * Styles for the dedicated photo picker view used when `selectMode + image-only`
- * is active (e.g. the avatar picker context). This view is intentionally
- * flagship-grade: black backdrop, translucent header, edge-to-edge grid.
- *
- * Kept in a separate StyleSheet so the rest of `fileManagementStyles` does not
- * carry a black-background bias when used elsewhere.
- */
-export const photoPickerStyles = StyleSheet.create({
-    root: {
-        flex: 1,
-        backgroundColor: '#000000',
-    },
-    headerSpacer: {
-        // Reserved for the absolute header so content does not sit underneath it.
-        backgroundColor: '#000000',
-    },
-    header: {
-        position: 'absolute',
-        top: 0,
-        left: 0,
-        right: 0,
-        backgroundColor: 'rgba(0,0,0,0.92)',
-        flexDirection: 'row',
-        alignItems: 'center',
-        justifyContent: 'space-between',
-        paddingHorizontal: 12,
-        zIndex: 30,
-    },
-    headerRow: {
-        flexDirection: 'row',
-        alignItems: 'center',
-        justifyContent: 'space-between',
-        width: '100%',
-        // Material 3 top app bar height — leaves a generous tap target for
-        // the Cancel / Upload pills without crowding the title.
-        height: 56,
-    },
-    headerSide: {
-        flexBasis: 0,
-        flexGrow: 1,
-        flexDirection: 'row',
-        alignItems: 'center',
-    },
-    headerSideRight: {
-        justifyContent: 'flex-end',
-    },
-    headerSideLeft: {
-        justifyContent: 'flex-start',
-    },
-    headerTitle: {
-        fontSize: 17,
-        fontWeight: '600',
-        color: '#FFFFFF',
-        letterSpacing: -0.2,
-        textAlign: 'center',
-    },
-    headerCancel: {
-        paddingHorizontal: 6,
-        paddingVertical: 8,
-        minHeight: 36,
-        minWidth: 44,
-        justifyContent: 'center',
-    },
-    headerCancelText: {
-        fontSize: 17,
-        fontWeight: '500',
-        color: '#FFFFFF',
-    },
-    headerPrimaryPill: {
-        flexDirection: 'row',
-        alignItems: 'center',
-        gap: 6,
-        paddingHorizontal: 14,
-        paddingVertical: 8,
-        borderRadius: 999,
-        minHeight: 36,
-    },
-    headerPrimaryPillIconOnly: {
-        paddingHorizontal: 8,
-        width: 36,
-        justifyContent: 'center',
-    },
-    headerPrimaryText: {
-        color: '#FFFFFF',
-        fontSize: 15,
-        fontWeight: '600',
-    },
-    headerProgressBarTrack: {
-        position: 'absolute',
-        left: 0,
-        right: 0,
-        bottom: 0,
-        height: 2,
-        backgroundColor: 'rgba(255,255,255,0.12)',
-    },
-    headerProgressBarFill: {
-        height: '100%',
-    },
-    grid: {
-        flex: 1,
-    },
-    gridContent: {
-        // Top inset is set dynamically (header height + safe area).
-        paddingBottom: 24,
-    },
-    cellWrapper: {
-        position: 'relative',
-        // width/height set dynamically per device
-    },
-    cellInner: {
-        flex: 1,
-        borderRadius: 8,
-        overflow: 'hidden',
-        backgroundColor: '#111111',
-    },
-    cellImage: {
-        width: '100%',
-        height: '100%',
-    },
-    cellRing: {
-        position: 'absolute',
-        top: 0,
-        left: 0,
-        right: 0,
-        bottom: 0,
-        borderRadius: 8,
-        borderWidth: 3,
-    },
-    cellDim: {
-        opacity: 0.6,
-    },
-    cellBadge: {
-        position: 'absolute',
-        top: 6,
-        right: 6,
-        minWidth: 22,
-        height: 22,
-        paddingHorizontal: 6,
-        borderRadius: 11,
-        alignItems: 'center',
-        justifyContent: 'center',
-    },
-    cellBadgeText: {
-        color: '#FFFFFF',
-        fontSize: 12,
-        fontWeight: '700',
-        lineHeight: 14,
-    },
-    empty: {
-        flex: 1,
-        alignItems: 'center',
-        justifyContent: 'center',
-        paddingHorizontal: 32,
-    },
-    emptyIconWrap: {
-        opacity: 0.3,
-        marginBottom: 16,
-    },
-    emptyTitle: {
-        fontSize: 17,
-        fontWeight: '600',
-        textAlign: 'center',
-        marginBottom: 6,
-    },
-    emptySubtitle: {
-        fontSize: 14,
-        fontWeight: '400',
-        textAlign: 'center',
-        opacity: 0.7,
-        marginBottom: 24,
-    },
-    emptyCta: {
-        flexDirection: 'row',
-        alignItems: 'center',
-        gap: 8,
-        paddingHorizontal: 22,
-        paddingVertical: 12,
-        borderRadius: 999,
-    },
-    emptyCtaText: {
-        color: '#FFFFFF',
-        fontSize: 15,
-        fontWeight: '600',
-    },
-});
-

package/src/ui/components/photogrid/JustifiedPhotoGrid.tsx

@@ -1,7 +1,6 @@
 import React, { useEffect, useMemo, useState, useCallback } from 'react';
 import { View, Text, type LayoutChangeEvent } from 'react-native';
 import type { FileMetadata } from '@oxyhq/core';
-// Using plain React Native styles (nativewind not installed in this repo)
 
 export interface JustifiedPhotoGridProps {
     photos: FileMetadata[];

package/src/ui/context/hooks/useAuthOperations.ts

@@ -170,8 +170,11 @@ export const useAuthOperations = ({
         logger?.('Failed to register sign-in into device session set', registrationError);
       }
 
-      // Get full user data
-      fullUser = await oxyServices.getUserBySession(sessionResponse.sessionId);
+      // Hydrate the full user from the bearer (`GET /users/me`) — `verifyChallenge`
+      // has already planted the access token for this session, so the bearer IS
+      // the session identity. Avoids a second, session-id-keyed source of truth
+      // (`GET /session/user/:sessionId`) that can disagree with the bearer.
+      fullUser = await oxyServices.getCurrentUser();
 
       // Fetch device sessions
       let allDeviceSessions: ClientSession[] = [];

package/src/ui/context/useOxyAccountGraph.ts

@@ -5,6 +5,7 @@ import { logger as loggerUtil } from '@oxyhq/core';
 import { useAuthStore } from '../stores/authStore';
 import { isUnauthorizedStatus } from './oxyContextHelpers';
 import { resetSessionScopedStores } from '../stores/resetSessionScopedStores';
+import { ASSET_DOWNLOAD_URLS_QUERY_KEY } from '../hooks/useResolvedFileUrls';
 import type { CommitInput } from './oxyContextTypes';
 
 interface UseOxyAccountGraphParams {
@@ -63,6 +64,10 @@ export function useOxyAccountGraph({
 
   const runPostAccountSwitchSideEffects = useCallback(async (): Promise<void> => {
     resetSessionScopedStores();
+    // Scoped media tokens are per-viewer — drop any cached URLs immediately so
+    // `keepPreviousData`-style placeholders cannot flash the prior account's
+    // private thumbnails while the new bearer mint lands.
+    queryClient.removeQueries({ queryKey: [ASSET_DOWNLOAD_URLS_QUERY_KEY] });
     await refreshAccounts();
     queryClient.invalidateQueries();
   }, [refreshAccounts, queryClient]);

package/src/ui/hooks/queries/__tests__/userCache.test.ts

@@ -268,6 +268,35 @@ describe('upsertCachedUser — keys & viewer scoping', () => {
     expect(readByUsername(qc, 'alice', 'viewerB')).toBeUndefined();
   });
 
+  it('never stores viewer-relative relationship on the viewer-independent by-id key', () => {
+    const qc = makeClient();
+    upsertCachedUser(
+      qc,
+      { id: 'u1', username: 'alice', relationship: { isFollowing: true, followsYou: true } },
+      'viewerA',
+    );
+
+    expect(readById(qc, 'u1')?.relationship).toBeUndefined();
+    expect(readByUsername(qc, 'alice', 'viewerA')?.relationship).toEqual({
+      isFollowing: true,
+      followsYou: true,
+    });
+  });
+
+  it('strips a stale relationship from an existing by-id entry on merge', () => {
+    const qc = makeClient();
+    qc.setQueryData(queryKeys.users.detail('u1'), {
+      id: 'u1',
+      username: 'alice',
+      relationship: { isFollowing: true, followsYou: true },
+    });
+
+    upsertCachedUser(qc, { id: 'u1', username: 'alice', avatar: 'file_a' }, 'viewerA');
+
+    expect(readById(qc, 'u1')?.relationship).toBeUndefined();
+    expect(readById(qc, 'u1')?.avatar).toBe('file_a');
+  });
+
   it('is case-insensitive on username (byUsername normalization)', () => {
     const qc = makeClient();
     upsertCachedUser(qc, { id: 'u1', username: 'AlIcE' }, 'v1');

package/src/ui/hooks/queries/useAccountQueries.ts

@@ -50,6 +50,15 @@ export const useUserProfiles = (sessionIds: string[], options?: { enabled?: bool
 /**
  * Get current authenticated user.
  *
+ * Hydrates from `GET /users/me` (the bearer identifies the session) rather than
+ * `GET /session/user/:activeSessionId`. Post zero-cookie cutover the bearer is
+ * the single source of session truth, so keying the CURRENT user off a session
+ * id in the URL was a second, independently-updated source that could disagree
+ * with the bearer during an account switch — the request fired under the
+ * previous account's token against the new account's session id and 404'd. The
+ * query KEY stays scoped to the active account so the cache re-scopes (and
+ * refetches) on a switch; only the URL stopped carrying a session id.
+ *
  * The store-mirror effect must NOT overwrite the in-memory user while a
  * write mutation is in flight — otherwise a stale background refetch
  * landing between optimistic update and server-confirmed update would
@@ -67,10 +76,7 @@ export const useCurrentUser = (options?: { enabled?: boolean }) => {
   const query = useQuery({
     queryKey: queryKeys.accounts.current(activeSessionId),
     queryFn: async () => {
-      if (!activeSessionId) {
-        throw new Error('No active session');
-      }
-      return await oxyServices.getUserBySession(activeSessionId);
+      return await oxyServices.getCurrentUser();
     },
     enabled: (options?.enabled !== false) && isAuthenticated && !!activeSessionId,
     staleTime: 1 * 60 * 1000, // 1 minute for current user

package/src/ui/hooks/queries/userCache.ts

@@ -29,6 +29,9 @@
  *     marked stale — it is already managed).
  *   - Nested objects (`name`, `_count`, `relationship`) merge field-by-field, so
  *     a partial `name`/`_count`/`relationship` never replaces a fuller one.
+ *   - `relationship` is written ONLY under the viewer-scoped by-username key —
+ *     the viewer-independent by-id key never stores it (prevents one viewer's
+ *     follow state from leaking into every other viewer's identity cache).
  *   - Anti-degradation: a good `username` / `name.displayName` / `avatar` is
  *     never overwritten by a degraded/empty one (empty username, the
  *     `'Unknown user'` ghost-author sentinel, `null` avatar).
@@ -184,8 +187,17 @@ function mergeRelationship(
 /**
  * Merge a (normalized) incoming user over an existing cache entry: keep every
  * existing field, override only with the meaningful fields of `incoming`.
+ *
+ * When `includeRelationship` is false (the viewer-independent by-id key), the
+ * viewer-relative `relationship` field is never read, written, or preserved —
+ * only the by-username key carries it (`useUserByUsername`).
  */
-function mergeUsers(existing: CachedUser, incoming: CachedUser): CachedUser {
+function mergeUsers(
+  existing: CachedUser,
+  incoming: CachedUser,
+  options?: { includeRelationship?: boolean },
+): CachedUser {
+  const includeRelationship = options?.includeRelationship ?? true;
   const merged: CachedUser = { ...existing };
   for (const [key, value] of Object.entries(incoming)) {
     if (key === 'name' || key === '_count' || key === 'relationship') continue;
@@ -199,8 +211,12 @@ function mergeUsers(existing: CachedUser, incoming: CachedUser): CachedUser {
   if (name !== undefined) merged.name = name;
   const count = mergeCount(existing._count, incoming._count);
   if (count !== undefined) merged._count = count;
-  const relationship = mergeRelationship(existing.relationship, incoming.relationship);
-  if (relationship !== undefined) merged.relationship = relationship;
+  if (includeRelationship) {
+    const relationship = mergeRelationship(existing.relationship, incoming.relationship);
+    if (relationship !== undefined) merged.relationship = relationship;
+  } else {
+    delete merged.relationship;
+  }
   return merged;
 }
 
@@ -209,17 +225,20 @@ function upsertOneKey(
   queryClient: QueryClient,
   key: readonly unknown[],
   incoming: CachedUser,
+  options: { includeRelationship: boolean },
 ): void {
+  const mergeOpts = { includeRelationship: options.includeRelationship };
   const existing = queryClient.getQueryData<CacheableUser>(key);
   if (existing === undefined) {
     // Cold slot: seed the full incoming object, STALE, so react-query refetches
     // the full authoritative profile (relationship, counts, createdAt, …).
-    queryClient.setQueryData<CachedUser>(key, incoming, { updatedAt: 0 });
+    const seeded = mergeUsers({ id: incoming.id }, incoming, mergeOpts);
+    queryClient.setQueryData<CachedUser>(key, seeded, { updatedAt: 0 });
     return;
   }
   // Existing entry: merge and leave its freshness lifecycle untouched. The
   // existing entry is keyed by `incoming.id`, so use it as the fallback id.
-  const merged = mergeUsers(toCachedUser(existing, incoming.id), incoming);
+  const merged = mergeUsers(toCachedUser(existing, incoming.id), incoming, mergeOpts);
   const dataUpdatedAt = queryClient.getQueryState(key)?.dataUpdatedAt ?? 0;
   queryClient.setQueryData<CachedUser>(key, merged, { updatedAt: dataUpdatedAt });
 }
@@ -253,8 +272,12 @@ export function upsertCachedUser(
   const incoming = normalizeIncoming(user);
   if (!incoming) return;
 
-  // By-id identity entry (read by `useUserById`). Not viewer-scoped.
-  upsertOneKey(queryClient, queryKeys.users.detail(incoming.id), incoming);
+  // By-id identity entry (read by `useUserById`). Not viewer-scoped — never store
+  // the viewer-relative `relationship` here or one viewer's follow state leaks
+  // into every other viewer's by-id cache entry.
+  upsertOneKey(queryClient, queryKeys.users.detail(incoming.id), incoming, {
+    includeRelationship: false,
+  });
 
   const username = incoming.username;
   if (typeof username === 'string' && username.trim() !== '') {
@@ -263,7 +286,7 @@ export function upsertCachedUser(
     // the key through the SAME helper the hook uses so username normalization
     // (`trim().toLowerCase()`) matches byte-for-byte.
     const key = queryKeys.users.byUsername(username, resolveViewerId(viewerId));
-    upsertOneKey(queryClient, key, incoming);
+    upsertOneKey(queryClient, key, incoming, { includeRelationship: true });
   }
 }
 

package/src/ui/hooks/useAvatarPicker.ts

@@ -100,11 +100,19 @@ export function useAvatarPicker({
   );
 
   /**
-   * After the user picks a file in the FileManagement sheet, route to the
-   * crop screen with the file's download URL as the source image.
+   * After the user picks a file in the FileManagement sheet, resolve a working
+   * source URL and route to the crop screen.
+   *
+   * The picked file is usually PRIVATE, so the synchronous
+   * `getFileDownloadUrl` (public CDN origin) would 404 and the crop screen's
+   * `Image.getSize` would fail silently. We resolve the authenticated URL via
+   * `assetGetUrl` (which throws on failure — unlike `getFileDownloadUrlAsync`,
+   * which swallows errors and falls back to the broken public URL) so a
+   * failure surfaces a real user-facing error instead of a blank crop canvas.
+   * No variant is requested — cropping needs the original.
    */
   const handleFilePicked = useCallback(
-    (file: FileMetadata) => {
+    async (file: FileMetadata) => {
       if (!file.contentType?.startsWith('image/')) {
         toast.error(
           translate(currentLanguage ?? undefined, 'editProfile.toasts.selectImage') ||
@@ -113,10 +121,22 @@ export function useAvatarPicker({
         return;
       }
 
-      // Use the public download URL of the picked file as the crop source.
-      // The OxyServices file URL endpoints accept image variants, but for
-      // cropping we want the original — passing no variant returns it.
-      const sourceUri = oxyServices.getFileDownloadUrl(file.id);
+      let sourceUri: string;
+      try {
+        const resolved = await oxyServices.assetGetUrl(file.id);
+        if (!resolved?.url) {
+          throw new Error('No download URL returned for the selected image');
+        }
+        sourceUri = resolved.url;
+      } catch (e: unknown) {
+        const message = e instanceof Error ? e.message : undefined;
+        toast.error(
+          message ||
+            translate(currentLanguage ?? undefined, 'editProfile.toasts.cropMeasureFailed') ||
+            'Could not load the selected image',
+        );
+        return;
+      }
 
       showBottomSheet({
         screen: 'AvatarCrop',

package/src/ui/hooks/useFileDownloadUrl.ts

@@ -15,8 +15,9 @@ export interface UseFileDownloadUrlResult {
 /**
  * Hook to resolve a file's download URL asynchronously.
  *
- * Uses `getFileDownloadUrlAsync` first, falling back to the synchronous
- * `getFileDownloadUrl` if the async call fails.
+ * Uses `getFileDownloadUrlAsync`, which returns a scoped media-token stream URL
+ * for private assets. There is no sync CDN fallback — the synchronous
+ * `getFileDownloadUrl` is public-CDN-only and 404s for private uploads.
  */
 export const useFileDownloadUrl = (
   oxyServices: OxyServices | null | undefined,
@@ -54,35 +55,18 @@ export const useFileDownloadUrl = (
       setError(null);
 
       try {
-        let resolvedUrl: string | null = null;
-
-        if (typeof instance.getFileDownloadUrlAsync === 'function') {
-          resolvedUrl = await instance.getFileDownloadUrlAsync(targetFileId, variant, expiresIn);
+        if (typeof instance.getFileDownloadUrlAsync !== 'function') {
+          throw new Error('getFileDownloadUrlAsync is not available on this OxyServices instance');
         }
 
-        if (!resolvedUrl && typeof instance.getFileDownloadUrl === 'function') {
-          resolvedUrl = instance.getFileDownloadUrl(targetFileId, variant, expiresIn);
-        }
+        const resolvedUrl = await instance.getFileDownloadUrlAsync(targetFileId, variant, expiresIn);
 
         if (!cancelled) {
           setUrl(resolvedUrl || null);
         }
       } catch (err: unknown) {
-        // Fallback to sync URL on error where possible
-        try {
-          if (typeof instance.getFileDownloadUrl === 'function') {
-            const fallbackUrl = instance.getFileDownloadUrl(targetFileId, variant, expiresIn);
-            if (!cancelled) {
-              setUrl(fallbackUrl || null);
-              setError(err instanceof Error ? err : new Error(String(err)));
-            }
-            return;
-          }
-        } catch {
-          // Secondary failure: surface the original error below.
-        }
-
         if (!cancelled) {
+          setUrl(null);
           setError(err instanceof Error ? err : new Error(String(err)));
         }
       } finally {