eas-cli 0.35.0 → 0.38.0

package/build/commandUtils/EasCommand.js

@@ -4,7 +4,7 @@ const tslib_1 = require("tslib");
 const eas_json_1 = require("@expo/eas-json");
 const command_1 = require("@oclif/command");
 const semver_1 = (0, tslib_1.__importDefault)(require("semver"));
-const analytics_1 = require("../analytics");
+const rudderstackClient_1 = require("../analytics/rudderstackClient");
 const log_1 = (0, tslib_1.__importDefault)(require("../log"));
 const projectUtils_1 = require("../project/projectUtils");
 const User_1 = require("../user/User");
@@ -25,7 +25,7 @@ class EasCommand extends command_1.Command {
     async run() {
         var _a;
         eas_json_1.EasJsonReader.setLog(log_1.default);
-        await (0, analytics_1.initAsync)();
+        await (0, rudderstackClient_1.initAsync)();
         await this.applyCliConfigAsync();
         if (this.requiresAuthentication) {
             const { flags } = this.parse();
@@ -35,7 +35,7 @@ class EasCommand extends command_1.Command {
         else {
             await (0, User_1.getUserAsync)();
         }
-        (0, analytics_1.logEvent)(analytics_1.AnalyticsEvent.ACTION, {
+        (0, rudderstackClient_1.logEvent)(rudderstackClient_1.AnalyticsEvent.ACTION, {
             // id is assigned by oclif in constructor based on the filepath:
             // commands/submit === submit, commands/build/list === build:list
             action: `eas ${this.id}`,
@@ -44,7 +44,7 @@ class EasCommand extends command_1.Command {
     }
     // eslint-disable-next-line async-protect/async-suffix
     async finally(err) {
-        await (0, analytics_1.flushAsync)();
+        await (0, rudderstackClient_1.flushAsync)();
         return super.finally(err);
     }
     async applyCliConfigAsync() {

package/build/commands/branch/publish.js

@@ -23,7 +23,8 @@ const utils_1 = require("../../update/utils");
 const uniqBy_1 = (0, tslib_1.__importDefault)(require("../../utils/expodash/uniqBy"));
 const formatFields_1 = (0, tslib_1.__importDefault)(require("../../utils/formatFields"));
 const vcs_1 = require("../../vcs");
-const create_1 = require("./create");
+const create_1 = require("../channel/create");
+const create_2 = require("./create");
 const list_1 = require("./list");
 const view_1 = require("./view");
 exports.defaultPublishPlatforms = ['android', 'ios'];
@@ -46,6 +47,24 @@ async function getUpdateGroupAsync({ group, }) {
         .toPromise());
     return updatesByGroup;
 }
+async function ensureChannelExistsAsync({ appId, branchId, channelName, }) {
+    var _a;
+    try {
+        await (0, create_1.createUpdateChannelOnAppAsync)({
+            appId,
+            channelName,
+            branchId,
+        });
+        log_1.default.withTick(`Created a channel: ${chalk_1.default.bold(channelName)} pointed at branch: ${chalk_1.default.bold(channelName)}.`);
+    }
+    catch (e) {
+        const isIgnorableError = ((_a = e.graphQLErrors) === null || _a === void 0 ? void 0 : _a.length) === 1 &&
+            e.graphQLErrors[0].extensions.errorCode === 'CHANNEL_ALREADY_EXISTS';
+        if (!isIgnorableError) {
+            throw e;
+        }
+    }
+}
 async function ensureBranchExistsAsync({ appId, name: branchName, }) {
     const { app } = await (0, view_1.viewUpdateBranchAsync)({
         appId,
@@ -54,9 +73,12 @@ async function ensureBranchExistsAsync({ appId, name: branchName, }) {
     const updateBranch = app === null || app === void 0 ? void 0 : app.byId.updateBranchByName;
     if (updateBranch) {
         const { id, updates } = updateBranch;
+        await ensureChannelExistsAsync({ appId, branchId: id, channelName: branchName });
         return { id, updates };
     }
-    const newUpdateBranch = await (0, create_1.createUpdateBranchOnAppAsync)({ appId, name: branchName });
+    const newUpdateBranch = await (0, create_2.createUpdateBranchOnAppAsync)({ appId, name: branchName });
+    log_1.default.withTick(`Created branch: ${chalk_1.default.bold(branchName)}`);
+    await ensureChannelExistsAsync({ appId, branchId: newUpdateBranch.id, channelName: branchName });
     return { id: newUpdateBranch.id, updates: [] };
 }
 class BranchPublish extends EasCommand_1.default {

package/build/commands/build/configure.js

@@ -9,12 +9,14 @@ const log_1 = (0, tslib_1.__importStar)(require("../../log"));
 const platform_1 = require("../../platform");
 const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
+const vcs_1 = require("../../vcs");
 class BuildConfigure extends EasCommand_1.default {
     async runAsync() {
         var _a;
         const { flags } = this.parse(BuildConfigure);
         log_1.default.log('💡 The following process will configure your iOS and/or Android project to be compatible with EAS Build. These changes only apply to your local project files and you can safely revert them at any time.');
         log_1.default.newLine();
+        await (0, vcs_1.getVcsClient)().ensureRepoExistsAsync();
         const platform = (_a = flags.platform) !== null && _a !== void 0 ? _a : (await promptForPlatformAsync());
         await (0, configure_1.configureAsync)({
             platform,

package/build/commands/build/index.js

@@ -13,7 +13,7 @@ const nullthrows_1 = (0, tslib_1.__importDefault)(require("nullthrows"));
 const build_1 = require("../../build/android/build");
 const build_2 = require("../../build/build");
 const configure_1 = require("../../build/configure");
-const context_1 = require("../../build/context");
+const createContext_1 = require("../../build/createContext");
 const build_3 = require("../../build/ios/build");
 const devClient_1 = require("../../build/utils/devClient");
 const printBuildInfo_1 = require("../../build/utils/printBuildInfo");
@@ -23,11 +23,10 @@ const generated_1 = require("../../graphql/generated");
 const AppPlatform_1 = require("../../graphql/types/AppPlatform");
 const log_1 = (0, tslib_1.__importStar)(require("../../log"));
 const platform_1 = require("../../platform");
-const isEasEnabledForProject_1 = require("../../project/isEasEnabledForProject");
 const metroConfig_1 = require("../../project/metroConfig");
 const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
-const context_2 = require("../../submit/context");
+const context_1 = require("../../submit/context");
 const submit_1 = require("../../submit/submit");
 const urls_1 = require("../../submit/utils/urls");
 const easCli_1 = require("../../utils/easCli");
@@ -41,7 +40,6 @@ class Build extends EasCommand_1.default {
         this.metroConfigValidated = false;
     }
     async runAsync() {
-        var _a;
         const { flags: rawFlags } = this.parse(Build);
         if (rawFlags.json) {
             (0, json_1.enableJsonOutput)();
@@ -54,13 +52,11 @@ class Build extends EasCommand_1.default {
         await (0, repository_1.ensureRepoIsCleanAsync)(flags.nonInteractive);
         await (0, configure_1.ensureProjectConfiguredAsync)(projectDir, requestedPlatform);
         const platforms = (0, platform_1.toPlatforms)(requestedPlatform);
-        const easJsonReader = new eas_json_1.EasJsonReader(projectDir);
         const buildProfiles = await (0, profiles_1.getProfilesAsync)({
+            type: 'build',
+            projectDir,
             platforms,
             profileName: flags.profile,
-            async readProfileAsync(platform, profileName) {
-                return await easJsonReader.readBuildProfileAsync(platform, profileName);
-            },
         });
         await (0, devClient_1.ensureExpoDevClientInstalledForDevClientBuildsAsync)({
             projectDir,
@@ -92,7 +88,7 @@ class Build extends EasCommand_1.default {
             for (const startedBuild of startedBuilds) {
                 const submission = await this.prepareAndStartSubmissionAsync({
                     build: startedBuild.build,
-                    credentialsCtx: (0, nullthrows_1.default)((_a = buildCtxByPlatform[startedBuild.build.platform]) === null || _a === void 0 ? void 0 : _a.credentialsCtx),
+                    buildCtx: (0, nullthrows_1.default)(buildCtxByPlatform[startedBuild.build.platform]),
                     flags,
                     moreBuilds: startedBuilds.length > 1,
                     projectDir,
@@ -154,12 +150,12 @@ class Build extends EasCommand_1.default {
             wait: flags['wait'],
             clearCache: flags['clear-cache'],
             json: flags['json'],
-            autoSubmit: flags['auto-submit'],
+            autoSubmit: flags['auto-submit'] || flags['auto-submit-with-profile'] !== undefined,
             submitProfile: (_a = flags['auto-submit-with-profile']) !== null && _a !== void 0 ? _a : profile,
         };
     }
     async prepareAndStartBuildAsync({ projectDir, flags, moreBuilds, buildProfile, }) {
-        const buildCtx = await (0, context_1.createBuildContextAsync)({
+        const buildCtx = await (0, createContext_1.createBuildContextAsync)({
             buildProfileName: buildProfile.profileName,
             clearCache: flags.clearCache,
             buildProfile: buildProfile.profile,
@@ -178,9 +174,6 @@ class Build extends EasCommand_1.default {
             await (0, metroConfig_1.validateMetroConfigForManagedWorkflowAsync)(buildCtx);
             this.metroConfigValidated = true;
         }
-        if (!buildCtx.local && !(await (0, isEasEnabledForProject_1.isEasEnabledForProjectAsync)(buildCtx.projectId))) {
-            (0, errors_1.error)(isEasEnabledForProject_1.EAS_UNAVAILABLE_MESSAGE, { exit: 1 });
-        }
         const build = await this.startBuildAsync(buildCtx);
         return {
             build,
@@ -197,11 +190,12 @@ class Build extends EasCommand_1.default {
         }
         return await sendBuildRequestAsync();
     }
-    async prepareAndStartSubmissionAsync({ build, credentialsCtx, flags, moreBuilds, projectDir, buildProfile, }) {
+    async prepareAndStartSubmissionAsync({ build, buildCtx, flags, moreBuilds, projectDir, buildProfile, }) {
+        var _a, _b, _c;
         const easJsonReader = new eas_json_1.EasJsonReader(projectDir);
         const platform = (0, AppPlatform_1.toPlatform)(build.platform);
         const submitProfile = await easJsonReader.readSubmitProfileAsync(platform, flags.submitProfile);
-        const submissionCtx = await (0, context_2.createSubmissionContextAsync)({
+        const submissionCtx = await (0, context_1.createSubmissionContextAsync)({
             platform,
             projectDir,
             projectId: build.project.id,
@@ -209,7 +203,8 @@ class Build extends EasCommand_1.default {
             archiveFlags: { id: build.id },
             nonInteractive: flags.nonInteractive,
             env: buildProfile.profile.env,
-            credentialsCtx,
+            credentialsCtx: buildCtx.credentialsCtx,
+            applicationIdentifier: (_b = (_a = buildCtx.android) === null || _a === void 0 ? void 0 : _a.applicationId) !== null && _b !== void 0 ? _b : (_c = buildCtx.ios) === null || _c === void 0 ? void 0 : _c.bundleIdentifier,
         });
         if (moreBuilds) {
             log_1.default.newLine();

package/build/commands/channel/create.d.ts

@@ -1,4 +1,10 @@
 import EasCommand from '../../commandUtils/EasCommand';
+import { CreateUpdateChannelOnAppMutation } from '../../graphql/generated';
+export declare function createUpdateChannelOnAppAsync({ appId, channelName, branchId, }: {
+    appId: string;
+    channelName: string;
+    branchId: string;
+}): Promise<CreateUpdateChannelOnAppMutation>;
 export default class ChannelCreate extends EasCommand {
     static hidden: boolean;
     static description: string;

package/build/commands/channel/create.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.createUpdateChannelOnAppAsync = void 0;
 const tslib_1 = require("tslib");
 const config_1 = require("@expo/config");
 const command_1 = require("@oclif/command");
@@ -36,6 +37,7 @@ async function createUpdateChannelOnAppAsync({ appId, channelName, branchId, })
     })
         .toPromise());
 }
+exports.createUpdateChannelOnAppAsync = createUpdateChannelOnAppAsync;
 class ChannelCreate extends EasCommand_1.default {
     async runAsync() {
         let { args: { name: channelName }, flags: { json: jsonFlag }, } = this.parse(ChannelCreate);

package/build/commands/secret/create.js

@@ -8,7 +8,6 @@ const EasCommand_1 = (0, tslib_1.__importDefault)(require("../../commandUtils/Ea
 const EnvironmentSecretMutation_1 = require("../../graphql/mutations/EnvironmentSecretMutation");
 const EnvironmentSecretsQuery_1 = require("../../graphql/queries/EnvironmentSecretsQuery");
 const log_1 = (0, tslib_1.__importDefault)(require("../../log"));
-const isEasEnabledForProject_1 = require("../../project/isEasEnabledForProject");
 const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
 const Account_1 = require("../../user/Account");
@@ -23,11 +22,6 @@ class EnvironmentSecretCreate extends EasCommand_1.default {
         const accountName = await (0, projectUtils_1.getProjectAccountNameAsync)(exp);
         const { slug } = exp;
         const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
-        if (!(await (0, isEasEnabledForProject_1.isEasEnabledForProjectAsync)(projectId))) {
-            (0, isEasEnabledForProject_1.warnEasUnavailable)();
-            process.exitCode = 1;
-            return;
-        }
         if (!scope) {
             const validationMessage = 'Secret scope may not be empty.';
             ({ scope } = await (0, prompts_1.promptAsync)({

package/build/commands/secret/delete.js

@@ -8,7 +8,6 @@ const EasCommand_1 = (0, tslib_1.__importDefault)(require("../../commandUtils/Ea
 const EnvironmentSecretMutation_1 = require("../../graphql/mutations/EnvironmentSecretMutation");
 const EnvironmentSecretsQuery_1 = require("../../graphql/queries/EnvironmentSecretsQuery");
 const log_1 = (0, tslib_1.__importDefault)(require("../../log"));
-const isEasEnabledForProject_1 = require("../../project/isEasEnabledForProject");
 const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
 class EnvironmentSecretDelete extends EasCommand_1.default {
@@ -17,11 +16,6 @@ class EnvironmentSecretDelete extends EasCommand_1.default {
         const { exp } = (0, config_1.getConfig)(projectDir, { skipSDKVersionRequirement: true });
         const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
         const projectAccountName = await (0, projectUtils_1.getProjectAccountNameAsync)(exp);
-        if (!(await (0, isEasEnabledForProject_1.isEasEnabledForProjectAsync)(projectId))) {
-            (0, isEasEnabledForProject_1.warnEasUnavailable)();
-            process.exitCode = 1;
-            return;
-        }
         let { flags: { id }, } = this.parse(EnvironmentSecretDelete);
         let secret;
         if (!id) {

package/build/commands/secret/list.js

@@ -8,7 +8,6 @@ const dateformat_1 = (0, tslib_1.__importDefault)(require("dateformat"));
 const EasCommand_1 = (0, tslib_1.__importDefault)(require("../../commandUtils/EasCommand"));
 const EnvironmentSecretsQuery_1 = require("../../graphql/queries/EnvironmentSecretsQuery");
 const log_1 = (0, tslib_1.__importDefault)(require("../../log"));
-const isEasEnabledForProject_1 = require("../../project/isEasEnabledForProject");
 const projectUtils_1 = require("../../project/projectUtils");
 class EnvironmentSecretList extends EasCommand_1.default {
     async runAsync() {
@@ -16,11 +15,6 @@ class EnvironmentSecretList extends EasCommand_1.default {
         const { exp } = (0, config_1.getConfig)(projectDir, { skipSDKVersionRequirement: true });
         const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
         const projectAccountName = await (0, projectUtils_1.getProjectAccountNameAsync)(exp);
-        if (!(await (0, isEasEnabledForProject_1.isEasEnabledForProjectAsync)(projectId))) {
-            (0, isEasEnabledForProject_1.warnEasUnavailable)();
-            process.exitCode = 1;
-            return;
-        }
         if (!projectDir) {
             throw new Error("Please run this command inside your project's directory");
         }

package/build/commands/submit.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const config_1 = require("@expo/config");
-const eas_json_1 = require("@expo/eas-json");
 const command_1 = require("@oclif/command");
 const errors_1 = require("@oclif/errors");
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
@@ -10,7 +9,6 @@ const EasCommand_1 = (0, tslib_1.__importDefault)(require("../commandUtils/EasCo
 const AppPlatform_1 = require("../graphql/types/AppPlatform");
 const log_1 = (0, tslib_1.__importStar)(require("../log"));
 const platform_1 = require("../platform");
-const isEasEnabledForProject_1 = require("../project/isEasEnabledForProject");
 const projectUtils_1 = require("../project/projectUtils");
 const context_1 = require("../submit/context");
 const submit_1 = require("../submit/submit");
@@ -23,19 +21,12 @@ class Submit extends EasCommand_1.default {
         const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
         const { exp } = (0, config_1.getConfig)(projectDir, { skipSDKVersionRequirement: true });
         const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
-        if (!(await (0, isEasEnabledForProject_1.isEasEnabledForProjectAsync)(projectId))) {
-            (0, isEasEnabledForProject_1.warnEasUnavailable)();
-            process.exitCode = 1;
-            return;
-        }
         const platforms = (0, platform_1.toPlatforms)(flags.requestedPlatform);
-        const easJsonReader = new eas_json_1.EasJsonReader(projectDir);
         const submissionProfiles = await (0, profiles_1.getProfilesAsync)({
+            type: 'submit',
+            projectDir,
             platforms,
             profileName: flags.profile,
-            async readProfileAsync(platform, profileName) {
-                return await easJsonReader.readSubmitProfileAsync(platform, profileName);
-            },
         });
         const submissions = [];
         for (const submissionProfile of submissionProfiles) {

package/build/commands/webhook/create.js

@@ -32,8 +32,7 @@ WebhookCreate.description = 'Create a webhook on the current project.';
 WebhookCreate.flags = {
     event: command_1.flags.enum({
         description: 'Event type that triggers the webhook',
-        options: [generated_1.WebhookType.Build],
-        default: generated_1.WebhookType.Build,
+        options: [generated_1.WebhookType.Build, generated_1.WebhookType.Submit],
     }),
     url: command_1.flags.string({
         description: 'Webhook URL',

package/build/commands/webhook/list.js

@@ -43,6 +43,6 @@ WebhookList.description = 'List webhooks on the current project.';
 WebhookList.flags = {
     event: command_1.flags.enum({
         description: 'Event type that triggers the webhook',
-        options: [generated_1.WebhookType.Build],
+        options: [generated_1.WebhookType.Build, generated_1.WebhookType.Submit],
     }),
 };

package/build/commands/webhook/update.js

@@ -35,8 +35,7 @@ WebhookUpdate.flags = {
     }),
     event: command_1.flags.enum({
         description: 'Event type that triggers the webhook',
-        options: [generated_1.WebhookType.Build],
-        default: generated_1.WebhookType.Build,
+        options: [generated_1.WebhookType.Build, generated_1.WebhookType.Submit],
     }),
     url: command_1.flags.string({
         description: 'Webhook URL',

package/build/credentials/android/actions/RemoveFcm.js

@@ -11,23 +11,23 @@ class RemoveFcm {
     }
     async runAsync(ctx) {
         if (ctx.nonInteractive) {
-            throw new Error("Deleting an FCM Api Key is a destructive operation. Start the CLI without the '--non-interactive' flag to delete the credentials.");
+            throw new Error("Deleting an FCM API Key is a destructive operation. Start the CLI without the '--non-interactive' flag to delete the credentials.");
         }
         const appCredentials = await ctx.android.getAndroidAppCredentialsWithCommonFieldsAsync(this.app);
         const fcm = appCredentials === null || appCredentials === void 0 ? void 0 : appCredentials.androidFcm;
         if (!fcm) {
-            log_1.default.warn(`There is no valid FCM Api Key defined for ${(0, GraphqlClient_1.formatProjectFullName)(this.app)}, ${this.app.androidApplicationIdentifier}`);
+            log_1.default.warn(`There is no valid FCM API Key defined for ${(0, GraphqlClient_1.formatProjectFullName)(this.app)}, ${this.app.androidApplicationIdentifier}`);
             return;
         }
         const confirm = await (0, prompts_1.confirmAsync)({
-            message: 'Permanently delete the FCM Api Key from Expo servers?',
+            message: 'Permanently delete the FCM API Key from Expo servers?',
             initial: false,
         });
         if (!confirm) {
             return;
         }
         await ctx.android.deleteFcmAsync(fcm);
-        log_1.default.succeed('FCM Api Key removed');
+        log_1.default.succeed('FCM API Key removed');
     }
 }
 exports.RemoveFcm = RemoveFcm;

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/ios/actions/AscApiKeyUtils.js

@@ -46,14 +46,14 @@ async function getMinimalAscApiKeyAsync(ascApiKey) {
 exports.getMinimalAscApiKeyAsync = getMinimalAscApiKeyAsync;
 async function provideOrGenerateAscApiKeyAsync(ctx, purpose) {
     if (ctx.nonInteractive) {
-        return await generateAscApiKeyAsync(ctx, purpose);
+        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.');
+        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);
@@ -61,7 +61,7 @@ async function provideOrGenerateAscApiKeyAsync(ctx, purpose) {
         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?`,
+        message: `App Store Connect API Key with ID ${userProvided.keyId} is not valid on Apple's servers. Proceed anyway?`,
     });
     if (useUserProvided) {
         return userProvided;
@@ -70,6 +70,7 @@ async function 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),
@@ -97,7 +98,7 @@ async function promptForKeyP8AndIdAsync() {
     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) => {
@@ -146,10 +147,10 @@ async function selectAscApiKeysFromAccountAsync(ctx, account, { filterDifferentA
     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}.` : '.'}`);
+            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.`);
+            log_1.default.warn(`There are no App Store Connect API Keys available in your EAS account.`);
         }
         return null;
     }
@@ -161,7 +162,7 @@ async function selectAscApiKeysAsync(ascApiKeys) {
     const { chosenAscApiKey } = await (0, prompts_1.promptAsync)({
         type: 'select',
         name: 'chosenAscApiKey',
-        message: 'Select an Api Key from the list:',
+        message: 'Select an API Key from the list:',
         choices: sortedAscApiKeys.map(ascApiKey => ({
             title: formatAscApiKey(ascApiKey),
             value: ascApiKey,

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

@@ -22,7 +22,7 @@ class AssignAscApiKey {
         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}.`);
+        log_1.default.succeed(`App Store Connect API Key assigned to ${this.app.projectName}: ${this.app.bundleIdentifier} for ${purpose}.`);
         return updatedAppCredentials;
     }
 }

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

@@ -10,11 +10,11 @@ class CreateAscApiKey {
     }
     async runAsync(ctx, purpose) {
         if (ctx.nonInteractive) {
-            throw new Error(`A new App Store Connect Api Key cannot be created in non-interactive mode.`);
+            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');
+        log_1.default.succeed('Created App Store Connect API Key');
         return result;
     }
 }