eas-cli 0.35.0 → 0.38.0

package/build/submit/android/ServiceAccountSource.js

@@ -8,6 +8,7 @@ const nullthrows_1 = (0, tslib_1.__importDefault)(require("nullthrows"));
 const SetUpGoogleServiceAccountKey_1 = require("../../credentials/android/actions/SetUpGoogleServiceAccountKey");
 const googleServiceAccountKey_1 = require("../../credentials/android/utils/googleServiceAccountKey");
 const log_1 = (0, tslib_1.__importStar)(require("../../log"));
+const applicationId_1 = require("../../project/android/applicationId");
 const prompts_1 = require("../../prompts");
 const Account_1 = require("../../user/Account");
 const files_1 = require("../utils/files");
@@ -17,9 +18,9 @@ var ServiceAccountSourceType;
     ServiceAccountSourceType[ServiceAccountSourceType["prompt"] = 1] = "prompt";
     ServiceAccountSourceType[ServiceAccountSourceType["credentialsService"] = 2] = "credentialsService";
 })(ServiceAccountSourceType = exports.ServiceAccountSourceType || (exports.ServiceAccountSourceType = {}));
-async function getServiceAccountKeyResultAsync(ctx, source, androidApplicationIdentifier) {
+async function getServiceAccountKeyResultAsync(ctx, source) {
     if (source.sourceType === ServiceAccountSourceType.credentialsService) {
-        return await getServiceAccountFromCredentialsServiceAsync(ctx, androidApplicationIdentifier);
+        return await getServiceAccountFromCredentialsServiceAsync(ctx, source);
     }
     else {
         return await getServiceAccountLocallyAsync(source);
@@ -50,12 +51,23 @@ async function getServiceAccountKeyPathAsync(source) {
     }
 }
 exports.getServiceAccountKeyPathAsync = getServiceAccountKeyPathAsync;
-async function getServiceAccountFromCredentialsServiceAsync(ctx, androidApplicationIdentifier) {
+async function promptForApplicationIdAsync() {
+    const { androidPackage } = await (0, prompts_1.promptAsync)({
+        name: 'androidPackage',
+        message: 'Android package name:',
+        type: 'text',
+        validate: value => ((0, applicationId_1.isApplicationIdValid)(value) ? true : applicationId_1.INVALID_APPLICATION_ID_MESSAGE),
+    });
+    return androidPackage;
+}
+async function getServiceAccountFromCredentialsServiceAsync(ctx, source) {
+    var _a;
     const appLookupParams = {
         account: (0, nullthrows_1.default)((0, Account_1.findAccountByName)(ctx.user.accounts, ctx.accountName), `You do not have access to account: ${ctx.accountName}`),
         projectName: ctx.projectName,
-        androidApplicationIdentifier,
+        androidApplicationIdentifier: (_a = source.androidApplicationIdentifier) !== null && _a !== void 0 ? _a : (await promptForApplicationIdAsync()),
     };
+    log_1.default.log(`Looking up credentials configuration for ${appLookupParams.androidApplicationIdentifier}...`);
     const setupGoogleServiceAccountKeyAction = new SetUpGoogleServiceAccountKey_1.SetUpGoogleServiceAccountKey(appLookupParams);
     const androidAppCredentials = await setupGoogleServiceAccountKeyAction.runAsync(ctx.credentialsCtx);
     const googleServiceAccountKey = (0, nullthrows_1.default)(androidAppCredentials.googleServiceAccountKeyForSubmissions, 'Credentials Service must provide a valid GoogleServiceAccountKey');

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;
@@ -15,6 +17,7 @@ export interface SubmissionContext<T extends Platform> {
     projectId: string;
     projectName: string;
     user: Actor;
+    applicationIdentifierOverride?: string;
 }
 export interface SubmitArchiveFlags {
     latest?: boolean;
@@ -31,4 +34,5 @@ export declare function createSubmissionContextAsync<T extends Platform>(params:
     profile: SubmitProfile<T>;
     projectDir: string;
     projectId: string;
+    applicationIdentifier?: string;
 }): Promise<SubmissionContext<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) {
-    const { projectDir, nonInteractive } = params;
+    var _a;
+    const { applicationIdentifier, 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,8 @@ async function createSubmissionContextAsync(params) {
         exp,
         projectName,
         user,
+        trackingCtx,
+        applicationIdentifierOverride: applicationIdentifier,
     };
 }
 exports.createSubmissionContextAsync = createSubmissionContextAsync;

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

@@ -1,3 +1,5 @@
+import { Platform } from '@expo/eas-build-job';
+import { SubmissionContext } from '../context';
 export declare enum AppSpecificPasswordSourceType {
     userDefined = 0
 }
@@ -8,6 +10,11 @@ interface AppSpecificPasswordUserDefinedSource extends AppSpecificPasswordSource
     sourceType: AppSpecificPasswordSourceType.userDefined;
     appSpecificPassword: string;
 }
+export interface AppSpecificPasswordCredentials {
+    password: string;
+    appleIdUsername: string;
+}
 export declare type AppSpecificPasswordSource = AppSpecificPasswordUserDefinedSource;
-export declare function getAppSpecificPasswordAsync(source: AppSpecificPasswordSource): Promise<string>;
+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,18 +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 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 = exports.AppSpecificPasswordSourceType || (exports.AppSpecificPasswordSourceType = {}));
-async function getAppSpecificPasswordAsync(source) {
+async function getAppSpecificPasswordLocallyAsync(ctx, source) {
     var _a;
     if (source.sourceType === AppSpecificPasswordSourceType.userDefined) {
-        return source.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/CredentialsServiceSource.d.ts

@@ -1,14 +1,18 @@
 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
+ * 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;
+export declare const CREDENTIALS_SERVICE_SOURCE: "CREDENTIALS_SERVICE_SOURCE";
+export interface CredentialsServiceSource {
+    sourceType: typeof CREDENTIALS_SERVICE_SOURCE;
+    bundleIdentifier?: string;
+}
+export declare function getFromCredentialsServiceAsync(ctx: SubmissionContext<Platform.IOS>, source: CredentialsServiceSource): Promise<{
+    appSpecificPassword: AppSpecificPasswordCredentials;
 } | {
     ascApiKeyResult: AscApiKeyResult;
 }>;

package/build/submit/ios/CredentialsServiceSource.js

@@ -6,14 +6,26 @@ 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 prompts_1 = require("../../prompts");
 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
+ * 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);
+async function promptForBundleIdentifierAsync() {
+    const { bundleIdentifier } = await (0, prompts_1.promptAsync)({
+        name: 'bundleIdentifier',
+        message: 'Bundle identifier:',
+        type: 'text',
+        validate: value => ((0, bundleIdentifier_1.isBundleIdentifierValid)(value) ? true : bundleIdentifier_1.INVALID_BUNDLE_IDENTIFIER_MESSAGE),
+    });
+    return bundleIdentifier;
+}
+async function getFromCredentialsServiceAsync(ctx, source) {
+    var _a;
+    const bundleIdentifier = (_a = source.bundleIdentifier) !== null && _a !== void 0 ? _a : (await promptForBundleIdentifierAsync());
     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}`),
@@ -24,10 +36,15 @@ async function getFromCredentialsServiceAsync(ctx) {
     const ascOrAsp = await setupSubmissionCredentialsAction.runAsync(ctx.credentialsCtx);
     const isAppSpecificPassword = typeof ascOrAsp === 'string';
     if (isAppSpecificPassword) {
-        return { appSpecificPassword: ascOrAsp };
+        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 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: {

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

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

package/build/submit/ios/IosSubmitCommand.js

@@ -8,8 +8,7 @@ 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 bundleIdentifier_1 = require("../../project/ios/bundleIdentifier");
 const commons_1 = require("../commons");
 const AppProduce_1 = require("./AppProduce");
 const AppSpecificPasswordSource_1 = require("./AppSpecificPasswordSource");
@@ -26,22 +25,6 @@ class IosSubmitCommand {
         const submitter = new IosSubmitter_1.default(this.ctx, options);
         return await submitter.submitAsync();
     }
-    async resolveCredentialSubmissionOptionsAsync() {
-        const ascApiKeySource = this.resolveAscApiKeySource();
-        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();
@@ -53,14 +36,12 @@ class IosSubmitCommand {
             ? 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');
@@ -69,7 +50,6 @@ class IosSubmitCommand {
         }
         return {
             projectId: this.ctx.projectId,
-            appleIdUsername: appleIdUsername.enforceValue(),
             ascAppIdentifier: ascAppIdentifier.enforceValue(),
             archiveSource: archiveSource.enforceValue(),
             ...(maybeAppSpecificPasswordSource
@@ -89,6 +69,51 @@ class IosSubmitCommand {
                 : null),
         };
     }
+    async maybeGetIosBundleIdentifierAsync() {
+        try {
+            return (0, results_1.result)(await (0, bundleIdentifier_1.getBundleIdentifierAsync)(this.ctx.projectDir, this.ctx.exp));
+        }
+        catch (error) {
+            if (error instanceof bundleIdentifier_1.AmbiguousBundleIdentifierError) {
+                log_1.default.warn('bundleIdentifier in the Xcode project is ambiguous, specify it via "bundleIdentifier" field in the submit profile in the eas.json.');
+                return (0, results_1.result)(null);
+            }
+            return (0, results_1.result)(new Error(`Failed to resolve bundleIdentifier in the Xcode project: ${error.message}.`));
+        }
+    }
+    async resolveCredentialSubmissionOptionsAsync() {
+        var _a;
+        const ascApiKeySource = this.resolveAscApiKeySource();
+        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() };
+        }
+        let bundleIdentifier = (_a = this.ctx.applicationIdentifierOverride) !== null && _a !== void 0 ? _a : this.ctx.profile.bundleIdentifier;
+        if (!bundleIdentifier) {
+            const bundleIdentifierResult = await this.maybeGetIosBundleIdentifierAsync();
+            if (!bundleIdentifierResult.ok) {
+                return {
+                    credentialsServiceSource: (0, results_1.result)(bundleIdentifierResult.reason),
+                };
+            }
+            const bundleIdentifierValue = bundleIdentifierResult.enforceValue();
+            if (bundleIdentifierValue) {
+                bundleIdentifier = bundleIdentifierValue;
+            }
+        }
+        return {
+            credentialsServiceSource: (0, results_1.result)({
+                sourceType: CredentialsServiceSource_1.CREDENTIALS_SERVICE_SOURCE,
+                bundleIdentifier,
+            }),
+        };
+    }
     resolveAppSpecificPasswordSource() {
         const envAppSpecificPassword = getenv_1.default.string('EXPO_APPLE_APP_SPECIFIC_PASSWORD', '');
         if (envAppSpecificPassword) {
@@ -148,37 +173,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,9 +1,10 @@
 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;
@@ -12,11 +13,20 @@ export interface IosSubmissionOptions extends Pick<IosSubmissionConfigInput, 'ap
     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");
@@ -11,16 +12,51 @@ 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, this.options.credentialsServiceSource)
+                    : 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({
@@ -29,34 +65,23 @@ 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.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 }) {
+    formatSubmissionConfig(options, { archive, credentials }) {
+        const { appSpecificPassword, ascApiKeyResult } = credentials;
         const { appleIdUsername, ascAppIdentifier } = options;
         return {
             ascAppIdentifier,
             appleIdUsername,
             archiveUrl: archive.url,
-            appleAppSpecificPassword: appSpecificPassword,
+            ...(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,
+        };
+    }
     formatAscApiKeyResult(result) {
         return 'ascApiKeyId' in result
             ? { ascApiKeyId: result.ascApiKeyId }
@@ -68,13 +93,14 @@ class IosSubmitter extends BaseSubmitter_1.default {
                 },
             };
     }
-    prepareSummaryData(options, { archive, ascApiKeyResult }) {
-        const { appleIdUsername, ascAppIdentifier, projectId } = options;
+    prepareSummaryData(options, { archive, credentials }) {
+        const { ascApiKeyResult, appSpecificPassword } = credentials;
+        const { ascAppIdentifier, projectId } = options;
         // structuring order affects table rows order
         return {
             ascAppIdentifier,
-            appleIdUsername: appleIdUsername !== null && appleIdUsername !== void 0 ? appleIdUsername : undefined,
             projectId,
+            ...(appSpecificPassword ? { appleIdUsername: appSpecificPassword.appleIdUsername } : null),
             ...(ascApiKeyResult ? { formattedAscApiKey: formatAscApiKeySummary(ascApiKeyResult) } : null),
             ...(0, summary_1.formatArchiveSourceSummary)(archive),
         };
@@ -88,7 +114,7 @@ const SummaryHumanReadableKeys = {
     archiveUrl: 'Archive URL',
     archivePath: 'Archive Path',
     formattedBuild: 'Build',
-    formattedAscApiKey: 'App Store Connect Api Key',
+    formattedAscApiKey: 'App Store Connect API Key',
 };
 function formatAscApiKeySummary({ summary }) {
     const { source, path, keyId, name } = summary;

package/build/submit/submit.js

@@ -4,6 +4,8 @@ exports.waitToCompleteAsync = exports.submitAsync = void 0;
 const tslib_1 = require("tslib");
 const eas_build_job_1 = require("@expo/eas-build-job");
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
+const common_1 = require("../analytics/common");
+const events_1 = require("../analytics/events");
 const generated_1 = require("../graphql/generated");
 const log_1 = (0, tslib_1.__importStar)(require("../log"));
 const platform_1 = require("../platform");
@@ -12,10 +14,17 @@ const IosSubmitCommand_1 = (0, tslib_1.__importDefault)(require("./ios/IosSubmit
 const logs_1 = require("./utils/logs");
 const wait_1 = require("./utils/wait");
 async function submitAsync(ctx) {
-    const command = ctx.platform === eas_build_job_1.Platform.ANDROID
-        ? new AndroidSubmitCommand_1.default(ctx)
-        : new IosSubmitCommand_1.default(ctx);
-    return command.runAsync();
+    return await (0, common_1.withAnalyticsAsync)(async () => {
+        const command = ctx.platform === eas_build_job_1.Platform.ANDROID
+            ? new AndroidSubmitCommand_1.default(ctx)
+            : new IosSubmitCommand_1.default(ctx);
+        return command.runAsync();
+    }, {
+        attemptEvent: events_1.SubmissionEvent.SUBMIT_COMMAND_ATTEMPT,
+        successEvent: events_1.SubmissionEvent.SUBMIT_COMMAND_SUCCESS,
+        failureEvent: events_1.SubmissionEvent.SUBMIT_COMMAND_FAIL,
+        trackingCtx: ctx.trackingCtx,
+    });
 }
 exports.submitAsync = submitAsync;
 async function waitToCompleteAsync(submissions, { verbose = false } = {}) {

package/build/user/User.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.logoutAsync = exports.loginAsync = exports.getUserAsync = exports.getActorDisplayName = exports.getAccessToken = exports.getSessionSecret = void 0;
 const tslib_1 = require("tslib");
 const graphql_tag_1 = (0, tslib_1.__importDefault)(require("graphql-tag"));
-const Analytics = (0, tslib_1.__importStar)(require("../analytics"));
+const Analytics = (0, tslib_1.__importStar)(require("../analytics/rudderstackClient"));
 const api_1 = require("../api");
 const client_1 = require("../graphql/client");
 const UserQuery_1 = require("../graphql/queries/UserQuery");