eas-cli 0.30.0 → 0.32.0

package/build/submit/android/ServiceAccountSource.js

@@ -1,67 +1,85 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getServiceAccountAsync = exports.ServiceAccountSourceType = void 0;
+exports.getServiceAccountFromCredentialsServiceAsync = exports.getServiceAccountKeyPathAsync = exports.getServiceAccountKeyResultAsync = exports.ServiceAccountSourceType = void 0;
 const tslib_1 = require("tslib");
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
-const fast_glob_1 = (0, tslib_1.__importDefault)(require("fast-glob"));
 const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
+const nullthrows_1 = (0, tslib_1.__importDefault)(require("nullthrows"));
+const SetupGoogleServiceAccountKey_1 = require("../../credentials/android/actions/SetupGoogleServiceAccountKey");
+const googleServiceAccountKey_1 = require("../../credentials/android/utils/googleServiceAccountKey");
 const log_1 = (0, tslib_1.__importStar)(require("../../log"));
-const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
-const filterAsync_1 = require("../../utils/filterAsync");
+const Account_1 = require("../../user/Account");
 const files_1 = require("../utils/files");
 var ServiceAccountSourceType;
 (function (ServiceAccountSourceType) {
     ServiceAccountSourceType[ServiceAccountSourceType["path"] = 0] = "path";
     ServiceAccountSourceType[ServiceAccountSourceType["prompt"] = 1] = "prompt";
-    ServiceAccountSourceType[ServiceAccountSourceType["detect"] = 2] = "detect";
-    // credentialsService,
-    // ...
+    ServiceAccountSourceType[ServiceAccountSourceType["credentialsService"] = 2] = "credentialsService";
 })(ServiceAccountSourceType = exports.ServiceAccountSourceType || (exports.ServiceAccountSourceType = {}));
-async function getServiceAccountAsync(source) {
+async function getServiceAccountKeyResultAsync(ctx, source, androidApplicationIdentifier) {
+    if (source.sourceType === ServiceAccountSourceType.credentialsService) {
+        return await getServiceAccountFromCredentialsServiceAsync(ctx, androidApplicationIdentifier);
+    }
+    else {
+        return await getServiceAccountLocallyAsync(source);
+    }
+}
+exports.getServiceAccountKeyResultAsync = getServiceAccountKeyResultAsync;
+async function getServiceAccountLocallyAsync(source) {
+    const serviceAccountKeyPath = await getServiceAccountKeyPathAsync(source);
+    const serviceAccountKey = (0, googleServiceAccountKey_1.readAndValidateServiceAccountKey)(serviceAccountKeyPath);
+    return {
+        result: { googleServiceAccountKeyJson: await fs_extra_1.default.readFile(serviceAccountKeyPath, 'utf-8') },
+        summary: {
+            source: 'local',
+            path: serviceAccountKeyPath,
+            email: serviceAccountKey.client_email,
+        },
+    };
+}
+async function getServiceAccountKeyPathAsync(source) {
     switch (source.sourceType) {
         case ServiceAccountSourceType.path:
             return await handlePathSourceAsync(source);
         case ServiceAccountSourceType.prompt:
             return await handlePromptSourceAsync(source);
-        case ServiceAccountSourceType.detect:
-            return await handleDetectSourceAsync(source);
+        case ServiceAccountSourceType.credentialsService: {
+            throw new Error(`ServiceAccountSource ${source} does not return a path.`);
+        }
     }
 }
-exports.getServiceAccountAsync = getServiceAccountAsync;
+exports.getServiceAccountKeyPathAsync = getServiceAccountKeyPathAsync;
+async function getServiceAccountFromCredentialsServiceAsync(ctx, androidApplicationIdentifier) {
+    const appLookupParams = {
+        account: (0, nullthrows_1.default)((0, Account_1.findAccountByName)(ctx.user.accounts, ctx.accountName), `You do not have access to account: ${ctx.accountName}`),
+        projectName: ctx.projectName,
+        androidApplicationIdentifier,
+    };
+    const setupGoogleServiceAccountKeyAction = new SetupGoogleServiceAccountKey_1.SetupGoogleServiceAccountKey(appLookupParams);
+    const androidAppCredentials = await setupGoogleServiceAccountKeyAction.runAsync(ctx.credentialsCtx);
+    const googleServiceAccountKey = (0, nullthrows_1.default)(androidAppCredentials.googleServiceAccountKeyForSubmissions, 'Credentials Service must provide a valid GoogleServiceAccountKey');
+    return {
+        result: {
+            googleServiceAccountKeyId: googleServiceAccountKey.id,
+        },
+        summary: {
+            source: 'EAS servers',
+            email: googleServiceAccountKey.clientEmail,
+        },
+    };
+}
+exports.getServiceAccountFromCredentialsServiceAsync = getServiceAccountFromCredentialsServiceAsync;
 async function handlePathSourceAsync(source) {
     if (!(await (0, files_1.isExistingFileAsync)(source.path))) {
         log_1.default.warn(`File ${source.path} doesn't exist.`);
-        return await getServiceAccountAsync({ sourceType: ServiceAccountSourceType.prompt });
+        return await getServiceAccountKeyPathAsync({ sourceType: ServiceAccountSourceType.prompt });
     }
     return source.path;
 }
-async function handleDetectSourceAsync(_source) {
-    var _a;
-    const projectDir = (_a = (await (0, projectUtils_1.findProjectRootAsync)())) !== null && _a !== void 0 ? _a : process.cwd();
-    const foundFilePaths = await (0, fast_glob_1.default)('**/*.json', {
-        cwd: projectDir,
-        ignore: ['app.json', 'package*.json', 'tsconfig.json', 'node_modules'],
-    });
-    const googleServiceFiles = await (0, filterAsync_1.filterAsync)(foundFilePaths.map(file => path_1.default.join(projectDir, file)), fileIsGoogleServicesAsync);
-    if (googleServiceFiles.length > 1) {
-        const selectedPath = await displayPathChooserAsync(googleServiceFiles, projectDir);
-        if (selectedPath !== false) {
-            return selectedPath;
-        }
-    }
-    else if (googleServiceFiles.length === 1) {
-        const [detectedPath] = googleServiceFiles;
-        if (await confirmDetectedPathAsync(detectedPath)) {
-            return detectedPath;
-        }
-    }
-    return await getServiceAccountAsync({ sourceType: ServiceAccountSourceType.prompt });
-}
 async function handlePromptSourceAsync(_source) {
     const path = await askForServiceAccountPathAsync();
-    return await getServiceAccountAsync({
+    return await getServiceAccountKeyPathAsync({
         sourceType: ServiceAccountSourceType.path,
         path,
     });
@@ -90,42 +108,3 @@ async function askForServiceAccountPathAsync() {
     });
     return filePath;
 }
-async function displayPathChooserAsync(paths, projectDir) {
-    const choices = paths.map(f => ({
-        value: f,
-        title: f.startsWith(projectDir) ? path_1.default.relative(projectDir, f) : f,
-    }));
-    choices.push({
-        title: 'None of the above',
-        value: false,
-    });
-    log_1.default.log('Multiple Google Service Account JSON keys have been found inside your project directory.');
-    const { selectedPath } = await (0, prompts_1.promptAsync)({
-        name: 'selectedPath',
-        type: 'select',
-        message: 'Choose the key you want to use for this submission:',
-        choices,
-    });
-    log_1.default.addNewLineIfNone();
-    return selectedPath;
-}
-async function confirmDetectedPathAsync(path) {
-    log_1.default.log(`A Google Service Account JSON key has been found at\n  ${chalk_1.default.underline(path)}`);
-    const { confirmed } = await (0, prompts_1.promptAsync)({
-        name: 'confirmed',
-        type: 'confirm',
-        message: 'Would you like to use this file?',
-        initial: true,
-    });
-    log_1.default.addNewLineIfNone();
-    return confirmed;
-}
-async function fileIsGoogleServicesAsync(path) {
-    try {
-        const jsonFile = await fs_extra_1.default.readJson(path);
-        return jsonFile.type === 'service_account';
-    }
-    catch (e) {
-        return false;
-    }
-}

package/build/submit/context.d.ts

@@ -2,7 +2,9 @@ import { ExpoConfig } from '@expo/config';
 import { Platform } from '@expo/eas-build-job';
 import { SubmitProfile } from '@expo/eas-json';
 import { CredentialsContext } from '../credentials/context';
+import { Actor } from '../user/User';
 export interface SubmissionContext<T extends Platform> {
+    accountName: string;
     archiveFlags: SubmitArchiveFlags;
     credentialsCtx: CredentialsContext;
     exp: ExpoConfig;
@@ -11,6 +13,8 @@ export interface SubmissionContext<T extends Platform> {
     profile: SubmitProfile<T>;
     projectDir: string;
     projectId: string;
+    projectName: string;
+    user: Actor;
 }
 export interface SubmitArchiveFlags {
     latest?: boolean;

package/build/submit/context.js

@@ -3,20 +3,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSubmissionContextAsync = void 0;
 const context_1 = require("../credentials/context");
 const expoConfig_1 = require("../project/expoConfig");
+const projectUtils_1 = require("../project/projectUtils");
 const actions_1 = require("../user/actions");
 async function createSubmissionContextAsync(params) {
     const { projectDir, nonInteractive } = params;
     const exp = (0, expoConfig_1.getExpoConfig)(projectDir, { env: params.env });
     const { env, ...rest } = params;
+    const user = await (0, actions_1.ensureLoggedInAsync)();
+    const projectName = exp.slug;
+    const accountName = (0, projectUtils_1.getProjectAccountName)(exp, user);
     let credentialsCtx = params.credentialsCtx;
     if (!credentialsCtx) {
-        const user = await (0, actions_1.ensureLoggedInAsync)();
         credentialsCtx = new context_1.CredentialsContext({ projectDir, user, exp, nonInteractive });
     }
     return {
         ...rest,
+        accountName,
         credentialsCtx,
         exp,
+        projectName,
+        user,
     };
 }
 exports.createSubmissionContextAsync = createSubmissionContextAsync;

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

package/build/submit/ios/IosSubmitter.js

@@ -1,11 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+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");
 const AppSpecificPasswordSource_1 = require("./AppSpecificPasswordSource");
+const AscApiKeySource_1 = require("./AscApiKeySource");
 class IosSubmitter extends BaseSubmitter_1.default {
     async submitAsync() {
         var _a;
@@ -27,28 +30,46 @@ class IosSubmitter extends BaseSubmitter_1.default {
     }
     async resolveSourceOptionsAsync() {
         const archive = await (0, ArchiveSource_1.getArchiveAsync)(this.options.archiveSource);
-        const appSpecificPassword = await (0, AppSpecificPasswordSource_1.getAppSpecificPasswordAsync)(this.options.appSpecificPasswordSource);
+        const maybeAppSpecificPassword = this.options.appSpecificPasswordSource
+            ? await (0, AppSpecificPasswordSource_1.getAppSpecificPasswordAsync)(this.options.appSpecificPasswordSource)
+            : null;
+        const maybeAppStoreConnectApiKey = this.options.ascApiKeySource
+            ? await (0, AscApiKeySource_1.getAscApiKeyLocallyAsync)(this.options.ascApiKeySource)
+            : null;
         return {
             archive,
-            appSpecificPassword,
+            ...(maybeAppSpecificPassword ? { appSpecificPassword: maybeAppSpecificPassword } : null),
+            ...(maybeAppStoreConnectApiKey ? { ascApiKeyResult: maybeAppStoreConnectApiKey } : null),
         };
     }
-    async formatSubmissionConfigAsync(options, { archive, appSpecificPassword }) {
+    async formatSubmissionConfigAsync(options, { archive, appSpecificPassword, ascApiKeyResult }) {
         const { appleIdUsername, ascAppIdentifier } = options;
         return {
             ascAppIdentifier,
             appleIdUsername,
             archiveUrl: archive.url,
             appleAppSpecificPassword: appSpecificPassword,
+            ...((ascApiKeyResult === null || ascApiKeyResult === void 0 ? void 0 : ascApiKeyResult.result)
+                ? {
+                    ascApiKey: {
+                        keyP8: ascApiKeyResult === null || ascApiKeyResult === void 0 ? void 0 : ascApiKeyResult.result.keyP8,
+                        keyIdentifier: ascApiKeyResult === null || ascApiKeyResult === void 0 ? void 0 : ascApiKeyResult.result.keyId,
+                        issuerIdentifier: ascApiKeyResult === null || ascApiKeyResult === void 0 ? void 0 : ascApiKeyResult.result.issuerId,
+                    },
+                }
+                : null),
         };
     }
-    prepareSummaryData(options, { archive }) {
+    prepareSummaryData(options, { archive, ascApiKeyResult }) {
         const { appleIdUsername, ascAppIdentifier, projectId } = options;
         // structuring order affects table rows order
         return {
             ascAppIdentifier,
             appleIdUsername,
             projectId,
+            ...(ascApiKeyResult
+                ? { formattedAscApiKey: formatServiceAccountSummary(ascApiKeyResult) }
+                : null),
             ...(0, summary_1.formatArchiveSourceSummary)(archive),
         };
     }
@@ -61,4 +82,27 @@ const SummaryHumanReadableKeys = {
     archiveUrl: 'Archive URL',
     archivePath: 'Archive Path',
     formattedBuild: 'Build',
+    formattedAscApiKey: 'App Store Connect Api Key',
 };
+function formatServiceAccountSummary({ summary }) {
+    const { source, path, keyId } = summary;
+    const fields = [
+        {
+            label: 'Key Source',
+            value: source,
+        },
+        {
+            label: 'Key Path',
+            value: path,
+        },
+        {
+            label: 'Key ID',
+            value: keyId,
+        },
+    ];
+    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/submit.js

@@ -58,7 +58,7 @@ function printInstructionsForIosSubmission(submission) {
             '- It usually takes about 5-10 minutes depending on how busy Apple servers are.',
             // ascAppIdentifier should be always available for ios submissions but check it anyway
             ((_a = submission.iosConfig) === null || _a === void 0 ? void 0 : _a.ascAppIdentifier) &&
-                `- When it’s done, you can see your build here: ${(0, log_1.learnMore)(`https://appstoreconnect.apple.com/apps/${(_b = submission.iosConfig) === null || _b === void 0 ? void 0 : _b.ascAppIdentifier}/appstore/ios`, { learnMoreMessage: '' })}`,
+                `- When it’s done, you can see your build here: ${(0, log_1.link)(`https://appstoreconnect.apple.com/apps/${(_b = submission.iosConfig) === null || _b === void 0 ? void 0 : _b.ascAppIdentifier}/appstore/ios`)}`,
         ].join('\n');
         log_1.default.addNewLineIfNone();
         log_1.default.log(logMsg);

package/build/submit/utils/builds.d.ts

@@ -1,2 +1,4 @@
 import { AppPlatform, BuildFragment } from '../../graphql/generated';
-export declare function getLatestBuildForSubmissionAsync(platform: AppPlatform, appId: string): Promise<BuildFragment | null>;
+export declare function getRecentBuildsForSubmissionAsync(platform: AppPlatform, appId: string, { limit }?: {
+    limit?: number;
+}): Promise<BuildFragment[]>;

package/build/submit/utils/builds.js

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLatestBuildForSubmissionAsync = void 0;
+exports.getRecentBuildsForSubmissionAsync = void 0;
 const generated_1 = require("../../graphql/generated");
 const BuildQuery_1 = require("../../graphql/queries/BuildQuery");
-async function getLatestBuildForSubmissionAsync(platform, appId) {
-    const [build] = await BuildQuery_1.BuildQuery.allForAppAsync(appId, {
-        limit: 1,
+async function getRecentBuildsForSubmissionAsync(platform, appId, { limit = 1 } = {}) {
+    return await BuildQuery_1.BuildQuery.allForAppAsync(appId, {
+        limit,
         filter: {
             platform,
+            distribution: generated_1.DistributionType.Store,
             status: generated_1.BuildStatus.Finished,
         },
     });
-    return build;
 }
-exports.getLatestBuildForSubmissionAsync = getLatestBuildForSubmissionAsync;
+exports.getRecentBuildsForSubmissionAsync = getRecentBuildsForSubmissionAsync;

package/build/utils/json.js

@@ -10,9 +10,7 @@ function enableJsonOutput() {
         return;
     }
     stdoutWrite = process.stdout.write;
-    process.stdout.write = (...args) => {
-        return process.stderr.write.call(null, args);
-    };
+    process.stdout.write = process.stderr.write.bind(process.stderr);
 }
 exports.enableJsonOutput = enableJsonOutput;
 function printJsonOnlyOutput(value) {
@@ -22,9 +20,7 @@ function printJsonOnlyOutput(value) {
         log_1.default.log(JSON.stringify(sanitizeValue(value), null, 2));
     }
     finally {
-        process.stdout.write = (...args) => {
-            return process.stderr.write.call(null, args);
-        };
+        process.stdout.write = process.stderr.write.bind(process.stderr);
     }
 }
 exports.printJsonOnlyOutput = printJsonOnlyOutput;