eas-cli 0.33.0 → 0.35.0

package/build/credentials/ios/actions/PushKeyUtils.js

@@ -12,12 +12,12 @@ const pushKey_1 = require("../appstore/pushKey");
 const credentials_1 = require("../credentials");
 const validatePushKey_1 = require("../validators/validatePushKey");
 const AppleTeamUtils_1 = require("./AppleTeamUtils");
-async function provideOrGeneratePushKeyAsync(ctx, accountName) {
+async function provideOrGeneratePushKeyAsync(ctx) {
     if (!ctx.nonInteractive) {
         const userProvided = await promptForPushKeyAsync(ctx);
         if (userProvided) {
             if (!ctx.appStore.authCtx) {
-                log_1.default.warn('Unable to validate push key due to insufficient Apple Credentials');
+                log_1.default.warn('Unable to validate push key, you are not authenticated with Apple.');
                 return userProvided;
             }
             else {
@@ -32,11 +32,11 @@ async function provideOrGeneratePushKeyAsync(ctx, accountName) {
                 if (useUserProvided) {
                     return userProvided;
                 }
-                return await provideOrGeneratePushKeyAsync(ctx, accountName);
+                return await provideOrGeneratePushKeyAsync(ctx);
             }
         }
     }
-    return await generatePushKeyAsync(ctx, accountName);
+    return await generatePushKeyAsync(ctx);
 }
 exports.provideOrGeneratePushKeyAsync = provideOrGeneratePushKeyAsync;
 async function promptForPushKeyAsync(ctx) {
@@ -58,7 +58,7 @@ async function promptForPushKeyAsync(ctx) {
     }
     return userProvided;
 }
-async function generatePushKeyAsync(ctx, accountName) {
+async function generatePushKeyAsync(ctx) {
     await ctx.appStore.ensureAuthenticatedAsync();
     try {
         return await ctx.appStore.createPushKeyAsync();
@@ -94,7 +94,7 @@ async function generatePushKeyAsync(ctx, accountName) {
             throw e;
         }
     }
-    return await generatePushKeyAsync(ctx, accountName);
+    return await generatePushKeyAsync(ctx);
 }
 function formatPushKeyFromApple(pushKey) {
     const { name, id } = pushKey;

package/build/credentials/ios/actions/RemoveAscApiKey.d.ts

@@ -0,0 +1,14 @@
+import { AppStoreConnectApiKeyFragment } from '../../../graphql/generated';
+import { Account } from '../../../user/Account';
+import { CredentialsContext } from '../../context';
+export declare class SelectAndRemoveAscApiKey {
+    private account;
+    constructor(account: Account);
+    runAsync(ctx: CredentialsContext): Promise<void>;
+}
+export declare class RemoveAscApiKey {
+    private account;
+    private ascApiKey;
+    constructor(account: Account, ascApiKey: AppStoreConnectApiKeyFragment);
+    runAsync(ctx: CredentialsContext): Promise<void>;
+}

package/build/credentials/ios/actions/RemoveAscApiKey.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RemoveAscApiKey = exports.SelectAndRemoveAscApiKey = void 0;
+const tslib_1 = require("tslib");
+const log_1 = (0, tslib_1.__importDefault)(require("../../../log"));
+const prompts_1 = require("../../../prompts");
+const AscApiKeyUtils_1 = require("./AscApiKeyUtils");
+class SelectAndRemoveAscApiKey {
+    constructor(account) {
+        this.account = account;
+    }
+    async runAsync(ctx) {
+        const selected = await (0, AscApiKeyUtils_1.selectAscApiKeysFromAccountAsync)(ctx, this.account);
+        if (selected) {
+            await new RemoveAscApiKey(this.account, selected).runAsync(ctx);
+            log_1.default.succeed('Removed App Store Connect Api Key');
+            log_1.default.newLine();
+        }
+    }
+}
+exports.SelectAndRemoveAscApiKey = SelectAndRemoveAscApiKey;
+class RemoveAscApiKey {
+    constructor(account, ascApiKey) {
+        this.account = account;
+        this.ascApiKey = ascApiKey;
+    }
+    async runAsync(ctx) {
+        if (ctx.nonInteractive) {
+            throw new Error(`Cannot remove App Store Connect Api Keys in non-interactive mode.`);
+        }
+        // TODO(quin): add an extra edge on AppStoreConnectApiKey to find the apps using it
+        const confirm = await (0, prompts_1.confirmAsync)({
+            message: `Deleting this Api Key may affect your projects that rely on it. Do you want to continue?`,
+        });
+        if (!confirm) {
+            log_1.default.log('Aborting');
+            return;
+        }
+        log_1.default.log('Removing Api Key');
+        await ctx.ios.deleteAscApiKeyAsync(this.ascApiKey.id);
+        let shouldRevoke = false;
+        if (!ctx.nonInteractive) {
+            shouldRevoke = await (0, prompts_1.confirmAsync)({
+                message: `Do you also want to revoke this Api Key on the Apple Developer Portal?`,
+            });
+        }
+        else if (ctx.nonInteractive) {
+            log_1.default.log('Skipping Api Key revocation on the Apple Developer Portal.');
+        }
+        if (shouldRevoke) {
+            await ctx.appStore.revokeAscApiKeyAsync(this.ascApiKey.keyIdentifier);
+        }
+    }
+}
+exports.RemoveAscApiKey = RemoveAscApiKey;

package/build/credentials/ios/actions/{SetupAdhocProvisioningProfile.d.ts → SetUpAdhocProvisioningProfile.d.ts}

@@ -1,7 +1,7 @@
 import { AppleDistributionCertificateFragment, IosAppBuildCredentialsFragment } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/GraphqlClient';
-export declare class SetupAdhocProvisioningProfile {
+export declare class SetUpAdhocProvisioningProfile {
     private app;
     constructor(app: AppLookupParams);
     runAsync(ctx: CredentialsContext): Promise<IosAppBuildCredentialsFragment>;

package/build/credentials/ios/actions/{SetupAdhocProvisioningProfile.js → SetUpAdhocProvisioningProfile.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.doUDIDsMatch = exports.SetupAdhocProvisioningProfile = void 0;
+exports.doUDIDsMatch = exports.SetUpAdhocProvisioningProfile = void 0;
 const tslib_1 = require("tslib");
 const assert_1 = (0, tslib_1.__importDefault)(require("assert"));
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
@@ -15,19 +15,19 @@ const validateProvisioningProfile_1 = require("../validators/validateProvisionin
 const AppleTeamUtils_1 = require("./AppleTeamUtils");
 const BuildCredentialsUtils_1 = require("./BuildCredentialsUtils");
 const DeviceUtils_1 = require("./DeviceUtils");
-const SetupDistributionCertificate_1 = require("./SetupDistributionCertificate");
+const SetUpDistributionCertificate_1 = require("./SetUpDistributionCertificate");
 var ReuseAction;
 (function (ReuseAction) {
     ReuseAction[ReuseAction["Yes"] = 0] = "Yes";
     ReuseAction[ReuseAction["ShowDevices"] = 1] = "ShowDevices";
     ReuseAction[ReuseAction["No"] = 2] = "No";
 })(ReuseAction || (ReuseAction = {}));
-class SetupAdhocProvisioningProfile {
+class SetUpAdhocProvisioningProfile {
     constructor(app) {
         this.app = app;
     }
     async runAsync(ctx) {
-        const distCert = await new SetupDistributionCertificate_1.SetupDistributionCertificate(this.app, generated_1.IosDistributionType.AdHoc).runAsync(ctx);
+        const distCert = await new SetUpDistributionCertificate_1.SetUpDistributionCertificate(this.app, generated_1.IosDistributionType.AdHoc).runAsync(ctx);
         const areBuildCredentialsSetup = await this.areBuildCredentialsSetupAsync(ctx);
         if (ctx.nonInteractive) {
             if (areBuildCredentialsSetup) {
@@ -195,7 +195,7 @@ class SetupAdhocProvisioningProfile {
         }
     }
 }
-exports.SetupAdhocProvisioningProfile = SetupAdhocProvisioningProfile;
+exports.SetUpAdhocProvisioningProfile = SetUpAdhocProvisioningProfile;
 function doUDIDsMatch(udidsA, udidsB) {
     const setA = new Set(udidsA);
     const setB = new Set(udidsB);

package/build/credentials/ios/actions/SetUpAscApiKey.d.ts

@@ -0,0 +1,21 @@
+import { CommonIosAppCredentialsFragment } from '../../../graphql/generated';
+import { CredentialsContext } from '../../context';
+import { AppLookupParams } from '../api/GraphqlClient';
+import { AppStoreApiKeyPurpose } from './AscApiKeyUtils';
+export declare enum SetupAscApiKeyChoice {
+    GENERATE = "GENERATE",
+    USE_EXISTING = "USE_EXISTING"
+}
+export declare class SetUpAscApiKey {
+    private app;
+    private purpose;
+    choices: {
+        title: string;
+        value: string;
+    }[];
+    constructor(app: AppLookupParams, purpose: AppStoreApiKeyPurpose);
+    runAsync(ctx: CredentialsContext): Promise<CommonIosAppCredentialsFragment>;
+    private doBestEffortAutoselectAsync;
+    private isAscApiKeySetupAsync;
+    private processChoicesAsync;
+}

package/build/credentials/ios/actions/SetUpAscApiKey.js

@@ -0,0 +1,114 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SetUpAscApiKey = exports.SetupAscApiKeyChoice = void 0;
+const tslib_1 = require("tslib");
+const assert_1 = (0, tslib_1.__importDefault)(require("assert"));
+const nullthrows_1 = (0, tslib_1.__importDefault)(require("nullthrows"));
+const log_1 = (0, tslib_1.__importDefault)(require("../../../log"));
+const prompts_1 = require("../../../prompts");
+const errors_1 = require("../../errors");
+const validateAscApiKey_1 = require("../validators/validateAscApiKey");
+const AscApiKeyUtils_1 = require("./AscApiKeyUtils");
+const AssignAscApiKey_1 = require("./AssignAscApiKey");
+const CreateAscApiKey_1 = require("./CreateAscApiKey");
+var SetupAscApiKeyChoice;
+(function (SetupAscApiKeyChoice) {
+    SetupAscApiKeyChoice["GENERATE"] = "GENERATE";
+    SetupAscApiKeyChoice["USE_EXISTING"] = "USE_EXISTING";
+})(SetupAscApiKeyChoice = exports.SetupAscApiKeyChoice || (exports.SetupAscApiKeyChoice = {}));
+class SetUpAscApiKey {
+    constructor(app, purpose) {
+        this.app = app;
+        this.purpose = purpose;
+        this.choices = [
+            {
+                title: '[Choose an existing ASC Api Key]',
+                value: SetupAscApiKeyChoice.USE_EXISTING,
+            },
+            { title: '[Add a new ASC Api Key]', value: SetupAscApiKeyChoice.GENERATE },
+        ];
+    }
+    async runAsync(ctx) {
+        const isKeySetup = await this.isAscApiKeySetupAsync(ctx, this.purpose);
+        if (isKeySetup) {
+            log_1.default.succeed('App Store Connect Api Key already set up.');
+            return (0, nullthrows_1.default)(await ctx.ios.getIosAppCredentialsWithCommonFieldsAsync(this.app), 'iosAppCredentials cannot be null if App Store Connect Api Key is already set up');
+        }
+        if (ctx.nonInteractive) {
+            throw new errors_1.MissingCredentialsNonInteractiveError('App Store Connect Api Keys cannot be set up in --non-interactive mode.');
+        }
+        const keysForAccount = await (0, AscApiKeyUtils_1.getAscApiKeysFromAccountAsync)(ctx, this.app.account, {
+            filterDifferentAppleTeam: true,
+        });
+        const maybeAutoselectedKey = await this.doBestEffortAutoselectAsync(ctx, keysForAccount);
+        if (maybeAutoselectedKey) {
+            return await new AssignAscApiKey_1.AssignAscApiKey(this.app).runAsync(ctx, maybeAutoselectedKey, this.purpose);
+        }
+        const availableChoices = keysForAccount.length === 0
+            ? this.choices.filter(choice => choice.value !== SetupAscApiKeyChoice.USE_EXISTING)
+            : this.choices;
+        const ascApiKey = await this.processChoicesAsync(ctx, this.purpose, availableChoices);
+        return await new AssignAscApiKey_1.AssignAscApiKey(this.app).runAsync(ctx, ascApiKey, this.purpose);
+    }
+    async doBestEffortAutoselectAsync(ctx, keysForAccount) {
+        if (!ctx.appStore.authCtx) {
+            return null;
+        }
+        if (keysForAccount.length === 0) {
+            return null;
+        }
+        // only provide autoselect if we can find a key that is certainly valid
+        const validKeys = await (0, validateAscApiKey_1.getValidAndTrackedAscApiKeysAsync)(ctx, keysForAccount);
+        if (validKeys.length === 0) {
+            return null;
+        }
+        const [autoselectedKey] = (0, AscApiKeyUtils_1.sortAscApiKeysByUpdatedAtDesc)(validKeys);
+        const useAutoselected = await (0, prompts_1.confirmAsync)({
+            message: `Reuse this App Store Connect Api Key?\n${(0, AscApiKeyUtils_1.formatAscApiKey)(autoselectedKey)}`,
+        });
+        if (useAutoselected) {
+            log_1.default.log(`Using App Store Connect Api Key with ID ${autoselectedKey.keyIdentifier}`);
+            return autoselectedKey;
+        }
+        else {
+            return null;
+        }
+    }
+    async isAscApiKeySetupAsync(ctx, purpose) {
+        const appCredentials = await ctx.ios.getIosAppCredentialsWithCommonFieldsAsync(this.app);
+        if (purpose !== AscApiKeyUtils_1.AppStoreApiKeyPurpose.SUBMISSION_SERVICE) {
+            throw new Error(`App Store Connect Api Key setup is not yet supported for ${purpose}.`);
+        }
+        return !!(appCredentials === null || appCredentials === void 0 ? void 0 : appCredentials.appStoreConnectApiKeyForSubmissions);
+    }
+    async processChoicesAsync(ctx, purpose, choices) {
+        (0, assert_1.default)(choices.length > 0, 'SetupAscApiKey: There must be at least one choice');
+        let choice;
+        if (choices.length === 1) {
+            choice = choices[0].value;
+        }
+        else {
+            const result = await (0, prompts_1.promptAsync)({
+                type: 'select',
+                name: 'choice',
+                message: 'Select what to use for your project:',
+                choices,
+            });
+            choice = result.choice;
+        }
+        if (choice === SetupAscApiKeyChoice.GENERATE) {
+            return await new CreateAscApiKey_1.CreateAscApiKey(this.app.account).runAsync(ctx, purpose);
+        }
+        else if (choice === SetupAscApiKeyChoice.USE_EXISTING) {
+            const selectedAscApiKey = await (0, AscApiKeyUtils_1.selectAscApiKeysFromAccountAsync)(ctx, this.app.account, {
+                filterDifferentAppleTeam: true,
+            });
+            if (!selectedAscApiKey) {
+                return await this.processChoicesAsync(ctx, purpose, choices);
+            }
+            return selectedAscApiKey;
+        }
+        throw new errors_1.UnsupportedCredentialsChoiceError(`AscApiKey Setup does not support choice:${choice}`, choice);
+    }
+}
+exports.SetUpAscApiKey = SetUpAscApiKey;

package/build/credentials/ios/actions/{SetupBuildCredentials.d.ts → SetUpBuildCredentials.d.ts}

@@ -9,7 +9,7 @@ interface Options {
     enterpriseProvisioning?: IosEnterpriseProvisioning;
     iosCapabilitiesOptions?: IosCapabilitiesOptions;
 }
-export declare class SetupBuildCredentials {
+export declare class SetUpBuildCredentials {
     private options;
     constructor(options: Options);
     runAsync(ctx: CredentialsContext): Promise<IosCredentials>;

package/build/credentials/ios/actions/{SetupBuildCredentials.js → SetUpBuildCredentials.js}

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SetupBuildCredentials = void 0;
+exports.SetUpBuildCredentials = void 0;
 const tslib_1 = require("tslib");
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 const nullthrows_1 = (0, tslib_1.__importDefault)(require("nullthrows"));
 const log_1 = (0, tslib_1.__importDefault)(require("../../../log"));
 const printCredentials_1 = require("../utils/printCredentials");
-const SetupTargetBuildCredentials_1 = require("./SetupTargetBuildCredentials");
-class SetupBuildCredentials {
+const SetUpTargetBuildCredentials_1 = require("./SetUpTargetBuildCredentials");
+class SetUpBuildCredentials {
     constructor(options) {
         this.options = options;
     }
@@ -35,7 +35,7 @@ class SetupBuildCredentials {
             else {
                 log_1.default.newLine();
             }
-            const action = new SetupTargetBuildCredentials_1.SetupTargetBuildCredentials({
+            const action = new SetUpTargetBuildCredentials_1.SetUpTargetBuildCredentials({
                 ...this.options,
                 app: {
                     ...this.options.app,
@@ -53,7 +53,7 @@ class SetupBuildCredentials {
         return toIosCredentials(iosAppBuildCredentialsMap);
     }
 }
-exports.SetupBuildCredentials = SetupBuildCredentials;
+exports.SetUpBuildCredentials = SetUpBuildCredentials;
 function toIosCredentials(appBuildCredentialsMap) {
     return Object.entries(appBuildCredentialsMap).reduce((acc, [targetName, appBuildCredentials]) => {
         var _a, _b, _c;

package/build/credentials/ios/actions/{SetupBuildCredentialsFromCredentialsJson.d.ts → SetUpBuildCredentialsFromCredentialsJson.d.ts}

@@ -1,7 +1,7 @@
 import { IosDistributionType } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
 import { App, Target } from '../types';
-export declare class SetupBuildCredentialsFromCredentialsJson {
+export declare class SetUpBuildCredentialsFromCredentialsJson {
     private app;
     private targets;
     private distributionType;

package/build/credentials/ios/actions/{SetupBuildCredentialsFromCredentialsJson.js → SetUpBuildCredentialsFromCredentialsJson.js}

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SetupBuildCredentialsFromCredentialsJson = void 0;
+exports.SetUpBuildCredentialsFromCredentialsJson = void 0;
 const tslib_1 = require("tslib");
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 const log_1 = (0, tslib_1.__importDefault)(require("../../../log"));
 const target_1 = require("../../../project/ios/target");
 const read_1 = require("../../credentialsJson/read");
 const utils_1 = require("../../credentialsJson/utils");
-const SetupTargetBuildCredentialsFromCredentialsJson_1 = require("./SetupTargetBuildCredentialsFromCredentialsJson");
-class SetupBuildCredentialsFromCredentialsJson {
+const SetUpTargetBuildCredentialsFromCredentialsJson_1 = require("./SetUpTargetBuildCredentialsFromCredentialsJson");
+class SetUpBuildCredentialsFromCredentialsJson {
     constructor(app, targets, distributionType) {
         this.app = app;
         this.targets = targets;
@@ -24,7 +24,7 @@ class SetupBuildCredentialsFromCredentialsJson {
                 log_1.default.log(`Setting up credentials for target ${chalk_1.default.bold(target.targetName)} (${target.bundleIdentifier})`);
                 log_1.default.newLine();
             }
-            await new SetupTargetBuildCredentialsFromCredentialsJson_1.SetupTargetBuildCredentialsFromCredentialsJson({
+            await new SetUpTargetBuildCredentialsFromCredentialsJson_1.SetUpTargetBuildCredentialsFromCredentialsJson({
                 account: this.app.account,
                 projectName: this.app.projectName,
                 bundleIdentifier: target.bundleIdentifier,
@@ -43,4 +43,4 @@ class SetupBuildCredentialsFromCredentialsJson {
         }
     }
 }
-exports.SetupBuildCredentialsFromCredentialsJson = SetupBuildCredentialsFromCredentialsJson;
+exports.SetUpBuildCredentialsFromCredentialsJson = SetUpBuildCredentialsFromCredentialsJson;

package/build/credentials/ios/actions/{SetupDistributionCertificate.d.ts → SetUpDistributionCertificate.d.ts}

@@ -1,7 +1,7 @@
 import { AppleDistributionCertificate, AppleDistributionCertificateFragment, IosDistributionType } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/GraphqlClient';
-export declare class SetupDistributionCertificate {
+export declare class SetUpDistributionCertificate {
     private app;
     private distributionType;
     private validDistCerts?;

package/build/credentials/ios/actions/{SetupDistributionCertificate.js → SetUpDistributionCertificate.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SetupDistributionCertificate = void 0;
+exports.SetUpDistributionCertificate = void 0;
 const tslib_1 = require("tslib");
 const assert_1 = (0, tslib_1.__importDefault)(require("assert"));
 const log_1 = (0, tslib_1.__importDefault)(require("../../../log"));
@@ -12,7 +12,7 @@ const errors_2 = require("../errors");
 const AppleTeamUtils_1 = require("./AppleTeamUtils");
 const CreateDistributionCertificate_1 = require("./CreateDistributionCertificate");
 const DistributionCertificateUtils_1 = require("./DistributionCertificateUtils");
-class SetupDistributionCertificate {
+class SetUpDistributionCertificate {
     constructor(app, distributionType) {
         this.app = app;
         this.distributionType = distributionType;
@@ -138,4 +138,4 @@ class SetupDistributionCertificate {
         return this.validDistCerts;
     }
 }
-exports.SetupDistributionCertificate = SetupDistributionCertificate;
+exports.SetUpDistributionCertificate = SetUpDistributionCertificate;

package/build/credentials/ios/actions/{SetupInternalProvisioningProfile.d.ts → SetUpInternalProvisioningProfile.d.ts}

@@ -8,7 +8,7 @@ import { AppLookupParams } from '../api/GraphqlClient';
  * to choose if they want to set up an adhoc or universal distribution provisioning profile. Otherwise, always
  * set up an adhoc provisioning profile.
  */
-export declare class SetupInternalProvisioningProfile {
+export declare class SetUpInternalProvisioningProfile {
     private app;
     constructor(app: AppLookupParams);
     runAsync(ctx: CredentialsContext): Promise<IosAppBuildCredentialsFragment>;

package/build/credentials/ios/actions/{SetupInternalProvisioningProfile.js → SetUpInternalProvisioningProfile.js}

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SetupInternalProvisioningProfile = void 0;
+exports.SetUpInternalProvisioningProfile = void 0;
 const tslib_1 = require("tslib");
 const generated_1 = require("../../../graphql/generated");
 const log_1 = (0, tslib_1.__importDefault)(require("../../../log"));
 const prompts_1 = require("../../../prompts");
 const BuildCredentialsUtils_1 = require("./BuildCredentialsUtils");
-const SetupAdhocProvisioningProfile_1 = require("./SetupAdhocProvisioningProfile");
-const SetupProvisioningProfile_1 = require("./SetupProvisioningProfile");
+const SetUpAdhocProvisioningProfile_1 = require("./SetUpAdhocProvisioningProfile");
+const SetUpProvisioningProfile_1 = require("./SetUpProvisioningProfile");
 /**
  * It's used when setting up credentials for internal distribution but `enterpriseProvisioning` is not set.
  *
@@ -15,7 +15,7 @@ const SetupProvisioningProfile_1 = require("./SetupProvisioningProfile");
  * to choose if they want to set up an adhoc or universal distribution provisioning profile. Otherwise, always
  * set up an adhoc provisioning profile.
  */
-class SetupInternalProvisioningProfile {
+class SetUpInternalProvisioningProfile {
     constructor(app) {
         this.app = app;
     }
@@ -70,10 +70,10 @@ class SetupInternalProvisioningProfile {
         }
     }
     async setupAdhocProvisioningProfileAsync(ctx) {
-        return await new SetupAdhocProvisioningProfile_1.SetupAdhocProvisioningProfile(this.app).runAsync(ctx);
+        return await new SetUpAdhocProvisioningProfile_1.SetUpAdhocProvisioningProfile(this.app).runAsync(ctx);
     }
     async setupUniversalProvisioningProfileAsync(ctx) {
-        return await new SetupProvisioningProfile_1.SetupProvisioningProfile(this.app, generated_1.IosDistributionType.Enterprise).runAsync(ctx);
+        return await new SetUpProvisioningProfile_1.SetUpProvisioningProfile(this.app, generated_1.IosDistributionType.Enterprise).runAsync(ctx);
     }
     async askForDistributionTypeAndSetupAsync(ctx, message) {
         const { distributionType } = await (0, prompts_1.promptAsync)({
@@ -93,4 +93,4 @@ class SetupInternalProvisioningProfile {
         }
     }
 }
-exports.SetupInternalProvisioningProfile = SetupInternalProvisioningProfile;
+exports.SetUpInternalProvisioningProfile = SetUpInternalProvisioningProfile;

package/build/credentials/ios/actions/{SetupProvisioningProfile.d.ts → SetUpProvisioningProfile.d.ts}

@@ -4,7 +4,7 @@ import { AppLookupParams } from '../api/GraphqlClient';
 /**
  * Sets up either APP_STORE or ENTERPRISE provisioning profiles
  */
-export declare class SetupProvisioningProfile {
+export declare class SetUpProvisioningProfile {
     private app;
     private distributionType;
     constructor(app: AppLookupParams, distributionType: IosDistributionType);

package/build/credentials/ios/actions/{SetupProvisioningProfile.js → SetUpProvisioningProfile.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SetupProvisioningProfile = void 0;
+exports.SetUpProvisioningProfile = void 0;
 const tslib_1 = require("tslib");
 const nullthrows_1 = (0, tslib_1.__importDefault)(require("nullthrows"));
 const prompts_1 = require("../../../prompts");
@@ -10,11 +10,11 @@ const BuildCredentialsUtils_1 = require("./BuildCredentialsUtils");
 const ConfigureProvisioningProfile_1 = require("./ConfigureProvisioningProfile");
 const CreateProvisioningProfile_1 = require("./CreateProvisioningProfile");
 const ProvisioningProfileUtils_1 = require("./ProvisioningProfileUtils");
-const SetupDistributionCertificate_1 = require("./SetupDistributionCertificate");
+const SetUpDistributionCertificate_1 = require("./SetUpDistributionCertificate");
 /**
  * Sets up either APP_STORE or ENTERPRISE provisioning profiles
  */
-class SetupProvisioningProfile {
+class SetUpProvisioningProfile {
     constructor(app, distributionType) {
         this.app = app;
         this.distributionType = distributionType;
@@ -42,7 +42,7 @@ class SetupProvisioningProfile {
         return await (0, BuildCredentialsUtils_1.assignBuildCredentialsAsync)(ctx, this.app, this.distributionType, distCert, updatedProvisioningProfile);
     }
     async runAsync(ctx) {
-        const distCert = await new SetupDistributionCertificate_1.SetupDistributionCertificate(this.app, this.distributionType).runAsync(ctx);
+        const distCert = await new SetUpDistributionCertificate_1.SetUpDistributionCertificate(this.app, this.distributionType).runAsync(ctx);
         const areBuildCredentialsSetup = await this.areBuildCredentialsSetupAsync(ctx);
         if (areBuildCredentialsSetup) {
             return (0, nullthrows_1.default)(await (0, BuildCredentialsUtils_1.getBuildCredentialsAsync)(ctx, this.app, this.distributionType));
@@ -82,4 +82,4 @@ class SetupProvisioningProfile {
             : currentProfile.provisioningProfile === profile.provisioningProfile)) !== null && _a !== void 0 ? _a : null);
     }
 }
-exports.SetupProvisioningProfile = SetupProvisioningProfile;
+exports.SetUpProvisioningProfile = SetUpProvisioningProfile;

package/build/credentials/ios/actions/{SetupPushKey.d.ts → SetUpPushKey.d.ts}

@@ -1,7 +1,7 @@
 import { CommonIosAppCredentialsFragment } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/GraphqlClient';
-export declare class SetupPushKey {
+export declare class SetUpPushKey {
     private app;
     constructor(app: AppLookupParams);
     isPushKeySetupAsync(ctx: CredentialsContext): Promise<boolean>;

package/build/credentials/ios/actions/{SetupPushKey.js → SetUpPushKey.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SetupPushKey = void 0;
+exports.SetUpPushKey = void 0;
 const tslib_1 = require("tslib");
 const assert_1 = (0, tslib_1.__importDefault)(require("assert"));
 const nullthrows_1 = (0, tslib_1.__importDefault)(require("nullthrows"));
@@ -9,7 +9,7 @@ const prompts_1 = require("../../../prompts");
 const AssignPushKey_1 = require("./AssignPushKey");
 const CreatePushKey_1 = require("./CreatePushKey");
 const PushKeyUtils_1 = require("./PushKeyUtils");
-class SetupPushKey {
+class SetUpPushKey {
     constructor(app) {
         this.app = app;
     }
@@ -74,4 +74,4 @@ class SetupPushKey {
         }
     }
 }
-exports.SetupPushKey = SetupPushKey;
+exports.SetUpPushKey = SetUpPushKey;

package/build/credentials/ios/actions/SetUpSubmissionCredentials.d.ts

@@ -0,0 +1,10 @@
+import { CommonIosAppCredentialsFragment } from '../../../graphql/generated';
+import { CredentialsContext } from '../../context';
+import { AppLookupParams } from '../api/GraphqlClient';
+export declare const PROMPT_FOR_APP_SPECIFIC_PASSWORD = "PROMPT_FOR_APP_SPECIFIC_PASSWORD";
+export declare class SetUpSubmissionCredentials {
+    private setupAscApiKeyAction;
+    constructor(app: AppLookupParams);
+    runAsync(ctx: CredentialsContext): Promise<CommonIosAppCredentialsFragment | string>;
+    promptForAppSpecificPasswordAsync(): Promise<string>;
+}

package/build/credentials/ios/actions/SetUpSubmissionCredentials.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SetUpSubmissionCredentials = exports.PROMPT_FOR_APP_SPECIFIC_PASSWORD = void 0;
+const tslib_1 = require("tslib");
+const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
+const nullthrows_1 = (0, tslib_1.__importDefault)(require("nullthrows"));
+const wrap_ansi_1 = (0, tslib_1.__importDefault)(require("wrap-ansi"));
+const log_1 = (0, tslib_1.__importStar)(require("../../../log"));
+const prompts_1 = require("../../../prompts");
+const errors_1 = require("../../errors");
+const AscApiKeyUtils_1 = require("./AscApiKeyUtils");
+const SetUpAscApiKey_1 = require("./SetUpAscApiKey");
+exports.PROMPT_FOR_APP_SPECIFIC_PASSWORD = 'PROMPT_FOR_APP_SPECIFIC_PASSWORD';
+class SetUpSubmissionCredentials {
+    constructor(app) {
+        this.setupAscApiKeyAction = new SetUpAscApiKey_1.SetUpAscApiKey(app, AscApiKeyUtils_1.AppStoreApiKeyPurpose.SUBMISSION_SERVICE);
+        // Add this unrelated choice to ASC Api Key setup for legacy purposes -- we will deprecate it soon
+        this.setupAscApiKeyAction.choices = this.setupAscApiKeyAction.choices.concat({
+            title: '[Enter an App Specific Password]',
+            value: exports.PROMPT_FOR_APP_SPECIFIC_PASSWORD,
+        });
+    }
+    async runAsync(ctx) {
+        try {
+            const iosAppCredentials = await this.setupAscApiKeyAction.runAsync(ctx);
+            const { keyIdentifier, name } = (0, nullthrows_1.default)(iosAppCredentials.appStoreConnectApiKeyForSubmissions, 'ASC Api Key must be defined for EAS Submit');
+            log_1.default.log(`Using Api Key ID: ${keyIdentifier}${name ? ` (${name})` : ''}`);
+            return iosAppCredentials;
+        }
+        catch (e) {
+            if (e instanceof errors_1.UnsupportedCredentialsChoiceError) {
+                if (e.choice === exports.PROMPT_FOR_APP_SPECIFIC_PASSWORD) {
+                    return await this.promptForAppSpecificPasswordAsync();
+                }
+            }
+            throw e;
+        }
+    }
+    async promptForAppSpecificPasswordAsync() {
+        log_1.default.addNewLineIfNone();
+        log_1.default.log(`Please enter your Apple app-specific password.`);
+        log_1.default.log((0, log_1.learnMore)('https://expo.fyi/apple-app-specific-password'));
+        log_1.default.warn((0, wrap_ansi_1.default)(`This option will be deprecated soon. You will still be able to provide your password with the ${chalk_1.default.bold('EXPO_APPLE_APP_SPECIFIC_PASSWORD')} environment variable.`, process.stdout.columns || 80));
+        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;
+    }
+}
+exports.SetUpSubmissionCredentials = SetUpSubmissionCredentials;

package/build/credentials/ios/actions/{SetupTargetBuildCredentials.d.ts → SetUpTargetBuildCredentials.d.ts}

@@ -9,7 +9,7 @@ interface Options {
     enterpriseProvisioning?: IosEnterpriseProvisioning;
     iosCapabilitiesOptions?: IosCapabilitiesOptions;
 }
-export declare class SetupTargetBuildCredentials {
+export declare class SetUpTargetBuildCredentials {
     private options;
     constructor(options: Options);
     runAsync(ctx: CredentialsContext): Promise<IosAppBuildCredentialsFragment>;