eas-cli 0.33.1 → 0.36.0

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

package/build/submit/ios/CredentialsServiceSource.js

@@ -0,0 +1,52 @@
+"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");
+const AppSpecificPasswordSource_1 = require("./AppSpecificPasswordSource");
+/**
+ * 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: {
+                password: ascOrAsp,
+                appleIdUsername: await (0, AppSpecificPasswordSource_1.getAppleIdUsernameAsync)(ctx),
+            },
+        };
+    }
+    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.d.ts

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

package/build/submit/ios/IosSubmitCommand.js

@@ -8,12 +8,11 @@ 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 CredentialsServiceSource_1 = require("./CredentialsServiceSource");
 const IosSubmitter_1 = (0, tslib_1.__importDefault)(require("./IosSubmitter"));
 class IosSubmitCommand {
     constructor(ctx) {
@@ -25,32 +24,39 @@ 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
+    resolveCredentialSubmissionOptions() {
         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();
-        const credentialsSource = await this.resolveCredentialSubmissionOptionsAsync();
+        const credentialsSource = this.resolveCredentialSubmissionOptions();
         const maybeAppSpecificPasswordSource = 'appSpecificPasswordSource' in credentialsSource
             ? 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);
         if (errored.length > 0) {
             const message = errored.map(err => { var _a; return (_a = err.reason) === null || _a === void 0 ? void 0 : _a.message; }).join('\n');
@@ -59,7 +65,6 @@ class IosSubmitCommand {
         }
         return {
             projectId: this.ctx.projectId,
-            appleIdUsername: appleIdUsername.enforceValue(),
             ascAppIdentifier: ascAppIdentifier.enforceValue(),
             archiveSource: archiveSource.enforceValue(),
             ...(maybeAppSpecificPasswordSource
@@ -72,6 +77,11 @@ class IosSubmitCommand {
                     ascApiKeySource: maybeAscApiKeySource.enforceValue(),
                 }
                 : null),
+            ...(maybeCredentialsServiceSource
+                ? {
+                    credentialsServiceSource: maybeCredentialsServiceSource.enforceValue(),
+                }
+                : null),
         };
     }
     resolveAppSpecificPasswordSource() {
@@ -82,14 +92,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;
@@ -140,37 +143,5 @@ class IosSubmitCommand {
             }
         }
     }
-    async resolveAppleIdUsernameAsync() {
-        var _a;
-        if (this.ctx.profile.appleId) {
-            return (0, results_1.result)(this.ctx.profile.appleId);
-        }
-        const envAppleId = getenv_1.default.string('EXPO_APPLE_ID', '');
-        if (envAppleId) {
-            return (0, results_1.result)(envAppleId);
-        }
-        if ((_a = this.ctx.credentialsCtx.appStore.authCtx) === null || _a === void 0 ? void 0 : _a.appleId) {
-            return (0, results_1.result)(this.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 (this.ctx.nonInteractive) {
-            if (lastAppleId) {
-                return (0, results_1.result)(lastAppleId);
-            }
-            else {
-                return (0, results_1.result)(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 (0, results_1.result)(appleId);
-    }
 }
 exports.default = IosSubmitCommand;

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

@@ -1,19 +1,32 @@
 import { Platform } from '@expo/eas-build-job';
 import { IosSubmissionConfigInput, SubmissionFragment } from '../../graphql/generated';
-import { ArchiveSource } from '../ArchiveSource';
+import { Archive, ArchiveSource } from '../ArchiveSource';
 import BaseSubmitter, { SubmissionInput } from '../BaseSubmitter';
-import { AppSpecificPasswordSource } from './AppSpecificPasswordSource';
-import { AscApiKeySource } from './AscApiKeySource';
+import { SubmissionContext } from '../context';
+import { AppSpecificPasswordCredentials, AppSpecificPasswordSource } from './AppSpecificPasswordSource';
+import { AscApiKeyResult, 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>;
+interface ResolvedSourceOptions {
+    archive: Archive;
+    credentials: {
+        appSpecificPassword?: AppSpecificPasswordCredentials;
+        ascApiKeyResult?: AscApiKeyResult;
+    };
+}
+export default class IosSubmitter extends BaseSubmitter<Platform.IOS, ResolvedSourceOptions, IosSubmissionOptions> {
+    constructor(ctx: SubmissionContext<Platform.IOS>, options: IosSubmissionOptions);
+    createSubmissionInputAsync(resolvedSourceOptions: ResolvedSourceOptions): Promise<SubmissionInput<Platform.IOS>>;
     protected createPlatformSubmissionAsync({ projectId, submissionConfig, buildId, }: SubmissionInput<Platform.IOS>): Promise<SubmissionFragment>;
-    private resolveSourceOptionsAsync;
-    private formatSubmissionConfigAsync;
+    private formatSubmissionConfig;
+    private formatAppSpecificPassword;
+    private formatAscApiKeyResult;
     private prepareSummaryData;
 }
+export {};

package/build/submit/ios/IosSubmitter.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");
@@ -9,17 +10,53 @@ 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() {
+    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
+            credentials: async () => {
+                const maybeAppSpecificPassword = this.options.appSpecificPasswordSource
+                    ? await (0, AppSpecificPasswordSource_1.getAppSpecificPasswordLocallyAsync)(this.ctx, this.options.appSpecificPasswordSource)
+                    : null;
+                const maybeAppStoreConnectApiKey = 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 {
+                    ...(maybeAppSpecificPassword ? { appSpecificPassword: maybeAppSpecificPassword } : null),
+                    ...(maybeAppStoreConnectApiKey ? { ascApiKeyResult: maybeAppStoreConnectApiKey } : null),
+                    ...(maybeAscOrAspFromCredentialsService ? maybeAscOrAspFromCredentialsService : null),
+                };
+            },
+        };
+        const sourceOptionsAnalytics = {
+            archive: {
+                attemptEvent: events_1.SubmissionEvent.GATHER_ARCHIVE_ATTEMPT,
+                successEvent: events_1.SubmissionEvent.GATHER_ARCHIVE_SUCCESS,
+                failureEvent: events_1.SubmissionEvent.GATHER_ARCHIVE_FAIL,
+            },
+            credentials: {
+                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 = 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.createIosSubmissionAsync({
@@ -28,48 +65,43 @@ class IosSubmitter extends BaseSubmitter_1.default {
             submittedBuildId: buildId,
         });
     }
-    async resolveSourceOptionsAsync() {
-        const archive = await (0, ArchiveSource_1.getArchiveAsync)(this.options.archiveSource);
-        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,
-            ...(maybeAppSpecificPassword ? { appSpecificPassword: maybeAppSpecificPassword } : null),
-            ...(maybeAppStoreConnectApiKey ? { ascApiKeyResult: maybeAppStoreConnectApiKey } : null),
-        };
-    }
-    async formatSubmissionConfigAsync(options, { archive, appSpecificPassword, ascApiKeyResult }) {
+    formatSubmissionConfig(options, { archive, credentials }) {
+        const { appSpecificPassword, ascApiKeyResult } = credentials;
         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),
+            ...(appSpecificPassword ? this.formatAppSpecificPassword(appSpecificPassword) : null),
+            ...((ascApiKeyResult === null || ascApiKeyResult === void 0 ? void 0 : ascApiKeyResult.result) ? this.formatAscApiKeyResult(ascApiKeyResult.result) : null),
+        };
+    }
+    formatAppSpecificPassword(appSpecificPassword) {
+        return {
+            appleAppSpecificPassword: appSpecificPassword.password,
+            appleIdUsername: appSpecificPassword.appleIdUsername,
         };
     }
-    prepareSummaryData(options, { archive, ascApiKeyResult }) {
-        const { appleIdUsername, ascAppIdentifier, projectId } = options;
+    formatAscApiKeyResult(result) {
+        return 'ascApiKeyId' in result
+            ? { ascApiKeyId: result.ascApiKeyId }
+            : {
+                ascApiKey: {
+                    keyP8: result.keyP8,
+                    keyIdentifier: result.keyId,
+                    issuerIdentifier: result.issuerId,
+                },
+            };
+    }
+    prepareSummaryData(options, { archive, credentials }) {
+        const { ascApiKeyResult, appSpecificPassword } = credentials;
+        const { ascAppIdentifier, projectId } = options;
         // structuring order affects table rows order
         return {
             ascAppIdentifier,
-            appleIdUsername,
             projectId,
-            ...(ascApiKeyResult
-                ? { formattedAscApiKey: formatServiceAccountSummary(ascApiKeyResult) }
-                : null),
+            ...(appSpecificPassword ? { appleIdUsername: appSpecificPassword.appleIdUsername } : null),
+            ...(ascApiKeyResult ? { formattedAscApiKey: formatAscApiKeySummary(ascApiKeyResult) } : null),
             ...(0, summary_1.formatArchiveSourceSummary)(archive),
         };
     }
@@ -82,11 +114,19 @@ const SummaryHumanReadableKeys = {
     archiveUrl: 'Archive URL',
     archivePath: 'Archive Path',
     formattedBuild: 'Build',
-    formattedAscApiKey: 'App Store Connect Api Key',
+    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 +135,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' +