v0.35.0

* [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

CHANGELOG.md

@@ -15,13 +15,14 @@ This is the log of notable changes to EAS CLI and related packages.
 - 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))
 

lerna.json

@@ -1,5 +1,5 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "0.34.1"
+  "version": "0.35.0"
 }

packages/eas-cli/README.md

@@ -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 -->

packages/eas-cli/graphql-codegen.yml

@@ -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}'

packages/eas-cli/package.json

@@ -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",

packages/eas-cli/src/__tests__/api-test.ts

@@ -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 {

packages/eas-cli/src/api.ts

@@ -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`;
   }
 }
 

packages/eas-cli/src/build/utils/url.ts

@@ -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`;
   }

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

@@ -31,10 +31,10 @@ export enum SetupAscApiKeyChoice {
 export class SetUpAscApiKey {
   public choices: { title: string; value: string }[] = [
     {
-      title: '[Choose an existing 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,7 +123,7 @@ export class SetUpAscApiKey {
       const result = await promptAsync({
         type: 'select',
         name: 'choice',
-        message: 'Select the App Store Connect Api Key to use for your project:',
+        message: 'Select what to use for your project:',
         choices,
       });
       choice = result.choice;

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

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

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

@@ -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();
+    }
+  });
+});

packages/eas-cli/src/graphql/client.ts

@@ -30,7 +30,7 @@ type SessionHeaders = {
 };
 
 export const graphqlClient = createUrqlClient({
-  url: getExpoApiBaseUrl() + '/--/graphql',
+  url: getExpoApiBaseUrl() + '/graphql',
   exchanges: [
     dedupExchange,
     cacheExchange,

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

@@ -1,33 +1,21 @@
 import { Platform } from '@expo/eas-build-job';
 import fs from 'fs-extra';
-import nullthrows from 'nullthrows';
 
-import {
-  AppStoreApiKeyPurpose,
-  promptForAscApiKeyPathAsync,
-} from '../../credentials/ios/actions/AscApiKeyUtils';
-import { SetUpAscApiKey } from '../../credentials/ios/actions/SetUpAscApiKey';
+import { promptForAscApiKeyPathAsync } from '../../credentials/ios/actions/AscApiKeyUtils';
 import { AscApiKeyPath, MinimalAscApiKey } from '../../credentials/ios/credentials';
 import Log from '../../log';
-import { getBundleIdentifierAsync } from '../../project/ios/bundleIdentifier';
-import { findAccountByName } from '../../user/Account';
 import { SubmissionContext } from '../context';
 import { isExistingFileAsync } from '../utils/files';
 
 export enum AscApiKeySourceType {
   path,
   prompt,
-  credentialsService,
 }
 
 interface AscApiKeySourceBase {
   sourceType: AscApiKeySourceType;
 }
 
-interface AscApiKeyCredentialsServiceSource extends AscApiKeySourceBase {
-  sourceType: AscApiKeySourceType.credentialsService;
-}
-
 interface AscApiKeyPromptSource extends AscApiKeySourceBase {
   sourceType: AscApiKeySourceType.prompt;
 }
@@ -37,10 +25,7 @@ interface AscApiKeyEnvVarSource extends AscApiKeySourceBase {
   path: AscApiKeyPath;
 }
 
-export type AscApiKeySource =
-  | AscApiKeyEnvVarSource
-  | AscApiKeyPromptSource
-  | AscApiKeyCredentialsServiceSource;
+export type AscApiKeySource = AscApiKeyEnvVarSource | AscApiKeyPromptSource;
 
 type AscApiKeySummary = {
   source: 'local' | 'EAS servers';
@@ -58,55 +43,7 @@ export type AscApiKeyResult = {
   summary: AscApiKeySummary;
 };
 
-export async function getAscApiKeyResultAsync(
-  ctx: SubmissionContext<Platform.IOS>,
-  source: AscApiKeySource
-): Promise<AscApiKeyResult> {
-  if (source.sourceType === AscApiKeySourceType.credentialsService) {
-    return await getAscApiKeyFromCredentialsServiceAsync(ctx);
-  } else {
-    return await getAscApiKeyLocallyAsync(ctx, source);
-  }
-}
-
-async function getAscApiKeyFromCredentialsServiceAsync(
-  ctx: SubmissionContext<Platform.IOS>
-): Promise<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 setupAscApiKeyAction = new SetUpAscApiKey(
-    appLookupParams,
-    AppStoreApiKeyPurpose.SUBMISSION_SERVICE
-  );
-  const iosAppCredentials = await setupAscApiKeyAction.runAsync(ctx.credentialsCtx);
-  const ascKeyForSubmissions = nullthrows(
-    iosAppCredentials.appStoreConnectApiKeyForSubmissions,
-    `An EAS Submit ASC Api Key could not be found for ${iosAppCredentials.appleAppIdentifier.bundleIdentifier}`
-  );
-  const { id, keyIdentifier, name } = ascKeyForSubmissions;
-  Log.log(`Using Api Key ID: ${keyIdentifier}${name ? ` (${name})` : ''}`);
-  return {
-    result: {
-      ascApiKeyId: id,
-    },
-    summary: {
-      source: 'EAS servers',
-      keyId: keyIdentifier,
-      name: name ?? undefined,
-    },
-  };
-}
-
-async function getAscApiKeyLocallyAsync(
+export async function getAscApiKeyLocallyAsync(
   ctx: SubmissionContext<Platform.IOS>,
   source: AscApiKeySource
 ): Promise<AscApiKeyResult> {
@@ -133,8 +70,6 @@ export async function getAscApiKeyPathAsync(
       return await handlePathSourceAsync(ctx, source);
     case AscApiKeySourceType.prompt:
       return await handlePromptSourceAsync(ctx, source);
-    case AscApiKeySourceType.credentialsService:
-      throw new Error(`AscApiKeySourceType ${source} does not return a path.`);
   }
 }
 

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

@@ -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,
+        },
+      },
+    };
+  }
+}

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

@@ -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,8 +34,15 @@ export default class IosSubmitCommand {
   private async resolveCredentialSubmissionOptionsAsync(): Promise<
     | { appSpecificPasswordSource: Result<AppSpecificPasswordSource> }
     | { ascApiKeySource: Result<AscApiKeySource> }
+    | { credentialsServiceSource: Result<CredentialsServiceSource> }
   > {
-    // if an App Specific Password env var is not specified, use ASC Api Key
+    const ascApiKeySource = this.resolveAscApiKeySource();
+    const shouldSkipAscApiKeySource =
+      !ascApiKeySource.ok && ascApiKeySource.enforceError() instanceof MissingCredentialsError;
+    if (!shouldSkipAscApiKeySource) {
+      return { ascApiKeySource };
+    }
+
     const appSpecificPasswordSource = this.resolveAppSpecificPasswordSource();
     const shouldSkipAppSpecificPasswordSource =
       !appSpecificPasswordSource.ok &&
@@ -43,8 +51,9 @@ export default class IosSubmitCommand {
       return { appSpecificPasswordSource: this.resolveAppSpecificPasswordSource() };
     }
 
-    const ascApiKeySource = this.resolveAscApiKeySource();
-    return { ascApiKeySource };
+    return {
+      credentialsServiceSource: result(CREDENTIALS_SERVICE_SOURCE),
+    };
   }
 
   private async resolveSubmissionOptionsAsync(): Promise<IosSubmissionOptions> {
@@ -56,6 +65,10 @@ export default class IosSubmitCommand {
         : null;
     const maybeAscApiKeySource =
       'ascApiKeySource' in credentialsSource ? credentialsSource.ascApiKeySource : null;
+    const maybeCredentialsServiceSource =
+      'credentialsServiceSource' in credentialsSource
+        ? credentialsSource.credentialsServiceSource
+        : null;
     const ascAppIdentifier = await this.resolveAscAppIdentifierAsync();
     const appleIdUsername = await this.resolveAppleIdUsernameAsync();
 
@@ -63,6 +76,7 @@ export default class IosSubmitCommand {
       archiveSource,
       ...(maybeAppSpecificPasswordSource ? [maybeAppSpecificPasswordSource] : []),
       ...(maybeAscApiKeySource ? [maybeAscApiKeySource] : []),
+      ...(maybeCredentialsServiceSource ? [maybeCredentialsServiceSource] : []),
       ascAppIdentifier,
       appleIdUsername,
     ].filter(r => !r.ok);
@@ -87,6 +101,11 @@ export default class IosSubmitCommand {
             ascApiKeySource: maybeAscApiKeySource.enforceValue(),
           }
         : null),
+      ...(maybeCredentialsServiceSource
+        ? {
+            credentialsServiceSource: maybeCredentialsServiceSource.enforceValue(),
+          }
+        : null),
     };
   }
 
@@ -129,7 +148,11 @@ export default class IosSubmitCommand {
       });
     }
 
-    return result({ sourceType: AscApiKeySourceType.credentialsService });
+    return result(
+      new MissingCredentialsError(
+        'Set the ascApiKeyPath, ascApiKeyIssuerId and ascApiKeyId fields in eas.json.'
+      )
+    );
   }
 
   private resolveArchiveSource(): Result<ArchiveSource> {

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

@@ -20,8 +20,12 @@ import {
   AscApiKeyFromExpoServers,
   AscApiKeyResult,
   AscApiKeySource,
-  getAscApiKeyResultAsync,
+  getAscApiKeyLocallyAsync,
 } from './AscApiKeySource';
+import {
+  CredentialsServiceSource,
+  getFromCredentialsServiceAsync,
+} from './CredentialsServiceSource';
 
 export interface IosSubmissionOptions
   extends Pick<IosSubmissionConfigInput, 'appleIdUsername' | 'ascAppIdentifier'> {
@@ -29,6 +33,7 @@ export interface IosSubmissionOptions
   archiveSource: ArchiveSource;
   appSpecificPasswordSource?: AppSpecificPasswordSource;
   ascApiKeySource?: AscApiKeySource;
+  credentialsServiceSource?: CredentialsServiceSource;
 }
 
 interface ResolvedSourceOptions {
@@ -75,12 +80,16 @@ export default class IosSubmitter extends BaseSubmitter<Platform.IOS, IosSubmiss
       ? await getAppSpecificPasswordAsync(this.options.appSpecificPasswordSource)
       : null;
     const maybeAppStoreConnectApiKey = this.options.ascApiKeySource
-      ? await getAscApiKeyResultAsync(this.ctx, 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),
     };
   }
 

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

@@ -4,18 +4,15 @@ 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 { SetUpAscApiKey } from '../../../credentials/ios/actions/SetUpAscApiKey';
 import { getCredentialsFromUserAsync } from '../../../credentials/utils/promptForCredentials';
 import { createTestProject } from '../../../project/__tests__/project-utils';
-import { getBundleIdentifierAsync } from '../../../project/ios/bundleIdentifier';
 import { promptAsync } from '../../../prompts';
 import { SubmissionContext, createSubmissionContextAsync } from '../../context';
 import {
   AscApiKeySource,
   AscApiKeySourceType,
+  getAscApiKeyLocallyAsync,
   getAscApiKeyPathAsync,
-  getAscApiKeyResultAsync,
 } from '../AscApiKeySource';
 
 jest.mock('fs');
@@ -27,7 +24,6 @@ jest.mock('../../../user/User', () => ({
 jest.mock('../../../user/Account', () => ({
   findAccountByName: jest.fn(() => mockJester.accounts[0]),
 }));
-jest.mock('../../../project/ios/bundleIdentifier');
 
 const testProject = createTestProject(mockJester, {
   android: {
@@ -171,14 +167,14 @@ describe(getAscApiKeyPathAsync, () => {
   });
 });
 
-describe(getAscApiKeyResultAsync, () => {
+describe(getAscApiKeyLocallyAsync, () => {
   it('returns a local Asc Api Key file with a AscApiKeySourceType.path source', async () => {
     const ctx = await getIosSubmissionContextAsync();
     const source: AscApiKeySource = {
       sourceType: AscApiKeySourceType.path,
       path: { keyP8Path: '/asc-api-key.p8', keyId: 'test-key-id', issuerId: 'test-issuer-id' },
     };
-    const ascApiKeyResult = await getAscApiKeyResultAsync(ctx, source);
+    const ascApiKeyResult = await getAscApiKeyLocallyAsync(ctx, source);
     expect(ascApiKeyResult).toMatchObject({
       result: {
         keyP8: 'super secret',
@@ -205,7 +201,7 @@ describe(getAscApiKeyResultAsync, () => {
     const source: AscApiKeySource = {
       sourceType: AscApiKeySourceType.prompt,
     };
-    const serviceAccountResult = await getAscApiKeyResultAsync(ctx, source);
+    const serviceAccountResult = await getAscApiKeyLocallyAsync(ctx, source);
     expect(serviceAccountResult).toMatchObject({
       result: {
         keyP8: 'super secret',
@@ -219,39 +215,4 @@ describe(getAscApiKeyResultAsync, () => {
       },
     });
   });
-
-  it('returns an Asc Api Key from server with a AscApiKeySourceType.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,
-    });
-    const source: AscApiKeySource = {
-      sourceType: AscApiKeySourceType.credentialsService,
-    };
-    jest
-      .spyOn(SetUpAscApiKey.prototype, 'runAsync')
-      .mockImplementation(async _ctx => testCommonIosAppCredentialsFragment);
-    asMock(getBundleIdentifierAsync).mockImplementation(() => 'com.hello.world');
-
-    const result = await getAscApiKeyResultAsync(ctx, source);
-    expect(result).toEqual({
-      result: {
-        ascApiKeyId: testCommonIosAppCredentialsFragment.appStoreConnectApiKeyForSubmissions?.id,
-      },
-      summary: {
-        keyId:
-          testCommonIosAppCredentialsFragment.appStoreConnectApiKeyForSubmissions?.keyIdentifier,
-        name: testCommonIosAppCredentialsFragment.appStoreConnectApiKeyForSubmissions?.name,
-        source: 'EAS servers',
-      },
-    });
-  });
 });

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

@@ -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',
+        },
+      },
+    });
+  });
+});

packages/eas-json/package.json

@@ -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": {