eas-cli 0.35.0 → 0.36.0

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

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

@@ -13,7 +13,7 @@ class SelectAndRemoveAscApiKey {
         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.succeed('Removed App Store Connect API Key');
             log_1.default.newLine();
         }
     }
@@ -26,26 +26,26 @@ class RemoveAscApiKey {
     }
     async runAsync(ctx) {
         if (ctx.nonInteractive) {
-            throw new Error(`Cannot remove App Store Connect Api Keys in non-interactive mode.`);
+            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?`,
+            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');
+        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?`,
+                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.');
+            log_1.default.log('Skipping API Key revocation on the Apple Developer Portal.');
         }
         if (shouldRevoke) {
             await ctx.appStore.revokeAscApiKeyAsync(this.ascApiKey.keyIdentifier);

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

@@ -22,20 +22,20 @@ class SetUpAscApiKey {
         this.purpose = purpose;
         this.choices = [
             {
-                title: '[Choose an existing ASC Api Key]',
+                title: '[Choose an existing ASC API Key]',
                 value: SetupAscApiKeyChoice.USE_EXISTING,
             },
-            { title: '[Add a new ASC Api Key]', value: SetupAscApiKeyChoice.GENERATE },
+            { title: '[Add a new ASC API Key]', value: SetupAscApiKeyChoice.GENERATE },
         ];
     }
     async runAsync(ctx) {
         const isKeySetup = await this.isAscApiKeySetupAsync(ctx, this.purpose);
         if (isKeySetup) {
-            log_1.default.succeed('App Store Connect Api Key already set up.');
-            return (0, nullthrows_1.default)(await ctx.ios.getIosAppCredentialsWithCommonFieldsAsync(this.app), 'iosAppCredentials cannot be null if App Store Connect Api Key is already set up');
+            log_1.default.succeed('App Store Connect API Key already set up.');
+            return (0, nullthrows_1.default)(await ctx.ios.getIosAppCredentialsWithCommonFieldsAsync(this.app), 'iosAppCredentials cannot be null if App Store Connect API Key is already set up');
         }
         if (ctx.nonInteractive) {
-            throw new errors_1.MissingCredentialsNonInteractiveError('App Store Connect Api Keys cannot be set up in --non-interactive mode.');
+            throw new errors_1.MissingCredentialsNonInteractiveError('App Store Connect API Keys cannot be set up in --non-interactive mode.');
         }
         const keysForAccount = await (0, AscApiKeyUtils_1.getAscApiKeysFromAccountAsync)(ctx, this.app.account, {
             filterDifferentAppleTeam: true,
@@ -64,10 +64,10 @@ class SetUpAscApiKey {
         }
         const [autoselectedKey] = (0, AscApiKeyUtils_1.sortAscApiKeysByUpdatedAtDesc)(validKeys);
         const useAutoselected = await (0, prompts_1.confirmAsync)({
-            message: `Reuse this App Store Connect Api Key?\n${(0, AscApiKeyUtils_1.formatAscApiKey)(autoselectedKey)}`,
+            message: `Reuse this App Store Connect API Key?\n${(0, AscApiKeyUtils_1.formatAscApiKey)(autoselectedKey)}`,
         });
         if (useAutoselected) {
-            log_1.default.log(`Using App Store Connect Api Key with ID ${autoselectedKey.keyIdentifier}`);
+            log_1.default.log(`Using App Store Connect API Key with ID ${autoselectedKey.keyIdentifier}`);
             return autoselectedKey;
         }
         else {
@@ -77,7 +77,7 @@ class SetUpAscApiKey {
     async isAscApiKeySetupAsync(ctx, purpose) {
         const appCredentials = await ctx.ios.getIosAppCredentialsWithCommonFieldsAsync(this.app);
         if (purpose !== AscApiKeyUtils_1.AppStoreApiKeyPurpose.SUBMISSION_SERVICE) {
-            throw new Error(`App Store Connect Api Key setup is not yet supported for ${purpose}.`);
+            throw new Error(`App Store Connect API Key setup is not yet supported for ${purpose}.`);
         }
         return !!(appCredentials === null || appCredentials === void 0 ? void 0 : appCredentials.appStoreConnectApiKeyForSubmissions);
     }

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

@@ -14,7 +14,7 @@ exports.PROMPT_FOR_APP_SPECIFIC_PASSWORD = 'PROMPT_FOR_APP_SPECIFIC_PASSWORD';
 class SetUpSubmissionCredentials {
     constructor(app) {
         this.setupAscApiKeyAction = new SetUpAscApiKey_1.SetUpAscApiKey(app, AscApiKeyUtils_1.AppStoreApiKeyPurpose.SUBMISSION_SERVICE);
-        // Add this unrelated choice to ASC Api Key setup for legacy purposes -- we will deprecate it soon
+        // Add this unrelated choice to ASC API Key setup for legacy purposes -- we will deprecate it soon
         this.setupAscApiKeyAction.choices = this.setupAscApiKeyAction.choices.concat({
             title: '[Enter an App Specific Password]',
             value: exports.PROMPT_FOR_APP_SPECIFIC_PASSWORD,
@@ -23,8 +23,8 @@ class SetUpSubmissionCredentials {
     async runAsync(ctx) {
         try {
             const iosAppCredentials = await this.setupAscApiKeyAction.runAsync(ctx);
-            const { keyIdentifier, name } = (0, nullthrows_1.default)(iosAppCredentials.appStoreConnectApiKeyForSubmissions, 'ASC Api Key must be defined for EAS Submit');
-            log_1.default.log(`Using Api Key ID: ${keyIdentifier}${name ? ` (${name})` : ''}`);
+            const { keyIdentifier, name } = (0, nullthrows_1.default)(iosAppCredentials.appStoreConnectApiKeyForSubmissions, 'ASC API Key must be defined for EAS Submit');
+            log_1.default.log(`Using API Key ID: ${keyIdentifier}${name ? ` (${name})` : ''}`);
             return iosAppCredentials;
         }
         catch (e) {

package/build/credentials/ios/appstore/ascApiKey.js

@@ -7,26 +7,26 @@ const log_1 = (0, tslib_1.__importDefault)(require("../../../log"));
 const ora_1 = require("../../../ora");
 const authenticate_1 = require("./authenticate");
 async function listAscApiKeysAsync(authCtx) {
-    const spinner = (0, ora_1.ora)(`Fetching App Store Connect Api Keys.`).start();
+    const spinner = (0, ora_1.ora)(`Fetching App Store Connect API Keys.`).start();
     try {
         const context = (0, authenticate_1.getRequestContext)(authCtx);
         const keys = await apple_utils_1.ApiKey.getAsync(context);
-        spinner.succeed(`Fetched App Store Connect Api Keys.`);
+        spinner.succeed(`Fetched App Store Connect API Keys.`);
         return keys.map(key => getAscApiKeyInfo(key, authCtx));
     }
     catch (error) {
-        spinner.fail(`Failed to fetch App Store Connect Api Keys.`);
+        spinner.fail(`Failed to fetch App Store Connect API Keys.`);
         throw error;
     }
 }
 exports.listAscApiKeysAsync = listAscApiKeysAsync;
 async function getAscApiKeyAsync(authCtx, keyId) {
     var _a;
-    const spinner = (0, ora_1.ora)(`Fetching App Store Connect Api Key.`).start();
+    const spinner = (0, ora_1.ora)(`Fetching App Store Connect API Key.`).start();
     try {
         const context = (0, authenticate_1.getRequestContext)(authCtx);
         const apiKey = await apple_utils_1.ApiKey.infoAsync(context, { id: keyId });
-        spinner.succeed(`Fetched App Store Connect Api Key (ID: ${keyId}).`);
+        spinner.succeed(`Fetched App Store Connect API Key (ID: ${keyId}).`);
         return getAscApiKeyInfo(apiKey, authCtx);
     }
     catch (error) {
@@ -36,13 +36,13 @@ async function getAscApiKeyAsync(authCtx, keyId) {
             return null;
         }
         log_1.default.error(error);
-        spinner.fail(`Failed to fetch App Store Connect Api Key.`);
+        spinner.fail(`Failed to fetch App Store Connect API Key.`);
         throw error;
     }
 }
 exports.getAscApiKeyAsync = getAscApiKeyAsync;
 async function createAscApiKeyAsync(authCtx, { nickname, allAppsVisible, roles, keyType, }) {
-    const spinner = (0, ora_1.ora)(`Creating App Store Connect Api Key.`).start();
+    const spinner = (0, ora_1.ora)(`Creating App Store Connect API Key.`).start();
     try {
         const context = (0, authenticate_1.getRequestContext)(authCtx);
         const key = await apple_utils_1.ApiKey.createAsync(context, {
@@ -66,30 +66,30 @@ async function createAscApiKeyAsync(authCtx, { nickname, allAppsVisible, roles,
         }
         // this object has more optional parameters populated
         const fullKey = await apple_utils_1.ApiKey.infoAsync(context, { id: key.id });
-        spinner.succeed(`Created App Store Connect Api Key.`);
+        spinner.succeed(`Created App Store Connect API Key.`);
         return {
             ...getAscApiKeyInfo(fullKey, authCtx),
             keyP8,
         };
     }
     catch (err) {
-        spinner.fail('Failed to create App Store Connect Api Key.');
+        spinner.fail('Failed to create App Store Connect API Key.');
         throw err;
     }
 }
 exports.createAscApiKeyAsync = createAscApiKeyAsync;
 async function revokeAscApiKeyAsync(authCtx, keyId) {
-    const spinner = (0, ora_1.ora)(`Revoking App Store Connect Api Key.`).start();
+    const spinner = (0, ora_1.ora)(`Revoking App Store Connect API Key.`).start();
     try {
         const context = (0, authenticate_1.getRequestContext)(authCtx);
         const apiKey = await apple_utils_1.ApiKey.infoAsync(context, { id: keyId });
         const revokedKey = await apiKey.revokeAsync();
-        spinner.succeed(`Revoked App Store Connect Api Key.`);
+        spinner.succeed(`Revoked App Store Connect API Key.`);
         return getAscApiKeyInfo(revokedKey, authCtx);
     }
     catch (error) {
         log_1.default.error(error);
-        spinner.fail(`Failed to revoke App Store Connect Api Key.`);
+        spinner.fail(`Failed to revoke App Store Connect API Key.`);
         throw error;
     }
 }

package/build/credentials/ios/appstore/entitlements.d.ts

@@ -1,4 +1,4 @@
 import { Workflow } from '@expo/eas-build-job';
 import { JSONObject } from '@expo/json-file';
-export declare function getManagedEntitlementsJsonAsync(projectDir: string): Promise<JSONObject>;
-export declare function resolveEntitlementsJsonAsync(projectDir: string, workflow: Workflow): Promise<JSONObject>;
+export declare function getManagedEntitlementsJsonAsync(projectDir: string, env: Record<string, string>): Promise<JSONObject>;
+export declare function resolveEntitlementsJsonAsync(projectDir: string, workflow: Workflow, env: Record<string, string>): Promise<JSONObject>;

package/build/credentials/ios/appstore/entitlements.js

@@ -7,23 +7,33 @@ const eas_build_job_1 = require("@expo/eas-build-job");
 const plist_1 = (0, tslib_1.__importDefault)(require("@expo/plist"));
 const prebuild_config_1 = require("@expo/prebuild-config");
 const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
-async function getManagedEntitlementsJsonAsync(projectDir) {
+async function getManagedEntitlementsJsonAsync(projectDir, env) {
     var _a;
-    let { exp } = (0, prebuild_config_1.getPrebuildConfig)(projectDir, { platforms: ['ios'] });
-    exp = await (0, config_plugins_1.compileModsAsync)(exp, {
-        projectRoot: projectDir,
-        platforms: ['ios'],
-        introspect: true,
-    });
-    return ((_a = exp.ios) === null || _a === void 0 ? void 0 : _a.entitlements) || {};
+    const originalProcessEnv = process.env;
+    try {
+        process.env = {
+            ...process.env,
+            ...env,
+        };
+        const { exp } = (0, prebuild_config_1.getPrebuildConfig)(projectDir, { platforms: ['ios'] });
+        const expWithMods = await (0, config_plugins_1.compileModsAsync)(exp, {
+            projectRoot: projectDir,
+            platforms: ['ios'],
+            introspect: true,
+        });
+        return ((_a = expWithMods.ios) === null || _a === void 0 ? void 0 : _a.entitlements) || {};
+    }
+    finally {
+        process.env = originalProcessEnv;
+    }
 }
 exports.getManagedEntitlementsJsonAsync = getManagedEntitlementsJsonAsync;
-async function resolveEntitlementsJsonAsync(projectDir, workflow) {
+async function resolveEntitlementsJsonAsync(projectDir, workflow, env) {
     if (workflow === eas_build_job_1.Workflow.GENERIC) {
         return (await getEntitlementsJsonAsync(projectDir)) || {};
     }
     else if (workflow === eas_build_job_1.Workflow.MANAGED) {
-        return await getManagedEntitlementsJsonAsync(projectDir);
+        return await getManagedEntitlementsJsonAsync(projectDir, env);
     }
     else {
         throw new Error(`Unknown workflow: ${workflow}`);

package/build/credentials/ios/credentials.js

@@ -51,7 +51,7 @@ exports.distributionCertificateSchema = {
     },
 };
 exports.ascApiKeyIdSchema = {
-    name: 'App Store Connect Api Key',
+    name: 'App Store Connect API Key',
     questions: [
         {
             field: 'keyId',
@@ -61,7 +61,7 @@ exports.ascApiKeyIdSchema = {
     ],
 };
 exports.ascApiKeyIssuerIdSchema = {
-    name: 'App Store Connect Api Key',
+    name: 'App Store Connect API Key',
     questions: [
         {
             field: 'issuerId',

package/build/credentials/ios/utils/printCredentials.js

@@ -198,7 +198,7 @@ function displayApplePushKey(maybePushKey, fields) {
     fields.push({ label: '', value: '' });
 }
 function displayAscApiKey(maybeAscApiKey, fields) {
-    fields.push({ label: 'App Store Connect Api Key', value: '' });
+    fields.push({ label: 'App Store Connect API Key', value: '' });
     if (maybeAscApiKey) {
         const { keyIdentifier, issuerIdentifier, appleTeam, name, roles, updatedAt } = maybeAscApiKey;
         fields.push({ label: 'Developer Portal ID', value: keyIdentifier });

package/build/credentials/manager/AndroidActions.js

@@ -10,7 +10,7 @@ exports.highLevelActions = [
     },
     {
         value: Actions_1.AndroidActionType.ManageFcm,
-        title: 'Push Notifications: Manage your FCM Api Key',
+        title: 'Push Notifications: Manage your FCM API Key',
         scope: Actions_1.Scope.Manager,
     },
     {
@@ -71,12 +71,12 @@ exports.buildCredentialsActions = [
 exports.fcmActions = [
     {
         value: Actions_1.AndroidActionType.CreateFcm,
-        title: 'Upload an FCM Api Key',
+        title: 'Upload an FCM API Key',
         scope: Actions_1.Scope.Project,
     },
     {
         value: Actions_1.AndroidActionType.RemoveFcm,
-        title: 'Delete your FCM Api Key',
+        title: 'Delete your FCM API Key',
         scope: Actions_1.Scope.Project,
     },
     {

package/build/credentials/manager/IosActions.js

@@ -15,7 +15,7 @@ exports.highLevelActions = [
     },
     {
         value: Actions_1.IosActionType.ManageAscApiKey,
-        title: 'App Store Connect: Manage your Api Key',
+        title: 'App Store Connect: Manage your API Key',
         scope: Actions_1.Scope.Manager,
     },
     {
@@ -80,22 +80,22 @@ function getAscApiKeyActions(ctx) {
     return [
         {
             value: Actions_1.IosActionType.SetUpAscApiKeyForSubmissions,
-            title: 'Set up your project to use an Api Key for EAS Submit',
+            title: 'Set up your project to use an API Key for EAS Submit',
             scope: Actions_1.Scope.Project,
         },
         {
             value: Actions_1.IosActionType.UseExistingAscApiKeyForSubmissions,
-            title: 'Use an existing Api Key for EAS Submit',
+            title: 'Use an existing API Key for EAS Submit',
             scope: Actions_1.Scope.Project,
         },
         {
             value: Actions_1.IosActionType.CreateAscApiKeyForSubmissions,
-            title: 'Add a new Api Key For EAS Submit',
+            title: 'Add a new API Key For EAS Submit',
             scope: ctx.hasProjectContext ? Actions_1.Scope.Project : Actions_1.Scope.Account,
         },
         {
             value: Actions_1.IosActionType.RemoveAscApiKey,
-            title: 'Delete an Api Key',
+            title: 'Delete an API Key',
             scope: Actions_1.Scope.Account,
         },
         {