Skip to content

Commit 3237128

Browse files
committed
feat(ios): support explicit iOS simulator keychain reset
`settings clear-app-state` never touched keychain-backed credentials (e.g. Firebase auth), so a customer's fresh-install reset via the CLI left an app signed in when their in-app reset button did not (#2282). simctl exposes no per-app keychain reset, only a whole-simulator one (`simctl keychain <device> reset`), so this ships as a separate, explicit `settings reset-keychain clear` command rather than folding it into `clear-app-state` — callers opt in knowing the scope is the whole simulator, not just the app under test. Split the pre-existing `apps.test.ts` and `snapshot-handler.test.ts` suites along the `app-settings.ts`/`snapshot-settings.ts` modules they actually mirror, since both were already over the test-file-size tripwire and could not grow further.
1 parent 27a97ee commit 3237128

11 files changed

Lines changed: 781 additions & 565 deletions

File tree

‎packages/contracts/src/client-settings.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ export type SettingsUpdateOptions =
2626
state: 'clear';
2727
app?: string;
2828
})
29+
| (DeviceCommandBaseOptions & {
30+
setting: 'reset-keychain';
31+
state: 'clear';
32+
})
2933
| (DeviceCommandBaseOptions & {
3034
setting: 'wifi' | 'airplane' | 'location';
3135
state: 'on' | 'off';

‎packages/contracts/src/settings.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ const SETTINGS_FACEID_USAGE = 'faceid <match|nonmatch|enroll|unenroll>';
4545
const SETTINGS_TOUCHID_USAGE = 'touchid <match|nonmatch|enroll|unenroll>';
4646
const SETTINGS_FINGERPRINT_USAGE = 'fingerprint <match|nonmatch>';
4747
const SETTINGS_CLEAR_APP_STATE_USAGE = 'clear-app-state [app-id]';
48+
const SETTINGS_RESET_KEYCHAIN_USAGE = 'reset-keychain clear';
4849
const SETTINGS_PERMISSION_USAGE =
4950
'permission <grant|deny|reset> <camera|microphone|photos|contacts|contacts-limited|notifications|calendar|location|location-always|media-library|motion|reminders|siri> [full|limited]';
5051
const SETTINGS_MACOS_PERMISSION_USAGE =
@@ -60,11 +61,12 @@ export const SETTINGS_USAGE_OVERRIDE = [
6061
`settings ${SETTINGS_TOUCHID_USAGE}`,
6162
`settings ${SETTINGS_FINGERPRINT_USAGE}`,
6263
`settings ${SETTINGS_CLEAR_APP_STATE_USAGE}`,
64+
`settings ${SETTINGS_RESET_KEYCHAIN_USAGE}`,
6365
`settings ${SETTINGS_PERMISSION_USAGE}`,
6466
`settings ${SETTINGS_MACOS_PERMISSION_USAGE}`,
6567
].join(' | ');
6668

67-
export const SETTINGS_INVALID_ARGS_MESSAGE = `settings requires ${SETTINGS_WIFI_USAGE}, ${SETTINGS_LOCATION_SET_USAGE}, ${SETTINGS_ANIMATIONS_USAGE}, ${SETTINGS_APPEARANCE_USAGE}, ${SETTINGS_FACEID_USAGE}, ${SETTINGS_TOUCHID_USAGE}, ${SETTINGS_FINGERPRINT_USAGE}, ${SETTINGS_CLEAR_APP_STATE_USAGE}, ${SETTINGS_PERMISSION_USAGE}, or ${SETTINGS_MACOS_PERMISSION_USAGE}`;
69+
export const SETTINGS_INVALID_ARGS_MESSAGE = `settings requires ${SETTINGS_WIFI_USAGE}, ${SETTINGS_LOCATION_SET_USAGE}, ${SETTINGS_ANIMATIONS_USAGE}, ${SETTINGS_APPEARANCE_USAGE}, ${SETTINGS_FACEID_USAGE}, ${SETTINGS_TOUCHID_USAGE}, ${SETTINGS_FINGERPRINT_USAGE}, ${SETTINGS_CLEAR_APP_STATE_USAGE}, ${SETTINGS_RESET_KEYCHAIN_USAGE}, ${SETTINGS_PERMISSION_USAGE}, or ${SETTINGS_MACOS_PERMISSION_USAGE}`;
6870

6971
export function isMacOsSettingSupported(setting: string): boolean {
7072
const normalized = setting.trim().toLowerCase();

0 commit comments

Comments
 (0)