eas-cli 0.30.0 → 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/credentials/ios/utils/printCredentials.js

@@ -99,10 +99,9 @@ function displayProjectCredentials(app, appBuildCredentials, targets) {
     }, {});
     const isMultitarget = targets.length > 1;
     log_1.default.addNewLineIfNone();
-    const fields = [
-        { label: 'Project Credentials Configuration', value: '' },
-        { label: 'Project', value: projectFullName },
-    ];
+    log_1.default.log(chalk_1.default.cyan.bold('Project Credentials Configuration'));
+    log_1.default.newLine();
+    const fields = [{ label: 'Project', value: projectFullName }];
     for (const [targetName, buildCredentials] of Object.entries(appBuildCredentials)) {
         if (isMultitarget) {
             fields.push({ label: '', value: '' });
@@ -115,10 +114,12 @@ function displayProjectCredentials(app, appBuildCredentials, targets) {
 }
 exports.displayProjectCredentials = displayProjectCredentials;
 function displayIosAppBuildCredentials(buildCredentials, fields) {
+    fields.push({ label: '', value: '' });
     fields.push({
         label: `${prettyIosDistributionType(buildCredentials.iosDistributionType)} Configuration`,
         value: '',
     });
+    fields.push({ label: '', value: '' });
     const maybeDistCert = buildCredentials.distributionCertificate;
     fields.push({ label: 'Distribution Certificate', value: '' });
     if (maybeDistCert) {
@@ -158,9 +159,13 @@ function displayIosAppBuildCredentials(buildCredentials, fields) {
             });
         }
         if (appleDevices && appleDevices.length > 0) {
-            fields.push({ label: 'Provisioned devices', value: '' });
-            for (const appleDevice of appleDevices) {
-                fields.push({ label: '    -', value: formatAppleDevice(appleDevice) });
+            const [firstAppleDevice, ...rest] = appleDevices;
+            fields.push({
+                label: 'Provisioned devices',
+                value: `- ${formatAppleDevice(firstAppleDevice)}`,
+            });
+            for (const appleDevice of rest) {
+                fields.push({ label: '', value: `- ${formatAppleDevice(appleDevice)}` });
             }
         }
         fields.push({ label: 'Updated', value: `${(0, date_1.fromNow)(new Date(updatedAt))} ago` });

package/build/devices/context.js

@@ -4,7 +4,7 @@ exports.createContextAsync = void 0;
 const config_1 = require("@expo/config");
 const projectUtils_1 = require("../project/projectUtils");
 async function createContextAsync({ appStore, cwd, user, }) {
-    const projectDir = await (0, projectUtils_1.findProjectRootAsync)(cwd);
+    const projectDir = await (0, projectUtils_1.findProjectRootAsync)({ cwd });
     let exp = null;
     if (projectDir) {
         const config = (0, config_1.getConfig)(projectDir, { skipSDKVersionRequirement: true });

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/project/projectUtils.d.ts

@@ -5,7 +5,10 @@ import { Actor } from '../user/User';
 export declare function getProjectAccountName(exp: ExpoConfig, user: Actor): string;
 export declare function getUsername(exp: ExpoConfig, user: Actor): string | undefined;
 export declare function getProjectAccountNameAsync(exp: ExpoConfig): Promise<string>;
-export declare function findProjectRootAsync(cwd?: string): Promise<string | null>;
+export declare function findProjectRootAsync({ cwd, defaultToProcessCwd, }?: {
+    cwd?: string;
+    defaultToProcessCwd?: boolean;
+}): Promise<string>;
 export declare function setProjectIdAsync(projectDir: string, options?: {
     env?: Env;
 }): Promise<ExpoConfig | undefined>;

package/build/project/projectUtils.js

@@ -45,9 +45,19 @@ async function getProjectAccountNameAsync(exp) {
     return getProjectAccountName(exp, user);
 }
 exports.getProjectAccountNameAsync = getProjectAccountNameAsync;
-async function findProjectRootAsync(cwd) {
+async function findProjectRootAsync({ cwd, defaultToProcessCwd = false, } = {}) {
     const projectRootDir = await (0, pkg_dir_1.default)(cwd);
-    return projectRootDir !== null && projectRootDir !== void 0 ? projectRootDir : null;
+    if (!projectRootDir) {
+        if (!defaultToProcessCwd) {
+            throw new Error('Please run this command inside a project directory.');
+        }
+        else {
+            return process.cwd();
+        }
+    }
+    else {
+        return projectRootDir;
+    }
 }
 exports.findProjectRootAsync = findProjectRootAsync;
 async function setProjectIdAsync(projectDir, options = {}) {
@@ -106,7 +116,7 @@ async function getProjectIdAsync(exp, options = {}) {
         return localProjectId;
     }
     // Set the project ID if it is missing.
-    const projectDir = await findProjectRootAsync(process.cwd());
+    const projectDir = await findProjectRootAsync();
     if (!projectDir) {
         throw new Error('Please run this command inside a project directory.');
     }

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/android/AndroidSubmitCommand.js

@@ -120,14 +120,9 @@ class AndroidSubmitCommand {
                 path: serviceAccountKeyPath,
             });
         }
-        else if (this.ctx.nonInteractive) {
-            return (0, results_1.result)(new Error('Set serviceAccountKeyPath in the submit profile (eas.json).'));
-        }
-        else {
-            return (0, results_1.result)({
-                sourceType: ServiceAccountSource_1.ServiceAccountSourceType.detect,
-            });
-        }
+        return (0, results_1.result)({
+            sourceType: ServiceAccountSource_1.ServiceAccountSourceType.credentialsService,
+        });
     }
 }
 exports.default = AndroidSubmitCommand;

package/build/submit/android/AndroidSubmitter.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
+const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 const SubmissionMutation_1 = require("../../graphql/mutations/SubmissionMutation");
+const formatFields_1 = (0, tslib_1.__importDefault)(require("../../utils/formatFields"));
 const ArchiveSource_1 = require("../ArchiveSource");
 const BaseSubmitter_1 = (0, tslib_1.__importDefault)(require("../BaseSubmitter"));
 const summary_1 = require("../utils/summary");
@@ -30,15 +31,14 @@ class AndroidSubmitter extends BaseSubmitter_1.default {
     async resolveSourceOptionsAsync() {
         const androidPackage = await (0, AndroidPackageSource_1.getAndroidPackageAsync)(this.options.androidPackageSource);
         const archive = await (0, ArchiveSource_1.getArchiveAsync)(this.options.archiveSource);
-        const serviceAccountPath = await (0, ServiceAccountSource_1.getServiceAccountAsync)(this.options.serviceAccountSource);
+        const serviceAccountKeyResult = await (0, ServiceAccountSource_1.getServiceAccountKeyResultAsync)(this.ctx, this.options.serviceAccountSource, androidPackage);
         return {
             androidPackage,
             archive,
-            serviceAccountPath,
+            serviceAccountKeyResult,
         };
     }
-    async formatSubmissionConfigAsync(options, { archive, androidPackage, serviceAccountPath }) {
-        const serviceAccount = await fs_extra_1.default.readFile(serviceAccountPath, 'utf-8');
+    async formatSubmissionConfigAsync(options, { archive, androidPackage, serviceAccountKeyResult }) {
         const { track, releaseStatus, changesNotSentForReview } = options;
         return {
             applicationIdentifier: androidPackage,
@@ -46,10 +46,10 @@ class AndroidSubmitter extends BaseSubmitter_1.default {
             track,
             changesNotSentForReview,
             releaseStatus,
-            googleServiceAccountKeyJson: serviceAccount,
+            ...serviceAccountKeyResult.result,
         };
     }
-    prepareSummaryData(options, { archive, androidPackage, serviceAccountPath }) {
+    prepareSummaryData(options, { archive, androidPackage, serviceAccountKeyResult }) {
         const { projectId, track, releaseStatus, changesNotSentForReview } = options;
         // structuring order affects table rows order
         return {
@@ -58,7 +58,7 @@ class AndroidSubmitter extends BaseSubmitter_1.default {
             track,
             changesNotSentForReview: changesNotSentForReview !== null && changesNotSentForReview !== void 0 ? changesNotSentForReview : undefined,
             releaseStatus: releaseStatus !== null && releaseStatus !== void 0 ? releaseStatus : undefined,
-            serviceAccountPath,
+            formattedServiceAccount: formatServiceAccountSummary(serviceAccountKeyResult),
             ...(0, summary_1.formatArchiveSourceSummary)(archive),
         };
     }
@@ -70,8 +70,30 @@ const SummaryHumanReadableKeys = {
     archiveUrl: 'Download URL',
     changesNotSentForReview: 'Changes not sent for a review',
     formattedBuild: 'Build',
+    formattedServiceAccount: 'Google Service Account Key',
     projectId: 'Project ID',
     releaseStatus: 'Release status',
-    serviceAccountPath: 'Google Service Key',
     track: 'Release track',
 };
+function formatServiceAccountSummary({ summary }) {
+    const { email: serviceAccountEmail, path: serviceAccountKeyPath, source: serviceAccountKeySource, } = summary;
+    const fields = [
+        {
+            label: 'Key Source',
+            value: serviceAccountKeySource,
+        },
+        {
+            label: 'Key Path',
+            value: serviceAccountKeyPath,
+        },
+        {
+            label: 'Account E-mail',
+            value: serviceAccountEmail,
+        },
+    ];
+    const filteredFields = fields.filter(({ value }) => value !== undefined && value !== null);
+    return ('\n' +
+        (0, formatFields_1.default)(filteredFields, {
+            labelFormat: label => `    ${chalk_1.default.dim(label)}:`,
+        }));
+}

package/build/submit/android/ServiceAccountSource.d.ts

@@ -1,7 +1,9 @@
+import { Platform } from '@expo/eas-build-job';
+import { SubmissionContext } from '../context';
 export declare enum ServiceAccountSourceType {
     path = 0,
     prompt = 1,
-    detect = 2
+    credentialsService = 2
 }
 interface ServiceAccountSourceBase {
     sourceType: ServiceAccountSourceType;
@@ -13,9 +15,26 @@ interface ServiceAccountPathSource extends ServiceAccountSourceBase {
 interface ServiceAccountPromptSource extends ServiceAccountSourceBase {
     sourceType: ServiceAccountSourceType.prompt;
 }
-interface ServiceAccountDetectSource extends ServiceAccountSourceBase {
-    sourceType: ServiceAccountSourceType.detect;
+export interface ServiceAccountCredentialsServiceSource extends ServiceAccountSourceBase {
+    sourceType: ServiceAccountSourceType.credentialsService;
 }
-export declare type ServiceAccountSource = ServiceAccountPathSource | ServiceAccountPromptSource | ServiceAccountDetectSource;
-export declare function getServiceAccountAsync(source: ServiceAccountSource): Promise<string>;
+export declare type ServiceAccountKeyResult = {
+    result: ServiceAccountKeyFile | ServiceAccountKeyFromExpoServers;
+    summary: ServiceAccountKeySummary;
+};
+declare type ServiceAccountKeySummary = {
+    source: 'local' | 'EAS servers';
+    path?: string;
+    email: string;
+};
+declare type ServiceAccountKeyFile = {
+    googleServiceAccountKeyJson: string;
+};
+declare type ServiceAccountKeyFromExpoServers = {
+    googleServiceAccountKeyId: string;
+};
+export declare type ServiceAccountSource = ServiceAccountPathSource | ServiceAccountPromptSource | ServiceAccountCredentialsServiceSource;
+export declare function getServiceAccountKeyResultAsync(ctx: SubmissionContext<Platform.ANDROID>, source: ServiceAccountSource, androidApplicationIdentifier: string): Promise<ServiceAccountKeyResult>;
+export declare function getServiceAccountKeyPathAsync(source: ServiceAccountSource): Promise<string>;
+export declare function getServiceAccountFromCredentialsServiceAsync(ctx: SubmissionContext<Platform.ANDROID>, androidApplicationIdentifier: string): Promise<ServiceAccountKeyResult>;
 export {};