eas-cli 0.34.1 → 0.37.0

package/build/credentials/manager/IosActions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBuildCredentialsActions = exports.getPushKeyActions = exports.credentialsJsonActions = exports.highLevelActions = void 0;
+exports.getBuildCredentialsActions = exports.getAscApiKeyActions = exports.getPushKeyActions = exports.credentialsJsonActions = exports.highLevelActions = void 0;
 const Actions_1 = require("./Actions");
 exports.highLevelActions = [
     {
@@ -13,6 +13,11 @@ exports.highLevelActions = [
         title: 'Push Notifications: Manage your Apple Push Notifications Key',
         scope: Actions_1.Scope.Manager,
     },
+    {
+        value: Actions_1.IosActionType.ManageAscApiKey,
+        title: 'App Store Connect: Manage your API Key',
+        scope: Actions_1.Scope.Manager,
+    },
     {
         value: Actions_1.IosActionType.ManageCredentialsJson,
         title: 'credentials.json: Upload/Download credentials between EAS servers and your local json ',
@@ -31,7 +36,7 @@ exports.credentialsJsonActions = [
         scope: Actions_1.Scope.Project,
     },
     {
-        value: Actions_1.IosActionType.SetupBuildCredentialsFromCredentialsJson,
+        value: Actions_1.IosActionType.SetUpBuildCredentialsFromCredentialsJson,
         title: 'Upload credentials from credentials.json to EAS',
         scope: Actions_1.Scope.Project,
     },
@@ -44,8 +49,8 @@ exports.credentialsJsonActions = [
 function getPushKeyActions(ctx) {
     return [
         {
-            value: Actions_1.IosActionType.SetupPushKey,
-            title: 'Setup your project to use Push Notifications',
+            value: Actions_1.IosActionType.SetUpPushKey,
+            title: 'Set up your project to use Push Notifications',
             scope: Actions_1.Scope.Project,
         },
         {
@@ -71,12 +76,42 @@ function getPushKeyActions(ctx) {
     ];
 }
 exports.getPushKeyActions = getPushKeyActions;
+function getAscApiKeyActions(ctx) {
+    return [
+        {
+            value: Actions_1.IosActionType.SetUpAscApiKeyForSubmissions,
+            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',
+            scope: Actions_1.Scope.Project,
+        },
+        {
+            value: Actions_1.IosActionType.CreateAscApiKeyForSubmissions,
+            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',
+            scope: Actions_1.Scope.Account,
+        },
+        {
+            value: Actions_1.IosActionType.GoBackToHighLevelActions,
+            title: 'Go back',
+            scope: Actions_1.Scope.Manager,
+        },
+    ];
+}
+exports.getAscApiKeyActions = getAscApiKeyActions;
 function getBuildCredentialsActions(ctx) {
     return [
         {
             // This command will be triggered during build to ensure all credentials are ready
             // I'm leaving it here for now to simplify testing
-            value: Actions_1.IosActionType.SetupBuildCredentials,
+            value: Actions_1.IosActionType.SetUpBuildCredentials,
             title: 'All: Set up all the required credentials to build your project',
             scope: Actions_1.Scope.Project,
         },

package/build/credentials/manager/ManageAndroid.js

@@ -20,8 +20,8 @@ const DownloadKeystore_1 = require("../android/actions/DownloadKeystore");
 const RemoveFcm_1 = require("../android/actions/RemoveFcm");
 const RemoveGoogleServiceAccountKey_1 = require("../android/actions/RemoveGoogleServiceAccountKey");
 const RemoveKeystore_1 = require("../android/actions/RemoveKeystore");
-const SetupBuildCredentialsFromCredentialsJson_1 = require("../android/actions/SetupBuildCredentialsFromCredentialsJson");
-const SetupGoogleServiceAccountKey_1 = require("../android/actions/SetupGoogleServiceAccountKey");
+const SetUpBuildCredentialsFromCredentialsJson_1 = require("../android/actions/SetUpBuildCredentialsFromCredentialsJson");
+const SetUpGoogleServiceAccountKey_1 = require("../android/actions/SetUpGoogleServiceAccountKey");
 const UpdateCredentialsJson_1 = require("../android/actions/UpdateCredentialsJson");
 const UseExistingGoogleServiceAccountKey_1 = require("../android/actions/UseExistingGoogleServiceAccountKey");
 const printCredentials_1 = require("../android/utils/printCredentials");
@@ -180,8 +180,8 @@ class ManageAndroid {
         else if (action === Actions_1.AndroidActionType.RemoveGsaKey) {
             await new RemoveGoogleServiceAccountKey_1.SelectAndRemoveGoogleServiceAccountKey(appLookupParams.account).runAsync(ctx);
         }
-        else if (action === Actions_1.AndroidActionType.SetupGsaKey) {
-            await new SetupGoogleServiceAccountKey_1.SetupGoogleServiceAccountKey(appLookupParams).runAsync(ctx);
+        else if (action === Actions_1.AndroidActionType.SetUpGsaKey) {
+            await new SetUpGoogleServiceAccountKey_1.SetUpGoogleServiceAccountKey(appLookupParams).runAsync(ctx);
         }
         else if (action === Actions_1.AndroidActionType.UpdateCredentialsJson) {
             const buildCredentials = await new SelectAndroidBuildCredentials_1.SelectExistingAndroidBuildCredentials(appLookupParams).runAsync(ctx);
@@ -189,8 +189,8 @@ class ManageAndroid {
                 await new UpdateCredentialsJson_1.UpdateCredentialsJson().runAsync(ctx, buildCredentials);
             }
         }
-        else if (action === Actions_1.AndroidActionType.SetupBuildCredentialsFromCredentialsJson) {
-            await new SetupBuildCredentialsFromCredentialsJson_1.SetupBuildCredentialsFromCredentialsJson(appLookupParams).runAsync(ctx);
+        else if (action === Actions_1.AndroidActionType.SetUpBuildCredentialsFromCredentialsJson) {
+            await new SetUpBuildCredentialsFromCredentialsJson_1.SetUpBuildCredentialsFromCredentialsJson(appLookupParams).runAsync(ctx);
         }
     }
 }

package/build/credentials/manager/ManageIos.js

@@ -13,20 +13,25 @@ const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
 const Account_1 = require("../../user/Account");
 const actions_1 = require("../../user/actions");
+const AscApiKeyUtils_1 = require("../ios/actions/AscApiKeyUtils");
+const AssignAscApiKey_1 = require("../ios/actions/AssignAscApiKey");
 const AssignPushKey_1 = require("../ios/actions/AssignPushKey");
 const BuildCredentialsUtils_1 = require("../ios/actions/BuildCredentialsUtils");
+const CreateAscApiKey_1 = require("../ios/actions/CreateAscApiKey");
 const CreateDistributionCertificate_1 = require("../ios/actions/CreateDistributionCertificate");
 const CreatePushKey_1 = require("../ios/actions/CreatePushKey");
 const DistributionCertificateUtils_1 = require("../ios/actions/DistributionCertificateUtils");
 const PushKeyUtils_1 = require("../ios/actions/PushKeyUtils");
+const RemoveAscApiKey_1 = require("../ios/actions/RemoveAscApiKey");
 const RemoveDistributionCertificate_1 = require("../ios/actions/RemoveDistributionCertificate");
 const RemoveProvisioningProfile_1 = require("../ios/actions/RemoveProvisioningProfile");
 const RemovePushKey_1 = require("../ios/actions/RemovePushKey");
-const SetupAdhocProvisioningProfile_1 = require("../ios/actions/SetupAdhocProvisioningProfile");
-const SetupBuildCredentials_1 = require("../ios/actions/SetupBuildCredentials");
-const SetupBuildCredentialsFromCredentialsJson_1 = require("../ios/actions/SetupBuildCredentialsFromCredentialsJson");
-const SetupProvisioningProfile_1 = require("../ios/actions/SetupProvisioningProfile");
-const SetupPushKey_1 = require("../ios/actions/SetupPushKey");
+const SetUpAdhocProvisioningProfile_1 = require("../ios/actions/SetUpAdhocProvisioningProfile");
+const SetUpAscApiKey_1 = require("../ios/actions/SetUpAscApiKey");
+const SetUpBuildCredentials_1 = require("../ios/actions/SetUpBuildCredentials");
+const SetUpBuildCredentialsFromCredentialsJson_1 = require("../ios/actions/SetUpBuildCredentialsFromCredentialsJson");
+const SetUpProvisioningProfile_1 = require("../ios/actions/SetUpProvisioningProfile");
+const SetUpPushKey_1 = require("../ios/actions/SetUpPushKey");
 const UpdateCredentialsJson_1 = require("../ios/actions/UpdateCredentialsJson");
 const entitlements_1 = require("../ios/appstore/entitlements");
 const printCredentials_1 = require("../ios/utils/printCredentials");
@@ -42,6 +47,7 @@ class ManageIos {
     async runAsync(ctx, currentActions = IosActions_1.highLevelActions) {
         const buildCredentialsActions = (0, IosActions_1.getBuildCredentialsActions)(ctx);
         const pushKeyActions = (0, IosActions_1.getPushKeyActions)(ctx);
+        const ascApiKeyActions = (0, IosActions_1.getAscApiKeyActions)(ctx);
         await ctx.bestEffortAppStoreAuthenticateAsync();
         const accountName = ctx.hasProjectContext
             ? (0, projectUtils_1.getProjectAccountName)(ctx.exp, ctx.user)
@@ -89,6 +95,10 @@ class ManageIos {
                         currentActions = pushKeyActions;
                         continue;
                     }
+                    else if (chosenAction === Actions_1.IosActionType.ManageAscApiKey) {
+                        currentActions = ascApiKeyActions;
+                        continue;
+                    }
                     else if (chosenAction === Actions_1.IosActionType.GoBackToHighLevelActions) {
                         currentActions = IosActions_1.highLevelActions;
                         continue;
@@ -154,27 +164,33 @@ class ManageIos {
         else if (action === Actions_1.IosActionType.CreatePushKey) {
             await new CreatePushKey_1.CreatePushKey(account).runAsync(ctx);
         }
+        else if (action === Actions_1.IosActionType.CreateAscApiKeyForSubmissions) {
+            await new CreateAscApiKey_1.CreateAscApiKey(account).runAsync(ctx, AscApiKeyUtils_1.AppStoreApiKeyPurpose.SUBMISSION_SERVICE);
+        }
         else if (action === Actions_1.IosActionType.RemovePushKey) {
             await new RemovePushKey_1.SelectAndRemovePushKey(account).runAsync(ctx);
         }
+        else if (action === Actions_1.IosActionType.RemoveAscApiKey) {
+            await new RemoveAscApiKey_1.SelectAndRemoveAscApiKey(account).runAsync(ctx);
+        }
     }
     async runProjectSpecificActionAsync(ctx, app, targets, buildProfile, action) {
-        var _a;
-        if (action === Actions_1.IosActionType.SetupBuildCredentials) {
-            await new SetupBuildCredentials_1.SetupBuildCredentials({
+        var _a, _b;
+        if (action === Actions_1.IosActionType.SetUpBuildCredentials) {
+            await new SetUpBuildCredentials_1.SetUpBuildCredentials({
                 app,
                 targets,
                 distribution: buildProfile.distribution,
                 enterpriseProvisioning: buildProfile.enterpriseProvisioning,
                 iosCapabilitiesOptions: {
-                    entitlements: await (0, entitlements_1.getManagedEntitlementsJsonAsync)(ctx.projectDir),
+                    entitlements: await (0, entitlements_1.getManagedEntitlementsJsonAsync)(ctx.projectDir, (_a = buildProfile.env) !== null && _a !== void 0 ? _a : {}),
                 },
             }).runAsync(ctx);
             return;
         }
         const distributionType = await new SelectIosDistributionTypeGraphqlFromBuildProfile_1.SelectIosDistributionTypeGraphqlFromBuildProfile(buildProfile).runAsync(ctx);
-        if (action === Actions_1.IosActionType.SetupBuildCredentialsFromCredentialsJson) {
-            await new SetupBuildCredentialsFromCredentialsJson_1.SetupBuildCredentialsFromCredentialsJson(app, targets, distributionType).runAsync(ctx);
+        if (action === Actions_1.IosActionType.SetUpBuildCredentialsFromCredentialsJson) {
+            await new SetUpBuildCredentialsFromCredentialsJson_1.SetUpBuildCredentialsFromCredentialsJson(app, targets, distributionType).runAsync(ctx);
             return;
         }
         else if (action === Actions_1.IosActionType.UpdateCredentialsJson) {
@@ -204,7 +220,7 @@ class ManageIos {
             }
             case Actions_1.IosActionType.RemoveProvisioningProfile: {
                 const iosAppCredentials = await ctx.ios.getIosAppCredentialsWithCommonFieldsAsync(appLookupParams);
-                const provisioningProfile = (_a = iosAppCredentials === null || iosAppCredentials === void 0 ? void 0 : iosAppCredentials.iosAppBuildCredentialsList.find(buildCredentials => buildCredentials.iosDistributionType === distributionType)) === null || _a === void 0 ? void 0 : _a.provisioningProfile;
+                const provisioningProfile = (_b = iosAppCredentials === null || iosAppCredentials === void 0 ? void 0 : iosAppCredentials.iosAppBuildCredentialsList.find(buildCredentials => buildCredentials.iosDistributionType === distributionType)) === null || _b === void 0 ? void 0 : _b.provisioningProfile;
                 if (!provisioningProfile) {
                     log_1.default.log(`No provisioning profile associated with the ${distributionType} configuration of ${appLookupParams.projectName}`);
                     return;
@@ -217,14 +233,14 @@ class ManageIos {
                 }
                 return;
             }
-            case Actions_1.IosActionType.SetupPushKey: {
-                const setupPushKeyAction = await new SetupPushKey_1.SetupPushKey(appLookupParams);
+            case Actions_1.IosActionType.SetUpPushKey: {
+                const setupPushKeyAction = await new SetUpPushKey_1.SetUpPushKey(appLookupParams);
                 const isPushKeySetup = await setupPushKeyAction.isPushKeySetupAsync(ctx);
                 if (isPushKeySetup) {
                     log_1.default.log(`Push Key is already set up for ${appLookupParams.projectName} ${appLookupParams.bundleIdentifier}`);
                 }
                 else {
-                    await new SetupPushKey_1.SetupPushKey(appLookupParams).runAsync(ctx);
+                    await new SetUpPushKey_1.SetUpPushKey(appLookupParams).runAsync(ctx);
                 }
                 return;
             }
@@ -245,6 +261,29 @@ class ManageIos {
                 }
                 return;
             }
+            case Actions_1.IosActionType.SetUpAscApiKeyForSubmissions: {
+                await new SetUpAscApiKey_1.SetUpAscApiKey(appLookupParams, AscApiKeyUtils_1.AppStoreApiKeyPurpose.SUBMISSION_SERVICE).runAsync(ctx);
+                return;
+            }
+            case Actions_1.IosActionType.UseExistingAscApiKeyForSubmissions: {
+                const ascApiKey = await (0, AscApiKeyUtils_1.selectAscApiKeysFromAccountAsync)(ctx, appLookupParams.account, {
+                    filterDifferentAppleTeam: true,
+                });
+                if (ascApiKey) {
+                    await new AssignAscApiKey_1.AssignAscApiKey(appLookupParams).runAsync(ctx, ascApiKey, AscApiKeyUtils_1.AppStoreApiKeyPurpose.SUBMISSION_SERVICE);
+                }
+                return;
+            }
+            case Actions_1.IosActionType.CreateAscApiKeyForSubmissions: {
+                const ascApiKey = await new CreateAscApiKey_1.CreateAscApiKey(appLookupParams.account).runAsync(ctx, AscApiKeyUtils_1.AppStoreApiKeyPurpose.SUBMISSION_SERVICE);
+                const confirm = await (0, prompts_1.confirmAsync)({
+                    message: `Do you want ${appLookupParams.projectName} to use the new API Key?`,
+                });
+                if (confirm) {
+                    await new AssignAscApiKey_1.AssignAscApiKey(appLookupParams).runAsync(ctx, ascApiKey, AscApiKeyUtils_1.AppStoreApiKeyPurpose.SUBMISSION_SERVICE);
+                }
+                return;
+            }
             default:
                 throw new Error('Unknown action selected');
         }
@@ -253,10 +292,10 @@ class ManageIos {
         log_1.default.log(`Setting up ${appLookupParams.projectName} to use Distribution Certificate`);
         log_1.default.log(`Creating provisioning profile...`);
         if (distributionType === generated_1.IosDistributionType.AdHoc) {
-            return await new SetupAdhocProvisioningProfile_1.SetupAdhocProvisioningProfile(appLookupParams).runWithDistributionCertificateAsync(ctx, distCert);
+            return await new SetUpAdhocProvisioningProfile_1.SetUpAdhocProvisioningProfile(appLookupParams).runWithDistributionCertificateAsync(ctx, distCert);
         }
         else {
-            return await new SetupProvisioningProfile_1.SetupProvisioningProfile(appLookupParams, distributionType).createAndAssignProfileAsync(ctx, distCert);
+            return await new SetUpProvisioningProfile_1.SetUpProvisioningProfile(appLookupParams, distributionType).createAndAssignProfileAsync(ctx, distCert);
         }
     }
     async selectTargetAsync(targets) {

package/build/credentials/utils/promptForCredentials.d.ts

@@ -13,4 +13,5 @@ export declare type CredentialSchema<T> = {
     transformResultAsync?: (answers: Partial<T>) => Promise<T>;
 };
 export declare function askForUserProvidedAsync<T>(schema: CredentialSchema<T>, initialValues?: Partial<T>): Promise<T | null>;
-export declare function getCredentialsFromUserAsync<T>(credentialsSchema: CredentialSchema<T>, initialValues: Partial<T>): Promise<T>;
+export declare function getCredentialsFromUserAsync<T>(credentialsSchema: CredentialSchema<T>, initialValues?: Partial<T>): Promise<T>;
+export declare function shouldAutoGenerateCredentialsAsync<T>(schema: CredentialSchema<T>): Promise<boolean>;

package/build/credentials/utils/promptForCredentials.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCredentialsFromUserAsync = exports.askForUserProvidedAsync = void 0;
+exports.shouldAutoGenerateCredentialsAsync = exports.getCredentialsFromUserAsync = exports.askForUserProvidedAsync = void 0;
 const tslib_1 = require("tslib");
 const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
 const path_1 = (0, tslib_1.__importDefault)(require("path"));
@@ -29,7 +29,7 @@ async function askForUserProvidedAsync(schema, initialValues = {}) {
     return await getCredentialsFromUserAsync(schema, initialValues);
 }
 exports.askForUserProvidedAsync = askForUserProvidedAsync;
-async function getCredentialsFromUserAsync(credentialsSchema, initialValues) {
+async function getCredentialsFromUserAsync(credentialsSchema, initialValues = {}) {
     var _a;
     const results = {};
     for (const question of credentialsSchema.questions) {
@@ -48,6 +48,7 @@ async function shouldAutoGenerateCredentialsAsync(schema) {
     });
     return answer;
 }
+exports.shouldAutoGenerateCredentialsAsync = shouldAutoGenerateCredentialsAsync;
 async function askQuestionAndProcessAnswerAsync(definition, initialValue) {
     const questionObject = buildQuestionObject(definition, initialValue);
     const { input } = await (0, prompts_1.promptAsync)(questionObject);

package/build/graphql/client.js

@@ -13,7 +13,7 @@ const api_1 = require("../api");
 const log_1 = (0, tslib_1.__importDefault)(require("../log"));
 const sessionStorage_1 = require("../user/sessionStorage");
 exports.graphqlClient = (0, core_1.createClient)({
-    url: (0, api_1.getExpoApiBaseUrl)() + '/--/graphql',
+    url: (0, api_1.getExpoApiBaseUrl)() + '/graphql',
     exchanges: [
         core_1.dedupExchange,
         core_1.cacheExchange,