From 3482edc4f1d87a7ec57093a49a8de9191f347f2a Mon Sep 17 00:00:00 2001 From: wobsoriano Date: Tue, 10 Nov 2026 17:16:01 -0800 Subject: [PATCH 1/2] refactor(expo): extract shared FAPI request helpers and app identifier lookup --- packages/expo/src/hooks/useHostedAuth.ts | 26 +-------- packages/expo/src/utils/appIdentifier.ts | 25 ++++++++ packages/expo/src/utils/fapiRequest.ts | 72 ++++++++++++++++++++++++ packages/expo/src/utils/hostedAuth.ts | 67 +++------------------- 4 files changed, 105 insertions(+), 85 deletions(-) create mode 100644 packages/expo/src/utils/appIdentifier.ts create mode 100644 packages/expo/src/utils/fapiRequest.ts diff --git a/packages/expo/src/hooks/useHostedAuth.ts b/packages/expo/src/hooks/useHostedAuth.ts index ab7019b2678..2e07d8d29f6 100644 --- a/packages/expo/src/hooks/useHostedAuth.ts +++ b/packages/expo/src/hooks/useHostedAuth.ts @@ -5,10 +5,10 @@ import type * as WebBrowser from 'expo-web-browser'; import { Platform } from 'react-native'; import { getClerkInstance } from '../provider/singleton'; +import { getExpoAppIdentifier } from '../utils/appIdentifier'; import { errorThrower } from '../utils/errors'; import type { HostedAuthClerkInstance, HostedAuthMode } from '../utils/hostedAuth'; import { applyHostedAuthClientJSON, createHostedAuth, redeemHostedAuth } from '../utils/hostedAuth'; -import { isExpoGo } from '../utils/runtime'; export type { HostedAuthMode }; @@ -237,30 +237,6 @@ function warnAndroidDefaultRedirectOnce(): void { } } -function getExpoAppIdentifier(): string | undefined { - try { - // expo-constants is already an optional @clerk/expo peer and is present in - // standard Expo projects. Keep the fallback below for Expo Go and bare apps. - // eslint-disable-next-line @typescript-eslint/no-require-imports - const constantsModule = require('expo-constants') as { - default?: { - expoConfig?: { - ios?: { bundleIdentifier?: string }; - android?: { package?: string }; - }; - }; - }; - if (isExpoGo()) { - return undefined; - } - - const expoConfig = constantsModule.default?.expoConfig; - return Platform.OS === 'ios' ? expoConfig?.ios?.bundleIdentifier : expoConfig?.android?.package; - } catch { - return undefined; - } -} - function getHostedAuthClerk(): HostedAuthClerkInstance { const hostedAuthClerk = getClerkInstance() as Partial | undefined; if (typeof hostedAuthClerk?.getFapiClient !== 'function') { diff --git a/packages/expo/src/utils/appIdentifier.ts b/packages/expo/src/utils/appIdentifier.ts new file mode 100644 index 00000000000..a7800ca1ce6 --- /dev/null +++ b/packages/expo/src/utils/appIdentifier.ts @@ -0,0 +1,25 @@ +import { Platform } from 'react-native'; + +import { isExpoGo } from './runtime'; + +export function getExpoAppIdentifier(): string | undefined { + try { + // eslint-disable-next-line @typescript-eslint/no-require-imports + const constantsModule = require('expo-constants') as { + default?: { + expoConfig?: { + ios?: { bundleIdentifier?: string }; + android?: { package?: string }; + }; + }; + }; + if (isExpoGo()) { + return undefined; + } + + const expoConfig = constantsModule.default?.expoConfig; + return Platform.OS === 'ios' ? expoConfig?.ios?.bundleIdentifier : expoConfig?.android?.package; + } catch { + return undefined; + } +} diff --git a/packages/expo/src/utils/fapiRequest.ts b/packages/expo/src/utils/fapiRequest.ts new file mode 100644 index 00000000000..c66e0218b35 --- /dev/null +++ b/packages/expo/src/utils/fapiRequest.ts @@ -0,0 +1,72 @@ +import { ClerkAPIResponseError } from '@clerk/shared/error'; +import type { ClerkAPIErrorJSON } from '@clerk/shared/types'; + +export type FapiPayload = { + response?: R; + errors?: ClerkAPIErrorJSON[]; +}; + +export type FapiResponse = { + ok: boolean; + status: number; + statusText: string; + headers?: Headers; + payload: FapiPayload | null; +}; + +export async function requestWithSignedOutRetry( + request: () => Promise>, +): Promise> { + const response = await request(); + if ( + !response.ok && + response.status === 401 && + getFapiErrors(response.payload).some(error => error.code === 'signed_out') + ) { + // The Expo response hook has already persisted the replacement device token. + return request(); + } + + return response; +} + +export function getResponseJSON( + payload: FapiPayload | null, + object: O, +): Extract | null { + const response = payload?.response; + return !!response && typeof response === 'object' && isResponseObject(response, object) ? response : null; +} + +function isResponseObject( + response: R, + object: O, +): response is Extract { + return response.object === object; +} + +export function toClerkAPIResponseError( + response: FapiResponse<{ object: string }>, + fallbackMessage: string, +): ClerkAPIResponseError { + const errors = getFapiErrors(response.payload); + return new ClerkAPIResponseError(errors[0]?.long_message || response.statusText || fallbackMessage, { + data: errors, + status: response.status, + retryAfter: getRetryAfter(response.headers), + }); +} + +function getFapiErrors(payload: FapiPayload<{ object: string }> | null): ClerkAPIErrorJSON[] { + return payload?.errors ?? []; +} + +function getRetryAfter(headers: Headers | undefined): number | undefined { + const retryAfter = headers?.get('retry-after'); + if (!retryAfter) { + return undefined; + } + + const retryAfterSeconds = parseInt(retryAfter, 10); + return Number.isNaN(retryAfterSeconds) ? undefined : retryAfterSeconds; +} diff --git a/packages/expo/src/utils/hostedAuth.ts b/packages/expo/src/utils/hostedAuth.ts index d1c9d3bb436..d7d0d56f012 100644 --- a/packages/expo/src/utils/hostedAuth.ts +++ b/packages/expo/src/utils/hostedAuth.ts @@ -1,7 +1,8 @@ -import { ClerkAPIResponseError } from '@clerk/shared/error'; -import type { ClerkAPIErrorJSON, ClientJSON, ClientResource } from '@clerk/shared/types'; +import type { ClientJSON, ClientResource } from '@clerk/shared/types'; import { errorThrower } from './errors'; +import type { FapiResponse } from './fapiRequest'; +import { getResponseJSON, requestWithSignedOutRetry, toClerkAPIResponseError } from './fapiRequest'; /** * Controls which Account Portal auth screen opens for hosted auth. @@ -25,18 +26,7 @@ type HostedAuthJSON = { url: string; }; -type HostedAuthPayload = { - response?: HostedAuthJSON | ClientJSON; - errors?: ClerkAPIErrorJSON[]; -}; - -type HostedAuthResponse = { - ok: boolean; - status: number; - statusText: string; - headers?: Headers; - payload: HostedAuthPayload | null; -}; +type HostedAuthResponse = FapiResponse; type FapiClient = { request: (requestInit: { @@ -62,18 +52,9 @@ export async function createHostedAuth( body: params, }); - let response = await request(); - if ( - !response.ok && - response.status === 401 && - getHostedAuthErrors(response.payload).some(error => error.code === 'signed_out') - ) { - // The Expo response hook has already persisted the replacement device token. - response = await request(); - } - + const response = await requestWithSignedOutRetry(request); if (!response.ok) { - throw buildHostedAuthAPIResponseError(response); + throw toClerkAPIResponseError(response, 'Hosted auth request failed.'); } const hostedAuthJSON = getResponseJSON(response.payload, 'hosted_auth'); @@ -110,13 +91,6 @@ export async function redeemHostedAuth( return clientJSON; } -function getResponseJSON(payload: HostedAuthResponse['payload'], object: 'hosted_auth'): HostedAuthJSON | null; -function getResponseJSON(payload: HostedAuthResponse['payload'], object: 'client'): ClientJSON | null; -function getResponseJSON(payload: HostedAuthResponse['payload'], object: string): HostedAuthJSON | ClientJSON | null { - const response = payload?.response; - return !!response && typeof response === 'object' && response.object === object ? response : null; -} - export function applyHostedAuthClientJSON(client: ClientResource, clientJSON: ClientJSON): ClientResource { // Hosted auth gets the same /client payload as Client.reload(), but its verifier-bound // exchange uses a request body. Apply it to the existing ClerkJS client instance here @@ -140,32 +114,5 @@ async function throwHostedAuthAPIResponseError( await clerk.handleUnauthenticated?.(); } - throw buildHostedAuthAPIResponseError(response); -} - -function buildHostedAuthAPIResponseError(response: HostedAuthResponse) { - const errors = getHostedAuthErrors(response.payload); - return new ClerkAPIResponseError(errors[0]?.long_message || response.statusText || 'Hosted auth request failed.', { - data: errors, - status: response.status, - retryAfter: getRetryAfter(response.headers), - }); -} - -function getHostedAuthErrors(payload: HostedAuthResponse['payload']): ClerkAPIErrorJSON[] { - if (!payload || !('errors' in payload)) { - return []; - } - - return payload.errors ?? []; -} - -function getRetryAfter(headers: Headers | undefined): number | undefined { - const retryAfter = headers?.get('retry-after'); - if (!retryAfter) { - return undefined; - } - - const retryAfterSeconds = parseInt(retryAfter, 10); - return Number.isNaN(retryAfterSeconds) ? undefined : retryAfterSeconds; + throw toClerkAPIResponseError(response, 'Hosted auth request failed.'); } From ab2bb0735647ae9d52fa7330c4ac2724df0db7c9 Mon Sep 17 00:00:00 2001 From: wobsoriano Date: Sun, 15 Nov 2026 21:17:50 -0800 Subject: [PATCH 2/2] chore(expo): add an empty changeset for the FAPI helper extraction Part of MOBILE-450 --- .changeset/thin-eagles-lay.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .changeset/thin-eagles-lay.md diff --git a/.changeset/thin-eagles-lay.md b/.changeset/thin-eagles-lay.md new file mode 100644 index 00000000000..a845151cc84 --- /dev/null +++ b/.changeset/thin-eagles-lay.md @@ -0,0 +1,2 @@ +--- +---