eas-cli 0.31.1 → 0.32.0

package/build/credentials/ios/credentials.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.provisioningProfileSchema = exports.pushKeySchema = exports.distributionCertificateSchema = exports.getAppLookupParams = void 0;
+exports.provisioningProfileSchema = exports.pushKeySchema = exports.ascApiKeyMetadataSchema = exports.distributionCertificateSchema = exports.getAppLookupParams = void 0;
 const tslib_1 = require("tslib");
 const log_1 = (0, tslib_1.__importDefault)(require("../../log"));
 const p12Certificate_1 = require("./utils/p12Certificate");
@@ -50,6 +50,21 @@ exports.distributionCertificateSchema = {
         return answers;
     },
 };
+exports.ascApiKeyMetadataSchema = {
+    name: 'App Store Connect API Key',
+    questions: [
+        {
+            field: 'keyId',
+            type: 'string',
+            question: 'Key ID:',
+        },
+        {
+            field: 'issuerId',
+            type: 'string',
+            question: 'Issuer ID:',
+        },
+    ],
+};
 exports.pushKeySchema = {
     name: 'Apple Push Notifications service key',
     questions: [

package/build/graphql/generated.d.ts

@@ -312,12 +312,15 @@ export declare type Offer = {
     trialLength?: Maybe<Scalars['Int']>;
     type: OfferType;
     features?: Maybe<Array<Maybe<Feature>>>;
+    prerequisite?: Maybe<OfferPrerequisite>;
 };
 export declare enum OfferType {
     /** Term subscription */
     Subscription = "SUBSCRIPTION",
     /** Advanced Purchase of Paid Resource */
-    Prepaid = "PREPAID"
+    Prepaid = "PREPAID",
+    /** Addon, or supplementary subscription */
+    Addon = "ADDON"
 }
 export declare enum Feature {
     /** Top Tier Support */
@@ -329,6 +332,11 @@ export declare enum Feature {
     /** Funds support for open source development */
     OpenSource = "OPEN_SOURCE"
 }
+export declare type OfferPrerequisite = {
+    __typename?: 'OfferPrerequisite';
+    type: Scalars['String'];
+    stripeIds: Array<Scalars['String']>;
+};
 export declare type Snack = Project & {
     __typename?: 'Snack';
     id: Scalars['ID'];
@@ -1206,6 +1214,7 @@ export declare type UserPermission = {
 };
 export declare type Billing = {
     __typename?: 'Billing';
+    id: Scalars['ID'];
     payment?: Maybe<PaymentDetails>;
     subscription?: Maybe<SubscriptionDetails>;
     /** History of invoices */
@@ -1236,6 +1245,8 @@ export declare type Address = {
 export declare type SubscriptionDetails = {
     __typename?: 'SubscriptionDetails';
     id: Scalars['ID'];
+    planId?: Maybe<Scalars['String']>;
+    addons: Array<AddonDetails>;
     name?: Maybe<Scalars['String']>;
     nextInvoice?: Maybe<Scalars['DateTime']>;
     cancelledAt?: Maybe<Scalars['DateTime']>;
@@ -1244,6 +1255,12 @@ export declare type SubscriptionDetails = {
     trialEnd?: Maybe<Scalars['DateTime']>;
     status?: Maybe<Scalars['String']>;
 };
+export declare type AddonDetails = {
+    __typename?: 'AddonDetails';
+    id: Scalars['ID'];
+    planId: Scalars['String'];
+    name: Scalars['String'];
+};
 export declare type Charge = {
     __typename?: 'Charge';
     id: Scalars['ID'];
@@ -2473,10 +2490,16 @@ export declare type CreateIosSubmissionInput = {
 export declare type IosSubmissionConfigInput = {
     appleAppSpecificPasswordId?: Maybe<Scalars['String']>;
     appleAppSpecificPassword?: Maybe<Scalars['String']>;
+    ascApiKey?: Maybe<AscApiKeyInput>;
     archiveUrl?: Maybe<Scalars['String']>;
     appleIdUsername: Scalars['String'];
     ascAppIdentifier: Scalars['String'];
 };
+export declare type AscApiKeyInput = {
+    keyP8: Scalars['String'];
+    keyIdentifier: Scalars['String'];
+    issuerIdentifier: Scalars['String'];
+};
 export declare type CreateAndroidSubmissionInput = {
     appId: Scalars['ID'];
     config: AndroidSubmissionConfigInput;

package/build/graphql/generated.js

@@ -13,6 +13,8 @@ var OfferType;
     OfferType["Subscription"] = "SUBSCRIPTION";
     /** Advanced Purchase of Paid Resource */
     OfferType["Prepaid"] = "PREPAID";
+    /** Addon, or supplementary subscription */
+    OfferType["Addon"] = "ADDON";
 })(OfferType = exports.OfferType || (exports.OfferType = {}));
 var Feature;
 (function (Feature) {

package/build/log.d.ts

@@ -18,10 +18,20 @@ export default class Log {
     private static updateIsLastLineNewLine;
 }
 /**
+ * Prints a link for given URL, using text if provided, otherwise text is just the URL.
+ * Format links as dim (unless disabled) and with an underline.
+ *
+ * @example https://expo.dev
+ */
+export declare function link(url: string, { text, dim }?: {
+    text?: string;
+    dim?: boolean;
+}): string;
+/**
+ * Provide a consistent "Learn more" link experience.
  * Format links as dim (unless disabled) with an underline.
  *
  * @example Learn more: https://expo.dev
- * @param url
  */
 export declare function learnMore(url: string, { learnMoreMessage: maybeLearnMoreMessage, dim, }?: {
     learnMoreMessage?: string;

package/build/log.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.learnMore = void 0;
+exports.learnMore = exports.link = void 0;
 const tslib_1 = require("tslib");
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 const figures_1 = (0, tslib_1.__importDefault)(require("figures"));
@@ -79,19 +79,30 @@ exports.default = Log;
 Log.isDebug = (0, getenv_1.boolish)('EXPO_DEBUG', false);
 Log.isLastLineNewLine = false;
 /**
- * Format links as dim (unless disabled) with an underline.
+ * Prints a link for given URL, using text if provided, otherwise text is just the URL.
+ * Format links as dim (unless disabled) and with an underline.
  *
- * @example Learn more: https://expo.dev
- * @param url
+ * @example https://expo.dev
  */
-function learnMore(url, { learnMoreMessage: maybeLearnMoreMessage, dim = true, } = {}) {
+function link(url, { text = url, dim = true } = {}) {
+    let output;
     // Links can be disabled via env variables https://github.com/jamestalmage/supports-hyperlinks/blob/master/index.js
     if (terminal_link_1.default.isSupported) {
-        const text = (0, terminal_link_1.default)(maybeLearnMoreMessage !== null && maybeLearnMoreMessage !== void 0 ? maybeLearnMoreMessage : 'Learn more.', url);
-        return dim ? chalk_1.default.dim(text) : text;
+        output = (0, terminal_link_1.default)(text, url);
     }
-    const learnMoreMessage = maybeLearnMoreMessage !== null && maybeLearnMoreMessage !== void 0 ? maybeLearnMoreMessage : 'Learn more';
-    const text = `${learnMoreMessage === '' ? learnMoreMessage : `${learnMoreMessage}: `}${chalk_1.default.underline(url)}`;
-    return dim ? chalk_1.default.dim(text) : text;
+    else {
+        output = `${text === url ? '' : text + ': '}${chalk_1.default.underline(url)}`;
+    }
+    return dim ? chalk_1.default.dim(output) : output;
+}
+exports.link = link;
+/**
+ * Provide a consistent "Learn more" link experience.
+ * Format links as dim (unless disabled) with an underline.
+ *
+ * @example Learn more: https://expo.dev
+ */
+function learnMore(url, { learnMoreMessage: maybeLearnMoreMessage, dim = true, } = {}) {
+    return link(url, { text: maybeLearnMoreMessage !== null && maybeLearnMoreMessage !== void 0 ? maybeLearnMoreMessage : 'Learn more', dim });
 }
 exports.learnMore = learnMore;

package/build/submit/ArchiveSource.d.ts

@@ -1,11 +1,13 @@
 import { Platform } from '@expo/eas-build-job';
 import { BuildFragment } from '../graphql/generated';
+export declare const BUILD_LIST_ITEM_COUNT = 4;
 export declare enum ArchiveSourceType {
     url = 0,
     latest = 1,
     path = 2,
     buildId = 3,
-    prompt = 4
+    buildList = 4,
+    prompt = 5
 }
 interface ArchiveSourceBase {
     sourceType: ArchiveSourceType;
@@ -28,6 +30,9 @@ interface ArchiveBuildIdSource extends ArchiveSourceBase {
     sourceType: ArchiveSourceType.buildId;
     id: string;
 }
+interface ArchiveBuildListSource extends ArchiveSourceBase {
+    sourceType: ArchiveSourceType.buildList;
+}
 interface ArchivePromptSource extends ArchiveSourceBase {
     sourceType: ArchiveSourceType.prompt;
 }
@@ -36,7 +41,7 @@ export interface Archive {
     source: ArchiveSource;
     url?: string;
 }
-export declare type ArchiveSource = ArchiveUrlSource | ArchiveLatestSource | ArchivePathSource | ArchiveBuildIdSource | ArchivePromptSource;
+export declare type ArchiveSource = ArchiveUrlSource | ArchiveLatestSource | ArchivePathSource | ArchiveBuildIdSource | ArchiveBuildListSource | ArchivePromptSource;
 export declare function getArchiveAsync(source: ArchiveSource): Promise<Archive>;
 export declare function isUuidV4(s: string): boolean;
 export {};

package/build/submit/ArchiveSource.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isUuidV4 = exports.getArchiveAsync = exports.ArchiveSourceType = void 0;
+exports.isUuidV4 = exports.getArchiveAsync = exports.ArchiveSourceType = exports.BUILD_LIST_ITEM_COUNT = void 0;
 const tslib_1 = require("tslib");
 const eas_build_job_1 = require("@expo/eas-build-job");
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 const url_1 = require("url");
 const uuid = (0, tslib_1.__importStar)(require("uuid"));
+const generated_1 = require("../graphql/generated");
 const BuildQuery_1 = require("../graphql/queries/BuildQuery");
 const AppPlatform_1 = require("../graphql/types/AppPlatform");
 const log_1 = (0, tslib_1.__importStar)(require("../log"));
@@ -13,13 +14,15 @@ const platform_1 = require("../platform");
 const prompts_1 = require("../prompts");
 const builds_1 = require("./utils/builds");
 const files_1 = require("./utils/files");
+exports.BUILD_LIST_ITEM_COUNT = 4;
 var ArchiveSourceType;
 (function (ArchiveSourceType) {
     ArchiveSourceType[ArchiveSourceType["url"] = 0] = "url";
     ArchiveSourceType[ArchiveSourceType["latest"] = 1] = "latest";
     ArchiveSourceType[ArchiveSourceType["path"] = 2] = "path";
     ArchiveSourceType[ArchiveSourceType["buildId"] = 3] = "buildId";
-    ArchiveSourceType[ArchiveSourceType["prompt"] = 4] = "prompt";
+    ArchiveSourceType[ArchiveSourceType["buildList"] = 4] = "buildList";
+    ArchiveSourceType[ArchiveSourceType["prompt"] = 5] = "prompt";
 })(ArchiveSourceType = exports.ArchiveSourceType || (exports.ArchiveSourceType = {}));
 async function getArchiveAsync(source) {
     switch (source.sourceType) {
@@ -38,6 +41,9 @@ async function getArchiveAsync(source) {
         case ArchiveSourceType.buildId: {
             return await handleBuildIdSourceAsync(source);
         }
+        case ArchiveSourceType.buildList: {
+            return await handleBuildListSourceAsync(source);
+        }
     }
 }
 exports.getArchiveAsync = getArchiveAsync;
@@ -67,7 +73,7 @@ async function handleUrlSourceAsync(source) {
 }
 async function handleLatestSourceAsync(source) {
     try {
-        const latestBuild = await (0, builds_1.getLatestBuildForSubmissionAsync)((0, AppPlatform_1.toAppPlatform)(source.platform), source.projectId);
+        const [latestBuild] = await (0, builds_1.getRecentBuildsForSubmissionAsync)((0, AppPlatform_1.toAppPlatform)(source.platform), source.projectId);
         if (!latestBuild) {
             log_1.default.error(chalk_1.default.bold("Couldn't find any builds for this project on EAS servers. It looks like you haven't run 'eas build' yet."));
             return getArchiveAsync({
@@ -128,6 +134,83 @@ async function handleBuildIdSourceAsync(source) {
         });
     }
 }
+async function handleBuildListSourceAsync(source) {
+    try {
+        const appPlatform = (0, AppPlatform_1.toAppPlatform)(source.platform);
+        const expiryDate = new Date(); // artifacts expire after 30 days
+        expiryDate.setDate(expiryDate.getDate() - 30);
+        const recentBuilds = await (0, builds_1.getRecentBuildsForSubmissionAsync)(appPlatform, source.projectId, {
+            limit: exports.BUILD_LIST_ITEM_COUNT,
+        });
+        if (recentBuilds.length < 1) {
+            log_1.default.error(chalk_1.default.bold(`Couldn't find any ${platform_1.appPlatformDisplayNames[appPlatform]} builds for this project on EAS servers. ` +
+                "It looks like you haven't run 'eas build' yet."));
+            return getArchiveAsync({
+                ...source,
+                sourceType: ArchiveSourceType.prompt,
+            });
+        }
+        if (recentBuilds.every(it => new Date(it.updatedAt) < expiryDate)) {
+            log_1.default.error(chalk_1.default.bold('It looks like all of your build artifacts have expired. ' +
+                'EAS keeps your build artifacts only for 30 days.'));
+            return getArchiveAsync({
+                ...source,
+                sourceType: ArchiveSourceType.prompt,
+            });
+        }
+        const choices = recentBuilds.map(build => formatBuildChoice(build, expiryDate));
+        choices.push({
+            title: 'None of the above (select another option)',
+            value: null,
+        });
+        const { selectedBuild } = await (0, prompts_1.promptAsync)({
+            name: 'selectedBuild',
+            type: 'select',
+            message: 'Which build would you like to submit?',
+            choices: choices.map(choice => ({ ...choice, title: `- ${choice.title}` })),
+            // @ts-expect-error field documented in npm, but not defined in typescript
+            warn: 'This artifact has expired',
+        });
+        if (selectedBuild == null) {
+            return getArchiveAsync({
+                ...source,
+                sourceType: ArchiveSourceType.prompt,
+            });
+        }
+        return {
+            build: selectedBuild,
+            source,
+        };
+    }
+    catch (err) {
+        log_1.default.error(err);
+        throw err;
+    }
+}
+function formatBuildChoice(build, expiryDate) {
+    const { id, platform, updatedAt, appVersion, sdkVersion, runtimeVersion, buildProfile, appBuildVersion, releaseChannel, } = build;
+    const formatValue = (field) => field ? chalk_1.default.bold(field) : chalk_1.default.dim('Unknown');
+    const buildDate = new Date(updatedAt);
+    const maybeRuntimeVersion = runtimeVersion ? `Runtime: ${formatValue(runtimeVersion)}` : null;
+    const maybeSdkVersion = sdkVersion ? `SDK: ${formatValue(sdkVersion)}` : null;
+    const appBuildVersionString = `${platform === generated_1.AppPlatform.Android ? 'Version code' : 'Build number'}: ${formatValue(appBuildVersion)}`;
+    const title = [
+        `ID: ${chalk_1.default.dim(id)}, Finished at: ${chalk_1.default.bold(buildDate.toLocaleString())}`,
+        [
+            `\tApp version: ${formatValue(appVersion)}, ${appBuildVersionString}`,
+            maybeRuntimeVersion,
+            maybeSdkVersion,
+        ]
+            .filter(it => it != null)
+            .join(', '),
+        `\tProfile: ${formatValue(buildProfile)}, Release channel: ${formatValue(releaseChannel)}`,
+    ].join('\n');
+    return {
+        title,
+        value: build,
+        disabled: buildDate < expiryDate,
+    };
+}
 async function handlePromptSourceAsync(source) {
     const { sourceType: sourceTypeRaw } = await (0, prompts_1.promptAsync)({
         name: 'sourceType',
@@ -135,8 +218,8 @@ async function handlePromptSourceAsync(source) {
         message: 'What would you like to submit?',
         choices: [
             {
-                title: 'Latest finished build from EAS',
-                value: ArchiveSourceType.latest,
+                title: 'Selected build from EAS',
+                value: ArchiveSourceType.buildList,
             },
             { title: 'I have a url to the app archive', value: ArchiveSourceType.url },
             {
@@ -167,10 +250,10 @@ async function handlePromptSourceAsync(source) {
                 path,
             });
         }
-        case ArchiveSourceType.latest: {
+        case ArchiveSourceType.buildList: {
             return getArchiveAsync({
                 ...source,
-                sourceType: ArchiveSourceType.latest,
+                sourceType: ArchiveSourceType.buildList,
             });
         }
         case ArchiveSourceType.buildId: {
@@ -181,7 +264,7 @@ async function handlePromptSourceAsync(source) {
                 id,
             });
         }
-        case ArchiveSourceType.prompt:
+        default:
             throw new Error('This should never happen');
     }
 }

package/build/submit/ios/AscApiKeySource.d.ts

@@ -0,0 +1,28 @@
+import { AscApiKeyPath, MinimalAscApiKey } from '../../credentials/ios/credentials';
+export declare enum AscApiKeySourceType {
+    path = 0,
+    prompt = 1
+}
+interface AscApiKeySourceBase {
+    sourceType: AscApiKeySourceType;
+}
+interface AscApiKeyPromptSource extends AscApiKeySourceBase {
+    sourceType: AscApiKeySourceType.prompt;
+}
+interface AscApiKeyEnvVarSource extends AscApiKeySourceBase {
+    sourceType: AscApiKeySourceType.path;
+    path: AscApiKeyPath;
+}
+export declare type AscApiKeySource = AscApiKeyEnvVarSource | AscApiKeyPromptSource;
+declare type AscApiKeySummary = {
+    source: 'local' | 'EAS servers';
+    path?: string;
+    keyId: string;
+};
+export declare type AscApiKeyResult = {
+    result: MinimalAscApiKey;
+    summary: AscApiKeySummary;
+};
+export declare function getAscApiKeyLocallyAsync(source: AscApiKeySource): Promise<AscApiKeyResult>;
+export declare function getAscApiKeyPathAsync(source: AscApiKeySource): Promise<AscApiKeyPath>;
+export {};

package/build/submit/ios/AscApiKeySource.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAscApiKeyPathAsync = exports.getAscApiKeyLocallyAsync = exports.AscApiKeySourceType = void 0;
+const tslib_1 = require("tslib");
+const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
+const AscApiKeyUtils_1 = require("../../credentials/ios/actions/AscApiKeyUtils");
+const log_1 = (0, tslib_1.__importDefault)(require("../../log"));
+const files_1 = require("../utils/files");
+var AscApiKeySourceType;
+(function (AscApiKeySourceType) {
+    AscApiKeySourceType[AscApiKeySourceType["path"] = 0] = "path";
+    AscApiKeySourceType[AscApiKeySourceType["prompt"] = 1] = "prompt";
+})(AscApiKeySourceType = exports.AscApiKeySourceType || (exports.AscApiKeySourceType = {}));
+async function getAscApiKeyLocallyAsync(source) {
+    const ascApiKeyPath = await getAscApiKeyPathAsync(source);
+    const { keyP8Path, keyId, issuerId } = ascApiKeyPath;
+    const keyP8 = await fs_extra_1.default.readFile(keyP8Path, 'utf-8');
+    return {
+        result: { keyP8, keyId, issuerId },
+        summary: {
+            source: 'local',
+            path: keyP8Path,
+            keyId,
+        },
+    };
+}
+exports.getAscApiKeyLocallyAsync = getAscApiKeyLocallyAsync;
+async function getAscApiKeyPathAsync(source) {
+    switch (source.sourceType) {
+        case AscApiKeySourceType.path:
+            return await handlePathSourceAsync(source);
+        case AscApiKeySourceType.prompt:
+            return await handlePromptSourceAsync(source);
+    }
+}
+exports.getAscApiKeyPathAsync = getAscApiKeyPathAsync;
+async function handlePathSourceAsync(source) {
+    const { keyP8Path } = source.path;
+    if (!(await (0, files_1.isExistingFileAsync)(keyP8Path))) {
+        log_1.default.warn(`File ${keyP8Path} doesn't exist.`);
+        return await getAscApiKeyPathAsync({ sourceType: AscApiKeySourceType.prompt });
+    }
+    return source.path;
+}
+async function handlePromptSourceAsync(_source) {
+    const ascApiKeyPath = await (0, AscApiKeyUtils_1.promptForAscApiKeyAsync)();
+    return await getAscApiKeyPathAsync({
+        sourceType: AscApiKeySourceType.path,
+        path: ascApiKeyPath,
+    });
+}

package/build/submit/ios/IosSubmitCommand.d.ts

@@ -5,8 +5,10 @@ export default class IosSubmitCommand {
     private ctx;
     constructor(ctx: SubmissionContext<Platform.IOS>);
     runAsync(): Promise<SubmissionFragment>;
+    private resolveCredentialSubmissionOptionsAsync;
     private resolveSubmissionOptionsAsync;
     private resolveAppSpecificPasswordSource;
+    private resolveAscApiKeySource;
     private resolveArchiveSource;
     private resolveAscAppIdentifierAsync;
     private resolveAppleIdUsernameAsync;

package/build/submit/ios/IosSubmitCommand.js

@@ -6,12 +6,14 @@ const results_1 = require("@expo/results");
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 const getenv_1 = (0, tslib_1.__importDefault)(require("getenv"));
 const wrap_ansi_1 = (0, tslib_1.__importDefault)(require("wrap-ansi"));
+const errors_1 = require("../../credentials/errors");
 const log_1 = (0, tslib_1.__importStar)(require("../../log"));
 const prompts_1 = require("../../prompts");
 const UserSettings_1 = (0, tslib_1.__importDefault)(require("../../user/UserSettings"));
 const commons_1 = require("../commons");
 const AppProduce_1 = require("./AppProduce");
 const AppSpecificPasswordSource_1 = require("./AppSpecificPasswordSource");
+const AscApiKeySource_1 = require("./AscApiKeySource");
 const IosSubmitter_1 = (0, tslib_1.__importDefault)(require("./IosSubmitter"));
 class IosSubmitCommand {
     constructor(ctx) {
@@ -23,14 +25,30 @@ class IosSubmitCommand {
         const submitter = new IosSubmitter_1.default(this.ctx, options);
         return await submitter.submitAsync();
     }
+    async resolveCredentialSubmissionOptionsAsync() {
+        // Fall back to app specific password if no ascApiKey defined
+        const ascApiKeySource = this.resolveAscApiKeySource();
+        const shouldUseAppSpecificPassword = !ascApiKeySource.ok && ascApiKeySource.enforceError() instanceof errors_1.MissingCredentialsError;
+        if (shouldUseAppSpecificPassword) {
+            return { appSpecificPasswordSource: this.resolveAppSpecificPasswordSource() };
+        }
+        else {
+            return { ascApiKeySource };
+        }
+    }
     async resolveSubmissionOptionsAsync() {
         const archiveSource = this.resolveArchiveSource();
-        const appSpecificPasswordSource = this.resolveAppSpecificPasswordSource();
+        const credentialsSource = await this.resolveCredentialSubmissionOptionsAsync();
+        const maybeAppSpecificPasswordSource = 'appSpecificPasswordSource' in credentialsSource
+            ? credentialsSource.appSpecificPasswordSource
+            : null;
+        const maybeAscApiKeySource = 'ascApiKeySource' in credentialsSource ? credentialsSource.ascApiKeySource : null;
         const ascAppIdentifier = await this.resolveAscAppIdentifierAsync();
         const appleIdUsername = await this.resolveAppleIdUsernameAsync();
         const errored = [
             archiveSource,
-            appSpecificPasswordSource,
+            ...(maybeAppSpecificPasswordSource ? [maybeAppSpecificPasswordSource] : []),
+            ...(maybeAscApiKeySource ? [maybeAscApiKeySource] : []),
             ascAppIdentifier,
             appleIdUsername,
         ].filter(r => !r.ok);
@@ -44,7 +62,16 @@ class IosSubmitCommand {
             appleIdUsername: appleIdUsername.enforceValue(),
             ascAppIdentifier: ascAppIdentifier.enforceValue(),
             archiveSource: archiveSource.enforceValue(),
-            appSpecificPasswordSource: appSpecificPasswordSource.enforceValue(),
+            ...(maybeAppSpecificPasswordSource
+                ? {
+                    appSpecificPasswordSource: maybeAppSpecificPasswordSource.enforceValue(),
+                }
+                : null),
+            ...(maybeAscApiKeySource
+                ? {
+                    ascApiKeySource: maybeAscApiKeySource.enforceValue(),
+                }
+                : null),
         };
     }
     resolveAppSpecificPasswordSource() {
@@ -64,6 +91,27 @@ class IosSubmitCommand {
             });
         }
     }
+    resolveAscApiKeySource() {
+        const { ascApiKeyPath, ascApiKeyIssuerId, ascApiKeyId } = this.ctx.profile;
+        if (ascApiKeyPath && ascApiKeyIssuerId && ascApiKeyId) {
+            return (0, results_1.result)({
+                sourceType: AscApiKeySource_1.AscApiKeySourceType.path,
+                path: {
+                    keyP8Path: ascApiKeyPath,
+                    issuerId: ascApiKeyIssuerId,
+                    keyId: ascApiKeyId,
+                },
+            });
+        }
+        // interpret this to mean the user had some intention of passing in ASC Api key
+        if (ascApiKeyPath || ascApiKeyIssuerId || ascApiKeyId) {
+            log_1.default.warn(`ascApiKeyPath, ascApiKeyIssuerId and ascApiKeyId must all be defined in eas.json`);
+            return (0, results_1.result)({
+                sourceType: AscApiKeySource_1.AscApiKeySourceType.prompt,
+            });
+        }
+        return (0, results_1.result)(new errors_1.MissingCredentialsError('Set the ascApiKeyPath, ascApiKeyIssuerId and ascApiKeyId fields in eas.json.'));
+    }
     resolveArchiveSource() {
         try {
             return (0, results_1.result)((0, commons_1.resolveArchiveSource)(this.ctx, eas_build_job_1.Platform.IOS));

package/build/submit/ios/IosSubmitter.d.ts

@@ -3,10 +3,12 @@ import { IosSubmissionConfigInput, SubmissionFragment } from '../../graphql/gene
 import { ArchiveSource } from '../ArchiveSource';
 import BaseSubmitter, { SubmissionInput } from '../BaseSubmitter';
 import { AppSpecificPasswordSource } from './AppSpecificPasswordSource';
+import { AscApiKeySource } from './AscApiKeySource';
 export interface IosSubmissionOptions extends Pick<IosSubmissionConfigInput, 'appleIdUsername' | 'ascAppIdentifier'> {
     projectId: string;
     archiveSource: ArchiveSource;
-    appSpecificPasswordSource: AppSpecificPasswordSource;
+    appSpecificPasswordSource?: AppSpecificPasswordSource;
+    ascApiKeySource?: AscApiKeySource;
 }
 export default class IosSubmitter extends BaseSubmitter<Platform.IOS, IosSubmissionOptions> {
     submitAsync(): Promise<SubmissionFragment>;