eas-cli 0.33.1 → 0.36.0

package/build/credentials/ios/IosCredentialsProvider.js

@@ -9,8 +9,8 @@ const prompts_1 = require("../../prompts");
 const credentialsJsonReader = (0, tslib_1.__importStar)(require("../credentialsJson/read"));
 const utils_1 = require("../credentialsJson/utils");
 const BuildCredentialsUtils_1 = require("./actions/BuildCredentialsUtils");
-const SetupBuildCredentials_1 = require("./actions/SetupBuildCredentials");
-const SetupPushKey_1 = require("./actions/SetupPushKey");
+const SetUpBuildCredentials_1 = require("./actions/SetUpBuildCredentials");
+const SetUpPushKey_1 = require("./actions/SetUpPushKey");
 const provisioningProfile_1 = require("./utils/provisioningProfile");
 class IosCredentialsProvider {
     constructor(ctx, options) {
@@ -39,7 +39,7 @@ class IosCredentialsProvider {
         return iosCredentials;
     }
     async getRemoteAsync() {
-        return await new SetupBuildCredentials_1.SetupBuildCredentials({
+        return await new SetUpBuildCredentials_1.SetUpBuildCredentials({
             app: this.options.app,
             targets: this.options.targets,
             distribution: this.options.distribution,
@@ -58,7 +58,7 @@ class IosCredentialsProvider {
             bundleIdentifier: applicationTarget.bundleIdentifier,
             parentBundleIdentifier: applicationTarget.parentBundleIdentifier,
         };
-        const setupPushKeyAction = new SetupPushKey_1.SetupPushKey(appLookupParams);
+        const setupPushKeyAction = new SetUpPushKey_1.SetUpPushKey(appLookupParams);
         const isPushKeySetup = await setupPushKeyAction.isPushKeySetupAsync(ctx);
         if (isPushKeySetup) {
             log_1.default.succeed(`Push Notifications setup for ${app.projectName}: ${applicationTarget.bundleIdentifier}`);

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

@@ -1,5 +1,21 @@
+import { AppStoreConnectApiKeyFragment } from '../../../graphql/generated';
+import { Account } from '../../../user/Account';
+import { CredentialsContext } from '../../context';
 import { AscApiKey } from '../appstore/Credentials.types';
 import { AscApiKeyPath, MinimalAscApiKey } from '../credentials';
-export declare function promptForAscApiKeyAsync(): Promise<AscApiKeyPath>;
+export declare enum AppStoreApiKeyPurpose {
+    SUBMISSION_SERVICE = "EAS Submit"
+}
+export declare function promptForAscApiKeyPathAsync(ctx: CredentialsContext): Promise<AscApiKeyPath>;
 export declare function promptForIssuerIdAsync(): Promise<string>;
 export declare function getMinimalAscApiKeyAsync(ascApiKey: AscApiKey): Promise<MinimalAscApiKey>;
+export declare function provideOrGenerateAscApiKeyAsync(ctx: CredentialsContext, purpose: AppStoreApiKeyPurpose): Promise<MinimalAscApiKey>;
+export declare function getAscApiKeyName(purpose: AppStoreApiKeyPurpose): string;
+export declare function getAscApiKeysFromAccountAsync(ctx: CredentialsContext, account: Account, { filterDifferentAppleTeam }?: {
+    filterDifferentAppleTeam?: boolean;
+}): Promise<AppStoreConnectApiKeyFragment[]>;
+export declare function selectAscApiKeysFromAccountAsync(ctx: CredentialsContext, account: Account, { filterDifferentAppleTeam }?: {
+    filterDifferentAppleTeam?: boolean;
+}): Promise<AppStoreConnectApiKeyFragment | null>;
+export declare function sortAscApiKeysByUpdatedAtDesc(keys: AppStoreConnectApiKeyFragment[]): AppStoreConnectApiKeyFragment[];
+export declare function formatAscApiKey(ascApiKey: AppStoreConnectApiKeyFragment): string;

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

@@ -1,23 +1,104 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMinimalAscApiKeyAsync = exports.promptForIssuerIdAsync = exports.promptForAscApiKeyAsync = void 0;
+exports.formatAscApiKey = exports.sortAscApiKeysByUpdatedAtDesc = exports.selectAscApiKeysFromAccountAsync = exports.getAscApiKeysFromAccountAsync = exports.getAscApiKeyName = exports.provideOrGenerateAscApiKeyAsync = exports.getMinimalAscApiKeyAsync = exports.promptForIssuerIdAsync = exports.promptForAscApiKeyPathAsync = exports.AppStoreApiKeyPurpose = void 0;
 const tslib_1 = require("tslib");
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
+const nanoid_1 = require("nanoid");
 const path_1 = (0, tslib_1.__importDefault)(require("path"));
-const uuid = (0, tslib_1.__importStar)(require("uuid"));
 const log_1 = (0, tslib_1.__importStar)(require("../../../log"));
 const prompts_1 = require("../../../prompts");
+const date_1 = require("../../../utils/date");
 const promptForCredentials_1 = require("../../utils/promptForCredentials");
 const credentials_1 = require("../credentials");
-async function promptForAscApiKeyAsync() {
+const validateAscApiKey_1 = require("../validators/validateAscApiKey");
+const AppleTeamUtils_1 = require("./AppleTeamUtils");
+var AppStoreApiKeyPurpose;
+(function (AppStoreApiKeyPurpose) {
+    AppStoreApiKeyPurpose["SUBMISSION_SERVICE"] = "EAS Submit";
+})(AppStoreApiKeyPurpose = exports.AppStoreApiKeyPurpose || (exports.AppStoreApiKeyPurpose = {}));
+async function promptForAscApiKeyPathAsync(ctx) {
+    const { keyId, keyP8Path } = await promptForKeyP8AndIdAsync();
+    const bestEffortIssuerId = await getBestEffortIssuerIdAsync(ctx, keyId);
+    if (bestEffortIssuerId) {
+        log_1.default.log(`Detected Issuer ID: ${bestEffortIssuerId}`);
+        return { keyId, issuerId: bestEffortIssuerId, keyP8Path };
+    }
+    const issuerId = await promptForIssuerIdAsync();
+    return { keyId, issuerId, keyP8Path };
+}
+exports.promptForAscApiKeyPathAsync = promptForAscApiKeyPathAsync;
+async function promptForIssuerIdAsync() {
+    log_1.default.log(chalk_1.default.bold('An App Store Connect Issuer ID is required'));
+    log_1.default.log(`If you're not sure what this is or how to find yours, ${(0, log_1.learnMore)('https://expo.fyi/asc-issuer-id')}`);
+    // Do not perform uuid validation - Apple's issuerIds are not RFC4122 compliant
+    const { issuerId } = await (0, promptForCredentials_1.getCredentialsFromUserAsync)(credentials_1.ascApiKeyIssuerIdSchema);
+    return issuerId;
+}
+exports.promptForIssuerIdAsync = promptForIssuerIdAsync;
+async function getMinimalAscApiKeyAsync(ascApiKey) {
+    var _a;
+    return {
+        ...ascApiKey,
+        issuerId: (_a = ascApiKey.issuerId) !== null && _a !== void 0 ? _a : (await promptForIssuerIdAsync()),
+    };
+}
+exports.getMinimalAscApiKeyAsync = getMinimalAscApiKeyAsync;
+async function provideOrGenerateAscApiKeyAsync(ctx, purpose) {
+    if (ctx.nonInteractive) {
+        throw new Error(`A new App Store Connect API Key cannot be created in non-interactive mode.`);
+    }
+    const userProvided = await promptForAscApiKeyAsync(ctx);
+    if (!userProvided) {
+        return await generateAscApiKeyAsync(ctx, purpose);
+    }
+    if (!ctx.appStore.authCtx) {
+        log_1.default.warn('Unable to validate App Store Connect API Key, you are not authenticated with Apple.');
+        return userProvided;
+    }
+    const isValidAndTracked = await (0, validateAscApiKey_1.isAscApiKeyValidAndTrackedAsync)(ctx, userProvided);
+    if (isValidAndTracked) {
+        return userProvided;
+    }
+    const useUserProvided = await (0, prompts_1.confirmAsync)({
+        message: `App Store Connect API Key with ID ${userProvided.keyId} is not valid on Apple's servers. Proceed anyway?`,
+    });
+    if (useUserProvided) {
+        return userProvided;
+    }
+    return await provideOrGenerateAscApiKeyAsync(ctx, purpose);
+}
+exports.provideOrGenerateAscApiKeyAsync = provideOrGenerateAscApiKeyAsync;
+async function generateAscApiKeyAsync(ctx, purpose) {
+    //console.log('debug');
+    await ctx.appStore.ensureAuthenticatedAsync();
+    const ascApiKey = await ctx.appStore.createAscApiKeyAsync({
+        nickname: getAscApiKeyName(purpose),
+    });
+    return await getMinimalAscApiKeyAsync(ascApiKey);
+}
+function getAscApiKeyName(purpose) {
+    const nameParts = ['[Expo]', purpose, (0, nanoid_1.nanoid)(10)];
+    return nameParts.join(' ');
+}
+exports.getAscApiKeyName = getAscApiKeyName;
+async function promptForAscApiKeyAsync(ctx) {
+    const shouldAutoGenerateCredentials = await (0, promptForCredentials_1.shouldAutoGenerateCredentialsAsync)(credentials_1.ascApiKeyIdSchema);
+    if (shouldAutoGenerateCredentials) {
+        return null;
+    }
+    const ascApiKeyPath = await promptForAscApiKeyPathAsync(ctx);
+    const { keyP8Path, keyId, issuerId } = ascApiKeyPath;
+    return { keyP8: await fs_extra_1.default.readFile(keyP8Path, 'utf-8'), keyId, issuerId };
+}
+async function promptForKeyP8AndIdAsync() {
     var _a, _b;
     log_1.default.log(chalk_1.default.bold('An App Store Connect Api key is required to upload your app to the Apple App Store'));
     log_1.default.log(`If you're not sure what this is or how to create one, ${(0, log_1.learnMore)('https://expo.fyi/creating-asc-api-key')}`);
     const { keyP8Path } = await (0, prompts_1.promptAsync)({
         type: 'text',
         name: 'keyP8Path',
-        message: 'Path to App Store Connect Api Key:',
+        message: 'Path to App Store Connect API Key:',
         initial: 'AuthKey_ABCD.p8',
         // eslint-disable-next-line async-protect/async-suffix
         validate: async (filePath) => {
@@ -35,29 +116,82 @@ async function promptForAscApiKeyAsync() {
     });
     const regex = /^AuthKey_(?<keyId>\w+)\.p8$/; // Common ASC Api file name downloaded from Apple
     const bestEffortKeyId = (_b = (_a = path_1.default.basename(keyP8Path).match(regex)) === null || _a === void 0 ? void 0 : _a.groups) === null || _b === void 0 ? void 0 : _b.keyId;
-    const ascApiKeyMetadata = await (0, promptForCredentials_1.getCredentialsFromUserAsync)(credentials_1.ascApiKeyMetadataSchema, {
+    const { keyId } = await (0, promptForCredentials_1.getCredentialsFromUserAsync)(credentials_1.ascApiKeyIdSchema, {
         keyId: bestEffortKeyId,
     });
-    return { ...ascApiKeyMetadata, keyP8Path };
+    return { keyId, keyP8Path };
 }
-exports.promptForAscApiKeyAsync = promptForAscApiKeyAsync;
-async function promptForIssuerIdAsync() {
-    log_1.default.log(chalk_1.default.bold('An App Store Connect Issuer ID is required'));
-    log_1.default.log(`If you're not sure what this is or how to find yours, ${(0, log_1.learnMore)('https://expo.fyi/asc-issuer-id')}`);
-    const { issuerId } = await (0, prompts_1.promptAsync)({
-        type: 'text',
-        name: 'issuerId',
-        message: 'App Store Connect Issuer ID:',
-        validate: (input) => uuid.validate(input),
-    });
-    return issuerId;
+async function getBestEffortIssuerIdAsync(ctx, ascApiKeyId) {
+    var _a;
+    if (!ctx.appStore.authCtx) {
+        return null;
+    }
+    const ascApiKeyInfo = await ctx.appStore.getAscApiKeyAsync(ascApiKeyId);
+    return (_a = ascApiKeyInfo === null || ascApiKeyInfo === void 0 ? void 0 : ascApiKeyInfo.issuerId) !== null && _a !== void 0 ? _a : null;
 }
-exports.promptForIssuerIdAsync = promptForIssuerIdAsync;
-async function getMinimalAscApiKeyAsync(ascApiKey) {
+async function getAscApiKeysFromAccountAsync(ctx, account, { filterDifferentAppleTeam } = {}) {
+    const ascApiKeysForAccount = await ctx.ios.getAscApiKeysForAccountAsync(account);
+    if (!filterDifferentAppleTeam) {
+        return ascApiKeysForAccount;
+    }
+    else {
+        return filterKeysFromDifferentAppleTeam(ctx, ascApiKeysForAccount);
+    }
+}
+exports.getAscApiKeysFromAccountAsync = getAscApiKeysFromAccountAsync;
+async function selectAscApiKeysFromAccountAsync(ctx, account, { filterDifferentAppleTeam } = {}) {
     var _a;
-    return {
-        ...ascApiKey,
-        issuerId: (_a = ascApiKey.issuerId) !== null && _a !== void 0 ? _a : (await promptForIssuerIdAsync()),
-    };
+    const ascApiKeysForAccount = await getAscApiKeysFromAccountAsync(ctx, account, {
+        filterDifferentAppleTeam,
+    });
+    if (ascApiKeysForAccount.length === 0) {
+        if (filterDifferentAppleTeam) {
+            const maybeAppleTeamId = (_a = ctx.appStore.authCtx) === null || _a === void 0 ? void 0 : _a.team.id;
+            log_1.default.warn(`There are no App Store Connect API Keys in your EAS account${maybeAppleTeamId ? ` matching Apple Team ID: ${maybeAppleTeamId}.` : '.'}`);
+        }
+        else {
+            log_1.default.warn(`There are no App Store Connect API Keys available in your EAS account.`);
+        }
+        return null;
+    }
+    return selectAscApiKeysAsync(ascApiKeysForAccount);
 }
-exports.getMinimalAscApiKeyAsync = getMinimalAscApiKeyAsync;
+exports.selectAscApiKeysFromAccountAsync = selectAscApiKeysFromAccountAsync;
+async function selectAscApiKeysAsync(ascApiKeys) {
+    const sortedAscApiKeys = sortAscApiKeysByUpdatedAtDesc(ascApiKeys);
+    const { chosenAscApiKey } = await (0, prompts_1.promptAsync)({
+        type: 'select',
+        name: 'chosenAscApiKey',
+        message: 'Select an API Key from the list:',
+        choices: sortedAscApiKeys.map(ascApiKey => ({
+            title: formatAscApiKey(ascApiKey),
+            value: ascApiKey,
+        })),
+    });
+    return chosenAscApiKey;
+}
+function filterKeysFromDifferentAppleTeam(ctx, keys) {
+    if (!ctx.appStore.authCtx) {
+        return keys;
+    }
+    const teamId = ctx.appStore.authCtx.team.id;
+    return keys.filter(key => { var _a; return !key.appleTeam || ((_a = key.appleTeam) === null || _a === void 0 ? void 0 : _a.appleTeamIdentifier) === teamId; });
+}
+function sortAscApiKeysByUpdatedAtDesc(keys) {
+    return keys.sort((keyA, keyB) => new Date(keyB.updatedAt).getTime() - new Date(keyA.updatedAt).getTime());
+}
+exports.sortAscApiKeysByUpdatedAtDesc = sortAscApiKeysByUpdatedAtDesc;
+function formatAscApiKey(ascApiKey) {
+    const { keyIdentifier, appleTeam, name, updatedAt } = ascApiKey;
+    let line = '';
+    line += `Key ID: ${keyIdentifier}`;
+    if (name) {
+        line += chalk_1.default.gray(`\n    Name: ${name}`);
+    }
+    if (appleTeam) {
+        line += chalk_1.default.gray(`\n    ${(0, AppleTeamUtils_1.formatAppleTeam)(appleTeam)}`);
+    }
+    line += chalk_1.default.gray(`\n    Updated: ${(0, date_1.fromNow)(new Date(updatedAt))} ago`);
+    return line;
+}
+exports.formatAscApiKey = formatAscApiKey;

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

@@ -0,0 +1,9 @@
+import { AppStoreConnectApiKeyFragment, CommonIosAppCredentialsFragment } from '../../../graphql/generated';
+import { CredentialsContext } from '../../context';
+import { AppLookupParams } from '../api/GraphqlClient';
+import { AppStoreApiKeyPurpose } from './AscApiKeyUtils';
+export declare class AssignAscApiKey {
+    private app;
+    constructor(app: AppLookupParams);
+    runAsync(ctx: CredentialsContext, ascApiKey: AppStoreConnectApiKeyFragment, purpose: AppStoreApiKeyPurpose): Promise<CommonIosAppCredentialsFragment>;
+}

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

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AssignAscApiKey = void 0;
+const tslib_1 = require("tslib");
+const log_1 = (0, tslib_1.__importDefault)(require("../../../log"));
+const AppleTeamUtils_1 = require("./AppleTeamUtils");
+const AscApiKeyUtils_1 = require("./AscApiKeyUtils");
+class AssignAscApiKey {
+    constructor(app) {
+        this.app = app;
+    }
+    async runAsync(ctx, ascApiKey, purpose) {
+        var _a, _b;
+        const appleTeam = (_b = (_a = (await (0, AppleTeamUtils_1.resolveAppleTeamIfAuthenticatedAsync)(ctx, this.app))) !== null && _a !== void 0 ? _a : ascApiKey.appleTeam) !== null && _b !== void 0 ? _b : null;
+        const appCredentials = await ctx.ios.createOrGetIosAppCredentialsWithCommonFieldsAsync(this.app, { appleTeam: appleTeam !== null && appleTeam !== void 0 ? appleTeam : undefined });
+        let updatedAppCredentials;
+        if (purpose === AscApiKeyUtils_1.AppStoreApiKeyPurpose.SUBMISSION_SERVICE) {
+            updatedAppCredentials = await ctx.ios.updateIosAppCredentialsAsync(appCredentials, {
+                ascApiKeyIdForSubmissions: ascApiKey.id,
+            });
+        }
+        else {
+            throw new Error(`${purpose} is not yet supported.`);
+        }
+        log_1.default.succeed(`App Store Connect API Key assigned to ${this.app.projectName}: ${this.app.bundleIdentifier} for ${purpose}.`);
+        return updatedAppCredentials;
+    }
+}
+exports.AssignAscApiKey = AssignAscApiKey;

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

@@ -0,0 +1,9 @@
+import { AppStoreConnectApiKeyFragment } from '../../../graphql/generated';
+import { Account } from '../../../user/Account';
+import { CredentialsContext } from '../../context';
+import { AppStoreApiKeyPurpose } from './AscApiKeyUtils';
+export declare class CreateAscApiKey {
+    private account;
+    constructor(account: Account);
+    runAsync(ctx: CredentialsContext, purpose: AppStoreApiKeyPurpose): Promise<AppStoreConnectApiKeyFragment>;
+}

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

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CreateAscApiKey = void 0;
+const tslib_1 = require("tslib");
+const log_1 = (0, tslib_1.__importDefault)(require("../../../log"));
+const AscApiKeyUtils_1 = require("./AscApiKeyUtils");
+class CreateAscApiKey {
+    constructor(account) {
+        this.account = account;
+    }
+    async runAsync(ctx, purpose) {
+        if (ctx.nonInteractive) {
+            throw new Error(`A new App Store Connect API Key cannot be created in non-interactive mode.`);
+        }
+        const ascApiKey = await (0, AscApiKeyUtils_1.provideOrGenerateAscApiKeyAsync)(ctx, purpose);
+        const result = await ctx.ios.createAscApiKeyAsync(this.account, ascApiKey);
+        log_1.default.succeed('Created App Store Connect API Key');
+        return result;
+    }
+}
+exports.CreateAscApiKey = CreateAscApiKey;

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

@@ -9,7 +9,7 @@ class CreateDistributionCertificate {
         this.account = account;
     }
     async runAsync(ctx) {
-        const distCert = await (0, DistributionCertificateUtils_1.provideOrGenerateDistributionCertificateAsync)(ctx, this.account.name);
+        const distCert = await (0, DistributionCertificateUtils_1.provideOrGenerateDistributionCertificateAsync)(ctx);
         const result = await ctx.ios.createDistributionCertificateAsync(this.account, distCert);
         log_1.default.succeed('Created distribution certificate');
         return result;

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

@@ -12,7 +12,7 @@ class CreatePushKey {
         if (ctx.nonInteractive) {
             throw new Error(`A new push key cannot be created in non-interactive mode.`);
         }
-        const pushKey = await (0, PushKeyUtils_1.provideOrGeneratePushKeyAsync)(ctx, this.account.name);
+        const pushKey = await (0, PushKeyUtils_1.provideOrGeneratePushKeyAsync)(ctx);
         const result = await ctx.ios.createPushKeyAsync(this.account, pushKey);
         log_1.default.succeed('Created push key');
         return result;

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

@@ -12,4 +12,4 @@ export declare function selectDistributionCertificateWithDependenciesAsync(ctx:
  * select a distribution certificate from a valid set (curated on a best effort basis)
  * */
 export declare function selectValidDistributionCertificateAsync(ctx: CredentialsContext, appLookupParams: AppLookupParams): Promise<AppleDistributionCertificateFragment | null>;
-export declare function provideOrGenerateDistributionCertificateAsync(ctx: CredentialsContext, accountName: string): Promise<DistributionCertificate>;
+export declare function provideOrGenerateDistributionCertificateAsync(ctx: CredentialsContext): Promise<DistributionCertificate>;

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

@@ -99,12 +99,12 @@ You can have only ${chalk_1.default.underline('three')} Apple Distribution Certi
 Please revoke the old ones or reuse existing from your other apps.
 Please remember that Apple Distribution Certificates are not application specific!
 `;
-async function provideOrGenerateDistributionCertificateAsync(ctx, accountName) {
+async function provideOrGenerateDistributionCertificateAsync(ctx) {
     if (!ctx.nonInteractive) {
         const userProvided = await promptForDistCertAsync(ctx);
         if (userProvided) {
             if (!ctx.appStore.authCtx) {
-                log_1.default.warn('Unable to validate distribution certificate due to insufficient Apple Credentials');
+                log_1.default.warn('Unable to validate distribution certificate, you are not authenticated with Apple.');
                 return userProvided;
             }
             else {
@@ -112,13 +112,11 @@ async function provideOrGenerateDistributionCertificateAsync(ctx, accountName) {
                 if (!isValid) {
                     log_1.default.warn("Provided Distribution Certificate is no longer valid on Apple's server");
                 }
-                return isValid
-                    ? userProvided
-                    : await provideOrGenerateDistributionCertificateAsync(ctx, accountName);
+                return isValid ? userProvided : await provideOrGenerateDistributionCertificateAsync(ctx);
             }
         }
     }
-    return await generateDistributionCertificateAsync(ctx, accountName);
+    return await generateDistributionCertificateAsync(ctx);
 }
 exports.provideOrGenerateDistributionCertificateAsync = provideOrGenerateDistributionCertificateAsync;
 async function promptForDistCertAsync(ctx) {
@@ -140,7 +138,7 @@ async function promptForDistCertAsync(ctx) {
     }
     return userProvided;
 }
-async function generateDistributionCertificateAsync(ctx, accountName) {
+async function generateDistributionCertificateAsync(ctx) {
     await ctx.appStore.ensureAuthenticatedAsync();
     try {
         return await ctx.appStore.createDistributionCertificateAsync();
@@ -176,7 +174,7 @@ async function generateDistributionCertificateAsync(ctx, accountName) {
             throw e;
         }
     }
-    return await generateDistributionCertificateAsync(ctx, accountName);
+    return await generateDistributionCertificateAsync(ctx);
 }
 function formatDistributionCertificateFromApple(appleInfo) {
     const { name, status, id, expires, created, ownerName, serialNumber } = appleInfo;

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

@@ -2,7 +2,7 @@ import { ApplePushKeyFragment } from '../../../graphql/generated';
 import { Account } from '../../../user/Account';
 import { CredentialsContext } from '../../context';
 import { PushKey } from '../appstore/Credentials.types';
-export declare function provideOrGeneratePushKeyAsync(ctx: CredentialsContext, accountName: string): Promise<PushKey>;
+export declare function provideOrGeneratePushKeyAsync(ctx: CredentialsContext): Promise<PushKey>;
 /**
  * select a push key from an account (validity status shown on a best effort basis)
  * */

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