Skip to content

fix(settings): Improve fetchLegalTerms and fetchConfig error capture #20097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dschom merged 1 commit into from
Feb 25, 2026
Merged

fix(settings): Improve fetchLegalTerms and fetchConfig error capture #20097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion packages/fxa-settings/src/models/hooks.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,13 @@ describe('useCmsInfoState', () => {
// why we changed the hook to start with.
expect(Sentry.captureException).toHaveBeenCalledWith(fetchError, {
tags: { area: 'useCmsInfoState' },
extra: { clientId: '1234567890abcdef', entrypoint: 'preferences' },
extra: {
clientId: '1234567890abcdef',
entrypoint: 'preferences',
cancelled: false,
errorName: 'Error',
fetchDuration: expect.any(Number),
},
});
});

Expand Down
66 changes: 51 additions & 15 deletions packages/fxa-settings/src/models/hooks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ import {
} from '../lib/integrations';
import { ReachRouterWindow } from '../lib/window';
import { StorageData, UrlHashData, UrlQueryData } from '../lib/model-data';
import { MetricsData, SignedInAccountStatus } from '../components/App/interfaces';
import {
MetricsData,
SignedInAccountStatus,
} from '../components/App/interfaces';
import {
RelierClientInfo,
RelierSubscriptionInfo,
Expand All @@ -28,7 +31,10 @@ import * as Sentry from '@sentry/browser';
import { useDynamicLocalization } from '../contexts/DynamicLocalizationContext';
import { sessionToken } from '../lib/cache';
import { useLocalStorageSync } from '../lib/hooks/useLocalStorageSync';
import { getFullAccountData, isSignedIn as checkIsSignedIn } from '../lib/account-storage';
import {
getFullAccountData,
isSignedIn as checkIsSignedIn,
} from '../lib/account-storage';

const DEFAULT_CMS_ENTRYPOINT = 'default';

Expand Down Expand Up @@ -197,15 +203,21 @@ export function useInitialMetricsQueryState() {
throw new Error('AuthClient not available');
}

const [accountResult, totpResult, recoveryKeyResult] = await Promise.allSettled([
authClient.account(token),
authClient.checkTotpTokenExists(token),
authClient.recoveryKeyExists(token, undefined),
]);

const accountData = accountResult.status === 'fulfilled' ? accountResult.value : null;
const totpData = totpResult.status === 'fulfilled' ? totpResult.value : null;
const recoveryKeyData = recoveryKeyResult.status === 'fulfilled' ? recoveryKeyResult.value : null;
const [accountResult, totpResult, recoveryKeyResult] =
await Promise.allSettled([
authClient.account(token),
authClient.checkTotpTokenExists(token),
authClient.recoveryKeyExists(token, undefined),
]);

const accountData =
accountResult.status === 'fulfilled' ? accountResult.value : null;
const totpData =
totpResult.status === 'fulfilled' ? totpResult.value : null;
const recoveryKeyData =
recoveryKeyResult.status === 'fulfilled'
? recoveryKeyResult.value
: null;

if (mounted && accountData) {
const emails = accountData.emails || [];
Expand All @@ -215,10 +227,16 @@ export function useInitialMetricsQueryState() {
account: {
uid: accountData.uid,
recoveryKey: recoveryKeyData
? { exists: recoveryKeyData.exists, estimatedSyncDeviceCount: recoveryKeyData.estimatedSyncDeviceCount }
? {
exists: recoveryKeyData.exists,
estimatedSyncDeviceCount:
recoveryKeyData.estimatedSyncDeviceCount,
}
: null,
metricsEnabled: accountData.metricsEnabled ?? true,
primaryEmail: emails.find((e: { isPrimary?: boolean }) => e.isPrimary) || null,
primaryEmail:
emails.find((e: { isPrimary?: boolean }) => e.isPrimary) ||
null,
emails,
totp: totpData || null,
},
Expand Down Expand Up @@ -388,6 +406,7 @@ export function useCmsInfoState() {
setState((prev) => ({ ...prev, loading: true }));

const fetchConfig = async () => {
const fetchStart = performance.now();
try {
const url = new URL(`${authUrl}/v1/cms/config`);
url.searchParams.append('clientId', clientId);
Expand Down Expand Up @@ -420,9 +439,17 @@ export function useCmsInfoState() {
});
}
} catch (error) {
const fetchDuration = Math.round(performance.now() - fetchStart);
const cancelled = error instanceof Error && error.name === 'AbortError';
Sentry.captureException(error, {
tags: { area: 'useCmsInfoState' },
extra: { clientId, entrypoint },
extra: {
clientId,
entrypoint,
fetchDuration,
cancelled,
errorName: error instanceof Error ? error.name : typeof error,
},
});

if (mounted) {
Expand Down Expand Up @@ -579,6 +606,7 @@ export function useLegalTermsState() {
setState((prev) => ({ ...prev, loading: true }));

const fetchLegalTerms = async () => {
const fetchStart = performance.now();
try {
const url = new URL(`${authUrl}/v1/cms/legal-terms`);
url.searchParams.append(queryParam, queryValue);
Expand Down Expand Up @@ -622,9 +650,17 @@ export function useLegalTermsState() {
});
}
} catch (error) {
const fetchDuration = Math.round(performance.now() - fetchStart);
const cancelled = error instanceof Error && error.name === 'AbortError';
Sentry.captureException(error, {
tags: { area: 'useLegalTermsState' },
extra: { queryParam, queryValue },
extra: {
queryParam,
queryValue,
fetchDuration,
cancelled,
errorName: error instanceof Error ? error.name : typeof error,
},
});

if (mounted) {
Expand Down
Loading