eas-cli 0.34.0 → 0.36.1

package/build/graphql/mutations/KeystoreGenerationUrlMutation.d.ts

@@ -0,0 +1,3 @@
+export declare const KeystoreGenerationUrlMutation: {
+    createKeystoreGenerationUrlAsync(): Promise<string>;
+};

package/build/graphql/mutations/KeystoreGenerationUrlMutation.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.KeystoreGenerationUrlMutation = void 0;
+const tslib_1 = require("tslib");
+const graphql_tag_1 = (0, tslib_1.__importDefault)(require("graphql-tag"));
+const client_1 = require("../client");
+exports.KeystoreGenerationUrlMutation = {
+    async createKeystoreGenerationUrlAsync() {
+        const data = await (0, client_1.withErrorHandlingAsync)(client_1.graphqlClient
+            .mutation((0, graphql_tag_1.default) `
+            mutation CreateKeystoreGenerationUrlMutation {
+              keystoreGenerationUrl {
+                createKeystoreGenerationUrl {
+                  id
+                  url
+                }
+              }
+            }
+          `)
+            .toPromise());
+        return data.keystoreGenerationUrl.createKeystoreGenerationUrl.url;
+    },
+};

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/graphql/types/credentials/AppStoreConnectApiKey.d.ts

@@ -0,0 +1 @@
+export declare const AppStoreConnectApiKeyFragmentNode: import("graphql").DocumentNode;

package/build/graphql/types/credentials/AppStoreConnectApiKey.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AppStoreConnectApiKeyFragmentNode = void 0;
+const tslib_1 = require("tslib");
+const graphql_1 = require("graphql");
+const graphql_tag_1 = (0, tslib_1.__importDefault)(require("graphql-tag"));
+const AppleTeam_1 = require("./AppleTeam");
+exports.AppStoreConnectApiKeyFragmentNode = (0, graphql_tag_1.default) `
+  fragment AppStoreConnectApiKeyFragment on AppStoreConnectApiKey {
+    id
+    appleTeam {
+      id
+      ...AppleTeamFragment
+    }
+    issuerIdentifier
+    keyIdentifier
+    name
+    roles
+    createdAt
+    updatedAt
+  }
+  ${(0, graphql_1.print)(AppleTeam_1.AppleTeamFragmentNode)}
+`;

package/build/graphql/types/credentials/IosAppCredentials.js

@@ -4,6 +4,7 @@ exports.CommonIosAppCredentialsFragmentNode = exports.CommonIosAppCredentialsWit
 const tslib_1 = require("tslib");
 const graphql_tag_1 = (0, tslib_1.__importDefault)(require("graphql-tag"));
 const App_1 = require("../App");
+const AppStoreConnectApiKey_1 = require("./AppStoreConnectApiKey");
 const AppleAppIdentifier_1 = require("./AppleAppIdentifier");
 const ApplePushKey_1 = require("./ApplePushKey");
 const AppleTeam_1 = require("./AppleTeam");
@@ -27,11 +28,16 @@ exports.CommonIosAppCredentialsWithoutBuildCredentialsFragmentNode = (0, graphql
       id
       ...ApplePushKeyFragment
     }
+    appStoreConnectApiKeyForSubmissions {
+      id
+      ...AppStoreConnectApiKeyFragment
+    }
   }
   ${App_1.AppFragmentNode}
   ${AppleTeam_1.AppleTeamFragmentNode}
   ${AppleAppIdentifier_1.AppleAppIdentifierFragmentNode}
   ${ApplePushKey_1.ApplePushKeyFragmentNode}
+  ${AppStoreConnectApiKey_1.AppStoreConnectApiKeyFragmentNode}
 `;
 exports.CommonIosAppCredentialsFragmentNode = (0, graphql_tag_1.default) `
   fragment CommonIosAppCredentialsFragment on IosAppCredentials {

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

@@ -1,4 +1,5 @@
 import { Platform } from '@expo/eas-build-job';
+import { Event } from '../analytics/events';
 import { AndroidSubmissionConfigInput, IosSubmissionConfigInput, SubmissionFragment } from '../graphql/generated';
 import { SubmissionContext } from './context';
 export interface SubmissionInput<P extends Platform> {
@@ -6,11 +7,26 @@ export interface SubmissionInput<P extends Platform> {
     submissionConfig: P extends Platform.ANDROID ? AndroidSubmissionConfigInput : IosSubmissionConfigInput;
     buildId?: string;
 }
-export default abstract class BaseSubmitter<P extends Platform, SubmissionOptions> {
+interface AnalyticEvents {
+    attemptEvent: Event;
+    successEvent: Event;
+    failureEvent: Event;
+}
+export default abstract class BaseSubmitter<P extends Platform, ResolvedSourceOptions, SubmissionOptions> {
     protected ctx: SubmissionContext<P>;
     protected options: SubmissionOptions;
-    constructor(ctx: SubmissionContext<P>, options: SubmissionOptions);
-    abstract submitAsync(): Promise<SubmissionFragment>;
-    protected createSubmissionAsync(submissionInput: SubmissionInput<P>): Promise<SubmissionFragment>;
+    protected sourceOptionResolver: {
+        [K in keyof ResolvedSourceOptions]: () => Promise<ResolvedSourceOptions[K]>;
+    };
+    protected sourceOptionAnalytics: Record<keyof ResolvedSourceOptions, AnalyticEvents>;
+    constructor(ctx: SubmissionContext<P>, options: SubmissionOptions, sourceOptionResolver: {
+        [K in keyof ResolvedSourceOptions]: () => Promise<ResolvedSourceOptions[K]>;
+    }, sourceOptionAnalytics: Record<keyof ResolvedSourceOptions, AnalyticEvents>);
+    private getSourceOptionsAsync;
+    submitAsync(): Promise<SubmissionFragment>;
+    abstract createSubmissionInputAsync(resolvedOptions: ResolvedSourceOptions): Promise<SubmissionInput<P>>;
+    private createSubmissionAsync;
+    private createSubmissionWithAnalyticsAsync;
     protected abstract createPlatformSubmissionAsync(input: SubmissionInput<P>): Promise<SubmissionFragment>;
 }
+export {};

package/build/submit/BaseSubmitter.js

@@ -1,14 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+const common_1 = require("../analytics/common");
+const events_1 = require("../analytics/events");
 const AppPlatform_1 = require("../graphql/types/AppPlatform");
 const log_1 = (0, tslib_1.__importDefault)(require("../log"));
 const ora_1 = require("../ora");
 const platform_1 = require("../platform");
 class BaseSubmitter {
-    constructor(ctx, options) {
+    constructor(ctx, options, sourceOptionResolver, sourceOptionAnalytics) {
         this.ctx = ctx;
         this.options = options;
+        this.sourceOptionResolver = sourceOptionResolver;
+        this.sourceOptionAnalytics = sourceOptionAnalytics;
+    }
+    async getSourceOptionsAsync() {
+        const resolvedSourceOptions = {};
+        // Do not perform this in parallel as some of these require user interaction
+        for (const key in this.sourceOptionResolver) {
+            const sourceOptionKey = key;
+            const sourceOptionAnalytics = this.sourceOptionAnalytics[sourceOptionKey];
+            const sourceOption = await (0, common_1.withAnalyticsAsync)(async () => await this.sourceOptionResolver[sourceOptionKey](), {
+                attemptEvent: sourceOptionAnalytics.attemptEvent,
+                successEvent: sourceOptionAnalytics.successEvent,
+                failureEvent: sourceOptionAnalytics.failureEvent,
+                trackingCtx: this.ctx.trackingCtx,
+            });
+            resolvedSourceOptions[sourceOptionKey] = sourceOption;
+        }
+        return resolvedSourceOptions;
+    }
+    async submitAsync() {
+        const resolvedSourceOptions = await this.getSourceOptionsAsync();
+        const input = await this.createSubmissionInputAsync(resolvedSourceOptions);
+        return await this.createSubmissionWithAnalyticsAsync(input);
     }
     async createSubmissionAsync(submissionInput) {
         log_1.default.addNewLineIfNone();
@@ -24,5 +49,13 @@ class BaseSubmitter {
             throw err;
         }
     }
+    async createSubmissionWithAnalyticsAsync(submissionInput) {
+        return await (0, common_1.withAnalyticsAsync)(async () => this.createSubmissionAsync(submissionInput), {
+            attemptEvent: events_1.SubmissionEvent.SUBMIT_REQUEST_ATTEMPT,
+            successEvent: events_1.SubmissionEvent.SUBMIT_REQUEST_SUCCESS,
+            failureEvent: events_1.SubmissionEvent.SUBMIT_REQUEST_FAIL,
+            trackingCtx: this.ctx.trackingCtx,
+        });
+    }
 }
 exports.default = BaseSubmitter;

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

@@ -1,19 +1,25 @@
 import { Platform } from '@expo/eas-build-job';
 import { AndroidSubmissionConfigInput, SubmissionFragment } from '../../graphql/generated';
-import { ArchiveSource } from '../ArchiveSource';
+import { Archive, ArchiveSource } from '../ArchiveSource';
 import BaseSubmitter, { SubmissionInput } from '../BaseSubmitter';
+import { SubmissionContext } from '../context';
 import { AndroidPackageSource } from './AndroidPackageSource';
-import { ServiceAccountSource } from './ServiceAccountSource';
+import { ServiceAccountKeyResult, ServiceAccountSource } from './ServiceAccountSource';
 export interface AndroidSubmissionOptions extends Pick<AndroidSubmissionConfigInput, 'track' | 'releaseStatus' | 'changesNotSentForReview'> {
     projectId: string;
     androidPackageSource: AndroidPackageSource;
     archiveSource: ArchiveSource;
     serviceAccountSource: ServiceAccountSource;
 }
-export default class AndroidSubmitter extends BaseSubmitter<Platform.ANDROID, AndroidSubmissionOptions> {
-    submitAsync(): Promise<SubmissionFragment>;
+interface ResolvedSourceOptions {
+    archive: Archive;
+    serviceAccountKeyResult: ServiceAccountKeyResult;
+}
+export default class AndroidSubmitter extends BaseSubmitter<Platform.ANDROID, ResolvedSourceOptions, AndroidSubmissionOptions> {
+    constructor(ctx: SubmissionContext<Platform.ANDROID>, options: AndroidSubmissionOptions);
+    createSubmissionInputAsync(resolvedSourceOptions: ResolvedSourceOptions): Promise<SubmissionInput<Platform.ANDROID>>;
     protected createPlatformSubmissionAsync({ projectId, submissionConfig, buildId, }: SubmissionInput<Platform.ANDROID>): Promise<SubmissionFragment>;
-    private resolveSourceOptionsAsync;
-    private formatSubmissionConfigAsync;
+    private formatSubmissionConfig;
     private prepareSummaryData;
 }
+export {};

package/build/submit/android/AndroidSubmitter.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
+const events_1 = require("../../analytics/events");
 const SubmissionMutation_1 = require("../../graphql/mutations/SubmissionMutation");
 const formatFields_1 = (0, tslib_1.__importDefault)(require("../../utils/formatFields"));
 const ArchiveSource_1 = require("../ArchiveSource");
@@ -10,16 +11,39 @@ const summary_1 = require("../utils/summary");
 const AndroidPackageSource_1 = require("./AndroidPackageSource");
 const ServiceAccountSource_1 = require("./ServiceAccountSource");
 class AndroidSubmitter extends BaseSubmitter_1.default {
-    async submitAsync() {
+    constructor(ctx, options) {
+        const sourceOptionsResolver = {
+            // eslint-disable-next-line async-protect/async-suffix
+            archive: async () => await (0, ArchiveSource_1.getArchiveAsync)(this.options.archiveSource),
+            // eslint-disable-next-line async-protect/async-suffix
+            serviceAccountKeyResult: async () => {
+                const androidPackage = await (0, AndroidPackageSource_1.getAndroidPackageAsync)(this.options.androidPackageSource);
+                return await (0, ServiceAccountSource_1.getServiceAccountKeyResultAsync)(this.ctx, this.options.serviceAccountSource, androidPackage);
+            },
+        };
+        const sourceOptionsAnalytics = {
+            archive: {
+                attemptEvent: events_1.SubmissionEvent.GATHER_ARCHIVE_ATTEMPT,
+                successEvent: events_1.SubmissionEvent.GATHER_ARCHIVE_SUCCESS,
+                failureEvent: events_1.SubmissionEvent.GATHER_ARCHIVE_FAIL,
+            },
+            serviceAccountKeyResult: {
+                attemptEvent: events_1.SubmissionEvent.GATHER_CREDENTIALS_ATTEMPT,
+                successEvent: events_1.SubmissionEvent.GATHER_CREDENTIALS_SUCCESS,
+                failureEvent: events_1.SubmissionEvent.GATHER_CREDENTIALS_FAIL,
+            },
+        };
+        super(ctx, options, sourceOptionsResolver, sourceOptionsAnalytics);
+    }
+    async createSubmissionInputAsync(resolvedSourceOptions) {
         var _a;
-        const resolvedSourceOptions = await this.resolveSourceOptionsAsync();
-        const submissionConfig = await this.formatSubmissionConfigAsync(this.options, resolvedSourceOptions);
+        const submissionConfig = await this.formatSubmissionConfig(this.options, resolvedSourceOptions);
         (0, summary_1.printSummary)(this.prepareSummaryData(this.options, resolvedSourceOptions), SummaryHumanReadableKeys);
-        return await this.createSubmissionAsync({
+        return {
             projectId: this.options.projectId,
             submissionConfig,
             buildId: (_a = resolvedSourceOptions.archive.build) === null || _a === void 0 ? void 0 : _a.id,
-        });
+        };
     }
     async createPlatformSubmissionAsync({ projectId, submissionConfig, buildId, }) {
         return await SubmissionMutation_1.SubmissionMutation.createAndroidSubmissionAsync({
@@ -28,20 +52,9 @@ class AndroidSubmitter extends BaseSubmitter_1.default {
             submittedBuildId: buildId,
         });
     }
-    async resolveSourceOptionsAsync() {
-        const androidPackage = await (0, AndroidPackageSource_1.getAndroidPackageAsync)(this.options.androidPackageSource);
-        const archive = await (0, ArchiveSource_1.getArchiveAsync)(this.options.archiveSource);
-        const serviceAccountKeyResult = await (0, ServiceAccountSource_1.getServiceAccountKeyResultAsync)(this.ctx, this.options.serviceAccountSource, androidPackage);
-        return {
-            androidPackage,
-            archive,
-            serviceAccountKeyResult,
-        };
-    }
-    async formatSubmissionConfigAsync(options, { archive, androidPackage, serviceAccountKeyResult }) {
+    formatSubmissionConfig(options, { archive, serviceAccountKeyResult }) {
         const { track, releaseStatus, changesNotSentForReview } = options;
         return {
-            applicationIdentifier: androidPackage,
             archiveUrl: archive.url,
             track,
             changesNotSentForReview,
@@ -49,12 +62,11 @@ class AndroidSubmitter extends BaseSubmitter_1.default {
             ...serviceAccountKeyResult.result,
         };
     }
-    prepareSummaryData(options, { archive, androidPackage, serviceAccountKeyResult }) {
+    prepareSummaryData(options, { archive, serviceAccountKeyResult }) {
         const { projectId, track, releaseStatus, changesNotSentForReview } = options;
         // structuring order affects table rows order
         return {
             projectId,
-            androidPackage,
             track,
             changesNotSentForReview: changesNotSentForReview !== null && changesNotSentForReview !== void 0 ? changesNotSentForReview : undefined,
             releaseStatus: releaseStatus !== null && releaseStatus !== void 0 ? releaseStatus : undefined,
@@ -65,7 +77,6 @@ class AndroidSubmitter extends BaseSubmitter_1.default {
 }
 exports.default = AndroidSubmitter;
 const SummaryHumanReadableKeys = {
-    androidPackage: 'Android package',
     archivePath: 'Archive path',
     archiveUrl: 'Download URL',
     changesNotSentForReview: 'Changes not sent for a review',

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

@@ -1,12 +1,14 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform } from '@expo/eas-build-job';
 import { SubmitProfile } from '@expo/eas-json';
+import { TrackingContext } from '../analytics/common';
 import { CredentialsContext } from '../credentials/context';
 import { Actor } from '../user/User';
 export interface SubmissionContext<T extends Platform> {
     accountName: string;
     archiveFlags: SubmitArchiveFlags;
     credentialsCtx: CredentialsContext;
+    trackingCtx: TrackingContext;
     exp: ExpoConfig;
     nonInteractive: boolean;
     platform: T;

package/build/submit/context.js

@@ -1,21 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSubmissionContextAsync = void 0;
+const uuid_1 = require("uuid");
+const events_1 = require("../analytics/events");
 const context_1 = require("../credentials/context");
 const expoConfig_1 = require("../project/expoConfig");
 const projectUtils_1 = require("../project/projectUtils");
+const Account_1 = require("../user/Account");
 const actions_1 = require("../user/actions");
 async function createSubmissionContextAsync(params) {
+    var _a;
     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);
+    const accountId = (_a = (0, Account_1.findAccountByName)(user.accounts, accountName)) === null || _a === void 0 ? void 0 : _a.id;
     let credentialsCtx = params.credentialsCtx;
     if (!credentialsCtx) {
         credentialsCtx = new context_1.CredentialsContext({ projectDir, user, exp, nonInteractive });
     }
+    const trackingCtx = {
+        tracking_id: (0, uuid_1.v4)(),
+        platform: params.platform,
+        ...(accountId && { account_id: accountId }),
+        account_name: accountName,
+        project_id: params.projectId,
+    };
+    events_1.Analytics.logEvent(events_1.SubmissionEvent.SUBMIT_COMMAND, trackingCtx);
     return {
         ...rest,
         accountName,
@@ -23,6 +36,7 @@ async function createSubmissionContextAsync(params) {
         exp,
         projectName,
         user,
+        trackingCtx,
     };
 }
 exports.createSubmissionContextAsync = createSubmissionContextAsync;

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

@@ -1,6 +1,7 @@
+import { Platform } from '@expo/eas-build-job';
+import { SubmissionContext } from '../context';
 export declare enum AppSpecificPasswordSourceType {
-    userDefined = 0,
-    prompt = 1
+    userDefined = 0
 }
 interface AppSpecificPasswordSourceBase {
     sourceType: AppSpecificPasswordSourceType;
@@ -9,9 +10,11 @@ interface AppSpecificPasswordUserDefinedSource extends AppSpecificPasswordSource
     sourceType: AppSpecificPasswordSourceType.userDefined;
     appSpecificPassword: string;
 }
-interface AppSpecificPasswordPromptSource extends AppSpecificPasswordSourceBase {
-    sourceType: AppSpecificPasswordSourceType.prompt;
+export interface AppSpecificPasswordCredentials {
+    password: string;
+    appleIdUsername: string;
 }
-export declare type AppSpecificPasswordSource = AppSpecificPasswordUserDefinedSource | AppSpecificPasswordPromptSource;
-export declare function getAppSpecificPasswordAsync(source: AppSpecificPasswordSource): Promise<string>;
+export declare type AppSpecificPasswordSource = AppSpecificPasswordUserDefinedSource;
+export declare function getAppSpecificPasswordLocallyAsync(ctx: SubmissionContext<Platform.IOS>, source: AppSpecificPasswordSource): Promise<AppSpecificPasswordCredentials>;
+export declare function getAppleIdUsernameAsync(ctx: SubmissionContext<Platform.IOS>): Promise<string>;
 export {};

package/build/submit/ios/AppSpecificPasswordSource.js

@@ -1,36 +1,58 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAppSpecificPasswordAsync = exports.AppSpecificPasswordSourceType = void 0;
+exports.getAppleIdUsernameAsync = exports.getAppSpecificPasswordLocallyAsync = 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 getenv_1 = (0, tslib_1.__importDefault)(require("getenv"));
 const prompts_1 = require("../../prompts");
+const UserSettings_1 = (0, tslib_1.__importDefault)(require("../../user/UserSettings"));
 var AppSpecificPasswordSourceType;
 (function (AppSpecificPasswordSourceType) {
     AppSpecificPasswordSourceType[AppSpecificPasswordSourceType["userDefined"] = 0] = "userDefined";
-    AppSpecificPasswordSourceType[AppSpecificPasswordSourceType["prompt"] = 1] = "prompt";
 })(AppSpecificPasswordSourceType = exports.AppSpecificPasswordSourceType || (exports.AppSpecificPasswordSourceType = {}));
-async function getAppSpecificPasswordAsync(source) {
+async function getAppSpecificPasswordLocallyAsync(ctx, 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;
+        return {
+            password: source.appSpecificPassword,
+            appleIdUsername: await getAppleIdUsernameAsync(ctx),
+        };
     }
     else {
         // exhaustive -- should never happen
         throw new Error(`Unknown app specific password source type "${(_a = source) === null || _a === void 0 ? void 0 : _a.sourceType}"`);
     }
 }
-exports.getAppSpecificPasswordAsync = getAppSpecificPasswordAsync;
+exports.getAppSpecificPasswordLocallyAsync = getAppSpecificPasswordLocallyAsync;
+async function getAppleIdUsernameAsync(ctx) {
+    var _a;
+    if (ctx.profile.appleId) {
+        return ctx.profile.appleId;
+    }
+    const envAppleId = getenv_1.default.string('EXPO_APPLE_ID', '');
+    if (envAppleId) {
+        return envAppleId;
+    }
+    if ((_a = ctx.credentialsCtx.appStore.authCtx) === null || _a === void 0 ? void 0 : _a.appleId) {
+        return ctx.credentialsCtx.appStore.authCtx.appleId;
+    }
+    // Get the email address that was last used and set it as
+    // the default value for quicker authentication.
+    const lastAppleId = await UserSettings_1.default.getAsync('appleId', null);
+    if (ctx.nonInteractive) {
+        if (lastAppleId) {
+            return lastAppleId;
+        }
+        else {
+            throw new Error('Set appleId in the submit profile (eas.json).');
+        }
+    }
+    const { appleId } = await (0, prompts_1.promptAsync)({
+        type: 'text',
+        name: 'appleId',
+        message: `Enter your Apple ID:`,
+        validate: (val) => !!val,
+        initial: lastAppleId !== null && lastAppleId !== void 0 ? lastAppleId : undefined,
+    });
+    return appleId;
+}
+exports.getAppleIdUsernameAsync = getAppleIdUsernameAsync;

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,15 @@
+import { Platform } from '@expo/eas-build-job';
+import { SubmissionContext } from '../context';
+import { AppSpecificPasswordCredentials } from './AppSpecificPasswordSource';
+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: AppSpecificPasswordCredentials;
+} | {
+    ascApiKeyResult: AscApiKeyResult;
+}>;