update CHANGELOG.md

* [eas-cli][bugfix] Fix ios version-test

Tests were passing, but were not testing the right thing, essentially always defaulting to 'managed' workflow. `projectDir` should be set to the same value as EAS_PROJECT_ROOT.

* [eas-cli][ENG-8571] Validate CFBundleShortVersionString

* update CHANGELOG.md

CHANGELOG.md

@@ -8,6 +8,18 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🎉 New features
 
+### 🐛 Bug fixes
+
+- Load iOS entitlements from prebuild config when `./ios` is gitignored. ([#1852](https://github.com/expo/eas-cli/pull/1852) by [@byCedric](https://github.com/byCedric))
+
+### 🧹 Chores
+
+- Short format for selecting devices prompt. ([#1840](https://github.com/expo/eas-cli/pull/1840) by [@khamilowicz](https://github.com/khamilowicz))
+
+## [3.13.0](https://github.com/expo/eas-cli/releases/tag/v3.13.0) - 2023-05-17
+
+### 🎉 New features
+
 - Add clear cache flag to eas update. ([#1839](https://github.com/expo/eas-cli/pull/1839) by [@quinlanj](https://github.com/quinlanj))
 
 ### 🐛 Bug fixes
@@ -17,6 +29,8 @@ This is the log of notable changes to EAS CLI and related packages.
 ### 🧹 Chores
 
 - Ignore dirty workingdir when building from GitHub. ([#1842](https://github.com/expo/eas-cli/pull/1842) by [@wkozyra95](https://github.com/wkozyra95))
+- Remove App Specific Password prompt. ([#1843](https://github.com/expo/eas-cli/pull/1843) by [@quinlanj](https://github.com/quinlanj))
+- Validate `CFBundleShortVersionString`. ([#1846](https://github.com/expo/eas-cli/pull/1846) by [@khamilowicz](https://github.com/khamilowicz))
 
 ## [3.12.1](https://github.com/expo/eas-cli/releases/tag/v3.12.1) - 2023-05-15
 

packages/eas-cli/src/build/ios/__tests__/version-test.ts

@@ -77,7 +77,7 @@ describe(bumpVersionAsync, () => {
     );
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.BUILD_NUMBER,
-      projectDir: '/repo',
+      projectDir: '/app',
       exp: fakeExp,
       targets: [
         {
@@ -88,9 +88,9 @@ describe(bumpVersionAsync, () => {
       ],
     });
 
-    const appJSON = await fs.readJSON('/repo/app.json');
+    const appJSON = await fs.readJSON('/app/app.json');
     const infoPlist = (await readPlistAsync(
-      '/repo/ios/myproject/Info.plist'
+      '/app/ios/myproject/Info.plist'
     )) as IOSConfig.InfoPlist;
     expect(fakeExp.version).toBe('1.0.0');
     expect(fakeExp.ios?.buildNumber).toBe('2');
@@ -113,7 +113,7 @@ describe(bumpVersionAsync, () => {
     );
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.BUILD_NUMBER,
-      projectDir: '/repo',
+      projectDir: '/app',
       exp: fakeExp,
       targets: [
         {
@@ -124,9 +124,9 @@ describe(bumpVersionAsync, () => {
       ],
     });
 
-    const appJSON = await fs.readJSON('/repo/app.json');
+    const appJSON = await fs.readJSON('/app/app.json');
     const infoPlist = (await readPlistAsync(
-      '/repo/ios/myproject/Info2.plist'
+      '/app/ios/myproject/Info2.plist'
     )) as IOSConfig.InfoPlist;
     expect(fakeExp.version).toBe('1.0.0');
     expect(fakeExp.ios?.buildNumber).toBe('2');
@@ -148,7 +148,7 @@ describe(bumpVersionAsync, () => {
     );
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.APP_VERSION,
-      projectDir: '/repo',
+      projectDir: '/app',
       exp: fakeExp,
       targets: [
         {
@@ -159,9 +159,9 @@ describe(bumpVersionAsync, () => {
       ],
     });
 
-    const appJSON = await fs.readJSON('/repo/app.json');
+    const appJSON = await fs.readJSON('/app/app.json');
     const infoPlist = (await readPlistAsync(
-      '/repo/ios/myproject/Info.plist'
+      '/app/ios/myproject/Info.plist'
     )) as IOSConfig.InfoPlist;
     expect(fakeExp.version).toBe('1.0.1');
     expect(fakeExp.ios?.buildNumber).toBe('1');
@@ -183,7 +183,7 @@ describe(bumpVersionAsync, () => {
     );
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.NOOP,
-      projectDir: '/repo',
+      projectDir: '/app',
       exp: fakeExp,
       targets: [
         {
@@ -194,9 +194,9 @@ describe(bumpVersionAsync, () => {
       ],
     });
 
-    const appJSON = await fs.readJSON('/repo/app.json');
+    const appJSON = await fs.readJSON('/app/app.json');
     const infoPlist = (await readPlistAsync(
-      '/repo/ios/myproject/Info.plist'
+      '/app/ios/myproject/Info.plist'
     )) as IOSConfig.InfoPlist;
     expect(fakeExp.version).toBe('1.0.0');
     expect(fakeExp.ios?.buildNumber).toBe('1');
@@ -214,11 +214,11 @@ describe(bumpVersionInAppJsonAsync, () => {
 
     await bumpVersionInAppJsonAsync({
       bumpStrategy: BumpStrategy.BUILD_NUMBER,
-      projectDir: '/repo',
+      projectDir: '/app',
       exp: fakeExp,
     });
 
-    const appJSON = await fs.readJSON('/repo/app.json');
+    const appJSON = await fs.readJSON('/app/app.json');
     expect(fakeExp.version).toBe('1.0.0');
     expect(fakeExp.ios?.buildNumber).toBe('2');
     expect(appJSON.expo.version).toBe('1.0.0');
@@ -230,11 +230,11 @@ describe(bumpVersionInAppJsonAsync, () => {
 
     await bumpVersionInAppJsonAsync({
       bumpStrategy: BumpStrategy.APP_VERSION,
-      projectDir: '/repo',
+      projectDir: '/app',
       exp: fakeExp,
     });
 
-    const appJSON = await fs.readJSON('/repo/app.json');
+    const appJSON = await fs.readJSON('/app/app.json');
     expect(fakeExp.version).toBe('1.0.1');
     expect(fakeExp.ios?.buildNumber).toBe('1');
     expect(appJSON.expo.version).toBe('1.0.1');
@@ -246,11 +246,11 @@ describe(bumpVersionInAppJsonAsync, () => {
 
     await bumpVersionInAppJsonAsync({
       bumpStrategy: BumpStrategy.NOOP,
-      projectDir: '/repo',
+      projectDir: '/app',
       exp: fakeExp,
     });
 
-    const appJSON = await fs.readJSON('/repo/app.json');
+    const appJSON = await fs.readJSON('/app/app.json');
     expect(fakeExp.version).toBe('1.0.0');
     expect(fakeExp.ios?.buildNumber).toBe('1');
     expect(appJSON.expo.version).toBe('1.0.0');
@@ -262,7 +262,7 @@ describe(readBuildNumberAsync, () => {
   describe('bare project', () => {
     it('reads the build number from native code', async () => {
       const exp = initBareWorkflowProject();
-      const buildNumber = await readBuildNumberAsync('/repo', exp, {});
+      const buildNumber = await readBuildNumberAsync('/app', exp, {});
       expect(buildNumber).toBe('1');
     });
   });
@@ -270,7 +270,7 @@ describe(readBuildNumberAsync, () => {
   describe('managed project', () => {
     it('reads the build number from expo config', async () => {
       const exp = initManagedProject();
-      const buildNumber = await readBuildNumberAsync('/repo', exp, {});
+      const buildNumber = await readBuildNumberAsync('/app', exp, {});
       expect(buildNumber).toBe('1');
     });
   });
@@ -280,24 +280,38 @@ describe(readShortVersionAsync, () => {
   describe('bare project', () => {
     it('reads the short version from native code', async () => {
       const exp = initBareWorkflowProject();
-      const appVersion = await readShortVersionAsync('/repo', exp, {});
+      const appVersion = await readShortVersionAsync('/app', exp, {});
       expect(appVersion).toBe('1.0.0');
     });
     it('evaluates interpolated build number', async () => {
       const exp = initBareWorkflowProject({
         appVersion: '$(CURRENT_PROJECT_VERSION)',
       });
-      const buildNumber = await readShortVersionAsync('/repo', exp, {
+      const buildNumber = await readShortVersionAsync('/app', exp, {
         CURRENT_PROJECT_VERSION: '1.0.0',
       });
       expect(buildNumber).toBe('1.0.0');
     });
+
+    it('fails when build number is invalid', async () => {
+      const exp = initBareWorkflowProject({
+        appVersion: '$(CURRENT_PROJECT_VERSION)',
+      });
+
+      await expect(
+        readShortVersionAsync('/app', exp, {
+          CURRENT_PROJECT_VERSION: '0.0.7.1.028',
+        })
+      ).rejects.toThrowError(
+        'CFBundleShortVersionString (version field in app.json/app.config.js) must be a period-separated list of three non-negative integers. Current value: 0.0.7.1.028'
+      );
+    });
   });
 
   describe('managed project', () => {
     it('reads the version from app config', async () => {
       const exp = initBareWorkflowProject();
-      const appVersion = await readShortVersionAsync('/repo', exp, {});
+      const appVersion = await readShortVersionAsync('/app', exp, {});
       expect(appVersion).toBe('1.0.0');
     });
   });
@@ -309,66 +323,75 @@ describe(getInfoPlistPath, () => {
       {
         './ios/testapp/Info.plist': '',
       },
-      '/repo'
+      '/app'
     );
-    const plistPath = getInfoPlistPath('/repo', {});
-    expect(plistPath).toBe('/repo/ios/testapp/Info.plist');
+    const plistPath = getInfoPlistPath('/app', {});
+    expect(plistPath).toBe('/app/ios/testapp/Info.plist');
   });
   it('returns INFOPLIST_FILE if specified', () => {
     vol.fromJSON(
       {
         './ios/testapp/Info.plist': '',
       },
-      '/repo'
+      '/app'
     );
-    const plistPath = getInfoPlistPath('/repo', { INFOPLIST_FILE: './qwert/NotInfo.plist' });
-    expect(plistPath).toBe('/repo/ios/qwert/NotInfo.plist');
+    const plistPath = getInfoPlistPath('/app', { INFOPLIST_FILE: './qwert/NotInfo.plist' });
+    expect(plistPath).toBe('/app/ios/qwert/NotInfo.plist');
   });
   it('evaluates SRCROOT in Info.plist', () => {
     vol.fromJSON(
       {
         './ios/testapp/Info.plist': '',
       },
-      '/repo'
+      '/app'
     );
-    const plistPath = getInfoPlistPath('/repo', {
+    const plistPath = getInfoPlistPath('/app', {
       INFOPLIST_FILE: '$(SRCROOT)/qwert/NotInfo.plist',
     });
-    expect(plistPath).toBe('/repo/ios/qwert/NotInfo.plist');
+    expect(plistPath).toBe('/app/ios/qwert/NotInfo.plist');
   });
   it('evaluates BuildSettings in Info.plist', () => {
     vol.fromJSON(
       {
         './ios/testapp/Info.plist': '',
       },
-      '/repo'
+      '/app'
     );
-    const plistPath = getInfoPlistPath('/repo', {
+    const plistPath = getInfoPlistPath('/app', {
       INFOPLIST_FILE: '$(SRCROOT)/qwert/$(TARGET_NAME).plist',
       TARGET_NAME: 'NotInfo',
     });
-    expect(plistPath).toBe('/repo/ios/qwert/NotInfo.plist');
+    expect(plistPath).toBe('/app/ios/qwert/NotInfo.plist');
   });
 });
 
 function initBareWorkflowProject({
   appVersion = '1.0.0',
   buildNumber = '1',
+  expoConfig = {},
   infoPlistName = 'Info.plist',
-}: { appVersion?: string; buildNumber?: string; infoPlistName?: string } = {}): ExpoConfig {
+}: {
+  appVersion?: string;
+  buildNumber?: string;
+  infoPlistName?: string;
+  expoConfig?: { version?: string; ios?: object };
+} = {}): ExpoConfig {
   const fakeExp: ExpoConfig = {
     name: 'myproject',
     slug: 'myproject',
     version: '1.0.0',
     ios: {
       buildNumber: '1',
+      ...expoConfig.ios,
     },
+    ...expoConfig,
   };
   vol.fromJSON(
     {
       './app.json': JSON.stringify({
         expo: fakeExp,
       }),
+      './ios/myproject.xcodeproj/project.pbxproj': '',
       [`./ios/myproject/${infoPlistName}`]: `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -380,7 +403,7 @@ function initBareWorkflowProject({
 </dict>
 </plist>`,
     },
-    '/repo'
+    '/app'
   );
 
   return fakeExp;
@@ -402,7 +425,7 @@ function initManagedProject(): ExpoConfig {
         expo: fakeExp,
       }),
     },
-    '/repo'
+    '/app'
   );
 
   return fakeExp;

packages/eas-cli/src/build/ios/version.ts

@@ -22,6 +22,8 @@ import { readPlistAsync, writePlistAsync } from '../../utils/plist';
 import { updateAppJsonConfigAsync } from '../utils/appJson';
 import { bumpAppVersionAsync, ensureStaticConfigExists } from '../utils/version';
 
+const SHORT_VERSION_REGEX = /^\d+.\d+.\d+$/;
+
 export enum BumpStrategy {
   APP_VERSION,
   BUILD_NUMBER,
@@ -97,6 +99,14 @@ export async function bumpVersionInAppJsonAsync({
   }
 }
 
+function validateShortVersion(shortVersion: string | undefined): void {
+  if (shortVersion && !SHORT_VERSION_REGEX.test(shortVersion)) {
+    throw new Error(
+      `CFBundleShortVersionString (version field in app.json/app.config.js) must be a period-separated list of three non-negative integers. Current value: ${shortVersion}`
+    );
+  }
+}
+
 export async function readShortVersionAsync(
   projectDir: string,
   exp: ExpoConfig,
@@ -105,11 +115,15 @@ export async function readShortVersionAsync(
   const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
   if (workflow === Workflow.GENERIC) {
     const infoPlist = await readInfoPlistAsync(projectDir, buildSettings);
-    return (
+
+    const shortVersion =
       infoPlist.CFBundleShortVersionString &&
-      evaluateTemplateString(infoPlist.CFBundleShortVersionString, buildSettings)
-    );
+      evaluateTemplateString(infoPlist.CFBundleShortVersionString, buildSettings);
+
+    validateShortVersion(shortVersion);
+    return shortVersion;
   } else {
+    validateShortVersion(exp.version);
     return exp.version;
   }
 }

packages/eas-cli/src/credentials/ios/actions/DeviceUtils.ts

@@ -13,6 +13,7 @@ export async function chooseDevicesAsync(
   const { devices } = await promptAsync({
     type: 'multiselect',
     name: 'devices',
+    selectionFormat: '<num> devices selected',
     message: 'Select devices for the ad hoc build:',
     hint: '- Space to select. Return to submit',
     choices: allDevices.map(device => ({

packages/eas-cli/src/credentials/ios/actions/SetUpAscApiKey.ts

@@ -31,10 +31,10 @@ export enum SetupAscApiKeyChoice {
 export class SetUpAscApiKey {
   public choices: { title: string; value: string }[] = [
     {
-      title: '[Choose an existing ASC API Key]',
+      title: '[Choose an existing key]',
       value: SetupAscApiKeyChoice.USE_EXISTING,
     },
-    { title: '[Add a new ASC API Key]', value: SetupAscApiKeyChoice.GENERATE },
+    { title: '[Add a new key]', value: SetupAscApiKeyChoice.GENERATE },
   ];
 
   constructor(private app: AppLookupParams, private purpose: AppStoreApiKeyPurpose) {}
@@ -126,7 +126,7 @@ export class SetUpAscApiKey {
       const result = await promptAsync({
         type: 'select',
         name: 'choice',
-        message: 'Select what to use for your project:',
+        message: 'Select the App Store Connect Api Key to use for your project:',
         choices,
       });
       choice = result.choice;

packages/eas-cli/src/credentials/ios/actions/SetUpSubmissionCredentials.ts

@@ -1,70 +0,0 @@
-import chalk from 'chalk';
-import nullthrows from 'nullthrows';
-import wrapAnsi from 'wrap-ansi';
-
-import { CommonIosAppCredentialsFragment } from '../../../graphql/generated';
-import Log, { learnMore } from '../../../log';
-import { promptAsync } from '../../../prompts';
-import { CredentialsContext } from '../../context';
-import { UnsupportedCredentialsChoiceError } from '../../errors';
-import { AppLookupParams } from '../api/graphql/types/AppLookupParams';
-import { AppStoreApiKeyPurpose } from './AscApiKeyUtils';
-import { SetUpAscApiKey } from './SetUpAscApiKey';
-
-export const PROMPT_FOR_APP_SPECIFIC_PASSWORD = 'PROMPT_FOR_APP_SPECIFIC_PASSWORD';
-
-export class SetUpSubmissionCredentials {
-  private setupAscApiKeyAction;
-
-  constructor(app: AppLookupParams) {
-    this.setupAscApiKeyAction = new SetUpAscApiKey(app, AppStoreApiKeyPurpose.SUBMISSION_SERVICE);
-    // Add this unrelated choice to ASC API Key setup for legacy purposes -- we will deprecate it soon
-    this.setupAscApiKeyAction.choices = this.setupAscApiKeyAction.choices.concat({
-      title: '[Enter an App Specific Password]',
-      value: PROMPT_FOR_APP_SPECIFIC_PASSWORD,
-    });
-  }
-
-  public async runAsync(
-    ctx: CredentialsContext
-  ): Promise<CommonIosAppCredentialsFragment | string> {
-    try {
-      const iosAppCredentials = await this.setupAscApiKeyAction.runAsync(ctx);
-      const { keyIdentifier, name } = nullthrows(
-        iosAppCredentials.appStoreConnectApiKeyForSubmissions,
-        'ASC API Key must be defined for EAS Submit'
-      );
-      Log.log(`Using API Key ID: ${keyIdentifier}${name ? ` (${name})` : ''}`);
-      return iosAppCredentials;
-    } catch (e) {
-      if (e instanceof UnsupportedCredentialsChoiceError) {
-        if (e.choice === PROMPT_FOR_APP_SPECIFIC_PASSWORD) {
-          return await this.promptForAppSpecificPasswordAsync();
-        }
-      }
-      throw e;
-    }
-  }
-
-  async promptForAppSpecificPasswordAsync(): Promise<string> {
-    Log.addNewLineIfNone();
-    Log.log(`Enter your Apple app-specific password.`);
-    Log.log(learnMore('https://expo.fyi/apple-app-specific-password'));
-    Log.warn(
-      wrapAnsi(
-        `This option will be deprecated soon. You will still be able to provide your password with the ${chalk.bold(
-          'EXPO_APPLE_APP_SPECIFIC_PASSWORD'
-        )} environment variable.`,
-        process.stdout.columns || 80
-      )
-    );
-
-    const { appSpecificPassword } = await promptAsync({
-      name: 'appSpecificPassword',
-      message: 'Your Apple app-specific password:',
-      type: 'password',
-      validate: (val: string) => val !== '' || 'Apple app-specific password cannot be empty!',
-    });
-    return appSpecificPassword;
-  }
-}

packages/eas-cli/src/credentials/ios/actions/__tests__/SetUpSubmissionCredentials-test.ts

@@ -1,70 +0,0 @@
-import { AppQuery } from '../../../../graphql/queries/AppQuery';
-import { findApplicationTarget } from '../../../../project/ios/target';
-import { confirmAsync, promptAsync } from '../../../../prompts';
-import { testAppQueryByIdResponse } from '../../../__tests__/fixtures-constants';
-import { createCtxMock } from '../../../__tests__/fixtures-context';
-import {
-  getNewIosApiMock,
-  testCommonIosAppCredentialsFragment,
-  testTargets,
-} from '../../../__tests__/fixtures-ios';
-import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
-import { SetUpAscApiKey } from '../SetUpAscApiKey';
-import {
-  PROMPT_FOR_APP_SPECIFIC_PASSWORD,
-  SetUpSubmissionCredentials,
-} from '../SetUpSubmissionCredentials';
-
-jest.mock('../../../../prompts');
-jest.mocked(confirmAsync).mockImplementation(async () => true);
-jest.mock('../../../../graphql/queries/AppQuery');
-
-describe(SetUpSubmissionCredentials, () => {
-  beforeEach(() => {
-    jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
-  });
-  it('allows user to enter an App Specific Password', async () => {
-    jest
-      .mocked(promptAsync)
-      .mockImplementationOnce(async () => ({
-        choice: PROMPT_FOR_APP_SPECIFIC_PASSWORD,
-      }))
-      .mockImplementationOnce(async () => ({
-        appSpecificPassword: 'super secret',
-      }));
-    const ctx = createCtxMock({
-      nonInteractive: false,
-      ios: {
-        ...getNewIosApiMock(),
-      },
-    });
-    const appLookupParams = await getAppLookupParamsFromContextAsync(
-      ctx,
-      findApplicationTarget(testTargets)
-    );
-    const setupAscApiKeyAction = new SetUpSubmissionCredentials(appLookupParams);
-    const asp = await setupAscApiKeyAction.runAsync(ctx);
-
-    // prompt to choose ASP, then prompt to input ASP
-    expect(jest.mocked(promptAsync).mock.calls.length).toBe(2);
-    expect(asp).toBe('super secret');
-  });
-  it('returns an ASC API key', async () => {
-    try {
-      jest
-        .spyOn(SetUpAscApiKey.prototype, 'runAsync')
-        .mockImplementation(async _ctx => testCommonIosAppCredentialsFragment);
-      const ctx = createCtxMock();
-      const appLookupParams = await getAppLookupParamsFromContextAsync(
-        ctx,
-        findApplicationTarget(testTargets)
-      );
-      const setupAscApiKeyAction = new SetUpSubmissionCredentials(appLookupParams);
-      const asc = await setupAscApiKeyAction.runAsync(ctx);
-
-      expect(asc).toEqual(testCommonIosAppCredentialsFragment);
-    } finally {
-      jest.restoreAllMocks();
-    }
-  });
-});

packages/eas-cli/src/credentials/ios/appstore/__tests__/capabilityIdentifiers-test.ts

@@ -169,4 +169,8 @@ describe(syncCapabilityIdentifiersForEntitlementsAsync, () => {
       })
     ).rejects.toThrow(/is not available. Enter a different string/);
   });
+
+  it(`ignores capabilities from "/ios" folder when gitignored`, async () => {
+    //
+  });
 });

packages/eas-cli/src/easMultiselect.ts

@@ -0,0 +1,53 @@
+import { Choice, PromptObject } from 'prompts';
+import { MultiselectPrompt } from 'prompts/lib/elements';
+
+const noop = (): void => {};
+
+export type Question<T extends string = string> = PromptObject<T> & {
+  selectionFormat?: string;
+};
+
+/**
+ * Customized multiselect prompt.
+ *
+ * Additional parameters:
+ *
+ * @param selectionFormat
+ *   String indicating number of selected options. Should contain `<num>` substring.
+ *
+ *   Example:
+ *     'Selected <num> devices'
+ *
+ *   Short format is used when more than one option is selected.
+ *
+ **/
+
+export default class EasMultiselect extends MultiselectPrompt {
+  constructor(opts: Question) {
+    super(opts);
+    this.selectionFormat = opts.selectionFormat;
+  }
+  override renderDoneOrInstructions(): string {
+    if (this.done && this.selectionFormat && this.value) {
+      const selectedOptionsCount = this.value.filter(e => e.selected).length;
+
+      if (selectedOptionsCount > 1) {
+        return this.selectionFormat.replace('<num>', selectedOptionsCount.toString());
+      }
+    }
+    return super.renderDoneOrInstructions();
+  }
+}
+
+export const easMultiselect = (args: Question): Promise<Choice[]> => {
+  const toSelected = (items: Choice[]): Choice[] =>
+    items.filter(item => item.selected).map(item => item.value);
+
+  return new Promise((res, rej) => {
+    const p = new EasMultiselect(args);
+    const onAbort = toSelected || noop;
+    const onSubmit = toSelected || noop;
+    p.on('submit', x => res(onSubmit(x)));
+    p.on('abort', x => rej(onAbort(x)));
+  });
+};

packages/eas-cli/src/project/ios/entitlements.ts

@@ -2,12 +2,15 @@ import { IOSConfig, compileModsAsync } from '@expo/config-plugins';
 import { JSONObject } from '@expo/json-file';
 import { getPrebuildConfigAsync } from '@expo/prebuild-config';
 
+import Log from '../../log';
 import { readPlistAsync } from '../../utils/plist';
+import { getVcsClient } from '../../vcs';
 
 interface Target {
   buildConfiguration?: string;
   targetName: string;
 }
+
 export async function getManagedApplicationTargetEntitlementsAsync(
   projectDir: string,
   env: Record<string, string>
@@ -43,3 +46,37 @@ export async function getNativeTargetEntitlementsAsync(
     return null;
   }
 }
+
+/**
+ * When users have the `./ios` folder ignored through gitignore,
+ * we should load the app entitlements as managed instead of native/bare workflow.
+ * Without this, the user's configuration through config plugins will be ignored.
+ * The gitignore check can be disabled by setting the `EAS_SYNC_NATIVE_CAPABILITIES=1` env variable.
+ */
+export async function getNativeTargetEntitlementsUnlessGitIgnoredAsync(
+  projectDir: string,
+  {
+    target,
+    env,
+  }: {
+    target: Target;
+    env: Record<string, string>;
+  }
+): Promise<JSONObject | null> {
+  // Escape hatch to force syncing native capabilities from `/ios` folder
+  const useNativeCapabilities = process.env.EAS_SYNC_NATIVE_CAPABILITIES;
+  if (useNativeCapabilities) {
+    Log.log(
+      'Syncing native ios capabilities from `./ios` folder, EAS_SYNC_NATIVE_CAPABILITIES is defined.'
+    );
+    return getNativeTargetEntitlementsAsync(projectDir, target);
+  }
+
+  // Load the capabilities from the prebuild config, instead of the native project when gitignored
+  if (await getVcsClient().isFileIgnoredAsync('ios')) {
+    return getManagedApplicationTargetEntitlementsAsync(projectDir, env);
+  }
+
+  // Load the capabilities from the `./ios` native project
+  return getNativeTargetEntitlementsAsync(projectDir, target);
+}

packages/eas-cli/src/project/ios/target.ts

@@ -11,7 +11,7 @@ import { resolveWorkflowAsync } from '../workflow';
 import { getBundleIdentifierAsync } from './bundleIdentifier';
 import {
   getManagedApplicationTargetEntitlementsAsync,
-  getNativeTargetEntitlementsAsync,
+  getNativeTargetEntitlementsUnlessGitIgnoredAsync,
 } from './entitlements';
 import { XcodeBuildContext } from './scheme';
 
@@ -89,6 +89,7 @@ export async function resolveBareProjectTargetsAsync({
   exp,
   projectDir,
   xcodeBuildContext,
+  env,
 }: ResolveTargetOptions): Promise<Target[]> {
   const { buildScheme, buildConfiguration } = xcodeBuildContext;
   const result: Target[] = [];
@@ -102,9 +103,12 @@ export async function resolveBareProjectTargetsAsync({
     targetName: applicationTarget.name,
     buildConfiguration,
   });
-  const entitlements = await getNativeTargetEntitlementsAsync(projectDir, {
-    targetName: applicationTarget.name,
-    buildConfiguration,
+  const entitlements = await getNativeTargetEntitlementsUnlessGitIgnoredAsync(projectDir, {
+    env: env ?? {},
+    target: {
+      targetName: applicationTarget.name,
+      buildConfiguration,
+    },
   });
   result.push({
     targetName: applicationTarget.name,
@@ -151,6 +155,7 @@ async function resolveBareProjectDependenciesAsync({
   target,
   bundleIdentifier,
   pbxProject,
+  env,
 }: {
   exp: ExpoConfig;
   projectDir: string;
@@ -158,6 +163,7 @@ async function resolveBareProjectDependenciesAsync({
   target: IOSConfig.Target.Target;
   bundleIdentifier: string;
   pbxProject: XcodeProject;
+  env?: ResolveTargetOptions['env'];
 }): Promise<Target[]> {
   const result: Target[] = [];
 
@@ -170,9 +176,12 @@ async function resolveBareProjectDependenciesAsync({
         targetName: dependency.name,
         buildConfiguration,
       });
-      const entitlements = await getNativeTargetEntitlementsAsync(projectDir, {
-        targetName: target.name,
-        buildConfiguration,
+      const entitlements = await getNativeTargetEntitlementsUnlessGitIgnoredAsync(projectDir, {
+        env: env ?? {},
+        target: {
+          targetName: target.name,
+          buildConfiguration,
+        },
       });
       result.push({
         targetName: dependency.name,
@@ -193,6 +202,7 @@ async function resolveBareProjectDependenciesAsync({
         target: dependency,
         bundleIdentifier: dependencyBundleIdentifier,
         pbxProject,
+        env,
       });
       if (dependencyDependencies.length > 0) {
         result.push(...dependencyDependencies);

packages/eas-cli/src/prompts.ts

@@ -1,8 +1,13 @@
 import { constants } from 'os';
-import prompts, { Answers, Choice, Options, PromptType, PromptObject as Question } from 'prompts';
+import prompts, { Answers, Choice, Options, prompts as PromptElements, PromptType } from 'prompts';
 
+import { Question, easMultiselect } from './easMultiselect';
 export { PromptType, Question, Choice };
 
+if (PromptElements) {
+  PromptElements.multiselect = easMultiselect;
+}
+
 export interface ExpoChoice<T> extends Choice {
   value: T;
 }

packages/eas-cli/src/submit/ios/AscApiKeySource.ts

@@ -1,21 +1,38 @@
 import { Platform } from '@expo/eas-build-job';
 import fs from 'fs-extra';
+import nullthrows from 'nullthrows';
 
-import { promptForAscApiKeyPathAsync } from '../../credentials/ios/actions/AscApiKeyUtils';
+import {
+  AppStoreApiKeyPurpose,
+  promptForAscApiKeyPathAsync,
+} from '../../credentials/ios/actions/AscApiKeyUtils';
+import { SetUpAscApiKey } from '../../credentials/ios/actions/SetUpAscApiKey';
 import { AscApiKeyPath, MinimalAscApiKey } from '../../credentials/ios/credentials';
 import Log from '../../log';
+import {
+  AmbiguousBundleIdentifierError,
+  INVALID_BUNDLE_IDENTIFIER_MESSAGE,
+  getBundleIdentifierAsync,
+  isBundleIdentifierValid,
+} from '../../project/ios/bundleIdentifier';
+import { promptAsync } from '../../prompts';
 import { SubmissionContext } from '../context';
 import { isExistingFileAsync } from '../utils/files';
 
 export enum AscApiKeySourceType {
   path,
   prompt,
+  credentialsService,
 }
 
 interface AscApiKeySourceBase {
   sourceType: AscApiKeySourceType;
 }
 
+interface AscApiKeyCredentialsServiceSource extends AscApiKeySourceBase {
+  sourceType: AscApiKeySourceType.credentialsService;
+}
+
 interface AscApiKeyPromptSource extends AscApiKeySourceBase {
   sourceType: AscApiKeySourceType.prompt;
 }
@@ -25,7 +42,10 @@ interface AscApiKeyEnvVarSource extends AscApiKeySourceBase {
   path: AscApiKeyPath;
 }
 
-export type AscApiKeySource = AscApiKeyEnvVarSource | AscApiKeyPromptSource;
+export type AscApiKeySource =
+  | AscApiKeyEnvVarSource
+  | AscApiKeyPromptSource
+  | AscApiKeyCredentialsServiceSource;
 
 type AscApiKeySummary = {
   source: 'local' | 'EAS servers';
@@ -43,6 +63,84 @@ export type AscApiKeyResult = {
   summary: AscApiKeySummary;
 };
 
+export async function getAscApiKeyResultAsync(
+  ctx: SubmissionContext<Platform.IOS>,
+  source: AscApiKeySource
+): Promise<AscApiKeyResult> {
+  if (source.sourceType === AscApiKeySourceType.credentialsService) {
+    return await getAscApiKeyFromCredentialsServiceAsync(ctx);
+  } else {
+    return await getAscApiKeyLocallyAsync(ctx, source);
+  }
+}
+
+async function maybeGetIosBundleIdentifierAsync(
+  ctx: SubmissionContext<Platform.IOS>
+): Promise<string | null> {
+  try {
+    return await getBundleIdentifierAsync(ctx.projectDir, ctx.exp);
+  } catch (error: any) {
+    if (error instanceof AmbiguousBundleIdentifierError) {
+      Log.warn(
+        'bundleIdentifier in the Xcode project is ambiguous, specify it via "bundleIdentifier" field in the submit profile in the eas.json.'
+      );
+      return null;
+    }
+    throw new Error(`Failed to resolve bundleIdentifier in the Xcode project: ${error.message}.`);
+  }
+}
+
+async function promptForBundleIdentifierAsync(): Promise<string> {
+  const { bundleIdentifier } = await promptAsync({
+    name: 'bundleIdentifier',
+    message: 'Bundle identifier:',
+    type: 'text',
+    validate: value => (isBundleIdentifierValid(value) ? true : INVALID_BUNDLE_IDENTIFIER_MESSAGE),
+  });
+  return bundleIdentifier;
+}
+
+async function getAscApiKeyFromCredentialsServiceAsync(
+  ctx: SubmissionContext<Platform.IOS>
+): Promise<AscApiKeyResult> {
+  const bundleIdentifier =
+    ctx.applicationIdentifierOverride ??
+    ctx.profile.bundleIdentifier ??
+    (await maybeGetIosBundleIdentifierAsync(ctx)) ??
+    (await promptForBundleIdentifierAsync());
+  Log.log(`Looking up credentials configuration for ${bundleIdentifier}...`);
+
+  const appLookupParams = {
+    account: nullthrows(
+      ctx.user.accounts.find(a => a.name === ctx.accountName),
+      `You do not have access to account: ${ctx.accountName}`
+    ),
+    projectName: ctx.projectName,
+    bundleIdentifier,
+  };
+  const setupAscApiKeyAction = new SetUpAscApiKey(
+    appLookupParams,
+    AppStoreApiKeyPurpose.SUBMISSION_SERVICE
+  );
+  const iosAppCredentials = await setupAscApiKeyAction.runAsync(ctx.credentialsCtx);
+  const ascKeyForSubmissions = nullthrows(
+    iosAppCredentials.appStoreConnectApiKeyForSubmissions,
+    `An EAS Submit ASC Api Key could not be found for ${iosAppCredentials.appleAppIdentifier.bundleIdentifier}`
+  );
+  const { id, keyIdentifier, name } = ascKeyForSubmissions;
+  Log.log(`Using Api Key ID: ${keyIdentifier}${name ? ` (${name})` : ''}`);
+  return {
+    result: {
+      ascApiKeyId: id,
+    },
+    summary: {
+      source: 'EAS servers',
+      keyId: keyIdentifier,
+      name: name ?? undefined,
+    },
+  };
+}
+
 export async function getAscApiKeyLocallyAsync(
   ctx: SubmissionContext<Platform.IOS>,
   source: AscApiKeySource
@@ -70,6 +168,8 @@ export async function getAscApiKeyPathAsync(
       return await handlePathSourceAsync(ctx, source);
     case AscApiKeySourceType.prompt:
       return await handlePromptSourceAsync(ctx, source);
+    case AscApiKeySourceType.credentialsService:
+      throw new Error(`AscApiKeySourceType ${source} does not return a path.`);
   }
 }
 

packages/eas-cli/src/submit/ios/CredentialsServiceSource.ts

@@ -1,84 +0,0 @@
-import { Platform } from '@expo/eas-build-job';
-import nullthrows from 'nullthrows';
-
-import { SetUpSubmissionCredentials } from '../../credentials/ios/actions/SetUpSubmissionCredentials';
-import Log from '../../log';
-import {
-  INVALID_BUNDLE_IDENTIFIER_MESSAGE,
-  isBundleIdentifierValid,
-} from '../../project/ios/bundleIdentifier';
-import { promptAsync } from '../../prompts';
-import { SubmissionContext } from '../context';
-import {
-  AppSpecificPasswordCredentials,
-  getAppleIdUsernameAsync,
-} from './AppSpecificPasswordSource';
-import { AscApiKeyResult } from './AscApiKeySource';
-
-/**
- * The Credentials Service will either return an ASC API Key or an App Specific Password
- * When we no longer support the App Specific Password user prompt, refactor this into the AscApiKeySource
- */
-export const CREDENTIALS_SERVICE_SOURCE = 'CREDENTIALS_SERVICE_SOURCE' as const;
-export interface CredentialsServiceSource {
-  sourceType: typeof CREDENTIALS_SERVICE_SOURCE;
-  bundleIdentifier?: string;
-}
-
-async function promptForBundleIdentifierAsync(): Promise<string> {
-  const { bundleIdentifier } = await promptAsync({
-    name: 'bundleIdentifier',
-    message: 'Bundle identifier:',
-    type: 'text',
-    validate: value => (isBundleIdentifierValid(value) ? true : INVALID_BUNDLE_IDENTIFIER_MESSAGE),
-  });
-  return bundleIdentifier;
-}
-
-export async function getFromCredentialsServiceAsync(
-  ctx: SubmissionContext<Platform.IOS>,
-  source: CredentialsServiceSource
-): Promise<
-  { appSpecificPassword: AppSpecificPasswordCredentials } | { ascApiKeyResult: AscApiKeyResult }
-> {
-  const bundleIdentifier = source.bundleIdentifier ?? (await promptForBundleIdentifierAsync());
-  Log.log(`Looking up credentials configuration for ${bundleIdentifier}...`);
-
-  const appLookupParams = {
-    account: nullthrows(
-      ctx.user.accounts.find(a => a.name === ctx.accountName),
-      `You do not have access to account: ${ctx.accountName}`
-    ),
-    projectName: ctx.projectName,
-    bundleIdentifier,
-  };
-  const setupSubmissionCredentialsAction = new SetUpSubmissionCredentials(appLookupParams);
-  const ascOrAsp = await setupSubmissionCredentialsAction.runAsync(ctx.credentialsCtx);
-  const isAppSpecificPassword = typeof ascOrAsp === 'string';
-  if (isAppSpecificPassword) {
-    return {
-      appSpecificPassword: {
-        password: ascOrAsp,
-        appleIdUsername: await getAppleIdUsernameAsync(ctx),
-      },
-    };
-  } else {
-    const ascKeyForSubmissions = nullthrows(
-      ascOrAsp.appStoreConnectApiKeyForSubmissions,
-      `An EAS Submit ASC API Key could not be found for ${ascOrAsp.appleAppIdentifier.bundleIdentifier}`
-    );
-    const { id, keyIdentifier, name } = ascKeyForSubmissions;
-    return {
-      ascApiKeyResult: {
-        result: {
-          ascApiKeyId: id,
-        },
-        summary: {
-          source: 'EAS servers',
-          keyId: keyIdentifier,
-          name: name ?? undefined,
-        },
-      },
-    };
-  }
-}

packages/eas-cli/src/submit/ios/IosSubmitCommand.ts

@@ -7,10 +7,6 @@ import wrapAnsi from 'wrap-ansi';
 import { MissingCredentialsError } from '../../credentials/errors';
 import { SubmissionFragment } from '../../graphql/generated';
 import Log, { learnMore } from '../../log';
-import {
-  AmbiguousBundleIdentifierError,
-  getBundleIdentifierAsync,
-} from '../../project/ios/bundleIdentifier';
 import { ArchiveSource } from '../ArchiveSource';
 import { resolveArchiveSource } from '../commons';
 import { SubmissionContext } from '../context';
@@ -20,7 +16,6 @@ import {
   AppSpecificPasswordSourceType,
 } from './AppSpecificPasswordSource';
 import { AscApiKeySource, AscApiKeySourceType } from './AscApiKeySource';
-import { CREDENTIALS_SERVICE_SOURCE, CredentialsServiceSource } from './CredentialsServiceSource';
 import IosSubmitter, { IosSubmissionOptions } from './IosSubmitter';
 
 export default class IosSubmitCommand {
@@ -42,17 +37,12 @@ export default class IosSubmitCommand {
         : null;
     const maybeAscApiKeySource =
       'ascApiKeySource' in credentialsSource ? credentialsSource.ascApiKeySource : null;
-    const maybeCredentialsServiceSource =
-      'credentialsServiceSource' in credentialsSource
-        ? credentialsSource.credentialsServiceSource
-        : null;
     const ascAppIdentifier = await this.resolveAscAppIdentifierAsync();
 
     const errored = [
       archiveSource,
       ...(maybeAppSpecificPasswordSource ? [maybeAppSpecificPasswordSource] : []),
       ...(maybeAscApiKeySource ? [maybeAscApiKeySource] : []),
-      ...(maybeCredentialsServiceSource ? [maybeCredentialsServiceSource] : []),
       ascAppIdentifier,
     ].filter(r => !r.ok);
     if (errored.length > 0) {
@@ -75,42 +65,14 @@ export default class IosSubmitCommand {
             ascApiKeySource: maybeAscApiKeySource.enforceValue(),
           }
         : null),
-      ...(maybeCredentialsServiceSource
-        ? {
-            credentialsServiceSource: maybeCredentialsServiceSource.enforceValue(),
-          }
-        : null),
     };
   }
 
-  private async maybeGetIosBundleIdentifierAsync(): Promise<Result<string | null>> {
-    try {
-      return result(await getBundleIdentifierAsync(this.ctx.projectDir, this.ctx.exp));
-    } catch (error: any) {
-      if (error instanceof AmbiguousBundleIdentifierError) {
-        Log.warn(
-          'bundleIdentifier in the Xcode project is ambiguous, specify it via "bundleIdentifier" field in the submit profile in the eas.json.'
-        );
-        return result(null);
-      }
-      return result(
-        new Error(`Failed to resolve bundleIdentifier in the Xcode project: ${error.message}.`)
-      );
-    }
-  }
-
   private async resolveCredentialSubmissionOptionsAsync(): Promise<
     | { appSpecificPasswordSource: Result<AppSpecificPasswordSource> }
     | { ascApiKeySource: Result<AscApiKeySource> }
-    | { credentialsServiceSource: Result<CredentialsServiceSource> }
   > {
-    const ascApiKeySource = this.resolveAscApiKeySource();
-    const shouldSkipAscApiKeySource =
-      !ascApiKeySource.ok && ascApiKeySource.enforceError() instanceof MissingCredentialsError;
-    if (!shouldSkipAscApiKeySource) {
-      return { ascApiKeySource };
-    }
-
+    // if an App Specific Password env var is not specified, use ASC Api Key
     const appSpecificPasswordSource = this.resolveAppSpecificPasswordSource();
     const shouldSkipAppSpecificPasswordSource =
       !appSpecificPasswordSource.ok &&
@@ -119,26 +81,8 @@ export default class IosSubmitCommand {
       return { appSpecificPasswordSource: this.resolveAppSpecificPasswordSource() };
     }
 
-    let bundleIdentifier =
-      this.ctx.applicationIdentifierOverride ?? this.ctx.profile.bundleIdentifier;
-    if (!bundleIdentifier) {
-      const bundleIdentifierResult = await this.maybeGetIosBundleIdentifierAsync();
-      if (!bundleIdentifierResult.ok) {
-        return {
-          credentialsServiceSource: result(bundleIdentifierResult.reason),
-        };
-      }
-      const bundleIdentifierValue = bundleIdentifierResult.enforceValue();
-      if (bundleIdentifierValue) {
-        bundleIdentifier = bundleIdentifierValue;
-      }
-    }
-    return {
-      credentialsServiceSource: result({
-        sourceType: CREDENTIALS_SERVICE_SOURCE,
-        bundleIdentifier,
-      }),
-    };
+    const ascApiKeySource = this.resolveAscApiKeySource();
+    return { ascApiKeySource };
   }
 
   private resolveAppSpecificPasswordSource(): Result<AppSpecificPasswordSource> {
@@ -187,11 +131,7 @@ export default class IosSubmitCommand {
       });
     }
 
-    return result(
-      new MissingCredentialsError(
-        'Set the ascApiKeyPath, ascApiKeyIssuerId and ascApiKeyId fields in eas.json.'
-      )
-    );
+    return result({ sourceType: AscApiKeySourceType.credentialsService });
   }
 
   private resolveArchiveSource(): Result<ArchiveSource> {

packages/eas-cli/src/submit/ios/IosSubmitter.ts

@@ -23,12 +23,8 @@ import {
   AscApiKeyFromExpoServers,
   AscApiKeyResult,
   AscApiKeySource,
-  getAscApiKeyLocallyAsync,
+  getAscApiKeyResultAsync,
 } from './AscApiKeySource';
-import {
-  CredentialsServiceSource,
-  getFromCredentialsServiceAsync,
-} from './CredentialsServiceSource';
 
 export interface IosSubmissionOptions
   extends Pick<IosSubmissionConfigInput, 'appleIdUsername' | 'ascAppIdentifier'> {
@@ -36,7 +32,6 @@ export interface IosSubmissionOptions
   archiveSource: ArchiveSource;
   appSpecificPasswordSource?: AppSpecificPasswordSource;
   ascApiKeySource?: AscApiKeySource;
-  credentialsServiceSource?: CredentialsServiceSource;
 }
 
 interface ResolvedSourceOptions {
@@ -74,15 +69,11 @@ export default class IosSubmitter extends BaseSubmitter<
             )
           : null;
         const maybeAppStoreConnectApiKey = this.options.ascApiKeySource
-          ? await getAscApiKeyLocallyAsync(this.ctx, this.options.ascApiKeySource)
-          : null;
-        const maybeAscOrAspFromCredentialsService = this.options.credentialsServiceSource
-          ? await getFromCredentialsServiceAsync(this.ctx, this.options.credentialsServiceSource)
+          ? await getAscApiKeyResultAsync(this.ctx, this.options.ascApiKeySource)
           : null;
         return {
           ...(maybeAppSpecificPassword ? { appSpecificPassword: maybeAppSpecificPassword } : null),
           ...(maybeAppStoreConnectApiKey ? { ascApiKeyResult: maybeAppStoreConnectApiKey } : null),
-          ...(maybeAscOrAspFromCredentialsService ? maybeAscOrAspFromCredentialsService : null),
         };
       },
     };

packages/eas-cli/src/submit/ios/__tests__/AscApiKeySource-test.ts

@@ -10,16 +10,19 @@ import {
   testAppQueryByIdResponse,
   testProjectId,
 } from '../../../credentials/__tests__/fixtures-constants';
+import { testCommonIosAppCredentialsFragment } from '../../../credentials/__tests__/fixtures-ios';
+import { SetUpAscApiKey } from '../../../credentials/ios/actions/SetUpAscApiKey';
 import { getCredentialsFromUserAsync } from '../../../credentials/utils/promptForCredentials';
 import { AppQuery } from '../../../graphql/queries/AppQuery';
 import { createTestProject } from '../../../project/__tests__/project-utils';
+import { getBundleIdentifierAsync } from '../../../project/ios/bundleIdentifier';
 import { promptAsync } from '../../../prompts';
 import { SubmissionContext, createSubmissionContextAsync } from '../../context';
 import {
   AscApiKeySource,
   AscApiKeySourceType,
-  getAscApiKeyLocallyAsync,
   getAscApiKeyPathAsync,
+  getAscApiKeyResultAsync,
 } from '../AscApiKeySource';
 
 jest.mock('fs');
@@ -29,6 +32,7 @@ jest.mock('../../../user/User', () => ({
   getUserAsync: jest.fn(() => mockJester),
 }));
 jest.mock('../../../graphql/queries/AppQuery');
+jest.mock('../../../project/ios/bundleIdentifier');
 
 const testProject = createTestProject(testProjectId, mockJester.accounts[0].name, {
   android: {
@@ -179,14 +183,14 @@ describe(getAscApiKeyPathAsync, () => {
   });
 });
 
-describe(getAscApiKeyLocallyAsync, () => {
+describe(getAscApiKeyResultAsync, () => {
   it('returns a local Asc API Key file with a AscApiKeySourceType.path source', async () => {
     const ctx = await getIosSubmissionContextAsync();
     const source: AscApiKeySource = {
       sourceType: AscApiKeySourceType.path,
       path: { keyP8Path: '/asc-api-key.p8', keyId: 'test-key-id', issuerId: 'test-issuer-id' },
     };
-    const ascApiKeyResult = await getAscApiKeyLocallyAsync(ctx, source);
+    const ascApiKeyResult = await getAscApiKeyResultAsync(ctx, source);
     expect(ascApiKeyResult).toMatchObject({
       result: {
         keyP8: 'super secret',
@@ -213,7 +217,7 @@ describe(getAscApiKeyLocallyAsync, () => {
     const source: AscApiKeySource = {
       sourceType: AscApiKeySourceType.prompt,
     };
-    const serviceAccountResult = await getAscApiKeyLocallyAsync(ctx, source);
+    const serviceAccountResult = await getAscApiKeyResultAsync(ctx, source);
     expect(serviceAccountResult).toMatchObject({
       result: {
         keyP8: 'super secret',
@@ -227,4 +231,45 @@ describe(getAscApiKeyLocallyAsync, () => {
       },
     });
   });
+
+  it('returns an Asc Api Key from server with a AscApiKeySourceType.credentialService source', async () => {
+    const graphqlClient = {} as any as ExpoGraphqlClient;
+    const analytics = instance(mock<Analytics>());
+    const ctx = await createSubmissionContextAsync({
+      platform: Platform.IOS,
+      projectDir: testProject.projectRoot,
+      archiveFlags: {
+        url: 'http://expo.dev/fake.apk',
+      },
+      profile: {
+        language: 'en-US',
+      },
+      nonInteractive: true,
+      actor: mockJester,
+      graphqlClient,
+      analytics,
+      exp: testProject.appJSON.expo,
+      projectId,
+    });
+    const source: AscApiKeySource = {
+      sourceType: AscApiKeySourceType.credentialsService,
+    };
+    jest
+      .spyOn(SetUpAscApiKey.prototype, 'runAsync')
+      .mockImplementation(async _ctx => testCommonIosAppCredentialsFragment);
+    jest.mocked(getBundleIdentifierAsync).mockImplementation(async () => 'com.hello.world');
+
+    const result = await getAscApiKeyResultAsync(ctx, source);
+    expect(result).toEqual({
+      result: {
+        ascApiKeyId: testCommonIosAppCredentialsFragment.appStoreConnectApiKeyForSubmissions?.id,
+      },
+      summary: {
+        keyId:
+          testCommonIosAppCredentialsFragment.appStoreConnectApiKeyForSubmissions?.keyIdentifier,
+        name: testCommonIosAppCredentialsFragment.appStoreConnectApiKeyForSubmissions?.name,
+        source: 'EAS servers',
+      },
+    });
+  });
 });

packages/eas-cli/src/submit/ios/__tests__/CredentialsServiceSource-test.ts

@@ -1,124 +0,0 @@
-import { Platform } from '@expo/eas-build-job';
-import { instance, mock } from 'ts-mockito';
-import { v4 as uuidv4 } from 'uuid';
-
-import { Analytics } from '../../../analytics/AnalyticsManager';
-import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
-import {
-  jester as mockJester,
-  testAppQueryByIdResponse,
-  testProjectId,
-} from '../../../credentials/__tests__/fixtures-constants';
-import { testCommonIosAppCredentialsFragment } from '../../../credentials/__tests__/fixtures-ios';
-import { SetUpSubmissionCredentials } from '../../../credentials/ios/actions/SetUpSubmissionCredentials';
-import { AppQuery } from '../../../graphql/queries/AppQuery';
-import { createTestProject } from '../../../project/__tests__/project-utils';
-import { getBundleIdentifierAsync } from '../../../project/ios/bundleIdentifier';
-import { promptAsync } from '../../../prompts';
-import { createSubmissionContextAsync } from '../../context';
-import {
-  CREDENTIALS_SERVICE_SOURCE,
-  getFromCredentialsServiceAsync,
-} from '../CredentialsServiceSource';
-
-jest.mock('fs');
-jest.mock('../../../prompts');
-jest.mock('../../../credentials/utils/promptForCredentials');
-jest.mock('../../../user/User', () => ({
-  getUserAsync: jest.fn(() => mockJester),
-}));
-jest.mock('../../../project/ios/bundleIdentifier');
-jest.mock('../../../graphql/queries/AppQuery');
-
-const testProject = createTestProject(testProjectId, mockJester.accounts[0].name, {
-  android: {
-    package: 'com.expo.test.project',
-  },
-});
-const projectId = uuidv4();
-
-beforeEach(() => {
-  jest.restoreAllMocks();
-});
-
-describe(getFromCredentialsServiceAsync, () => {
-  beforeEach(() => {
-    jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
-  });
-
-  it('returns an App Specific Password from the credentialService source', async () => {
-    const graphqlClient = instance(mock<ExpoGraphqlClient>());
-    const analytics = instance(mock<Analytics>());
-    const ctx = await createSubmissionContextAsync({
-      platform: Platform.IOS,
-      projectDir: testProject.projectRoot,
-      archiveFlags: {
-        url: 'http://expo.dev/fake.apk',
-      },
-      profile: {
-        language: 'en-US',
-      },
-      nonInteractive: false,
-      actor: mockJester,
-      graphqlClient,
-      analytics,
-      exp: testProject.appJSON.expo,
-      projectId,
-    });
-    jest
-      .spyOn(SetUpSubmissionCredentials.prototype, 'runAsync')
-      .mockImplementation(async _ctx => 'super secret');
-    jest.mocked(getBundleIdentifierAsync).mockImplementation(async () => 'com.hello.world');
-    jest.mocked(promptAsync).mockImplementationOnce(async () => ({ appleId: '[email protected]' }));
-
-    const result = await getFromCredentialsServiceAsync(ctx, {
-      sourceType: CREDENTIALS_SERVICE_SOURCE,
-      bundleIdentifier: 'com.expo.test.project',
-    });
-    expect(result).toEqual({
-      appSpecificPassword: { password: 'super secret', appleIdUsername: '[email protected]' },
-    });
-  });
-  it('returns an ASC API Key from the credentialService source', async () => {
-    const graphqlClient = instance(mock<ExpoGraphqlClient>());
-    const analytics = instance(mock<Analytics>());
-    const ctx = await createSubmissionContextAsync({
-      platform: Platform.IOS,
-      projectDir: testProject.projectRoot,
-      archiveFlags: {
-        url: 'http://expo.dev/fake.apk',
-      },
-      profile: {
-        language: 'en-US',
-      },
-      nonInteractive: true,
-      actor: mockJester,
-      graphqlClient,
-      analytics,
-      exp: testProject.appJSON.expo,
-      projectId,
-    });
-    jest
-      .spyOn(SetUpSubmissionCredentials.prototype, 'runAsync')
-      .mockImplementation(async _ctx => testCommonIosAppCredentialsFragment);
-    jest.mocked(getBundleIdentifierAsync).mockImplementation(async () => 'com.hello.world');
-
-    const result = await getFromCredentialsServiceAsync(ctx, {
-      sourceType: CREDENTIALS_SERVICE_SOURCE,
-      bundleIdentifier: 'com.expo.test.project',
-    });
-    expect(result).toEqual({
-      ascApiKeyResult: {
-        result: {
-          ascApiKeyId: testCommonIosAppCredentialsFragment.appStoreConnectApiKeyForSubmissions?.id,
-        },
-        summary: {
-          keyId:
-            testCommonIosAppCredentialsFragment.appStoreConnectApiKeyForSubmissions?.keyIdentifier,
-          name: testCommonIosAppCredentialsFragment.appStoreConnectApiKeyForSubmissions?.name,
-          source: 'EAS servers',
-        },
-      },
-    });
-  });
-});

packages/eas-cli/tsconfig.json

@@ -14,8 +14,8 @@
     "outDir": "build",
     "rootDir": "src",
     "typeRoots": [
-      "../../node_modules/@types",
       "../../ts-declarations",
+      "../../node_modules/@types",
       "./node_modules/@types"
     ]
   },

ts-declarations/prompts/index.d.ts

@@ -0,0 +1,11 @@
+declare module 'prompts/lib/elements' {
+  class MultiselectPrompt {
+    selectionFormat: string | undefined;
+    done: boolean | undefined;
+    value: any[] | undefined;
+
+    constructor(parameters: any);
+    on(event: string, callback: (args: any) => any): any;
+    renderDoneOrInstructions(): string;
+  }
+}