v0.35.0

Update CHANGELOG.md
[api] Change API domain for EAS CLI (#744 )
2026-11-13 20:28:08 -10:00 · 2021-11-08 12:04:28 +01:00 · 2021-11-08 12:03:35 +01:00 · 2021-11-08 10:45:21 +01:00 · 2021-11-05 13:30:16 -07:00 · 2021-11-05 13:28:03 -07:00
52 changed files with 535 additions and 263 deletions
@@ -9,17 +9,22 @@ This is the log of notable changes to EAS CLI and related packages.
 ### 🎉 New features

 - Add ASC Api Key generation workflow. ([#718](https://github.com/expo/eas-cli/pull/718) by [@quinlanj](https://github.com/quinlanj))
- Add support for removal of App Store Connect Api Keys. ([#721](https://github.com/expo/eas-cli/pull/721) by [@quinlanj](https://github.com/quinlanj))
+- Add support for removal of ASC Api Keys. ([#721](https://github.com/expo/eas-cli/pull/721) by [@quinlanj](https://github.com/quinlanj))
 - Allow users to assign an ASC Api Key to their project. ([#719](https://github.com/expo/eas-cli/pull/719) by [@quinlanj](https://github.com/quinlanj))
 - Add setup support for ASC Api Keys. ([#733](https://github.com/expo/eas-cli/pull/733) by [@quinlanj](https://github.com/quinlanj))
 - Show initiating user display name when selecting a build to submit. ([#730](https://github.com/expo/eas-cli/pull/730) by [@barthap](https://github.com/barthap))
+- Handle Apple servers maintenance error in `eas submit`. ([#738](https://github.com/expo/eas-cli/pull/738) by [@barthap](https://github.com/barthap))
+- Integrate ASC Api Key with submissions workflow. ([#737](https://github.com/expo/eas-cli/pull/737) by [@quinlanj](https://github.com/quinlanj))
+- Change EAS API server domain. ([#744](https://github.com/expo/eas-cli/pull/744) by [@ide](https://github.com/ide))

 ### 🐛 Bug fixes

 ### 🧹 Chores

 - Clean up credentials prompt method. ([#728](https://github.com/expo/eas-cli/pull/728) by [@quinlanj](https://github.com/quinlanj))
- Bump @expo/apple-utils to 0.0.0-alpha.26. ([#723](https://github.com/expo/eas-cli/pull/723] by [@brentvatne](https://github.com/brentvatne))
+- Bump @expo/apple-utils to 0.0.0-alpha.26. ([#723](https://github.com/expo/eas-cli/pull/723) by [@brentvatne](https://github.com/brentvatne))
+- Grammar: replace setup with set up. ([#735](https://github.com/expo/eas-cli/pull/735) by [@quinlanj](https://github.com/quinlanj))
+- Improve VCS workflow migration experience. ([#732](https://github.com/expo/eas-cli/pull/732) by [@wkozyra95](https://github.com/wkozyra95))

 ## [0.34.1](https://github.com/expo/eas-cli/releases/tag/0.34.1) - 2021-11-02

@@ -1,5 +1,5 @@
 {
  "npmClient": "yarn",
  "useWorkspaces": true,
-  "version": "0.34.1"
+  "version": "0.35.0"
 }
@@ -73,7 +73,7 @@ ALIASES
  $ eas login
 ```

-_See code: [src/commands/account/login.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/account/login.js)_
+_See code: [src/commands/account/login.js](https://github.com/expo/eas-cli/blob/v0.35.0/packages/eas-cli/src/commands/account/login.js)_

 ## `eas account:logout`

@@ -87,7 +87,7 @@ ALIASES
  $ eas logout
 ```

-_See code: [src/commands/account/logout.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/account/logout.js)_
+_See code: [src/commands/account/logout.js](https://github.com/expo/eas-cli/blob/v0.35.0/packages/eas-cli/src/commands/account/logout.js)_

 ## `eas account:view`

@@ -101,7 +101,7 @@ ALIASES
  $ eas whoami
 ```

-_See code: [src/commands/account/view.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/account/view.js)_
+_See code: [src/commands/account/view.js](https://github.com/expo/eas-cli/blob/v0.35.0/packages/eas-cli/src/commands/account/view.js)_

 ## `eas analytics [STATUS]`

@@ -112,7 +112,7 @@ USAGE
  $ eas analytics [STATUS]
 ```

-_See code: [src/commands/analytics.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/analytics.js)_
+_See code: [src/commands/analytics.js](https://github.com/expo/eas-cli/blob/v0.35.0/packages/eas-cli/src/commands/analytics.js)_

 ## `eas build`

@@ -146,7 +146,7 @@ OPTIONS
  --[no-]wait                              Wait for build(s) to complete
 ```

-_See code: [src/commands/build/index.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/build/index.js)_
+_See code: [src/commands/build/index.js](https://github.com/expo/eas-cli/blob/v0.35.0/packages/eas-cli/src/commands/build/index.js)_

 ## `eas build:cancel [BUILD_ID]`

@@ -157,7 +157,7 @@ USAGE
  $ eas build:cancel [BUILD_ID]
 ```

-_See code: [src/commands/build/cancel.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/build/cancel.js)_
+_See code: [src/commands/build/cancel.js](https://github.com/expo/eas-cli/blob/v0.35.0/packages/eas-cli/src/commands/build/cancel.js)_

 ## `eas build:configure`

@@ -171,7 +171,7 @@ OPTIONS
  -p, --platform=(android|ios|all)  Platform to configure
 ```

-_See code: [src/commands/build/configure.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/build/configure.js)_
+_See code: [src/commands/build/configure.js](https://github.com/expo/eas-cli/blob/v0.35.0/packages/eas-cli/src/commands/build/configure.js)_

 ## `eas build:list`

@@ -204,7 +204,7 @@ OPTIONS
  --status=(new|in-queue|in-progress|errored|finished|canceled)
 ```

-_See code: [src/commands/build/list.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/build/list.js)_
+_See code: [src/commands/build/list.js](https://github.com/expo/eas-cli/blob/v0.35.0/packages/eas-cli/src/commands/build/list.js)_

 ## `eas build:view [BUILD_ID]`

@@ -218,7 +218,7 @@ OPTIONS
  --json  Enable JSON output, non-JSON messages will be printed to stderr
 ```

-_See code: [src/commands/build/view.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/build/view.js)_
+_See code: [src/commands/build/view.js](https://github.com/expo/eas-cli/blob/v0.35.0/packages/eas-cli/src/commands/build/view.js)_

 ## `eas config`

@@ -233,7 +233,7 @@ OPTIONS
  --profile=profile
 ```

-_See code: [src/commands/config.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/config.js)_
+_See code: [src/commands/config.js](https://github.com/expo/eas-cli/blob/v0.35.0/packages/eas-cli/src/commands/config.js)_

 ## `eas credentials`

@@ -244,7 +244,7 @@ USAGE
  $ eas credentials
 ```

-_See code: [src/commands/credentials.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/credentials.js)_
+_See code: [src/commands/credentials.js](https://github.com/expo/eas-cli/blob/v0.35.0/packages/eas-cli/src/commands/credentials.js)_

 ## `eas device:create`

@@ -255,7 +255,7 @@ USAGE
  $ eas device:create
 ```

-_See code: [src/commands/device/create.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/device/create.js)_
+_See code: [src/commands/device/create.js](https://github.com/expo/eas-cli/blob/v0.35.0/packages/eas-cli/src/commands/device/create.js)_

 ## `eas device:list`

@@ -269,7 +269,7 @@ OPTIONS
  --apple-team-id=apple-team-id
 ```

-_See code: [src/commands/device/list.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/device/list.js)_
+_See code: [src/commands/device/list.js](https://github.com/expo/eas-cli/blob/v0.35.0/packages/eas-cli/src/commands/device/list.js)_

 ## `eas device:view [UDID]`

@@ -280,7 +280,7 @@ USAGE
  $ eas device:view [UDID]
 ```

-_See code: [src/commands/device/view.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/device/view.js)_
+_See code: [src/commands/device/view.js](https://github.com/expo/eas-cli/blob/v0.35.0/packages/eas-cli/src/commands/device/view.js)_

 ## `eas diagnostics`

@@ -291,7 +291,7 @@ USAGE
  $ eas diagnostics
 ```

-_See code: [src/commands/diagnostics.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/diagnostics.js)_
+_See code: [src/commands/diagnostics.js](https://github.com/expo/eas-cli/blob/v0.35.0/packages/eas-cli/src/commands/diagnostics.js)_

 ## `eas help [COMMAND]`

@@ -319,7 +319,7 @@ USAGE
  $ eas project:info
 ```

-_See code: [src/commands/project/info.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/project/info.js)_
+_See code: [src/commands/project/info.js](https://github.com/expo/eas-cli/blob/v0.35.0/packages/eas-cli/src/commands/project/info.js)_

 ## `eas project:init`

@@ -333,7 +333,7 @@ ALIASES
  $ eas init
 ```

-_See code: [src/commands/project/init.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/project/init.js)_
+_See code: [src/commands/project/init.js](https://github.com/expo/eas-cli/blob/v0.35.0/packages/eas-cli/src/commands/project/init.js)_

 ## `eas secret:create`

@@ -350,7 +350,7 @@ OPTIONS
  --value=value              Value of the secret
 ```

-_See code: [src/commands/secret/create.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/secret/create.js)_
+_See code: [src/commands/secret/create.js](https://github.com/expo/eas-cli/blob/v0.35.0/packages/eas-cli/src/commands/secret/create.js)_

 ## `eas secret:delete`

@@ -367,7 +367,7 @@ DESCRIPTION
  Unsure where to find the secret's ID? Run eas secret:list
 ```

-_See code: [src/commands/secret/delete.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/secret/delete.js)_
+_See code: [src/commands/secret/delete.js](https://github.com/expo/eas-cli/blob/v0.35.0/packages/eas-cli/src/commands/secret/delete.js)_

 ## `eas secret:list`

@@ -378,7 +378,7 @@ USAGE
  $ eas secret:list
 ```

-_See code: [src/commands/secret/list.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/secret/list.js)_
+_See code: [src/commands/secret/list.js](https://github.com/expo/eas-cli/blob/v0.35.0/packages/eas-cli/src/commands/secret/list.js)_

 ## `eas submit`

@@ -405,14 +405,13 @@ OPTIONS
  --[no-]wait                       Wait for submission to complete

 DESCRIPTION
-  See how to configure submits with eas.json: 
-  https://docs.expo.dev/submit/eas-json/
+  See how to configure submits with eas.json: https://docs.expo.dev/submit/eas-json/

 ALIASES
  $ eas build:submit
 ```

-_See code: [src/commands/submit.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/submit.js)_
+_See code: [src/commands/submit.js](https://github.com/expo/eas-cli/blob/v0.35.0/packages/eas-cli/src/commands/submit.js)_

 ## `eas webhook:create`

@@ -431,7 +430,7 @@ OPTIONS
  --url=url        Webhook URL
 ```

-_See code: [src/commands/webhook/create.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/webhook/create.js)_
+_See code: [src/commands/webhook/create.js](https://github.com/expo/eas-cli/blob/v0.35.0/packages/eas-cli/src/commands/webhook/create.js)_

 ## `eas webhook:delete [ID]`

@@ -445,7 +444,7 @@ ARGUMENTS
  ID  ID of the webhook to delete
 ```

-_See code: [src/commands/webhook/delete.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/webhook/delete.js)_
+_See code: [src/commands/webhook/delete.js](https://github.com/expo/eas-cli/blob/v0.35.0/packages/eas-cli/src/commands/webhook/delete.js)_

 ## `eas webhook:list`

@@ -459,7 +458,7 @@ OPTIONS
  --event=(BUILD)  Event type that triggers the webhook
 ```

-_See code: [src/commands/webhook/list.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/webhook/list.js)_
+_See code: [src/commands/webhook/list.js](https://github.com/expo/eas-cli/blob/v0.35.0/packages/eas-cli/src/commands/webhook/list.js)_

 ## `eas webhook:update`

@@ -479,7 +478,7 @@ OPTIONS
  --url=url        Webhook URL
 ```

-_See code: [src/commands/webhook/update.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/webhook/update.js)_
+_See code: [src/commands/webhook/update.js](https://github.com/expo/eas-cli/blob/v0.35.0/packages/eas-cli/src/commands/webhook/update.js)_

 ## `eas webhook:view ID`

@@ -493,5 +492,5 @@ ARGUMENTS
  ID  ID of the webhook to view
 ```

-_See code: [src/commands/webhook/view.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/webhook/view.js)_
+_See code: [src/commands/webhook/view.js](https://github.com/expo/eas-cli/blob/v0.35.0/packages/eas-cli/src/commands/webhook/view.js)_
 <!-- commandsstop -->
@@ -1,5 +1,5 @@
 overwrite: true
-schema: 'https://staging.exp.host/--/graphql'
+schema: 'https://staging-api.expo.dev/graphql'
 documents:
  - 'src/graphql/**/!(*.d).{ts,tsx}'
  - 'src/credentials/ios/api/graphql/**/!(*.d).{ts,tsx}'
@@ -1,7 +1,7 @@
 {
  "name": "eas-cli",
  "description": "EAS command line tool",
-  "version": "0.34.1",
+  "version": "0.35.0",
  "author": "Expo <[email protected]>",
  "bin": {
    "eas": "./bin/run"
@@ -12,7 +12,7 @@
    "@expo/config": "6.0.3",
    "@expo/config-plugins": "4.0.3",
    "@expo/eas-build-job": "0.2.57",
-    "@expo/eas-json": "^0.34.1",
+    "@expo/eas-json": "^0.35.0",
    "@expo/json-file": "8.2.33",
    "@expo/pkcs12": "0.0.4",
    "@expo/plist": "0.0.14",
@@ -8,7 +8,7 @@ import { apiClient, getExpoApiBaseUrl } from '../api';
 describe('apiClient', () => {
  it('converts Expo APIv2 error to ApiV2Error', async () => {
    nock(getExpoApiBaseUrl())
-      .post('/--/api/v2/test')
+      .post('/v2/test')
      .reply(400, {
        errors: [
          {
@@ -39,7 +39,7 @@ describe('apiClient', () => {
  });

  it('does not convert non-APIv2 error to ApiV2Error', async () => {
-    nock(getExpoApiBaseUrl()).post('/--/api/v2/test').reply(500, 'Something went wrong');
+    nock(getExpoApiBaseUrl()).post('/v2/test').reply(500, 'Something went wrong');

    let error: Error | null = null;
    try {
@@ -4,7 +4,7 @@ import ApiV2Error from './ApiV2Error';
 import { getAccessToken, getSessionSecret } from './user/sessionStorage';

 export const apiClient = got.extend({
-  prefixUrl: getExpoApiBaseUrl() + '/--/api/v2/',
+  prefixUrl: getExpoApiBaseUrl() + '/v2/',
  hooks: {
    beforeRequest: [
      (options: NormalizedOptions) => {
@@ -40,11 +40,11 @@ export const apiClient = got.extend({

 export function getExpoApiBaseUrl(): string {
  if (process.env.EXPO_STAGING) {
-    return `https://staging.exp.host`;
+    return `https://staging-api.expo.dev`;
  } else if (process.env.EXPO_LOCAL) {
    return `http://127.0.0.1:3000`;
  } else {
-    return `https://exp.host`;
+    return `https://api.expo.dev`;
  }
 }

@@ -22,7 +22,7 @@ export function getArtifactUrl(artifactId: string): string {

 export function getInternalDistributionInstallUrl(build: BuildFragment): string {
  if (build.platform === AppPlatform.Ios) {
-    return `itms-services://?action=download-manifest;url=${getExpoApiBaseUrl()}/--/api/v2/projects/${
+    return `itms-services://?action=download-manifest;url=${getExpoApiBaseUrl()}/v2/projects/${
      build.project.id
    }/builds/${build.id}/manifest.plist`;
  }
@@ -14,7 +14,7 @@ import { BuildContext, createBuildContextAsync } from '../../build/context';
 import { prepareIosBuildAsync } from '../../build/ios/build';
 import { ensureExpoDevClientInstalledForDevClientBuildsAsync } from '../../build/utils/devClient';
 import { printBuildResults, printLogsUrls } from '../../build/utils/printBuildInfo';
-import { ensureRepoIsCleanAsync } from '../../build/utils/repository';
+import { ensureRepoIsCleanAsync, reviewAndCommitChangesAsync } from '../../build/utils/repository';
 import EasCommand from '../../commandUtils/EasCommand';
 import { CredentialsContext } from '../../credentials/context';
 import {
@@ -392,7 +392,8 @@ export async function handleDeprecatedEasJsonAsync(
  projectDir: string,
  nonInteractive: boolean
 ): Promise<void> {
-  if (!(await fs.pathExists(EasJsonReader.formatEasJsonPath(projectDir)))) {
+  const easJsonPath = EasJsonReader.formatEasJsonPath(projectDir);
+  if (!(await fs.pathExists(easJsonPath))) {
    return;
  }
  const easJsonReader = new EasJsonReader(projectDir);
@@ -432,12 +433,21 @@ export async function handleDeprecatedEasJsonAsync(
    { title: 'Allow builds with dirty Git working tree (new default)', value: 'noCommit' },
  ]);

+  if (mode === 'requireCommit') {
+    setVcsClient(new GitClient());
+    await ensureRepoIsCleanAsync(nonInteractive);
+  }
+
  rawEasJson.cli =
    mode === 'requireCommit'
      ? { version: `>= ${easCliVersion}`, requireCommit: true }
      : { version: `>= ${easCliVersion}` };
-  await fs.writeJSON(EasJsonReader.formatEasJsonPath(projectDir), rawEasJson, { spaces: 2 });
+  await fs.writeJSON(easJsonPath, rawEasJson, { spaces: 2 });
+  Log.withTick('Updated eas.json');
  if (mode === 'requireCommit') {
-    setVcsClient(new GitClient());
+    await getVcsClient().trackFileAsync(easJsonPath);
+    await reviewAndCommitChangesAsync('Set cli.requireCommit to true in eas.json', {
+      nonInteractive,
+    });
  }
 }
@@ -5,7 +5,7 @@ import nullthrows from 'nullthrows';
 import { AndroidAppBuildCredentialsFragment } from '../../graphql/generated';
 import { CredentialsContext } from '../context';
 import * as credentialsJsonReader from '../credentialsJson/read';
-import { SetupBuildCredentials } from './actions/SetupBuildCredentials';
+import { SetUpBuildCredentials } from './actions/SetUpBuildCredentials';
 import { AppLookupParams } from './api/GraphqlClient';
 import { Keystore } from './credentials';

@@ -34,7 +34,7 @@ export default class AndroidCredentialsProvider {
  }

  private async getRemoteAsync(): Promise<AndroidCredentials> {
-    const setupBuildCredentialsAction = new SetupBuildCredentials({ app: this.options.app });
+    const setupBuildCredentialsAction = new SetUpBuildCredentials({ app: this.options.app });
    const buildCredentials = await setupBuildCredentialsAction.runAsync(this.ctx);
    return this.toAndroidCredentials(buildCredentials);
  }
@@ -25,7 +25,7 @@ interface Options {
 * Sets up Build Credentials for Android
 * @name: sets up build credentials for the specified configuration. If no name is specified, the default configuration is setup
 */
-export class SetupBuildCredentials {
+export class SetUpBuildCredentials {
  constructor(private options: Options) {}

  async runAsync(ctx: CredentialsContext): Promise<AndroidAppBuildCredentialsFragment> {
@@ -14,7 +14,7 @@ import { AppLookupParams } from '../api/GraphqlClient';
 import { getKeystoreWithType } from '../utils/keystoreNew';
 import { BackupKeystore } from './DownloadKeystore';

-export class SetupBuildCredentialsFromCredentialsJson {
+export class SetUpBuildCredentialsFromCredentialsJson {
  constructor(private app: AppLookupParams) {}

  async runAsync(ctx: CredentialsContext): Promise<AndroidAppBuildCredentialsFragment | null> {
@@ -13,7 +13,7 @@ import { AssignGoogleServiceAccountKey } from './AssignGoogleServiceAccountKey';
 import { CreateGoogleServiceAccountKey } from './CreateGoogleServiceAccountKey';
 import { UseExistingGoogleServiceAccountKey } from './UseExistingGoogleServiceAccountKey';

-export class SetupGoogleServiceAccountKey {
+export class SetUpGoogleServiceAccountKey {
  constructor(private app: AppLookupParams) {}

  public async runAsync(ctx: CredentialsContext): Promise<CommonAndroidAppCredentialsFragment> {
@@ -9,7 +9,7 @@ import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { MissingCredentialsNonInteractiveError } from '../../../errors';
 import { generateRandomKeystoreAsync } from '../../utils/keystore';
 import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
-import { SetupBuildCredentials } from '../SetupBuildCredentials';
+import { SetUpBuildCredentials } from '../SetUpBuildCredentials';

 jest.mock('../../../../ora');
 jest.mock('../../../../project/ensureProjectExists');
@@ -17,7 +17,7 @@ jest.mock('../../../../user/actions', () => ({ ensureLoggedInAsync: jest.fn(() =
 jest.mock('../../../../prompts', () => ({ confirmAsync: jest.fn(() => true) }));
 jest.mock('../../utils/keystore', () => ({ generateRandomKeystoreAsync: jest.fn() }));

-describe('SetupBuildCredentials', () => {
+describe('SetUpBuildCredentials', () => {
  beforeEach(() => {
    asMock(generateRandomKeystoreAsync).mockReset();
  });
@@ -33,7 +33,7 @@ describe('SetupBuildCredentials', () => {
      },
    });
    const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
-    const setupBuildCredentialsAction = new SetupBuildCredentials({ app: appLookupParams });
+    const setupBuildCredentialsAction = new SetUpBuildCredentials({ app: appLookupParams });
    await setupBuildCredentialsAction.runAsync(ctx);

    // expect keystore not to be created
@@ -48,7 +48,7 @@ describe('SetupBuildCredentials', () => {
      },
    });
    const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
-    const setupBuildCredentialsAction = new SetupBuildCredentials({ app: appLookupParams });
+    const setupBuildCredentialsAction = new SetUpBuildCredentials({ app: appLookupParams });
    await setupBuildCredentialsAction.runAsync(ctx);

    // expect keystore to be created
@@ -63,7 +63,7 @@ describe('SetupBuildCredentials', () => {
      },
    });
    const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
-    const setupBuildCredentialsAction = new SetupBuildCredentials({ app: appLookupParams });
+    const setupBuildCredentialsAction = new SetUpBuildCredentials({ app: appLookupParams });
    await expect(setupBuildCredentialsAction.runAsync(ctx)).rejects.toThrowError(
      MissingCredentialsNonInteractiveError
    );
@@ -14,7 +14,7 @@ import {
  SelectAndroidBuildCredentialsResultType,
 } from '../../../manager/SelectAndroidBuildCredentials';
 import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
-import { SetupBuildCredentialsFromCredentialsJson } from '../SetupBuildCredentialsFromCredentialsJson';
+import { SetUpBuildCredentialsFromCredentialsJson } from '../SetUpBuildCredentialsFromCredentialsJson';

 jest.mock('fs');

@@ -26,7 +26,7 @@ beforeEach(() => {
  vol.reset();
 });

-describe(SetupBuildCredentialsFromCredentialsJson, () => {
+describe(SetUpBuildCredentialsFromCredentialsJson, () => {
  it('sets up a new build configuration from credentials.json upon user request', async () => {
    asMock(SelectAndroidBuildCredentials).mockImplementation(() => {
      return {
@@ -59,7 +59,7 @@ describe(SetupBuildCredentialsFromCredentialsJson, () => {
      'keystore.jks': 'some-binary-content',
    });
    const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
-    const setupBuildCredentialsAction = new SetupBuildCredentialsFromCredentialsJson(
+    const setupBuildCredentialsAction = new SetUpBuildCredentialsFromCredentialsJson(
      appLookupParams
    );
    await setupBuildCredentialsAction.runAsync(ctx);
@@ -109,7 +109,7 @@ describe(SetupBuildCredentialsFromCredentialsJson, () => {
      'keystore.jks': 'some-binary-content',
    });
    const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
-    const setupBuildCredentialsAction = new SetupBuildCredentialsFromCredentialsJson(
+    const setupBuildCredentialsAction = new SetUpBuildCredentialsFromCredentialsJson(
      appLookupParams
    );
    await setupBuildCredentialsAction.runAsync(ctx);
@@ -132,7 +132,7 @@ describe(SetupBuildCredentialsFromCredentialsJson, () => {
      nonInteractive: true,
    });
    const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
-    const setupBuildCredentialsAction = new SetupBuildCredentialsFromCredentialsJson(
+    const setupBuildCredentialsAction = new SetUpBuildCredentialsFromCredentialsJson(
      appLookupParams
    );
    await expect(setupBuildCredentialsAction.runAsync(ctx)).rejects.toThrowError();
@@ -10,7 +10,7 @@ import {
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { MissingCredentialsNonInteractiveError } from '../../../errors';
 import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
-import { SetupGoogleServiceAccountKey } from '../SetupGoogleServiceAccountKey';
+import { SetUpGoogleServiceAccountKey } from '../SetUpGoogleServiceAccountKey';

 jest.mock('../../../../prompts');
 jest.mock('fs');
@@ -22,7 +22,7 @@ beforeEach(() => {
  vol.reset();
 });

-describe(SetupGoogleServiceAccountKey, () => {
+describe(SetUpGoogleServiceAccountKey, () => {
  it('skips setup when there is a Google Service Account Key already assigned to the project', async () => {
    const ctx = createCtxMock({
      nonInteractive: false,
@@ -34,7 +34,7 @@ describe(SetupGoogleServiceAccountKey, () => {
      },
    });
    const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
-    const setupGoogleServiceAccountKeyAction = new SetupGoogleServiceAccountKey(appLookupParams);
+    const setupGoogleServiceAccountKeyAction = new SetUpGoogleServiceAccountKey(appLookupParams);
    await setupGoogleServiceAccountKeyAction.runAsync(ctx);

    expect(ctx.android.createGoogleServiceAccountKeyAsync).not.toHaveBeenCalled();
@@ -57,7 +57,7 @@ describe(SetupGoogleServiceAccountKey, () => {
      },
    });
    const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
-    const setupGoogleServiceAccountKeyAction = new SetupGoogleServiceAccountKey(appLookupParams);
+    const setupGoogleServiceAccountKeyAction = new SetUpGoogleServiceAccountKey(appLookupParams);
    await setupGoogleServiceAccountKeyAction.runAsync(ctx);

    expect(ctx.android.createGoogleServiceAccountKeyAsync).toHaveBeenCalledTimes(1);
@@ -68,7 +68,7 @@ describe(SetupGoogleServiceAccountKey, () => {
      nonInteractive: true,
    });
    const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
-    const setupGoogleServiceAccountKeyAction = new SetupGoogleServiceAccountKey(appLookupParams);
+    const setupGoogleServiceAccountKeyAction = new SetUpGoogleServiceAccountKey(appLookupParams);
    await expect(setupGoogleServiceAccountKeyAction.runAsync(ctx)).rejects.toThrowError(
      MissingCredentialsNonInteractiveError
    );
@@ -9,8 +9,8 @@ import { CredentialsContext } from '../context';
 import * as credentialsJsonReader from '../credentialsJson/read';
 import { ensureAllTargetsAreConfigured } from '../credentialsJson/utils';
 import { getAppFromContext } from './actions/BuildCredentialsUtils';
-import { SetupBuildCredentials } from './actions/SetupBuildCredentials';
-import { SetupPushKey } from './actions/SetupPushKey';
+import { SetUpBuildCredentials } from './actions/SetUpBuildCredentials';
+import { SetUpPushKey } from './actions/SetUpPushKey';
 import { IosCapabilitiesOptions } from './appstore/ensureAppExists';
 import { App, IosCredentials, Target } from './types';
 import { isAdHocProfile } from './utils/provisioningProfile';
@@ -58,7 +58,7 @@ export default class IosCredentialsProvider {
  }

  private async getRemoteAsync(): Promise<IosCredentials> {
-    return await new SetupBuildCredentials({
+    return await new SetUpBuildCredentials({
      app: this.options.app,
      targets: this.options.targets,
      distribution: this.options.distribution,
@@ -83,7 +83,7 @@ export default class IosCredentialsProvider {
      parentBundleIdentifier: applicationTarget.parentBundleIdentifier,
    };

-    const setupPushKeyAction = new SetupPushKey(appLookupParams);
+    const setupPushKeyAction = new SetUpPushKey(appLookupParams);
    const isPushKeySetup = await setupPushKeyAction.isPushKeySetupAsync(ctx);
    if (isPushKeySetup) {
      Log.succeed(
@@ -21,7 +21,7 @@ import { validateProvisioningProfileAsync } from '../validators/validateProvisio
 import { resolveAppleTeamIfAuthenticatedAsync } from './AppleTeamUtils';
 import { assignBuildCredentialsAsync, getBuildCredentialsAsync } from './BuildCredentialsUtils';
 import { chooseDevicesAsync, formatDeviceLabel } from './DeviceUtils';
-import { SetupDistributionCertificate } from './SetupDistributionCertificate';
+import { SetUpDistributionCertificate } from './SetUpDistributionCertificate';

 enum ReuseAction {
  Yes,
@@ -29,11 +29,11 @@ enum ReuseAction {
  No,
 }

-export class SetupAdhocProvisioningProfile {
+export class SetUpAdhocProvisioningProfile {
  constructor(private app: AppLookupParams) {}

  async runAsync(ctx: CredentialsContext): Promise<IosAppBuildCredentialsFragment> {
-    const distCert = await new SetupDistributionCertificate(
+    const distCert = await new SetUpDistributionCertificate(
      this.app,
      IosDistributionType.AdHoc
    ).runAsync(ctx);
@@ -31,10 +31,10 @@ export enum SetupAscApiKeyChoice {
 export class SetUpAscApiKey {
  public choices: { title: string; value: string }[] = [
    {
-      title: '[Choose an existing key]',
+      title: '[Choose an existing ASC Api Key]',
      value: SetupAscApiKeyChoice.USE_EXISTING,
    },
-    { title: '[Add a new key]', value: SetupAscApiKeyChoice.GENERATE },
+    { title: '[Add a new ASC Api Key]', value: SetupAscApiKeyChoice.GENERATE },
  ];

  constructor(private app: AppLookupParams, private purpose: AppStoreApiKeyPurpose) {}
@@ -123,8 +123,8 @@ export class SetUpAscApiKey {
      const result = await promptAsync({
        type: 'select',
        name: 'choice',
-        message: 'Select the App Store Connect Api Key to use for your project:',
-        choices: this.choices,
+        message: 'Select what to use for your project:',
+        choices,
      });
      choice = result.choice;
    }
@@ -7,7 +7,7 @@ import { CredentialsContext } from '../../context';
 import { IosCapabilitiesOptions } from '../appstore/ensureAppExists';
 import { App, IosAppBuildCredentialsMap, IosCredentials, Target } from '../types';
 import { displayProjectCredentials } from '../utils/printCredentials';
-import { SetupTargetBuildCredentials } from './SetupTargetBuildCredentials';
+import { SetUpTargetBuildCredentials } from './SetUpTargetBuildCredentials';

 interface Options {
  app: App;
@@ -17,7 +17,7 @@ interface Options {
  iosCapabilitiesOptions?: IosCapabilitiesOptions;
 }

-export class SetupBuildCredentials {
+export class SetUpBuildCredentials {
  constructor(private options: Options) {}

  async runAsync(ctx: CredentialsContext): Promise<IosCredentials> {
@@ -49,7 +49,7 @@ export class SetupBuildCredentials {
      } else {
        Log.newLine();
      }
-      const action = new SetupTargetBuildCredentials({
+      const action = new SetUpTargetBuildCredentials({
        ...this.options,
        app: {
          ...this.options.app,
@@ -8,9 +8,9 @@ import { readIosCredentialsAsync } from '../../credentialsJson/read';
 import { IosCredentials } from '../../credentialsJson/types';
 import { ensureAllTargetsAreConfigured } from '../../credentialsJson/utils';
 import { App, Target } from '../types';
-import { SetupTargetBuildCredentialsFromCredentialsJson } from './SetupTargetBuildCredentialsFromCredentialsJson';
+import { SetUpTargetBuildCredentialsFromCredentialsJson } from './SetUpTargetBuildCredentialsFromCredentialsJson';

-export class SetupBuildCredentialsFromCredentialsJson {
+export class SetUpBuildCredentialsFromCredentialsJson {
  constructor(
    private app: App,
    private targets: Target[],
@@ -32,7 +32,7 @@ export class SetupBuildCredentialsFromCredentialsJson {
        );
        Log.newLine();
      }
-      await new SetupTargetBuildCredentialsFromCredentialsJson(
+      await new SetUpTargetBuildCredentialsFromCredentialsJson(
        {
          account: this.app.account,
          projectName: this.app.projectName,
@@ -18,7 +18,7 @@ import { resolveAppleTeamIfAuthenticatedAsync } from './AppleTeamUtils';
 import { CreateDistributionCertificate } from './CreateDistributionCertificate';
 import { formatDistributionCertificate } from './DistributionCertificateUtils';

-export class SetupDistributionCertificate {
+export class SetUpDistributionCertificate {
  private validDistCerts?: AppleDistributionCertificateFragment[];

  constructor(private app: AppLookupParams, private distributionType: IosDistributionType) {}
@@ -4,8 +4,8 @@ import { promptAsync } from '../../../prompts';
 import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/GraphqlClient';
 import { getAllBuildCredentialsAsync } from './BuildCredentialsUtils';
-import { SetupAdhocProvisioningProfile } from './SetupAdhocProvisioningProfile';
-import { SetupProvisioningProfile } from './SetupProvisioningProfile';
+import { SetUpAdhocProvisioningProfile } from './SetUpAdhocProvisioningProfile';
+import { SetUpProvisioningProfile } from './SetUpProvisioningProfile';

 /**
 * It's used when setting up credentials for internal distribution but `enterpriseProvisioning` is not set.
@@ -14,7 +14,7 @@ import { SetupProvisioningProfile } from './SetupProvisioningProfile';
 * to choose if they want to set up an adhoc or universal distribution provisioning profile. Otherwise, always
 * set up an adhoc provisioning profile.
 */
-export class SetupInternalProvisioningProfile {
+export class SetUpInternalProvisioningProfile {
  constructor(private app: AppLookupParams) {}

  async runAsync(ctx: CredentialsContext): Promise<IosAppBuildCredentialsFragment> {
@@ -82,13 +82,13 @@ export class SetupInternalProvisioningProfile {
  private async setupAdhocProvisioningProfileAsync(
    ctx: CredentialsContext
  ): Promise<IosAppBuildCredentialsFragment> {
-    return await new SetupAdhocProvisioningProfile(this.app).runAsync(ctx);
+    return await new SetUpAdhocProvisioningProfile(this.app).runAsync(ctx);
  }

  private async setupUniversalProvisioningProfileAsync(
    ctx: CredentialsContext
  ): Promise<IosAppBuildCredentialsFragment> {
-    return await new SetupProvisioningProfile(this.app, IosDistributionType.Enterprise).runAsync(
+    return await new SetUpProvisioningProfile(this.app, IosDistributionType.Enterprise).runAsync(
      ctx
    );
  }
@@ -20,12 +20,12 @@ import {
 import { ConfigureProvisioningProfile } from './ConfigureProvisioningProfile';
 import { CreateProvisioningProfile } from './CreateProvisioningProfile';
 import { formatProvisioningProfileFromApple } from './ProvisioningProfileUtils';
-import { SetupDistributionCertificate } from './SetupDistributionCertificate';
+import { SetUpDistributionCertificate } from './SetUpDistributionCertificate';

 /**
 * Sets up either APP_STORE or ENTERPRISE provisioning profiles
 */
-export class SetupProvisioningProfile {
+export class SetUpProvisioningProfile {
  constructor(private app: AppLookupParams, private distributionType: IosDistributionType) {}

  async areBuildCredentialsSetupAsync(ctx: CredentialsContext): Promise<boolean> {
@@ -84,7 +84,7 @@ export class SetupProvisioningProfile {
  }

  async runAsync(ctx: CredentialsContext): Promise<IosAppBuildCredentialsFragment> {
-    const distCert = await new SetupDistributionCertificate(
+    const distCert = await new SetUpDistributionCertificate(
      this.app,
      this.distributionType
    ).runAsync(ctx);
@@ -14,7 +14,7 @@ import {
  selectPushKeyAsync,
 } from './PushKeyUtils';

-export class SetupPushKey {
+export class SetUpPushKey {
  constructor(private app: AppLookupParams) {}

  async isPushKeySetupAsync(ctx: CredentialsContext): Promise<boolean> {
@@ -1,4 +1,5 @@
 import chalk from 'chalk';
+import nullthrows from 'nullthrows';
 import wrapAnsi from 'wrap-ansi';

 import { CommonIosAppCredentialsFragment } from '../../../graphql/generated';
@@ -8,13 +9,16 @@ import { CredentialsContext } from '../../context';
 import { UnsupportedCredentialsChoiceError } from '../../errors';
 import { AppLookupParams } from '../api/GraphqlClient';
 import { AppStoreApiKeyPurpose } from './AscApiKeyUtils';
-import { SetupAscApiKey } from './SetupAscApiKey';
+import { SetUpAscApiKey } from './SetUpAscApiKey';

-const PROMPT_FOR_APP_SPECIFIC_PASSWORD = 'PROMPT_FOR_APP_SPECIFIC_PASSWORD';
-export class SetupSubmissionCredential {
+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);
+    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,
@@ -25,11 +29,16 @@ export class SetupSubmissionCredential {
    ctx: CredentialsContext
  ): Promise<CommonIosAppCredentialsFragment | string> {
    try {
-      return await this.setupAscApiKeyAction.runAsync(ctx);
+      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) {
-        const choice = e.choice;
-        if (choice === PROMPT_FOR_APP_SPECIFIC_PASSWORD) {
+        if (e.choice === PROMPT_FOR_APP_SPECIFIC_PASSWORD) {
          return await this.promptForAppSpecificPasswordAsync();
        }
      }
@@ -39,6 +48,8 @@ export class SetupSubmissionCredential {

  async promptForAppSpecificPasswordAsync(): Promise<string> {
    Log.addNewLineIfNone();
+    Log.log(`Please 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(
@@ -47,8 +58,6 @@ export class SetupSubmissionCredential {
        process.stdout.columns || 80
      )
    );
-    Log.log(`Please enter your Apple app-specific password.`);
-    Log.log(learnMore('https://expo.fyi/apple-app-specific-password'));

    const { appSpecificPassword } = await promptAsync({
      name: 'appSpecificPassword',
@@ -8,9 +8,9 @@ import Log from '../../../log';
 import { CredentialsContext } from '../../context';
 import { AppLookupParams as GraphQLAppLookupParams } from '../api/GraphqlClient';
 import { IosCapabilitiesOptions } from '../appstore/ensureAppExists';
-import { SetupAdhocProvisioningProfile } from './SetupAdhocProvisioningProfile';
-import { SetupInternalProvisioningProfile } from './SetupInternalProvisioningProfile';
-import { SetupProvisioningProfile } from './SetupProvisioningProfile';
+import { SetUpAdhocProvisioningProfile } from './SetUpAdhocProvisioningProfile';
+import { SetUpInternalProvisioningProfile } from './SetUpInternalProvisioningProfile';
+import { SetUpProvisioningProfile } from './SetUpProvisioningProfile';

 interface Options {
  app: GraphQLAppLookupParams;
@@ -18,7 +18,7 @@ interface Options {
  enterpriseProvisioning?: IosEnterpriseProvisioning;
  iosCapabilitiesOptions?: IosCapabilitiesOptions;
 }
-export class SetupTargetBuildCredentials {
+export class SetUpTargetBuildCredentials {
  constructor(private options: Options) {}

  async runAsync(ctx: CredentialsContext): Promise<IosAppBuildCredentialsFragment> {
@@ -50,17 +50,17 @@ export class SetupTargetBuildCredentials {
    const { app, distribution, enterpriseProvisioning } = this.options;
    if (distribution === 'internal') {
      if (enterpriseProvisioning === 'adhoc') {
-        return await new SetupAdhocProvisioningProfile(app).runAsync(ctx);
+        return await new SetUpAdhocProvisioningProfile(app).runAsync(ctx);
      } else if (enterpriseProvisioning === 'universal') {
-        return await new SetupProvisioningProfile(
+        return await new SetUpProvisioningProfile(
          app,
          GraphQLIosDistributionType.Enterprise
        ).runAsync(ctx);
      } else {
-        return await new SetupInternalProvisioningProfile(app).runAsync(ctx);
+        return await new SetUpInternalProvisioningProfile(app).runAsync(ctx);
      }
    } else {
-      return await new SetupProvisioningProfile(app, GraphQLIosDistributionType.AppStore).runAsync(
+      return await new SetUpProvisioningProfile(app, GraphQLIosDistributionType.AppStore).runAsync(
        ctx
      );
    }
@@ -22,7 +22,7 @@ import {
  getProvisioningProfileAsync,
 } from './BuildCredentialsUtils';

-export class SetupTargetBuildCredentialsFromCredentialsJson {
+export class SetUpTargetBuildCredentialsFromCredentialsJson {
  constructor(
    private app: AppLookupParams,
    private distributionType: IosDistributionType,
@@ -5,7 +5,7 @@ import {
 import { testDistCertFragmentOneDependency } from '../../../__tests__/fixtures-ios';
 import { CredentialsContext } from '../../../context';
 import { AppLookupParams } from '../../api/GraphqlClient';
-export class SetupDistributionCertificate {
+export class SetUpDistributionCertificate {
  constructor(private app: AppLookupParams, private distributionType: IosDistributionType) {}

  public async runAsync(_ctx: CredentialsContext): Promise<AppleDistributionCertificateFragment> {
@@ -1,4 +1,4 @@
-import { doUDIDsMatch } from '../SetupAdhocProvisioningProfile';
+import { doUDIDsMatch } from '../SetUpAdhocProvisioningProfile';

 describe(doUDIDsMatch, () => {
  it('return false if UDIDs do not match', () => {
@@ -115,6 +115,23 @@ describe(SetUpAscApiKey, () => {
    // expect configuration to be updated with a new ASC Api Key
    expect(asMock(ctx.ios.updateIosAppCredentialsAsync).mock.calls.length).toBe(1);
  });
+  it('works in Non Interactive Mode if ASC Key is configured', async () => {
+    const ctx = createCtxMock({
+      nonInteractive: true,
+      ios: {
+        ...getNewIosApiMock(),
+        getIosAppCredentialsWithCommonFieldsAsync: jest.fn(
+          () => testCommonIosAppCredentialsFragment
+        ),
+      },
+    });
+    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const setupAscApiKeyAction = new SetUpAscApiKey(
+      appLookupParams,
+      AppStoreApiKeyPurpose.SUBMISSION_SERVICE
+    );
+    await expect(setupAscApiKeyAction.runAsync(ctx)).resolves.not.toThrowError();
+  });
  it('errors in Non Interactive Mode', async () => {
    const ctx = createCtxMock({
      nonInteractive: true,
@@ -4,13 +4,13 @@ import { promptAsync } from '../../../../prompts';
 import { getAppstoreMock, testAuthCtx } from '../../../__tests__/fixtures-appstore';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { getAllBuildCredentialsAsync } from '../BuildCredentialsUtils';
-import { SetupAdhocProvisioningProfile } from '../SetupAdhocProvisioningProfile';
-import { SetupInternalProvisioningProfile } from '../SetupInternalProvisioningProfile';
-import { SetupProvisioningProfile } from '../SetupProvisioningProfile';
+import { SetUpAdhocProvisioningProfile } from '../SetUpAdhocProvisioningProfile';
+import { SetUpInternalProvisioningProfile } from '../SetUpInternalProvisioningProfile';
+import { SetUpProvisioningProfile } from '../SetUpProvisioningProfile';

 jest.mock('../../../../prompts');
-jest.mock('../SetupAdhocProvisioningProfile');
-jest.mock('../SetupProvisioningProfile');
+jest.mock('../SetUpAdhocProvisioningProfile');
+jest.mock('../SetUpProvisioningProfile');
 jest.mock('../BuildCredentialsUtils', () => ({ getAllBuildCredentialsAsync: jest.fn() }));

 beforeEach(() => {
@@ -33,15 +33,15 @@ const testEnterpriseBuildCredentials: IosAppBuildCredentialsFragment = {
  iosDistributionType: IosDistributionType.Enterprise,
 };

-describe(SetupInternalProvisioningProfile, () => {
+describe(SetUpInternalProvisioningProfile, () => {
  describe('interactive mode', () => {
    describe('when authenticated with apple', () => {
-      it('runs the SetupAdhocProvisioningProfile action for non-enterprise team', async () => {
+      it('runs the SetUpAdhocProvisioningProfile action for non-enterprise team', async () => {
        asMock(getAllBuildCredentialsAsync).mockImplementationOnce(() => {
          const buildCredentials: IosAppBuildCredentialsFragment[] = [];
          return buildCredentials;
        });
-        const action = new SetupInternalProvisioningProfile({
+        const action = new SetUpInternalProvisioningProfile({
          account: { id: 'account-id', name: 'account-name' },
          bundleIdentifier: 'com.expo.test',
          projectName: 'testproject',
@@ -56,7 +56,7 @@ describe(SetupInternalProvisioningProfile, () => {
        });

        const runAsync = jest.fn();
-        SetupAdhocProvisioningProfile.prototype.runAsync = runAsync;
+        SetUpAdhocProvisioningProfile.prototype.runAsync = runAsync;

        await action.runAsync(ctx);

@@ -72,7 +72,7 @@ describe(SetupInternalProvisioningProfile, () => {
          return buildCredentials;
        });

-        const action = new SetupInternalProvisioningProfile({
+        const action = new SetUpInternalProvisioningProfile({
          account: { id: 'account-id', name: 'account-name' },
          bundleIdentifier: 'com.expo.test',
          projectName: 'testproject',
@@ -90,7 +90,7 @@ describe(SetupInternalProvisioningProfile, () => {
        });

        const runAsync = jest.fn();
-        SetupProvisioningProfile.prototype.runAsync = runAsync;
+        SetUpProvisioningProfile.prototype.runAsync = runAsync;

        await action.runAsync(ctx);

@@ -110,7 +110,7 @@ describe(SetupInternalProvisioningProfile, () => {
          return buildCredentials;
        });

-        const action = new SetupInternalProvisioningProfile({
+        const action = new SetUpInternalProvisioningProfile({
          account: { id: 'account-id', name: 'account-name' },
          bundleIdentifier: 'com.expo.test',
          projectName: 'testproject',
@@ -125,14 +125,14 @@ describe(SetupInternalProvisioningProfile, () => {
        });

        const runAsync = jest.fn();
-        SetupProvisioningProfile.prototype.runAsync = runAsync;
+        SetUpProvisioningProfile.prototype.runAsync = runAsync;

        await action.runAsync(ctx);

        expect(runAsync).toHaveBeenCalled();
      });

-      it('runs the SetupAdhocProvisioningProfile action when adhoc credentials exist', async () => {
+      it('runs the SetUpAdhocProvisioningProfile action when adhoc credentials exist', async () => {
        asMock(promptAsync).mockImplementationOnce(() => ({
          distributionType: IosDistributionType.Enterprise,
        }));
@@ -141,7 +141,7 @@ describe(SetupInternalProvisioningProfile, () => {
          return buildCredentials;
        });

-        const action = new SetupInternalProvisioningProfile({
+        const action = new SetUpInternalProvisioningProfile({
          account: { id: 'account-id', name: 'account-name' },
          bundleIdentifier: 'com.expo.test',
          projectName: 'testproject',
@@ -156,14 +156,14 @@ describe(SetupInternalProvisioningProfile, () => {
        });

        const runAsync = jest.fn();
-        SetupAdhocProvisioningProfile.prototype.runAsync = runAsync;
+        SetUpAdhocProvisioningProfile.prototype.runAsync = runAsync;

        await action.runAsync(ctx);

        expect(runAsync).toHaveBeenCalled();
      });

-      it('runs the SetupProvisioningProfile action when enterprise credentials exist', async () => {
+      it('runs the SetUpProvisioningProfile action when enterprise credentials exist', async () => {
        asMock(promptAsync).mockImplementationOnce(() => ({
          distributionType: IosDistributionType.Enterprise,
        }));
@@ -174,7 +174,7 @@ describe(SetupInternalProvisioningProfile, () => {
          return buildCredentials;
        });

-        const action = new SetupInternalProvisioningProfile({
+        const action = new SetUpInternalProvisioningProfile({
          account: { id: 'account-id', name: 'account-name' },
          bundleIdentifier: 'com.expo.test',
          projectName: 'testproject',
@@ -189,7 +189,7 @@ describe(SetupInternalProvisioningProfile, () => {
        });

        const runAsync = jest.fn();
-        SetupProvisioningProfile.prototype.runAsync = runAsync;
+        SetUpProvisioningProfile.prototype.runAsync = runAsync;

        await action.runAsync(ctx);

@@ -205,7 +205,7 @@ describe(SetupInternalProvisioningProfile, () => {
          return buildCredentials;
        });

-        const action = new SetupInternalProvisioningProfile({
+        const action = new SetUpInternalProvisioningProfile({
          account: { id: 'account-id', name: 'account-name' },
          bundleIdentifier: 'com.expo.test',
          projectName: 'testproject',
@@ -235,7 +235,7 @@ describe(SetupInternalProvisioningProfile, () => {
        ];
        return buildCredentials;
      });
-      const action = new SetupInternalProvisioningProfile({
+      const action = new SetUpInternalProvisioningProfile({
        account: { id: 'account-id', name: 'account-name' },
        bundleIdentifier: 'com.expo.test',
        projectName: 'testproject',
@@ -253,7 +253,7 @@ describe(SetupInternalProvisioningProfile, () => {
        const buildCredentials: IosAppBuildCredentialsFragment[] = [];
        return buildCredentials;
      });
-      const action = new SetupInternalProvisioningProfile({
+      const action = new SetUpInternalProvisioningProfile({
        account: { id: 'account-id', name: 'account-name' },
        bundleIdentifier: 'com.expo.test',
        projectName: 'testproject',
@@ -264,12 +264,12 @@ describe(SetupInternalProvisioningProfile, () => {
      await expect(action.runAsync(ctx)).rejects.toThrow(/couldn't find any credentials/);
    });

-    it('runs the SetupAdhocProvisioningProfile action when adhoc credentials exist', async () => {
+    it('runs the SetUpAdhocProvisioningProfile action when adhoc credentials exist', async () => {
      asMock(getAllBuildCredentialsAsync).mockImplementationOnce(() => {
        const buildCredentials: IosAppBuildCredentialsFragment[] = [testAdhocBuildCredentials];
        return buildCredentials;
      });
-      const action = new SetupInternalProvisioningProfile({
+      const action = new SetUpInternalProvisioningProfile({
        account: { id: 'account-id', name: 'account-name' },
        bundleIdentifier: 'com.expo.test',
        projectName: 'testproject',
@@ -279,19 +279,19 @@ describe(SetupInternalProvisioningProfile, () => {
      });

      const runAsync = jest.fn();
-      SetupAdhocProvisioningProfile.prototype.runAsync = runAsync;
+      SetUpAdhocProvisioningProfile.prototype.runAsync = runAsync;

      await action.runAsync(ctx);

      expect(runAsync).toHaveBeenCalled();
    });

-    it('runs the SetupProvisioningProfile action when enterprise credentials exist', async () => {
+    it('runs the SetUpProvisioningProfile action when enterprise credentials exist', async () => {
      asMock(getAllBuildCredentialsAsync).mockImplementationOnce(() => {
        const buildCredentials: IosAppBuildCredentialsFragment[] = [testEnterpriseBuildCredentials];
        return buildCredentials;
      });
-      const action = new SetupInternalProvisioningProfile({
+      const action = new SetUpInternalProvisioningProfile({
        account: { id: 'account-id', name: 'account-name' },
        bundleIdentifier: 'com.expo.test',
        projectName: 'testproject',
@@ -301,7 +301,7 @@ describe(SetupInternalProvisioningProfile, () => {
      });

      const runAsync = jest.fn();
-      SetupProvisioningProfile.prototype.runAsync = runAsync;
+      SetUpProvisioningProfile.prototype.runAsync = runAsync;

      await action.runAsync(ctx);

@@ -16,16 +16,16 @@ import {
 import { MissingCredentialsNonInteractiveError } from '../../../errors';
 import { validateProvisioningProfileAsync } from '../../validators/validateProvisioningProfile';
 import { getAppLookupParamsFromContext } from '../BuildCredentialsUtils';
-import { SetupProvisioningProfile } from '../SetupProvisioningProfile';
+import { SetUpProvisioningProfile } from '../SetUpProvisioningProfile';

 jest.mock('../../../../prompts');
 asMock(confirmAsync).mockImplementation(() => true);
-jest.mock('../SetupDistributionCertificate');
+jest.mock('../SetUpDistributionCertificate');
 jest.mock('../ConfigureProvisioningProfile');
 jest.mock('../CreateProvisioningProfile');
 jest.mock('../../validators/validateProvisioningProfile');

-describe('SetupProvisioningProfile', () => {
+describe('SetUpProvisioningProfile', () => {
  it('repairs existing Provisioning Profile with bad build credentials in Interactive Mode', async () => {
    asMock(validateProvisioningProfileAsync).mockImplementation(() => false);
    const ctx = createCtxMock({
@@ -54,7 +54,7 @@ describe('SetupProvisioningProfile', () => {
      },
    });
    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
-    const setupProvisioningProfileAction = new SetupProvisioningProfile(
+    const setupProvisioningProfileAction = new SetUpProvisioningProfile(
      appLookupParams,
      IosDistributionType.AppStore
    );
@@ -84,7 +84,7 @@ describe('SetupProvisioningProfile', () => {
      },
    });
    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
-    const setupProvisioningProfileAction = new SetupProvisioningProfile(
+    const setupProvisioningProfileAction = new SetUpProvisioningProfile(
      appLookupParams,
      IosDistributionType.AppStore
    );
@@ -114,7 +114,7 @@ describe('SetupProvisioningProfile', () => {
      },
    });
    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
-    const setupProvisioningProfileAction = new SetupProvisioningProfile(
+    const setupProvisioningProfileAction = new SetUpProvisioningProfile(
      appLookupParams,
      IosDistributionType.AppStore
    );
@@ -140,7 +140,7 @@ describe('SetupProvisioningProfile', () => {
      },
    });
    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
-    const setupProvisioningProfileAction = new SetupProvisioningProfile(
+    const setupProvisioningProfileAction = new SetUpProvisioningProfile(
      appLookupParams,
      IosDistributionType.AppStore
    );
@@ -157,7 +157,7 @@ describe('SetupProvisioningProfile', () => {
      nonInteractive: true,
    });
    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
-    const setupProvisioningProfileAction = new SetupProvisioningProfile(
+    const setupProvisioningProfileAction = new SetUpProvisioningProfile(
      appLookupParams,
      IosDistributionType.AppStore
    );
@@ -5,12 +5,12 @@ import { getAppstoreMock, testAuthCtx } from '../../../__tests__/fixtures-appsto
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { getNewIosApiMock, testPushKey, testTargets } from '../../../__tests__/fixtures-ios';
 import { getAppLookupParamsFromContext } from '../BuildCredentialsUtils';
-import { SetupPushKey } from '../SetupPushKey';
+import { SetUpPushKey } from '../SetUpPushKey';

 jest.mock('../../../../prompts');
 asMock(confirmAsync).mockImplementation(() => true);

-describe(SetupPushKey, () => {
+describe(SetUpPushKey, () => {
  it('skips setting up a Push Key if it is already configured', async () => {
    const ctx = createCtxMock({
      nonInteractive: false,
@@ -20,7 +20,7 @@ describe(SetupPushKey, () => {
      },
    });
    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
-    const setupPushKeyAction = new SetupPushKey(appLookupParams);
+    const setupPushKeyAction = new SetUpPushKey(appLookupParams);
    await setupPushKeyAction.runAsync(ctx);

    // expect not to create a new push key on expo servers
@@ -38,7 +38,7 @@ describe(SetupPushKey, () => {
      },
    });
    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
-    const setupPushKeyAction = new SetupPushKey(appLookupParams);
+    const setupPushKeyAction = new SetUpPushKey(appLookupParams);
    await setupPushKeyAction.runAsync(ctx);

    // expect to create a new push key on expo servers
@@ -62,7 +62,7 @@ describe(SetupPushKey, () => {
      },
    });
    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
-    const setupPushKeyAction = new SetupPushKey(appLookupParams);
+    const setupPushKeyAction = new SetUpPushKey(appLookupParams);
    await setupPushKeyAction.runAsync(ctx);

    // expect not to create a new push key on expo servers, we are using the existing one
@@ -75,7 +75,7 @@ describe(SetupPushKey, () => {
      nonInteractive: true,
    });
    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
-    const createPushKeyAction = new SetupPushKey(appLookupParams);
+    const createPushKeyAction = new SetUpPushKey(appLookupParams);
    await expect(createPushKeyAction.runAsync(ctx)).rejects.toThrowError();
  });
 });
@@ -0,0 +1,61 @@
+import { asMock } from '../../../../__tests__/utils';
+import { findApplicationTarget } from '../../../../project/ios/target';
+import { confirmAsync, promptAsync } from '../../../../prompts';
+import { createCtxMock } from '../../../__tests__/fixtures-context';
+import {
+  getNewIosApiMock,
+  testCommonIosAppCredentialsFragment,
+  testTargets,
+} from '../../../__tests__/fixtures-ios';
+import { getAppLookupParamsFromContext } from '../BuildCredentialsUtils';
+import { SetUpAscApiKey } from '../SetUpAscApiKey';
+import {
+  PROMPT_FOR_APP_SPECIFIC_PASSWORD,
+  SetUpSubmissionCredentials,
+} from '../SetUpSubmissionCredentials';
+
+jest.mock('../../../../prompts');
+asMock(confirmAsync).mockImplementation(() => true);
+
+describe(SetUpSubmissionCredentials, () => {
+  it('allows user to enter an App Specific Password', async () => {
+    asMock(promptAsync)
+      .mockImplementationOnce(() => ({
+        choice: PROMPT_FOR_APP_SPECIFIC_PASSWORD,
+      }))
+      .mockImplementationOnce(() => ({
+        appSpecificPassword: 'super secret',
+      }));
+    const ctx = createCtxMock({
+      nonInteractive: false,
+      ios: {
+        ...getNewIosApiMock(),
+      },
+    });
+    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const setupAscApiKeyAction = new SetUpSubmissionCredentials(appLookupParams);
+    const asp = await setupAscApiKeyAction.runAsync(ctx);
+
+    // prompt to choose ASP, then prompt to input ASP
+    expect(asMock(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 = getAppLookupParamsFromContext(
+        ctx,
+        findApplicationTarget(testTargets)
+      );
+      const setupAscApiKeyAction = new SetUpSubmissionCredentials(appLookupParams);
+      const asc = await setupAscApiKeyAction.runAsync(ctx);
+
+      expect(asc).toEqual(testCommonIosAppCredentialsFragment);
+    } finally {
+      jest.restoreAllMocks();
+    }
+  });
+});
@@ -15,7 +15,7 @@ import {
 } from '../../../__tests__/fixtures-ios';
 import { IosTargetCredentials } from '../../../credentialsJson/types';
 import { getAppLookupParamsFromContext } from '../BuildCredentialsUtils';
-import { SetupTargetBuildCredentialsFromCredentialsJson } from '../SetupTargetBuildCredentialsFromCredentialsJson';
+import { SetUpTargetBuildCredentialsFromCredentialsJson } from '../SetUpTargetBuildCredentialsFromCredentialsJson';

 jest.mock('../../../../prompts');
 jest.mock('../../../credentialsJson/read');
@@ -25,7 +25,7 @@ beforeEach(() => {
  asMock(confirmAsync).mockImplementation(() => true);
 });

-describe('SetupTargetBuildCredentialsFromCredentialsJson', () => {
+describe('SetUpTargetBuildCredentialsFromCredentialsJson', () => {
  const targetCredentials: IosTargetCredentials = {
    distributionCertificate: {
      certificateP12: testDistCert.certP12,
@@ -53,7 +53,7 @@ describe('SetupTargetBuildCredentialsFromCredentialsJson', () => {
    });
    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
    const setupBuildCredentialsFromCredentialsJsonAction =
-      new SetupTargetBuildCredentialsFromCredentialsJson(
+      new SetUpTargetBuildCredentialsFromCredentialsJson(
        appLookupParams,
        IosDistributionType.AppStore,
        targetCredentials
@@ -82,7 +82,7 @@ describe('SetupTargetBuildCredentialsFromCredentialsJson', () => {
    });
    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
    const setupBuildCredentialsFromCredentialsJsonAction =
-      new SetupTargetBuildCredentialsFromCredentialsJson(
+      new SetUpTargetBuildCredentialsFromCredentialsJson(
        appLookupParams,
        IosDistributionType.AppStore,
        targetCredentials
@@ -115,7 +115,7 @@ describe('SetupTargetBuildCredentialsFromCredentialsJson', () => {
    });
    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
    const setupBuildCredentialsFromCredentialsJsonAction =
-      new SetupTargetBuildCredentialsFromCredentialsJson(
+      new SetUpTargetBuildCredentialsFromCredentialsJson(
        appLookupParams,
        IosDistributionType.AppStore,
        targetCredentials
@@ -149,7 +149,7 @@ describe('SetupTargetBuildCredentialsFromCredentialsJson', () => {
    });
    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
    const setupBuildCredentialsFromCredentialsJsonAction =
-      new SetupTargetBuildCredentialsFromCredentialsJson(
+      new SetUpTargetBuildCredentialsFromCredentialsJson(
        appLookupParams,
        IosDistributionType.AppStore,
        targetCredentials
@@ -25,9 +25,9 @@ export enum AndroidActionType {
  CreateGsaKey,
  UseExistingGsaKey,
  RemoveGsaKey,
-  SetupGsaKey,
+  SetUpGsaKey,
  UpdateCredentialsJson,
-  SetupBuildCredentialsFromCredentialsJson,
+  SetUpBuildCredentialsFromCredentialsJson,
 }

 export enum IosActionType {
@@ -37,14 +37,14 @@ export enum IosActionType {
  ManageAscApiKey,
  GoBackToCaller,
  GoBackToHighLevelActions,
-  SetupBuildCredentials,
-  SetupBuildCredentialsFromCredentialsJson,
+  SetUpBuildCredentials,
+  SetUpBuildCredentialsFromCredentialsJson,
  UpdateCredentialsJson,
  UseExistingDistributionCertificate,
  RemoveProvisioningProfile,
  CreateDistributionCertificate,
  RemoveDistributionCertificate,
-  SetupPushKey,
+  SetUpPushKey,
  CreatePushKey,
  UseExistingPushKey,
  RemovePushKey,
@@ -35,7 +35,7 @@ export const credentialsJsonActions: ActionInfo[] = [
    scope: Scope.Project,
  },
  {
-    value: AndroidActionType.SetupBuildCredentialsFromCredentialsJson,
+    value: AndroidActionType.SetUpBuildCredentialsFromCredentialsJson,
    title: 'Upload credentials from credentials.json to EAS',
    scope: Scope.Project,
  },
@@ -89,8 +89,8 @@ export const fcmActions: ActionInfo[] = [

 export const gsaKeyActions: ActionInfo[] = [
  {
-    value: AndroidActionType.SetupGsaKey,
-    title: 'Setup a Google Service Account Key',
+    value: AndroidActionType.SetUpGsaKey,
+    title: 'Set up a Google Service Account Key',
    scope: Scope.Project,
  },
  {
@@ -36,7 +36,7 @@ export const credentialsJsonActions: ActionInfo[] = [
    scope: Scope.Project,
  },
  {
-    value: IosActionType.SetupBuildCredentialsFromCredentialsJson,
+    value: IosActionType.SetUpBuildCredentialsFromCredentialsJson,
    title: 'Upload credentials from credentials.json to EAS',
    scope: Scope.Project,
  },
@@ -50,8 +50,8 @@ export const credentialsJsonActions: ActionInfo[] = [
 export function getPushKeyActions(ctx: CredentialsContext): ActionInfo[] {
  return [
    {
-      value: IosActionType.SetupPushKey,
-      title: 'Setup your project to use Push Notifications',
+      value: IosActionType.SetUpPushKey,
+      title: 'Set up your project to use Push Notifications',
      scope: Scope.Project,
    },
    {
@@ -112,7 +112,7 @@ export function getBuildCredentialsActions(ctx: CredentialsContext): ActionInfo[
    {
      // This command will be triggered during build to ensure all credentials are ready
      // I'm leaving it here for now to simplify testing
-      value: IosActionType.SetupBuildCredentials,
+      value: IosActionType.SetUpBuildCredentials,
      title: 'All: Set up all the required credentials to build your project',
      scope: Scope.Project,
    },
@@ -25,8 +25,8 @@ import { DownloadKeystore } from '../android/actions/DownloadKeystore';
 import { RemoveFcm } from '../android/actions/RemoveFcm';
 import { SelectAndRemoveGoogleServiceAccountKey } from '../android/actions/RemoveGoogleServiceAccountKey';
 import { RemoveKeystore } from '../android/actions/RemoveKeystore';
-import { SetupBuildCredentialsFromCredentialsJson } from '../android/actions/SetupBuildCredentialsFromCredentialsJson';
-import { SetupGoogleServiceAccountKey } from '../android/actions/SetupGoogleServiceAccountKey';
+import { SetUpBuildCredentialsFromCredentialsJson } from '../android/actions/SetUpBuildCredentialsFromCredentialsJson';
+import { SetUpGoogleServiceAccountKey } from '../android/actions/SetUpGoogleServiceAccountKey';
 import { UpdateCredentialsJson } from '../android/actions/UpdateCredentialsJson';
 import { UseExistingGoogleServiceAccountKey } from '../android/actions/UseExistingGoogleServiceAccountKey';
 import {
@@ -228,8 +228,8 @@ export class ManageAndroid {
      }
    } else if (action === AndroidActionType.RemoveGsaKey) {
      await new SelectAndRemoveGoogleServiceAccountKey(appLookupParams.account).runAsync(ctx);
-    } else if (action === AndroidActionType.SetupGsaKey) {
-      await new SetupGoogleServiceAccountKey(appLookupParams).runAsync(ctx);
+    } else if (action === AndroidActionType.SetUpGsaKey) {
+      await new SetUpGoogleServiceAccountKey(appLookupParams).runAsync(ctx);
    } else if (action === AndroidActionType.UpdateCredentialsJson) {
      const buildCredentials = await new SelectExistingAndroidBuildCredentials(
        appLookupParams
@@ -237,8 +237,8 @@ export class ManageAndroid {
      if (buildCredentials) {
        await new UpdateCredentialsJson().runAsync(ctx, buildCredentials);
      }
-    } else if (action === AndroidActionType.SetupBuildCredentialsFromCredentialsJson) {
-      await new SetupBuildCredentialsFromCredentialsJson(appLookupParams).runAsync(ctx);
+    } else if (action === AndroidActionType.SetUpBuildCredentialsFromCredentialsJson) {
+      await new SetUpBuildCredentialsFromCredentialsJson(appLookupParams).runAsync(ctx);
    }
  }
 }
@@ -35,12 +35,12 @@ import { SelectAndRemoveAscApiKey } from '../ios/actions/RemoveAscApiKey';
 import { SelectAndRemoveDistributionCertificate } from '../ios/actions/RemoveDistributionCertificate';
 import { RemoveProvisioningProfiles } from '../ios/actions/RemoveProvisioningProfile';
 import { SelectAndRemovePushKey } from '../ios/actions/RemovePushKey';
+import { SetUpAdhocProvisioningProfile } from '../ios/actions/SetUpAdhocProvisioningProfile';
 import { SetUpAscApiKey } from '../ios/actions/SetUpAscApiKey';
-import { SetupAdhocProvisioningProfile } from '../ios/actions/SetupAdhocProvisioningProfile';
-import { SetupBuildCredentials } from '../ios/actions/SetupBuildCredentials';
-import { SetupBuildCredentialsFromCredentialsJson } from '../ios/actions/SetupBuildCredentialsFromCredentialsJson';
-import { SetupProvisioningProfile } from '../ios/actions/SetupProvisioningProfile';
-import { SetupPushKey } from '../ios/actions/SetupPushKey';
+import { SetUpBuildCredentials } from '../ios/actions/SetUpBuildCredentials';
+import { SetUpBuildCredentialsFromCredentialsJson } from '../ios/actions/SetUpBuildCredentialsFromCredentialsJson';
+import { SetUpProvisioningProfile } from '../ios/actions/SetUpProvisioningProfile';
+import { SetUpPushKey } from '../ios/actions/SetUpPushKey';
 import { UpdateCredentialsJson } from '../ios/actions/UpdateCredentialsJson';
 import { AppLookupParams } from '../ios/api/GraphqlClient';
 import { getManagedEntitlementsJsonAsync } from '../ios/appstore/entitlements';
@@ -222,8 +222,8 @@ export class ManageIos {
    buildProfile: IosBuildProfile,
    action: IosActionType
  ): Promise<void> {
-    if (action === IosActionType.SetupBuildCredentials) {
-      await new SetupBuildCredentials({
+    if (action === IosActionType.SetUpBuildCredentials) {
+      await new SetUpBuildCredentials({
        app,
        targets,
        distribution: buildProfile.distribution,
@@ -239,8 +239,8 @@ export class ManageIos {
      buildProfile
    ).runAsync(ctx);

-    if (action === IosActionType.SetupBuildCredentialsFromCredentialsJson) {
-      await new SetupBuildCredentialsFromCredentialsJson(app, targets, distributionType).runAsync(
+    if (action === IosActionType.SetUpBuildCredentialsFromCredentialsJson) {
+      await new SetUpBuildCredentialsFromCredentialsJson(app, targets, distributionType).runAsync(
        ctx
      );
      return;
@@ -305,15 +305,15 @@ export class ManageIos {
        }
        return;
      }
-      case IosActionType.SetupPushKey: {
-        const setupPushKeyAction = await new SetupPushKey(appLookupParams);
+      case IosActionType.SetUpPushKey: {
+        const setupPushKeyAction = await new SetUpPushKey(appLookupParams);
        const isPushKeySetup = await setupPushKeyAction.isPushKeySetupAsync(ctx);
        if (isPushKeySetup) {
          Log.log(
            `Push Key is already set up for ${appLookupParams.projectName} ${appLookupParams.bundleIdentifier}`
          );
        } else {
-          await new SetupPushKey(appLookupParams).runAsync(ctx);
+          await new SetUpPushKey(appLookupParams).runAsync(ctx);
        }
        return;
      }
@@ -385,11 +385,11 @@ export class ManageIos {
    Log.log(`Setting up ${appLookupParams.projectName} to use Distribution Certificate`);
    Log.log(`Creating provisioning profile...`);
    if (distributionType === IosDistributionTypeGraphql.AdHoc) {
-      return await new SetupAdhocProvisioningProfile(
+      return await new SetUpAdhocProvisioningProfile(
        appLookupParams
      ).runWithDistributionCertificateAsync(ctx, distCert);
    } else {
-      return await new SetupProvisioningProfile(
+      return await new SetUpProvisioningProfile(
        appLookupParams,
        distributionType
      ).createAndAssignProfileAsync(ctx, distCert);
@@ -30,7 +30,7 @@ type SessionHeaders = {
 };

 export const graphqlClient = createUrqlClient({
-  url: getExpoApiBaseUrl() + '/--/graphql',
+  url: getExpoApiBaseUrl() + '/graphql',
  exchanges: [
    dedupExchange,
    cacheExchange,
@@ -3,7 +3,7 @@ import chalk from 'chalk';
 import fs from 'fs-extra';
 import nullthrows from 'nullthrows';

-import { SetupGoogleServiceAccountKey } from '../../credentials/android/actions/SetupGoogleServiceAccountKey';
+import { SetUpGoogleServiceAccountKey } from '../../credentials/android/actions/SetUpGoogleServiceAccountKey';
 import { readAndValidateServiceAccountKey } from '../../credentials/android/utils/googleServiceAccountKey';
 import Log, { learnMore } from '../../log';
 import { promptAsync } from '../../prompts';
@@ -109,7 +109,7 @@ export async function getServiceAccountFromCredentialsServiceAsync(
    projectName: ctx.projectName,
    androidApplicationIdentifier,
  };
-  const setupGoogleServiceAccountKeyAction = new SetupGoogleServiceAccountKey(appLookupParams);
+  const setupGoogleServiceAccountKeyAction = new SetUpGoogleServiceAccountKey(appLookupParams);
  const androidAppCredentials = await setupGoogleServiceAccountKeyAction.runAsync(
    ctx.credentialsCtx
  );
@@ -6,7 +6,7 @@ import { v4 as uuidv4 } from 'uuid';
 import { asMock } from '../../../__tests__/utils';
 import { testAndroidAppCredentialsFragment } from '../../../credentials/__tests__/fixtures-android';
 import { jester as mockJester } from '../../../credentials/__tests__/fixtures-constants';
-import { SetupGoogleServiceAccountKey } from '../../../credentials/android/actions/SetupGoogleServiceAccountKey';
+import { SetUpGoogleServiceAccountKey } from '../../../credentials/android/actions/SetUpGoogleServiceAccountKey';
 import { createTestProject } from '../../../project/__tests__/project-utils';
 import { promptAsync } from '../../../prompts';
 import { createSubmissionContextAsync } from '../../context';
@@ -20,7 +20,7 @@ import {
 jest.mock('fs');
 jest.mock('../../../prompts');
 jest.mock('../../../project/projectUtils');
-jest.mock('../../../credentials/android/actions/SetupGoogleServiceAccountKey');
+jest.mock('../../../credentials/android/actions/SetUpGoogleServiceAccountKey');
 jest.mock('../../../user/User', () => ({
  getUserAsync: jest.fn(() => mockJester),
 }));
@@ -52,7 +52,7 @@ beforeAll(() => {
    '/other_dir/invalid_file.txt': 'this is not even a JSON',
  });
  jest
-    .spyOn(SetupGoogleServiceAccountKey.prototype, 'runAsync')
+    .spyOn(SetUpGoogleServiceAccountKey.prototype, 'runAsync')
    .mockImplementation(async () => testAndroidAppCredentialsFragment);
 });
 afterAll(() => {
@@ -1,12 +1,5 @@
-import chalk from 'chalk';
-import wrapAnsi from 'wrap-ansi';
-
-import Log, { learnMore } from '../../log';
-import { promptAsync } from '../../prompts';
-
 export enum AppSpecificPasswordSourceType {
  userDefined,
-  prompt,
 }

 interface AppSpecificPasswordSourceBase {
@@ -18,38 +11,13 @@ interface AppSpecificPasswordUserDefinedSource extends AppSpecificPasswordSource
  appSpecificPassword: string;
 }

-interface AppSpecificPasswordPromptSource extends AppSpecificPasswordSourceBase {
-  sourceType: AppSpecificPasswordSourceType.prompt;
-}
-
-export type AppSpecificPasswordSource =
-  | AppSpecificPasswordUserDefinedSource
-  | AppSpecificPasswordPromptSource;
+export type AppSpecificPasswordSource = AppSpecificPasswordUserDefinedSource;

 export async function getAppSpecificPasswordAsync(
  source: AppSpecificPasswordSource
 ): Promise<string> {
  if (source.sourceType === AppSpecificPasswordSourceType.userDefined) {
    return source.appSpecificPassword;
-  } else if (source.sourceType === AppSpecificPasswordSourceType.prompt) {
-    Log.addNewLineIfNone();
-    Log.log(
-      wrapAnsi(
-        `Please enter your Apple app-specific password. You can also provide it by using the ${chalk.bold(
-          'EXPO_APPLE_APP_SPECIFIC_PASSWORD'
-        )} environment variable.`,
-        process.stdout.columns || 80
-      )
-    );
-    Log.log(learnMore('https://expo.fyi/apple-app-specific-password'));
-
-    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;
  } else {
    // exhaustive -- should never happen
    throw new Error(`Unknown app specific password source type "${(source as any)?.sourceType}"`);
@@ -31,10 +31,15 @@ type AscApiKeySummary = {
  source: 'local' | 'EAS servers';
  path?: string;
  keyId: string;
+  name?: string;
+};
+
+export type AscApiKeyFromExpoServers = {
+  ascApiKeyId: string;
 };

 export type AscApiKeyResult = {
-  result: MinimalAscApiKey;
+  result: MinimalAscApiKey | AscApiKeyFromExpoServers;
  summary: AscApiKeySummary;
 };

@@ -0,0 +1,56 @@
+import { Platform } from '@expo/eas-build-job';
+import nullthrows from 'nullthrows';
+
+import { SetUpSubmissionCredentials } from '../../credentials/ios/actions/SetUpSubmissionCredentials';
+import Log from '../../log';
+import { getBundleIdentifierAsync } from '../../project/ios/bundleIdentifier';
+import { findAccountByName } from '../../user/Account';
+import { SubmissionContext } from '../context';
+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';
+export type CredentialsServiceSource = typeof CREDENTIALS_SERVICE_SOURCE;
+
+export async function getFromCredentialsServiceAsync(
+  ctx: SubmissionContext<Platform.IOS>
+): Promise<{ appSpecificPassword: string } | { ascApiKeyResult: AscApiKeyResult }> {
+  const bundleIdentifier = await getBundleIdentifierAsync(ctx.projectDir, ctx.exp);
+  Log.log(`Looking up credentials configuration for ${bundleIdentifier}...`);
+
+  const appLookupParams = {
+    account: nullthrows(
+      findAccountByName(ctx.user.accounts, 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: ascOrAsp };
+  } 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,
+        },
+      },
+    };
+  }
+}
@@ -18,6 +18,7 @@ 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 {
@@ -33,16 +34,26 @@ export default class IosSubmitCommand {
  private async resolveCredentialSubmissionOptionsAsync(): Promise<
    | { appSpecificPasswordSource: Result<AppSpecificPasswordSource> }
    | { ascApiKeySource: Result<AscApiKeySource> }
+    | { credentialsServiceSource: Result<CredentialsServiceSource> }
  > {
-    // Fall back to app specific password if no ascApiKey defined
    const ascApiKeySource = this.resolveAscApiKeySource();
-    const shouldUseAppSpecificPassword =
+    const shouldSkipAscApiKeySource =
      !ascApiKeySource.ok && ascApiKeySource.enforceError() instanceof MissingCredentialsError;
-    if (shouldUseAppSpecificPassword) {
-      return { appSpecificPasswordSource: this.resolveAppSpecificPasswordSource() };
-    } else {
+    if (!shouldSkipAscApiKeySource) {
      return { ascApiKeySource };
    }
+
+    const appSpecificPasswordSource = this.resolveAppSpecificPasswordSource();
+    const shouldSkipAppSpecificPasswordSource =
+      !appSpecificPasswordSource.ok &&
+      appSpecificPasswordSource.enforceError() instanceof MissingCredentialsError;
+    if (!shouldSkipAppSpecificPasswordSource) {
+      return { appSpecificPasswordSource: this.resolveAppSpecificPasswordSource() };
+    }
+
+    return {
+      credentialsServiceSource: result(CREDENTIALS_SERVICE_SOURCE),
+    };
  }

  private async resolveSubmissionOptionsAsync(): Promise<IosSubmissionOptions> {
@@ -54,7 +65,10 @@ export default class IosSubmitCommand {
        : null;
    const maybeAscApiKeySource =
      'ascApiKeySource' in credentialsSource ? credentialsSource.ascApiKeySource : null;
-    const maybeCredentialsSource = null; // todo
+    const maybeCredentialsServiceSource =
+      'credentialsServiceSource' in credentialsSource
+        ? credentialsSource.credentialsServiceSource
+        : null;
    const ascAppIdentifier = await this.resolveAscAppIdentifierAsync();
    const appleIdUsername = await this.resolveAppleIdUsernameAsync();

@@ -62,6 +76,7 @@ export default class IosSubmitCommand {
      archiveSource,
      ...(maybeAppSpecificPasswordSource ? [maybeAppSpecificPasswordSource] : []),
      ...(maybeAscApiKeySource ? [maybeAscApiKeySource] : []),
+      ...(maybeCredentialsServiceSource ? [maybeCredentialsServiceSource] : []),
      ascAppIdentifier,
      appleIdUsername,
    ].filter(r => !r.ok);
@@ -86,6 +101,11 @@ export default class IosSubmitCommand {
            ascApiKeySource: maybeAscApiKeySource.enforceValue(),
          }
        : null),
+      ...(maybeCredentialsServiceSource
+        ? {
+            credentialsServiceSource: maybeCredentialsServiceSource.enforceValue(),
+          }
+        : null),
    };
  }

@@ -97,13 +117,13 @@ export default class IosSubmitCommand {
        sourceType: AppSpecificPasswordSourceType.userDefined,
        appSpecificPassword: envAppSpecificPassword,
      });
-    } else if (this.ctx.nonInteractive) {
-      return result(new Error('Set the EXPO_APPLE_APP_SPECIFIC_PASSWORD environment variable.'));
-    } else {
-      return result({
-        sourceType: AppSpecificPasswordSourceType.prompt,
-      });
    }
+
+    return result(
+      new MissingCredentialsError(
+        'The EXPO_APPLE_APP_SPECIFIC_PASSWORD environment variable must be set.'
+      )
+    );
  }

  private resolveAscApiKeySource(): Result<AscApiKeySource> {
@@ -1,6 +1,7 @@
 import { Platform } from '@expo/eas-build-job';
 import chalk from 'chalk';

+import { MinimalAscApiKey } from '../../credentials/ios/credentials';
 import { IosSubmissionConfigInput, SubmissionFragment } from '../../graphql/generated';
 import { SubmissionMutation } from '../../graphql/mutations/SubmissionMutation';
 import formatFields from '../../utils/formatFields';
@@ -15,7 +16,16 @@ import {
  AppSpecificPasswordSource,
  getAppSpecificPasswordAsync,
 } from './AppSpecificPasswordSource';
-import { AscApiKeyResult, AscApiKeySource, getAscApiKeyLocallyAsync } from './AscApiKeySource';
+import {
+  AscApiKeyFromExpoServers,
+  AscApiKeyResult,
+  AscApiKeySource,
+  getAscApiKeyLocallyAsync,
+} from './AscApiKeySource';
+import {
+  CredentialsServiceSource,
+  getFromCredentialsServiceAsync,
+} from './CredentialsServiceSource';

 export interface IosSubmissionOptions
  extends Pick<IosSubmissionConfigInput, 'appleIdUsername' | 'ascAppIdentifier'> {
@@ -23,6 +33,7 @@ export interface IosSubmissionOptions
  archiveSource: ArchiveSource;
  appSpecificPasswordSource?: AppSpecificPasswordSource;
  ascApiKeySource?: AscApiKeySource;
+  credentialsServiceSource?: CredentialsServiceSource;
 }

 interface ResolvedSourceOptions {
@@ -71,10 +82,14 @@ export default class IosSubmitter extends BaseSubmitter<Platform.IOS, IosSubmiss
    const maybeAppStoreConnectApiKey = this.options.ascApiKeySource
      ? await getAscApiKeyLocallyAsync(this.ctx, this.options.ascApiKeySource)
      : null;
+    const maybeAscOrAspFromCredentialsService = this.options.credentialsServiceSource
+      ? await getFromCredentialsServiceAsync(this.ctx)
+      : null;
    return {
      archive,
      ...(maybeAppSpecificPassword ? { appSpecificPassword: maybeAppSpecificPassword } : null),
      ...(maybeAppStoreConnectApiKey ? { ascApiKeyResult: maybeAppStoreConnectApiKey } : null),
+      ...(maybeAscOrAspFromCredentialsService ? maybeAscOrAspFromCredentialsService : null),
    };
  }

@@ -88,18 +103,24 @@ export default class IosSubmitter extends BaseSubmitter<Platform.IOS, IosSubmiss
      appleIdUsername,
      archiveUrl: archive.url,
      appleAppSpecificPassword: appSpecificPassword,
-      ...(ascApiKeyResult?.result
-        ? {
-            ascApiKey: {
-              keyP8: ascApiKeyResult?.result.keyP8,
-              keyIdentifier: ascApiKeyResult?.result.keyId,
-              issuerIdentifier: ascApiKeyResult?.result.issuerId,
-            },
-          }
-        : null),
+      ...(ascApiKeyResult?.result ? this.formatAscApiKeyResult(ascApiKeyResult.result) : null),
    };
  }

+  private formatAscApiKeyResult(
+    result: MinimalAscApiKey | AscApiKeyFromExpoServers
+  ): Pick<IosSubmissionConfigInput, 'ascApiKey'> | Pick<IosSubmissionConfigInput, 'ascApiKeyId'> {
+    return 'ascApiKeyId' in result
+      ? { ascApiKeyId: result.ascApiKeyId }
+      : {
+          ascApiKey: {
+            keyP8: result.keyP8,
+            keyIdentifier: result.keyId,
+            issuerIdentifier: result.issuerId,
+          },
+        };
+  }
+
  private prepareSummaryData(
    options: IosSubmissionOptions,
    { archive, ascApiKeyResult }: ResolvedSourceOptions
@@ -111,9 +132,7 @@ export default class IosSubmitter extends BaseSubmitter<Platform.IOS, IosSubmiss
      ascAppIdentifier,
      appleIdUsername: appleIdUsername ?? undefined,
      projectId,
-      ...(ascApiKeyResult
-        ? { formattedAscApiKey: formatServiceAccountSummary(ascApiKeyResult) }
-        : null),
+      ...(ascApiKeyResult ? { formattedAscApiKey: formatAscApiKeySummary(ascApiKeyResult) } : null),
      ...formatArchiveSourceSummary(archive),
    };
  }
@@ -136,10 +155,18 @@ const SummaryHumanReadableKeys: Record<keyof SummaryData, string> = {
  formattedAscApiKey: 'App Store Connect Api Key',
 };

-function formatServiceAccountSummary({ summary }: AscApiKeyResult): string {
-  const { source, path, keyId } = summary;
+function formatAscApiKeySummary({ summary }: AscApiKeyResult): string {
+  const { source, path, keyId, name } = summary;

  const fields = [
+    {
+      label: 'Key Name',
+      value: name,
+    },
+    {
+      label: 'Key ID',
+      value: keyId,
+    },
    {
      label: 'Key Source',
      value: source,
@@ -148,10 +175,6 @@ function formatServiceAccountSummary({ summary }: AscApiKeyResult): string {
      label: 'Key Path',
      value: path,
    },
-    {
-      label: 'Key ID',
-      value: keyId,
-    },
  ];

  const filteredFields = fields.filter(({ value }) => value !== undefined && value !== null) as {
@@ -0,0 +1,96 @@
+import { Platform } from '@expo/eas-build-job';
+import { v4 as uuidv4 } from 'uuid';
+
+import { asMock } from '../../../__tests__/utils';
+import { jester as mockJester } from '../../../credentials/__tests__/fixtures-constants';
+import { testCommonIosAppCredentialsFragment } from '../../../credentials/__tests__/fixtures-ios';
+import { SetUpSubmissionCredentials } from '../../../credentials/ios/actions/SetUpSubmissionCredentials';
+import { createTestProject } from '../../../project/__tests__/project-utils';
+import { getBundleIdentifierAsync } from '../../../project/ios/bundleIdentifier';
+import { createSubmissionContextAsync } from '../../context';
+import { getFromCredentialsServiceAsync } from '../CredentialsServiceSource';
+
+jest.mock('fs');
+jest.mock('../../../prompts');
+jest.mock('../../../credentials/utils/promptForCredentials');
+jest.mock('../../../user/User', () => ({
+  getUserAsync: jest.fn(() => mockJester),
+}));
+jest.mock('../../../user/Account', () => ({
+  findAccountByName: jest.fn(() => mockJester.accounts[0]),
+}));
+jest.mock('../../../project/ios/bundleIdentifier');
+
+const testProject = createTestProject(mockJester, {
+  android: {
+    package: 'com.expo.test.project',
+  },
+});
+const mockManifest = { exp: testProject.appJSON.expo };
+jest.mock('@expo/config', () => ({
+  getConfig: jest.fn(() => mockManifest),
+}));
+const projectId = uuidv4();
+
+beforeEach(() => {
+  jest.restoreAllMocks();
+});
+
+describe(getFromCredentialsServiceAsync, () => {
+  it('returns an App Specific Password from the credentialService source', async () => {
+    const ctx = await createSubmissionContextAsync({
+      platform: Platform.IOS,
+      projectDir: testProject.projectRoot,
+      projectId,
+      archiveFlags: {
+        url: 'http://expo.dev/fake.apk',
+      },
+      profile: {
+        language: 'en-US',
+      },
+      nonInteractive: true,
+    });
+    jest
+      .spyOn(SetUpSubmissionCredentials.prototype, 'runAsync')
+      .mockImplementation(async _ctx => 'super secret');
+    asMock(getBundleIdentifierAsync).mockImplementation(() => 'com.hello.world');
+
+    const result = await getFromCredentialsServiceAsync(ctx);
+    expect(result).toEqual({
+      appSpecificPassword: 'super secret',
+    });
+  });
+  it('returns an ASC Api Key from the credentialService source', async () => {
+    const ctx = await createSubmissionContextAsync({
+      platform: Platform.IOS,
+      projectDir: testProject.projectRoot,
+      projectId,
+      archiveFlags: {
+        url: 'http://expo.dev/fake.apk',
+      },
+      profile: {
+        language: 'en-US',
+      },
+      nonInteractive: true,
+    });
+    jest
+      .spyOn(SetUpSubmissionCredentials.prototype, 'runAsync')
+      .mockImplementation(async _ctx => testCommonIosAppCredentialsFragment);
+    asMock(getBundleIdentifierAsync).mockImplementation(() => 'com.hello.world');
+
+    const result = await getFromCredentialsServiceAsync(ctx);
+    expect(result).toEqual({
+      ascApiKeyResult: {
+        result: {
+          ascApiKeyId: testCommonIosAppCredentialsFragment.appStoreConnectApiKeyForSubmissions?.id,
+        },
+        summary: {
+          keyId:
+            testCommonIosAppCredentialsFragment.appStoreConnectApiKeyForSubmissions?.keyIdentifier,
+          name: testCommonIosAppCredentialsFragment.appStoreConnectApiKeyForSubmissions?.name,
+          source: 'EAS servers',
+        },
+      },
+    });
+  });
+});
@@ -16,6 +16,7 @@ enum SubmissionErrorCode {
  IOS_INVALID_SIGNATURE = 'SUBMISSION_SERVICE_IOS_INVALID_SIGNATURE',
  IOS_INCORRECT_CREDENTIALS = 'SUBMISSION_SERVICE_IOS_INVALID_CREDENTIALS',
  IOS_IPAD_INVALID_ORIENTATION = 'SUBMISSION_SERVICE_IOS_IPAD_INVALID_ORIENTATION',
+  IOS_APPLE_MAINTENANCE = 'SUBMISSION_SERVICE_IOS_APPLE_MAINTENANCE',
 }

 const SubmissionErrorMessages: Record<SubmissionErrorCode, string> = {
@@ -62,6 +63,8 @@ const SubmissionErrorMessages: Record<SubmissionErrorCode, string> = {
    "Your app doesn't support iPad multitasking and has to require full screen.\n" +
    "If you're submitting a managed Expo project, set the `expo.ios.requireFullScreen` to true in app.json and build the project again.\n" +
    `${learnMore('https://expo.fyi/ipad-requires-fullscreen')}`,
+  [SubmissionErrorCode.IOS_APPLE_MAINTENANCE]:
+    'It looks like Apple servers are undergoing an unscheduled maintenance. Please try again later.',
 };

 export function printSubmissionError(error: SubmissionError): boolean {
@@ -1,7 +1,7 @@
 {
  "name": "@expo/eas-json",
  "description": "A library for interacting with eas.json",
-  "version": "0.34.1",
+  "version": "0.35.0",
  "author": "Expo <[email protected]>",
  "bugs": "https://github.com/expo/eas-cli/issues",
  "dependencies": {
Author	SHA1	Message	Date
Dominik Sokal	d2f620dbc6	v0.35.0	2021-11-08 12:04:28 +01:00
Dominik Sokal	0aa556c29e	Update CHANGELOG.md	2021-11-08 12:03:35 +01:00
James Ide	10cf003758	[api] Change API domain for EAS CLI (#744 ) * [api] Change API domain for EAS CLI Why --- To match the API server domain the website uses, this commit switches the API domain for EAS CLI from exp.host to api.expo.dev. How --- URL paths for api.expo.dev are different than those for exp.host. * GraphQL: api.expo.dev/graphql * API v2: api.expo.dev/v2/... Updated the main functions that return the API server origin and the API v2 and GraphQL clients that create the URLs for each type of API. Test Plan --------- * Unit tests: `yarn test` * Log in and out: `yarn eas login`, `yarn eas logout` (tests API v2) * Project management: `yarn eas project:view` (tests GraphQL) -> confirm project gets created on expo.dev * update CHANGELOG.md	2021-11-08 10:45:21 +01:00
Quinlan Jung	0e6254453a	[eas-cli] integrate ascApiKey with submissions workflow (#737 ) * [eas-cli] integrate ascApiKey with submissions workflow * fix failing stuff * update CHANGELOG.md * barthap pr feedback * dominik pr feedback	2021-11-05 13:30:16 -07:00
Quinlan Jung	587a29892f	fix changelog	2021-11-05 13:28:03 -07:00
Quinlan Jung	db8245d954	[eas-cli] setup -> set up (#735 ) * [eas-cli] setup -> set up * fix stuff * update CHANGELOG.md * fix merge errors	2021-11-05 11:59:44 -07:00
Bartłomiej Klocek	0088306bca	[eas-cli] Handle Apple servers maintenance in `eas submit` (#738 ) * [eas-cli] Handle Apple servers maintenance in `eas submit` * update CHANGELOG.md	2021-11-05 11:08:30 +01:00
Wojciech KozyraandDominik Sokal	b6fc718713	[eas-cli] improve vcs migration experience (#732 ) * [eas-cli] improve vcs migration experience * update CHANGELOG.md * Update CHANGELOG.md Co-authored-by: Dominik Sokal <[email protected]> Co-authored-by: Dominik Sokal <[email protected]>	2021-11-05 10:40:00 +01:00