eas-cli 0.34.1 → 0.37.0

package/build/credentials/android/utils/keystore.js

@@ -3,32 +3,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateRandomKeystoreAsync = exports.keytoolCommandExistsAsync = void 0;
 const tslib_1 = require("tslib");
 const spawn_async_1 = (0, tslib_1.__importDefault)(require("@expo/spawn-async"));
+const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 const crypto_1 = (0, tslib_1.__importDefault)(require("crypto"));
 const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
+// (dsokal) We actually want to use node-fetch but the change is in progress.
+// See https://github.com/expo/eas-cli/issues/32 for context.
+// eslint-disable-next-line no-restricted-imports
+const node_fetch_1 = (0, tslib_1.__importDefault)(require("node-fetch"));
 const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const uuid_1 = require("uuid");
-const analytics_1 = (0, tslib_1.__importStar)(require("../../../build/utils/analytics"));
+const events_1 = require("../../../analytics/events");
 const generated_1 = require("../../../graphql/generated");
+const KeystoreGenerationUrlMutation_1 = require("../../../graphql/mutations/KeystoreGenerationUrlMutation");
 const log_1 = (0, tslib_1.__importDefault)(require("../../../log"));
+const ora_1 = require("../../../ora");
 const paths_1 = require("../../../utils/paths");
 async function keytoolCommandExistsAsync() {
     try {
         await (0, spawn_async_1.default)('keytool');
+        return true;
     }
     catch (error) {
         return false;
     }
-    return true;
 }
 exports.keytoolCommandExistsAsync = keytoolCommandExistsAsync;
-async function ensureKeytoolCommandExistsAsync() {
-    if (!(await keytoolCommandExistsAsync())) {
-        log_1.default.error('keytool is required to run this command, make sure you have it installed?');
-        log_1.default.warn('keytool is a part of OpenJDK: https://openjdk.java.net/');
-        log_1.default.warn('Also make sure that keytool is in your PATH after installation.');
-        throw new Error('keytool not found');
-    }
-}
 var KeystoreCreateStep;
 (function (KeystoreCreateStep) {
     KeystoreCreateStep["Attempt"] = "attempt";
@@ -44,17 +43,38 @@ async function generateRandomKeystoreAsync(projectId) {
     return await createKeystoreAsync(keystoreData, projectId);
 }
 exports.generateRandomKeystoreAsync = generateRandomKeystoreAsync;
-async function createKeystoreAsync(credentials, projectId) {
-    analytics_1.default.logEvent(analytics_1.Event.ANDROID_KEYSTORE_CREATE, {
+async function createKeystoreAsync(keystoreParams, projectId) {
+    events_1.Analytics.logEvent(events_1.BuildEvent.ANDROID_KEYSTORE_CREATE, {
         project_id: projectId,
         step: KeystoreCreateStep.Attempt,
         type: generated_1.AndroidKeystoreType.Jks,
     });
     try {
-        await ensureKeytoolCommandExistsAsync();
+        let keystore;
+        let localAttempt = false;
+        if (await keytoolCommandExistsAsync()) {
+            try {
+                localAttempt = true;
+                keystore = await createKeystoreLocallyAsync(keystoreParams);
+            }
+            catch {
+                log_1.default.error('Failed to generate keystore locally. Falling back to cloud generation.');
+            }
+        }
+        if (!keystore) {
+            keystore = await createKeystoreInCloudAsync(keystoreParams, {
+                showKeytoolDetectionMsg: !localAttempt,
+            });
+        }
+        events_1.Analytics.logEvent(events_1.BuildEvent.ANDROID_KEYSTORE_CREATE, {
+            project_id: projectId,
+            step: KeystoreCreateStep.Success,
+            type: generated_1.AndroidKeystoreType.Jks,
+        });
+        return keystore;
     }
     catch (error) {
-        analytics_1.default.logEvent(analytics_1.Event.ANDROID_KEYSTORE_CREATE, {
+        events_1.Analytics.logEvent(events_1.BuildEvent.ANDROID_KEYSTORE_CREATE, {
             project_id: projectId,
             step: KeystoreCreateStep.Fail,
             reason: error.message,
@@ -62,6 +82,8 @@ async function createKeystoreAsync(credentials, projectId) {
         });
         throw error;
     }
+}
+async function createKeystoreLocallyAsync(keystoreParams) {
     await fs_extra_1.default.mkdirp((0, paths_1.getTmpDirectory)());
     const keystorePath = path_1.default.join((0, paths_1.getTmpDirectory)(), `${(0, uuid_1.v4)()}-keystore.jks`);
     try {
@@ -71,13 +93,13 @@ async function createKeystoreAsync(credentials, projectId) {
             '-storetype',
             'JKS',
             '-storepass',
-            credentials.keystorePassword,
+            keystoreParams.keystorePassword,
             '-keypass',
-            credentials.keyPassword,
+            keystoreParams.keyPassword,
             '-keystore',
             keystorePath,
             '-alias',
-            credentials.keyAlias,
+            keystoreParams.keyAlias,
             '-keyalg',
             'RSA',
             '-keysize',
@@ -87,27 +109,40 @@ async function createKeystoreAsync(credentials, projectId) {
             '-dname',
             `CN=,OU=,O=,L=,S=,C=US`,
         ]);
-        analytics_1.default.logEvent(analytics_1.Event.ANDROID_KEYSTORE_CREATE, {
-            project_id: projectId,
-            step: KeystoreCreateStep.Success,
-            type: generated_1.AndroidKeystoreType.Jks,
-        });
         return {
-            ...credentials,
+            ...keystoreParams,
             keystore: await fs_extra_1.default.readFile(keystorePath, 'base64'),
             type: generated_1.AndroidKeystoreType.Jks,
         };
     }
-    catch (error) {
-        analytics_1.default.logEvent(analytics_1.Event.ANDROID_KEYSTORE_CREATE, {
-            project_id: projectId,
-            step: KeystoreCreateStep.Fail,
-            reason: error.message,
-            type: generated_1.AndroidKeystoreType.Jks,
-        });
-        throw error;
-    }
     finally {
         await fs_extra_1.default.remove(keystorePath);
     }
 }
+async function createKeystoreInCloudAsync(keystoreParams, { showKeytoolDetectionMsg = true } = {}) {
+    if (showKeytoolDetectionMsg) {
+        log_1.default.log(`Detected that you do not have ${chalk_1.default.bold('keytool')} installed locally.`);
+    }
+    const spinner = (0, ora_1.ora)('Generating keystore in the cloud...').start();
+    try {
+        const url = await KeystoreGenerationUrlMutation_1.KeystoreGenerationUrlMutation.createKeystoreGenerationUrlAsync();
+        const response = await (0, node_fetch_1.default)(url, {
+            method: 'POST',
+            body: JSON.stringify(keystoreParams),
+            headers: { 'Content-Type': 'application/json' },
+        });
+        const result = await response.json();
+        spinner.succeed();
+        return {
+            type: generated_1.AndroidKeystoreType.Jks,
+            keystore: result.keystoreBase64,
+            keystorePassword: result.keystorePassword,
+            keyAlias: result.keyAlias,
+            keyPassword: result.keyPassword,
+        };
+    }
+    catch (err) {
+        spinner.fail();
+        throw err;
+    }
+}

package/build/credentials/errors.d.ts

@@ -4,3 +4,7 @@ export declare class MissingCredentialsNonInteractiveError extends Error {
 export declare class MissingCredentialsError extends Error {
     constructor(message?: string);
 }
+export declare class UnsupportedCredentialsChoiceError extends Error {
+    choice: string;
+    constructor(message: string, choice: string);
+}

package/build/credentials/errors.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MissingCredentialsError = exports.MissingCredentialsNonInteractiveError = void 0;
+exports.UnsupportedCredentialsChoiceError = exports.MissingCredentialsError = exports.MissingCredentialsNonInteractiveError = void 0;
 class MissingCredentialsNonInteractiveError extends Error {
     constructor(message) {
         super(message !== null && message !== void 0 ? message : 'Credentials are not set up. Please run this command again in interactive mode.');
@@ -13,3 +13,10 @@ class MissingCredentialsError extends Error {
     }
 }
 exports.MissingCredentialsError = MissingCredentialsError;
+class UnsupportedCredentialsChoiceError extends Error {
+    constructor(message, choice) {
+        super(message);
+        this.choice = choice;
+    }
+}
+exports.UnsupportedCredentialsChoiceError = UnsupportedCredentialsChoiceError;

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/DistributionCertificateUtils.js

@@ -104,7 +104,7 @@ async function provideOrGenerateDistributionCertificateAsync(ctx) {
         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 {

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

@@ -17,7 +17,7 @@ async function provideOrGeneratePushKeyAsync(ctx) {
         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 {

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