eas-cli 0.34.1 → 0.35.0

package/build/graphql/generated.d.ts

@@ -3416,6 +3416,35 @@ export declare type GoogleServiceAccountKeyByAccountQuery = ({
         });
     });
 });
+export declare type CreateAppStoreConnectApiKeyMutationVariables = Exact<{
+    appStoreConnectApiKeyInput: AppStoreConnectApiKeyInput;
+    accountId: Scalars['ID'];
+}>;
+export declare type CreateAppStoreConnectApiKeyMutation = ({
+    __typename?: 'RootMutation';
+} & {
+    appStoreConnectApiKey: ({
+        __typename?: 'AppStoreConnectApiKeyMutation';
+    } & {
+        createAppStoreConnectApiKey: ({
+            __typename?: 'AppStoreConnectApiKey';
+        } & Pick<AppStoreConnectApiKey, 'id'> & AppStoreConnectApiKeyFragment);
+    });
+});
+export declare type DeleteAppStoreConnectApiKeyMutationVariables = Exact<{
+    appStoreConnectApiKeyId: Scalars['ID'];
+}>;
+export declare type DeleteAppStoreConnectApiKeyMutation = ({
+    __typename?: 'RootMutation';
+} & {
+    appStoreConnectApiKey: ({
+        __typename?: 'AppStoreConnectApiKeyMutation';
+    } & {
+        deleteAppStoreConnectApiKey: ({
+            __typename?: 'deleteAppStoreConnectApiKeyResult';
+        } & Pick<DeleteAppStoreConnectApiKeyResult, 'id'>);
+    });
+});
 export declare type CreateAppleAppIdentifierMutationVariables = Exact<{
     appleAppIdentifierInput: AppleAppIdentifierInput;
     accountId: Scalars['ID'];
@@ -3671,6 +3700,21 @@ export declare type SetPushKeyMutation = ({
         } & Pick<IosAppCredentials, 'id'> & CommonIosAppCredentialsFragment);
     });
 });
+export declare type SetAppStoreConnectApiKeyForSubmissionsMutationVariables = Exact<{
+    iosAppCredentialsId: Scalars['ID'];
+    ascApiKeyId: Scalars['ID'];
+}>;
+export declare type SetAppStoreConnectApiKeyForSubmissionsMutation = ({
+    __typename?: 'RootMutation';
+} & {
+    iosAppCredentials: ({
+        __typename?: 'IosAppCredentialsMutation';
+    } & {
+        setAppStoreConnectApiKeyForSubmissions: ({
+            __typename?: 'IosAppCredentials';
+        } & Pick<IosAppCredentials, 'id'> & CommonIosAppCredentialsFragment);
+    });
+});
 export declare type AppByFullNameQueryVariables = Exact<{
     fullName: Scalars['String'];
 }>;
@@ -3685,6 +3729,24 @@ export declare type AppByFullNameQuery = ({
         } & Pick<App, 'id'> & AppFragment);
     })>;
 });
+export declare type AppStoreConnectApiKeyByAccountQueryVariables = Exact<{
+    accountName: Scalars['String'];
+}>;
+export declare type AppStoreConnectApiKeyByAccountQuery = ({
+    __typename?: 'RootQuery';
+} & {
+    account: ({
+        __typename?: 'AccountQuery';
+    } & {
+        byName: ({
+            __typename?: 'Account';
+        } & Pick<Account, 'id'> & {
+            appStoreConnectApiKeys: Array<({
+                __typename?: 'AppStoreConnectApiKey';
+            } & Pick<AppStoreConnectApiKey, 'id'> & AppStoreConnectApiKeyFragment)>;
+        });
+    });
+});
 export declare type AppleAppIdentifierByBundleIdQueryVariables = Exact<{
     accountName: Scalars['String'];
     bundleIdentifier: Scalars['String'];
@@ -4410,9 +4472,9 @@ export declare type BuildFragment = ({
     } & Pick<BuildArtifacts, 'buildUrl' | 'xcodeBuildLogsUrl'>)>;
     initiatingActor?: Maybe<({
         __typename: 'User';
-    } & Pick<User, 'username' | 'id'>) | ({
+    } & Pick<User, 'id' | 'displayName'>) | ({
         __typename: 'Robot';
-    } & Pick<Robot, 'firstName' | 'id'>)>;
+    } & Pick<Robot, 'id' | 'displayName'>)>;
     project: ({
         __typename: 'Snack';
     } & Pick<Snack, 'id' | 'name'>) | ({

package/build/graphql/types/Build.js

@@ -20,12 +20,7 @@ exports.BuildFragmentNode = (0, graphql_tag_1.default) `
     initiatingActor {
       __typename
       id
-      ... on User {
-        username
-      }
-      ... on Robot {
-        firstName
-      }
+      displayName
     }
     project {
       __typename

package/build/submit/ArchiveSource.js

@@ -188,7 +188,7 @@ async function handleBuildListSourceAsync(source) {
     }
 }
 function formatBuildChoice(build, expiryDate) {
-    const { id, platform, updatedAt, appVersion, sdkVersion, runtimeVersion, buildProfile, appBuildVersion, releaseChannel, } = build;
+    const { id, platform, updatedAt, appVersion, sdkVersion, runtimeVersion, buildProfile, appBuildVersion, releaseChannel, initiatingActor, } = 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;
@@ -204,6 +204,7 @@ function formatBuildChoice(build, expiryDate) {
             .filter(it => it != null)
             .join(', '),
         `\tProfile: ${formatValue(buildProfile)}, Release channel: ${formatValue(releaseChannel)}`,
+        `\tAuthored by: ${formatValue(initiatingActor === null || initiatingActor === void 0 ? void 0 : initiatingActor.displayName)}`,
     ].join('\n');
     return {
         title,

package/build/submit/android/ServiceAccountSource.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
 const nullthrows_1 = (0, tslib_1.__importDefault)(require("nullthrows"));
-const SetupGoogleServiceAccountKey_1 = require("../../credentials/android/actions/SetupGoogleServiceAccountKey");
+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 prompts_1 = require("../../prompts");
@@ -56,7 +56,7 @@ async function getServiceAccountFromCredentialsServiceAsync(ctx, androidApplicat
         projectName: ctx.projectName,
         androidApplicationIdentifier,
     };
-    const setupGoogleServiceAccountKeyAction = new SetupGoogleServiceAccountKey_1.SetupGoogleServiceAccountKey(appLookupParams);
+    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 {

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

@@ -1,6 +1,5 @@
 export declare enum AppSpecificPasswordSourceType {
-    userDefined = 0,
-    prompt = 1
+    userDefined = 0
 }
 interface AppSpecificPasswordSourceBase {
     sourceType: AppSpecificPasswordSourceType;
@@ -9,9 +8,6 @@ interface AppSpecificPasswordUserDefinedSource extends AppSpecificPasswordSource
     sourceType: AppSpecificPasswordSourceType.userDefined;
     appSpecificPassword: string;
 }
-interface AppSpecificPasswordPromptSource extends AppSpecificPasswordSourceBase {
-    sourceType: AppSpecificPasswordSourceType.prompt;
-}
-export declare type AppSpecificPasswordSource = AppSpecificPasswordUserDefinedSource | AppSpecificPasswordPromptSource;
+export declare type AppSpecificPasswordSource = AppSpecificPasswordUserDefinedSource;
 export declare function getAppSpecificPasswordAsync(source: AppSpecificPasswordSource): Promise<string>;
 export {};

package/build/submit/ios/AppSpecificPasswordSource.js

@@ -1,33 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAppSpecificPasswordAsync = exports.AppSpecificPasswordSourceType = void 0;
-const tslib_1 = require("tslib");
-const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
-const wrap_ansi_1 = (0, tslib_1.__importDefault)(require("wrap-ansi"));
-const log_1 = (0, tslib_1.__importStar)(require("../../log"));
-const prompts_1 = require("../../prompts");
 var AppSpecificPasswordSourceType;
 (function (AppSpecificPasswordSourceType) {
     AppSpecificPasswordSourceType[AppSpecificPasswordSourceType["userDefined"] = 0] = "userDefined";
-    AppSpecificPasswordSourceType[AppSpecificPasswordSourceType["prompt"] = 1] = "prompt";
 })(AppSpecificPasswordSourceType = exports.AppSpecificPasswordSourceType || (exports.AppSpecificPasswordSourceType = {}));
 async function getAppSpecificPasswordAsync(source) {
     var _a;
     if (source.sourceType === AppSpecificPasswordSourceType.userDefined) {
         return source.appSpecificPassword;
     }
-    else if (source.sourceType === AppSpecificPasswordSourceType.prompt) {
-        log_1.default.addNewLineIfNone();
-        log_1.default.log((0, wrap_ansi_1.default)(`Please enter your Apple app-specific password. You can also provide it by using the ${chalk_1.default.bold('EXPO_APPLE_APP_SPECIFIC_PASSWORD')} environment variable.`, process.stdout.columns || 80));
-        log_1.default.log((0, log_1.learnMore)('https://expo.fyi/apple-app-specific-password'));
-        const { appSpecificPassword } = await (0, prompts_1.promptAsync)({
-            name: 'appSpecificPassword',
-            message: 'Your Apple app-specific password:',
-            type: 'password',
-            validate: (val) => val !== '' || 'Apple app-specific password cannot be empty!',
-        });
-        return appSpecificPassword;
-    }
     else {
         // exhaustive -- should never happen
         throw new Error(`Unknown app specific password source type "${(_a = source) === null || _a === void 0 ? void 0 : _a.sourceType}"`);

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

@@ -1,4 +1,6 @@
+import { Platform } from '@expo/eas-build-job';
 import { AscApiKeyPath, MinimalAscApiKey } from '../../credentials/ios/credentials';
+import { SubmissionContext } from '../context';
 export declare enum AscApiKeySourceType {
     path = 0,
     prompt = 1
@@ -18,11 +20,15 @@ declare type AscApiKeySummary = {
     source: 'local' | 'EAS servers';
     path?: string;
     keyId: string;
+    name?: string;
+};
+export declare type AscApiKeyFromExpoServers = {
+    ascApiKeyId: string;
 };
 export declare type AscApiKeyResult = {
-    result: MinimalAscApiKey;
+    result: MinimalAscApiKey | AscApiKeyFromExpoServers;
     summary: AscApiKeySummary;
 };
-export declare function getAscApiKeyLocallyAsync(source: AscApiKeySource): Promise<AscApiKeyResult>;
-export declare function getAscApiKeyPathAsync(source: AscApiKeySource): Promise<AscApiKeyPath>;
+export declare function getAscApiKeyLocallyAsync(ctx: SubmissionContext<Platform.IOS>, source: AscApiKeySource): Promise<AscApiKeyResult>;
+export declare function getAscApiKeyPathAsync(ctx: SubmissionContext<Platform.IOS>, source: AscApiKeySource): Promise<AscApiKeyPath>;
 export {};

package/build/submit/ios/AscApiKeySource.js

@@ -11,8 +11,8 @@ var 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);
+async function getAscApiKeyLocallyAsync(ctx, source) {
+    const ascApiKeyPath = await getAscApiKeyPathAsync(ctx, source);
     const { keyP8Path, keyId, issuerId } = ascApiKeyPath;
     const keyP8 = await fs_extra_1.default.readFile(keyP8Path, 'utf-8');
     return {
@@ -25,26 +25,26 @@ async function getAscApiKeyLocallyAsync(source) {
     };
 }
 exports.getAscApiKeyLocallyAsync = getAscApiKeyLocallyAsync;
-async function getAscApiKeyPathAsync(source) {
+async function getAscApiKeyPathAsync(ctx, source) {
     switch (source.sourceType) {
         case AscApiKeySourceType.path:
-            return await handlePathSourceAsync(source);
+            return await handlePathSourceAsync(ctx, source);
         case AscApiKeySourceType.prompt:
-            return await handlePromptSourceAsync(source);
+            return await handlePromptSourceAsync(ctx, source);
     }
 }
 exports.getAscApiKeyPathAsync = getAscApiKeyPathAsync;
-async function handlePathSourceAsync(source) {
+async function handlePathSourceAsync(ctx, 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 await getAscApiKeyPathAsync(ctx, { sourceType: AscApiKeySourceType.prompt });
     }
     return source.path;
 }
-async function handlePromptSourceAsync(_source) {
-    const ascApiKeyPath = await (0, AscApiKeyUtils_1.promptForAscApiKeyAsync)();
-    return await getAscApiKeyPathAsync({
+async function handlePromptSourceAsync(ctx, _source) {
+    const ascApiKeyPath = await (0, AscApiKeyUtils_1.promptForAscApiKeyPathAsync)(ctx.credentialsCtx);
+    return await getAscApiKeyPathAsync(ctx, {
         sourceType: AscApiKeySourceType.path,
         path: ascApiKeyPath,
     });

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

@@ -0,0 +1,14 @@
+import { Platform } from '@expo/eas-build-job';
+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 declare const CREDENTIALS_SERVICE_SOURCE = "CREDENTIALS_SERVICE_SOURCE";
+export declare type CredentialsServiceSource = typeof CREDENTIALS_SERVICE_SOURCE;
+export declare function getFromCredentialsServiceAsync(ctx: SubmissionContext<Platform.IOS>): Promise<{
+    appSpecificPassword: string;
+} | {
+    ascApiKeyResult: AscApiKeyResult;
+}>;

package/build/submit/ios/CredentialsServiceSource.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFromCredentialsServiceAsync = exports.CREDENTIALS_SERVICE_SOURCE = void 0;
+const tslib_1 = require("tslib");
+const nullthrows_1 = (0, tslib_1.__importDefault)(require("nullthrows"));
+const SetUpSubmissionCredentials_1 = require("../../credentials/ios/actions/SetUpSubmissionCredentials");
+const log_1 = (0, tslib_1.__importDefault)(require("../../log"));
+const bundleIdentifier_1 = require("../../project/ios/bundleIdentifier");
+const Account_1 = require("../../user/Account");
+/**
+ * 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
+ */
+exports.CREDENTIALS_SERVICE_SOURCE = 'CREDENTIALS_SERVICE_SOURCE';
+async function getFromCredentialsServiceAsync(ctx) {
+    const bundleIdentifier = await (0, bundleIdentifier_1.getBundleIdentifierAsync)(ctx.projectDir, ctx.exp);
+    log_1.default.log(`Looking up credentials configuration for ${bundleIdentifier}...`);
+    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,
+        bundleIdentifier,
+    };
+    const setupSubmissionCredentialsAction = new SetUpSubmissionCredentials_1.SetUpSubmissionCredentials(appLookupParams);
+    const ascOrAsp = await setupSubmissionCredentialsAction.runAsync(ctx.credentialsCtx);
+    const isAppSpecificPassword = typeof ascOrAsp === 'string';
+    if (isAppSpecificPassword) {
+        return { appSpecificPassword: ascOrAsp };
+    }
+    else {
+        const ascKeyForSubmissions = (0, nullthrows_1.default)(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 !== null && name !== void 0 ? name : undefined,
+                },
+            },
+        };
+    }
+}
+exports.getFromCredentialsServiceAsync = getFromCredentialsServiceAsync;

package/build/submit/ios/IosSubmitCommand.js

@@ -14,6 +14,7 @@ const commons_1 = require("../commons");
 const AppProduce_1 = require("./AppProduce");
 const AppSpecificPasswordSource_1 = require("./AppSpecificPasswordSource");
 const AscApiKeySource_1 = require("./AscApiKeySource");
+const CredentialsServiceSource_1 = require("./CredentialsServiceSource");
 const IosSubmitter_1 = (0, tslib_1.__importDefault)(require("./IosSubmitter"));
 class IosSubmitCommand {
     constructor(ctx) {
@@ -26,15 +27,20 @@ class IosSubmitCommand {
         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 {
+        const shouldSkipAscApiKeySource = !ascApiKeySource.ok && ascApiKeySource.enforceError() instanceof errors_1.MissingCredentialsError;
+        if (!shouldSkipAscApiKeySource) {
             return { ascApiKeySource };
         }
+        const appSpecificPasswordSource = this.resolveAppSpecificPasswordSource();
+        const shouldSkipAppSpecificPasswordSource = !appSpecificPasswordSource.ok &&
+            appSpecificPasswordSource.enforceError() instanceof errors_1.MissingCredentialsError;
+        if (!shouldSkipAppSpecificPasswordSource) {
+            return { appSpecificPasswordSource: this.resolveAppSpecificPasswordSource() };
+        }
+        return {
+            credentialsServiceSource: (0, results_1.result)(CredentialsServiceSource_1.CREDENTIALS_SERVICE_SOURCE),
+        };
     }
     async resolveSubmissionOptionsAsync() {
         const archiveSource = this.resolveArchiveSource();
@@ -43,12 +49,16 @@ class IosSubmitCommand {
             ? credentialsSource.appSpecificPasswordSource
             : 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();
         const errored = [
             archiveSource,
             ...(maybeAppSpecificPasswordSource ? [maybeAppSpecificPasswordSource] : []),
             ...(maybeAscApiKeySource ? [maybeAscApiKeySource] : []),
+            ...(maybeCredentialsServiceSource ? [maybeCredentialsServiceSource] : []),
             ascAppIdentifier,
             appleIdUsername,
         ].filter(r => !r.ok);
@@ -72,6 +82,11 @@ class IosSubmitCommand {
                     ascApiKeySource: maybeAscApiKeySource.enforceValue(),
                 }
                 : null),
+            ...(maybeCredentialsServiceSource
+                ? {
+                    credentialsServiceSource: maybeCredentialsServiceSource.enforceValue(),
+                }
+                : null),
         };
     }
     resolveAppSpecificPasswordSource() {
@@ -82,14 +97,7 @@ class IosSubmitCommand {
                 appSpecificPassword: envAppSpecificPassword,
             });
         }
-        else if (this.ctx.nonInteractive) {
-            return (0, results_1.result)(new Error('Set the EXPO_APPLE_APP_SPECIFIC_PASSWORD environment variable.'));
-        }
-        else {
-            return (0, results_1.result)({
-                sourceType: AppSpecificPasswordSource_1.AppSpecificPasswordSourceType.prompt,
-            });
-        }
+        return (0, results_1.result)(new errors_1.MissingCredentialsError('The EXPO_APPLE_APP_SPECIFIC_PASSWORD environment variable must be set.'));
     }
     resolveAscApiKeySource() {
         const { ascApiKeyPath, ascApiKeyIssuerId, ascApiKeyId } = this.ctx.profile;

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

@@ -4,16 +4,19 @@ import { ArchiveSource } from '../ArchiveSource';
 import BaseSubmitter, { SubmissionInput } from '../BaseSubmitter';
 import { AppSpecificPasswordSource } from './AppSpecificPasswordSource';
 import { AscApiKeySource } from './AscApiKeySource';
+import { CredentialsServiceSource } from './CredentialsServiceSource';
 export interface IosSubmissionOptions extends Pick<IosSubmissionConfigInput, 'appleIdUsername' | 'ascAppIdentifier'> {
     projectId: string;
     archiveSource: ArchiveSource;
     appSpecificPasswordSource?: AppSpecificPasswordSource;
     ascApiKeySource?: AscApiKeySource;
+    credentialsServiceSource?: CredentialsServiceSource;
 }
 export default class IosSubmitter extends BaseSubmitter<Platform.IOS, IosSubmissionOptions> {
     submitAsync(): Promise<SubmissionFragment>;
     protected createPlatformSubmissionAsync({ projectId, submissionConfig, buildId, }: SubmissionInput<Platform.IOS>): Promise<SubmissionFragment>;
     private resolveSourceOptionsAsync;
     private formatSubmissionConfigAsync;
+    private formatAscApiKeyResult;
     private prepareSummaryData;
 }

package/build/submit/ios/IosSubmitter.js

@@ -9,6 +9,7 @@ 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");
+const CredentialsServiceSource_1 = require("./CredentialsServiceSource");
 class IosSubmitter extends BaseSubmitter_1.default {
     async submitAsync() {
         var _a;
@@ -34,12 +35,16 @@ class IosSubmitter extends BaseSubmitter_1.default {
             ? await (0, AppSpecificPasswordSource_1.getAppSpecificPasswordAsync)(this.options.appSpecificPasswordSource)
             : null;
         const maybeAppStoreConnectApiKey = this.options.ascApiKeySource
-            ? await (0, AscApiKeySource_1.getAscApiKeyLocallyAsync)(this.options.ascApiKeySource)
+            ? await (0, AscApiKeySource_1.getAscApiKeyLocallyAsync)(this.ctx, this.options.ascApiKeySource)
+            : null;
+        const maybeAscOrAspFromCredentialsService = this.options.credentialsServiceSource
+            ? await (0, CredentialsServiceSource_1.getFromCredentialsServiceAsync)(this.ctx)
             : null;
         return {
             archive,
             ...(maybeAppSpecificPassword ? { appSpecificPassword: maybeAppSpecificPassword } : null),
             ...(maybeAppStoreConnectApiKey ? { ascApiKeyResult: maybeAppStoreConnectApiKey } : null),
+            ...(maybeAscOrAspFromCredentialsService ? maybeAscOrAspFromCredentialsService : null),
         };
     }
     async formatSubmissionConfigAsync(options, { archive, appSpecificPassword, ascApiKeyResult }) {
@@ -49,17 +54,20 @@ class IosSubmitter extends BaseSubmitter_1.default {
             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),
+            ...((ascApiKeyResult === null || ascApiKeyResult === void 0 ? void 0 : ascApiKeyResult.result) ? this.formatAscApiKeyResult(ascApiKeyResult.result) : null),
         };
     }
+    formatAscApiKeyResult(result) {
+        return 'ascApiKeyId' in result
+            ? { ascApiKeyId: result.ascApiKeyId }
+            : {
+                ascApiKey: {
+                    keyP8: result.keyP8,
+                    keyIdentifier: result.keyId,
+                    issuerIdentifier: result.issuerId,
+                },
+            };
+    }
     prepareSummaryData(options, { archive, ascApiKeyResult }) {
         const { appleIdUsername, ascAppIdentifier, projectId } = options;
         // structuring order affects table rows order
@@ -67,9 +75,7 @@ class IosSubmitter extends BaseSubmitter_1.default {
             ascAppIdentifier,
             appleIdUsername: appleIdUsername !== null && appleIdUsername !== void 0 ? appleIdUsername : undefined,
             projectId,
-            ...(ascApiKeyResult
-                ? { formattedAscApiKey: formatServiceAccountSummary(ascApiKeyResult) }
-                : null),
+            ...(ascApiKeyResult ? { formattedAscApiKey: formatAscApiKeySummary(ascApiKeyResult) } : null),
             ...(0, summary_1.formatArchiveSourceSummary)(archive),
         };
     }
@@ -84,9 +90,17 @@ const SummaryHumanReadableKeys = {
     formattedBuild: 'Build',
     formattedAscApiKey: 'App Store Connect Api Key',
 };
-function formatServiceAccountSummary({ summary }) {
-    const { source, path, keyId } = summary;
+function formatAscApiKeySummary({ summary }) {
+    const { source, path, keyId, name } = summary;
     const fields = [
+        {
+            label: 'Key Name',
+            value: name,
+        },
+        {
+            label: 'Key ID',
+            value: keyId,
+        },
         {
             label: 'Key Source',
             value: source,
@@ -95,10 +109,6 @@ function formatServiceAccountSummary({ summary }) {
             label: 'Key Path',
             value: path,
         },
-        {
-            label: 'Key ID',
-            value: keyId,
-        },
     ];
     const filteredFields = fields.filter(({ value }) => value !== undefined && value !== null);
     return ('\n' +

package/build/submit/utils/errors.js

@@ -19,6 +19,7 @@ var SubmissionErrorCode;
     SubmissionErrorCode["IOS_INVALID_SIGNATURE"] = "SUBMISSION_SERVICE_IOS_INVALID_SIGNATURE";
     SubmissionErrorCode["IOS_INCORRECT_CREDENTIALS"] = "SUBMISSION_SERVICE_IOS_INVALID_CREDENTIALS";
     SubmissionErrorCode["IOS_IPAD_INVALID_ORIENTATION"] = "SUBMISSION_SERVICE_IOS_IPAD_INVALID_ORIENTATION";
+    SubmissionErrorCode["IOS_APPLE_MAINTENANCE"] = "SUBMISSION_SERVICE_IOS_APPLE_MAINTENANCE";
 })(SubmissionErrorCode || (SubmissionErrorCode = {}));
 const SubmissionErrorMessages = {
     [SubmissionErrorCode.ARCHIVE_DOWNLOAD_NOT_FOUND_ERROR]: "Failed to download the archive file (Response code: 404 Not Found). Please make sure the URL you've provided is correct.",
@@ -50,6 +51,7 @@ const SubmissionErrorMessages = {
     [SubmissionErrorCode.IOS_IPAD_INVALID_ORIENTATION]: "Your app doesn't support iPad multitasking and has to require full screen.\n" +
         "If you're submitting a managed Expo project, set the `expo.ios.requireFullScreen` to true in app.json and build the project again.\n" +
         `${(0, log_1.learnMore)('https://expo.fyi/ipad-requires-fullscreen')}`,
+    [SubmissionErrorCode.IOS_APPLE_MAINTENANCE]: 'It looks like Apple servers are undergoing an unscheduled maintenance. Please try again later.',
 };
 function printSubmissionError(error) {
     if (error.errorCode &&