@oxyhq/services 14.1.0 → 16.0.0

package/lib/typescript/module/utils/deviceFlowSignIn.d.ts

@@ -30,9 +30,14 @@
  * claim->commit sequence here keeps native and web identical and
  * unit-testable.
  */
-import { type EstablishAfterClaimDeps, type SessionLoginResponse, type SsoEstablishClient, type User } from '@oxyhq/core';
+import { type SessionLoginResponse, type User } from '@oxyhq/core';
 interface DeviceFlowClaimResult {
     accessToken?: string;
+    /** Rotating refresh-token family head minted by `/auth/session/claim` on the
+     * trusted lane. Not on the core method's typed return, so read defensively;
+     * threaded into `commitSession` so the QR sign-in persists a durable session
+     * that survives a reload without a redirect. */
+    refreshToken?: string;
     sessionId?: string;
     deviceId?: string;
     expiresAt?: string;
@@ -44,10 +49,8 @@ interface DeviceFlowClaimResult {
  * trivially unit-testable with a stub and never pulls the RN/Expo runtime into
  * a test bundle.
  *
- * Extends {@link SsoEstablishClient} (`requestSsoEstablishUrl`) so the WEB
- * post-claim durable-session hop can be driven off the same client.
  */
-export interface DeviceFlowClient extends SsoEstablishClient {
+export interface DeviceFlowClient {
     /**
      * Exchange the device-flow `sessionToken` for the first access + refresh
      * token, planting them on the client. Single-use; replay is rejected by the
@@ -71,15 +74,14 @@ export interface CompleteDeviceFlowSignInOptions {
      * registers the account into the device's server-authoritative session set,
      * persists it durably, and hydrates the full user profile. Runs AFTER the
      * bearer is planted so its bearer-protected calls succeed.
+     *
+     * The `refreshToken` extra (optional; not on the public `SessionLoginResponse`
+     * type) carries the rotating refresh family so the commit funnel persists a
+     * durable session.
      */
-    commitSession: (session: SessionLoginResponse) => Promise<void>;
-    /**
-     * Injectable web seams for the post-claim durable-session establish hop
-     * ({@link establishIdpSessionAfterClaim}). Omit in production — the defaults
-     * resolve to `window.*` (and no-op off-web / on native). Tests inject fakes to
-     * drive the web path deterministically.
-     */
-    establishDeps?: EstablishAfterClaimDeps;
+    commitSession: (session: SessionLoginResponse & {
+        refreshToken?: string;
+    }) => Promise<void>;
 }
 /**
  * Complete a device-flow sign-in: claim the first access token with the secret
@@ -90,6 +92,6 @@ export interface CompleteDeviceFlowSignInOptions {
  * Throws if the claim did not return a usable session, or if either the claim
  * or the commit fails; callers surface a retry UI.
  */
-export declare function completeDeviceFlowSignIn({ oxyServices, sessionId, sessionToken, commitSession, establishDeps, }: CompleteDeviceFlowSignInOptions): Promise<User>;
+export declare function completeDeviceFlowSignIn({ oxyServices, sessionId, sessionToken, commitSession, }: CompleteDeviceFlowSignInOptions): Promise<User>;
 export {};
 //# sourceMappingURL=deviceFlowSignIn.d.ts.map

package/lib/typescript/module/utils/deviceFlowSignIn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deviceFlowSignIn.d.ts","sourceRoot":"","sources":["../../../../src/utils/deviceFlowSignIn.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAEH,OAAO,EAGL,KAAK,uBAAuB,EAE5B,KAAK,oBAAoB,EACzB,KAAK,kBAAkB,EACvB,KAAK,IAAI,EACV,MAAM,aAAa,CAAC;AAErB,UAAU,qBAAqB;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,IAAI,CAAC;CACb;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,gBAAiB,SAAQ,kBAAkB;IAC1D;;;;OAIG;IACH,mBAAmB,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAAC;CAC3F;AAED,MAAM,WAAW,+BAA+B;IAC9C,6EAA6E;IAC7E,WAAW,EAAE,gBAAgB,CAAC;IAC9B,+EAA+E;IAC/E,SAAS,EAAE,MAAM,CAAC;IAClB;;;OAGG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;;;;;OAMG;IACH,aAAa,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAChE;;;;;OAKG;IACH,aAAa,CAAC,EAAE,uBAAuB,CAAC;CACzC;AAED;;;;;;;;GAQG;AACH,wBAAsB,wBAAwB,CAAC,EAC7C,WAAW,EACX,SAAS,EACT,YAAY,EACZ,aAAa,EACb,aAAa,GACd,EAAE,+BAA+B,GAAG,OAAO,CAAC,IAAI,CAAC,CA+CjD"}
+{"version":3,"file":"deviceFlowSignIn.d.ts","sourceRoot":"","sources":["../../../../src/utils/deviceFlowSignIn.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAEH,OAAO,EAGL,KAAK,oBAAoB,EACzB,KAAK,IAAI,EACV,MAAM,aAAa,CAAC;AAErB,UAAU,qBAAqB;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;oDAGgD;IAChD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,IAAI,CAAC;CACb;AAED;;;;;;GAMG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;OAIG;IACH,mBAAmB,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAAC;CAC3F;AAED,MAAM,WAAW,+BAA+B;IAC9C,6EAA6E;IAC7E,WAAW,EAAE,gBAAgB,CAAC;IAC9B,+EAA+E;IAC/E,SAAS,EAAE,MAAM,CAAC;IAClB;;;OAGG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;;;;;;;;;OAUG;IACH,aAAa,EAAE,CAAC,OAAO,EAAE,oBAAoB,GAAG;QAAE,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7F;AAED;;;;;;;;GAQG;AACH,wBAAsB,wBAAwB,CAAC,EAC7C,WAAW,EACX,SAAS,EACT,YAAY,EACZ,aAAa,GACd,EAAE,+BAA+B,GAAG,OAAO,CAAC,IAAI,CAAC,CA4CjD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxyhq/services",
-  "version": "14.1.0",
+  "version": "16.0.0",
   "description": "OxyHQ Expo/React Native SDK — UI components, screens, and native features",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -106,10 +106,10 @@
     }
   },
   "dependencies": {
-    "@oxyhq/contracts": "0.8.0"
+    "@oxyhq/contracts": "0.10.0"
   },
   "devDependencies": {
-    "@oxyhq/core": "^5.5.0",
+    "@oxyhq/core": "^7.0.0",
     "nativewind": "5.0.0-preview.3",
     "react-native-css": "^3.0.0",
     "@react-native-async-storage/async-storage": "^2.0.0",
@@ -153,7 +153,7 @@
   "peerDependencies": {
     "@expo/vector-icons": "^15.0.3",
     "@oxyhq/bloom": ">=0.16.0",
-    "@oxyhq/core": "^5.5.0",
+    "@oxyhq/core": "^7.0.0",
     "@react-native-async-storage/async-storage": "^2.0.0",
     "@react-native-community/netinfo": "^11.4.1",
     "@tanstack/query-async-storage-persister": "^5.101",

package/src/index.ts

@@ -77,7 +77,7 @@ export {
     useUserByUsername,
     useUsersBySessions,
     usePrivacySettings,
-    useAuthorizedApps,
+    useConnectedApps,
 } from './ui/hooks/queries/useAccountQueries';
 export {
     useSessions,
@@ -124,7 +124,7 @@ export {
     useUpdatePrivacySettings,
     useUpdateNotificationPreferences,
     useUpdateUserPreferences,
-    useRevokeAuthorizedApp,
+    useRevokeConnectedApp,
     useUploadFile,
 } from './ui/hooks/mutations/useAccountMutations';
 export {
@@ -180,10 +180,6 @@ export {
     extractErrorMessage,
 } from './ui/utils/errorHandlers';
 export type { HandleAuthErrorOptions } from './ui/utils/errorHandlers';
-// Thrown by `signInWithPassword` / `signIn` on a cross-apex web RP, where a
-// direct (non-IdP) sign-in would not survive a page reload — apps catch it to
-// route the user to the durable "Continue with Oxy" IdP flow.
-export { CrossApexDirectSignInError, isCrossApexWeb } from './utils/crossApex';
 
 // ---------------------------------------------------------------------------
 // File filtering

package/src/ui/components/SignInAccountChooser.tsx

@@ -0,0 +1,162 @@
+import type React from 'react';
+import { View, Text, TouchableOpacity, StyleSheet, ActivityIndicator } from 'react-native';
+import { Ionicons } from '@expo/vector-icons';
+import { useTheme } from '@oxyhq/bloom/theme';
+import Avatar from './Avatar';
+import { useI18n } from '../hooks/useI18n';
+import type { SwitchableAccount } from '../hooks/useSwitchableAccounts';
+
+export interface SignInAccountChooserProps {
+    /** Accounts available on this device / in the caller's graph, current first. */
+    accounts: SwitchableAccount[];
+    /** Selecting a row — the active account continues, others switch into. */
+    onSelectAccount: (account: SwitchableAccount) => void;
+    /** "Use another account" → reveal the sign-in options (password / QR / add). */
+    onUseAnother: () => void;
+    /** The account id currently being switched into (shows a per-row spinner). */
+    pendingAccountId?: string | null;
+    /** Disables every row while a selection is in flight. */
+    disabled?: boolean;
+}
+
+/**
+ * Google-style account chooser (React Native). Lists every account the user can
+ * continue as — device sign-ins + linked graph accounts, from
+ * {@link SwitchableAccount} — plus a "Use another account" affordance. Rendered
+ * as the FRONT screen of the sign-in surfaces (`SignInModal` web,
+ * `OxyAuthScreen` native) whenever accounts exist; selecting a row funnels into
+ * the SAME `switchToAccount` path the account switcher uses. When no accounts
+ * exist the surfaces skip this and show the sign-in options directly.
+ *
+ * Presentational + chrome-agnostic (no modal/sheet wrapper, no data fetching) so
+ * both containers reuse it and it is unit-testable in isolation.
+ */
+export const SignInAccountChooser: React.FC<SignInAccountChooserProps> = ({
+    accounts,
+    onSelectAccount,
+    onUseAnother,
+    pendingAccountId,
+    disabled,
+}) => {
+    const { colors } = useTheme();
+    const { t } = useI18n();
+
+    return (
+        <View style={styles.container}>
+            {accounts.map((account) => {
+                const isPending = pendingAccountId === account.accountId;
+                const secondary = account.email;
+                return (
+                    <TouchableOpacity
+                        key={account.accountId}
+                        accessibilityRole="button"
+                        accessibilityLabel={t('signin.chooser.continueAs', { name: account.displayName })}
+                        accessibilityState={{ selected: account.isCurrent, disabled: Boolean(disabled) }}
+                        onPress={() => onSelectAccount(account)}
+                        disabled={disabled}
+                        activeOpacity={0.7}
+                        style={[
+                            styles.row,
+                            { borderColor: colors.border },
+                            account.isCurrent && { backgroundColor: colors.primarySubtle, borderColor: colors.primarySubtle },
+                            disabled && !isPending && styles.rowDisabled,
+                        ]}
+                    >
+                        <Avatar uri={account.avatarUrl} name={account.displayName} size={44} />
+                        <View style={styles.info}>
+                            <Text style={[styles.name, { color: colors.text }]} numberOfLines={1}>
+                                {account.displayName}
+                            </Text>
+                            {secondary ? (
+                                <Text style={[styles.secondary, { color: colors.textSecondary }]} numberOfLines={1}>
+                                    {secondary}
+                                </Text>
+                            ) : null}
+                        </View>
+                        {isPending ? (
+                            <ActivityIndicator size="small" color={colors.primary} />
+                        ) : account.isCurrent ? (
+                            <View style={[styles.currentPill, { backgroundColor: colors.card }]}>
+                                <Ionicons name="checkmark" size={14} color={colors.primary} />
+                                <Text style={[styles.currentPillText, { color: colors.primary }]}>
+                                    {t('signin.chooser.signedIn')}
+                                </Text>
+                            </View>
+                        ) : (
+                            <Ionicons name="chevron-forward" size={20} color={colors.textSecondary} />
+                        )}
+                    </TouchableOpacity>
+                );
+            })}
+
+            <TouchableOpacity
+                accessibilityRole="button"
+                accessibilityLabel={t('signin.chooser.useAnother')}
+                onPress={onUseAnother}
+                disabled={disabled}
+                activeOpacity={0.7}
+                style={[styles.row, { borderColor: colors.border }, disabled && styles.rowDisabled]}
+            >
+                <View style={[styles.addIcon, { backgroundColor: colors.backgroundSecondary }]}>
+                    <Ionicons name="person-add-outline" size={20} color={colors.textSecondary} />
+                </View>
+                <View style={styles.info}>
+                    <Text style={[styles.name, { color: colors.text }]}>{t('signin.chooser.useAnother')}</Text>
+                </View>
+                <Ionicons name="chevron-forward" size={20} color={colors.textSecondary} />
+            </TouchableOpacity>
+        </View>
+    );
+};
+
+const styles = StyleSheet.create({
+    container: {
+        width: '100%',
+        gap: 8,
+    },
+    row: {
+        flexDirection: 'row',
+        alignItems: 'center',
+        gap: 12,
+        borderWidth: 1,
+        borderRadius: 14,
+        paddingHorizontal: 14,
+        paddingVertical: 12,
+    },
+    rowDisabled: {
+        opacity: 0.5,
+    },
+    info: {
+        flex: 1,
+        minWidth: 0,
+    },
+    name: {
+        fontSize: 15,
+        fontWeight: '600',
+    },
+    secondary: {
+        fontSize: 13,
+        marginTop: 2,
+    },
+    currentPill: {
+        flexDirection: 'row',
+        alignItems: 'center',
+        gap: 3,
+        paddingHorizontal: 8,
+        paddingVertical: 3,
+        borderRadius: 999,
+    },
+    currentPillText: {
+        fontSize: 12,
+        fontWeight: '600',
+    },
+    addIcon: {
+        width: 44,
+        height: 44,
+        borderRadius: 22,
+        alignItems: 'center',
+        justifyContent: 'center',
+    },
+});
+
+export default SignInAccountChooser;