eas-cli 8.0.0 → 9.0.0

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

@@ -4,10 +4,11 @@ exports.ConfigureProvisioningProfile = void 0;
 const tslib_1 = require("tslib");
 const assert_1 = tslib_1.__importDefault(require("assert"));
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
-const log_1 = tslib_1.__importDefault(require("../../../log"));
+const log_1 = tslib_1.__importStar(require("../../../log"));
 const ora_1 = require("../../../ora");
 const target_1 = require("../../../project/ios/target");
 const errors_1 = require("../../errors");
+const authenticateTypes_1 = require("../appstore/authenticateTypes");
 class ConfigureProvisioningProfile {
     constructor(app, target, distributionCertificate, originalProvisioningProfile) {
         this.app = app;
@@ -16,8 +17,12 @@ class ConfigureProvisioningProfile {
         this.originalProvisioningProfile = originalProvisioningProfile;
     }
     async runAsync(ctx) {
-        if (ctx.nonInteractive) {
-            throw new errors_1.MissingCredentialsNonInteractiveError('Configuring Provisioning Profiles is only supported in interactive mode.');
+        if (ctx.freezeCredentials) {
+            throw new errors_1.ForbidCredentialModificationError('Remove the --freeze-credentials flag to configure a Provisioning Profile.');
+        }
+        else if (ctx.nonInteractive &&
+            ctx.appStore.defaultAuthenticationMode !== authenticateTypes_1.AuthenticationMode.API_KEY) {
+            throw new errors_1.InsufficientAuthenticationNonInteractiveError(`In order to configure your Provisioning Profile, authentication with an ASC API key is required in non-interactive mode. ${(0, log_1.learnMore)('https://docs.expo.dev/build/building-on-ci/#optional-provide-an-asc-api-token-for-your-apple-team')}`);
         }
         const { developerPortalIdentifier, provisioningProfile } = this.originalProvisioningProfile;
         if (!developerPortalIdentifier && !provisioningProfile) {
@@ -29,7 +34,7 @@ class ConfigureProvisioningProfile {
             log_1.default.warn('Make sure to recreate the profile if you selected a new distribution certificate.');
             return null;
         }
-        const applePlatform = await (0, target_1.getApplePlatformFromTarget)(this.target);
+        const applePlatform = (0, target_1.getApplePlatformFromTarget)(this.target);
         const profilesFromApple = await ctx.appStore.listProvisioningProfilesAsync(this.app.bundleIdentifier, applePlatform);
         const [matchingProfile] = profilesFromApple.filter(appleInfo => developerPortalIdentifier
             ? appleInfo.provisioningProfileId === developerPortalIdentifier

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

@@ -9,5 +9,6 @@ export declare class CreateProvisioningProfile {
     private distributionCertificate;
     constructor(app: AppLookupParams, target: Target, distributionCertificate: AppleDistributionCertificateFragment);
     runAsync(ctx: CredentialsContext): Promise<AppleProvisioningProfileMutationResult>;
+    private maybeGetUserProvidedAsync;
     private provideOrGenerateAsync;
 }

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

@@ -6,9 +6,10 @@ const assert_1 = tslib_1.__importDefault(require("assert"));
 const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
 const AppleTeamUtils_1 = require("./AppleTeamUtils");
 const ProvisioningProfileUtils_1 = require("./ProvisioningProfileUtils");
-const log_1 = tslib_1.__importDefault(require("../../../log"));
+const log_1 = tslib_1.__importStar(require("../../../log"));
 const errors_1 = require("../../errors");
 const promptForCredentials_1 = require("../../utils/promptForCredentials");
+const authenticateTypes_1 = require("../appstore/authenticateTypes");
 const credentials_1 = require("../credentials");
 class CreateProvisioningProfile {
     constructor(app, target, distributionCertificate) {
@@ -17,8 +18,12 @@ class CreateProvisioningProfile {
         this.distributionCertificate = distributionCertificate;
     }
     async runAsync(ctx) {
-        if (ctx.nonInteractive) {
-            throw new errors_1.MissingCredentialsNonInteractiveError('Creating Provisioning Profiles is only supported in interactive mode.');
+        if (ctx.freezeCredentials) {
+            throw new errors_1.ForbidCredentialModificationError('Run this command again without the --freeze-credentials flag in order to generate a new Provisioning Profile.');
+        }
+        else if (ctx.nonInteractive &&
+            ctx.appStore.defaultAuthenticationMode !== authenticateTypes_1.AuthenticationMode.API_KEY) {
+            throw new errors_1.InsufficientAuthenticationNonInteractiveError(`In order to generate a new Provisioning Profile, authentication with an ASC API key is required in non-interactive mode. ${(0, log_1.learnMore)('https://docs.expo.dev/build/building-on-ci/#optional-provide-an-asc-api-token-for-your-apple-team')}`);
         }
         const appleAuthCtx = await ctx.appStore.ensureAuthenticatedAsync();
         const provisioningProfile = await this.provideOrGenerateAsync(ctx, appleAuthCtx);
@@ -31,14 +36,26 @@ class CreateProvisioningProfile {
         log_1.default.succeed('Created provisioning profile');
         return provisioningProfileMutationResult;
     }
-    async provideOrGenerateAsync(ctx, appleAuthCtx) {
-        var _a, _b, _c;
+    async maybeGetUserProvidedAsync(ctx) {
+        if (ctx.nonInteractive) {
+            return null;
+        }
         const userProvided = await (0, promptForCredentials_1.askForUserProvidedAsync)(credentials_1.provisioningProfileSchema);
         if (userProvided) {
             // userProvided profiles don't come with ProvisioningProfileId's (only accessible from Apple Portal API)
             log_1.default.warn('Provisioning profile: Unable to validate specified profile.');
             return userProvided;
         }
+        return null;
+    }
+    async provideOrGenerateAsync(ctx, appleAuthCtx) {
+        var _a, _b, _c;
+        const maybeUserProvided = await this.maybeGetUserProvidedAsync(ctx);
+        if (maybeUserProvided) {
+            // userProvided profiles don't come with ProvisioningProfileId's (only accessible from Apple Portal API)
+            log_1.default.warn('Provisioning profile: Unable to validate specified profile.');
+            return maybeUserProvided;
+        }
         (0, assert_1.default)(this.distributionCertificate.certificateP12, 'Distribution Certificate must have p12 certificate');
         (0, assert_1.default)(this.distributionCertificate.certificatePassword, 'Distribution Certificate must have certificate password');
         return await (0, ProvisioningProfileUtils_1.generateProvisioningProfileAsync)(ctx, this.target, this.app.bundleIdentifier, {

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

@@ -8,9 +8,11 @@ const ConfigureProvisioningProfile_1 = require("./ConfigureProvisioningProfile")
 const CreateProvisioningProfile_1 = require("./CreateProvisioningProfile");
 const ProvisioningProfileUtils_1 = require("./ProvisioningProfileUtils");
 const SetUpDistributionCertificate_1 = require("./SetUpDistributionCertificate");
+const log_1 = require("../../../log");
 const target_1 = require("../../../project/ios/target");
 const prompts_1 = require("../../../prompts");
 const errors_1 = require("../../errors");
+const authenticateTypes_1 = require("../appstore/authenticateTypes");
 const validateProvisioningProfile_1 = require("../validators/validateProvisioningProfile");
 /**
  * Sets up either APP_STORE or ENTERPRISE provisioning profiles
@@ -49,8 +51,12 @@ class SetUpProvisioningProfile {
         if (areBuildCredentialsSetup) {
             return (0, nullthrows_1.default)(await (0, BuildCredentialsUtils_1.getBuildCredentialsAsync)(ctx, this.app, this.distributionType));
         }
-        if (ctx.nonInteractive) {
-            throw new errors_1.MissingCredentialsNonInteractiveError('Provisioning profile is not configured correctly. Run this command again in interactive mode.');
+        if (ctx.freezeCredentials) {
+            throw new errors_1.ForbidCredentialModificationError('Provisioning profile is not configured correctly. Remove the --freeze-credentials flag to configure it.');
+        }
+        else if (ctx.nonInteractive &&
+            ctx.appStore.defaultAuthenticationMode !== authenticateTypes_1.AuthenticationMode.API_KEY) {
+            throw new errors_1.InsufficientAuthenticationNonInteractiveError(`In order to configure your Provisioning Profile, authentication with an ASC API key is required in non-interactive mode. ${(0, log_1.learnMore)('https://docs.expo.dev/build/building-on-ci/#optional-provide-an-asc-api-token-for-your-apple-team')}`);
         }
         const currentProfile = await (0, BuildCredentialsUtils_1.getProvisioningProfileAsync)(ctx, this.app, this.distributionType);
         if (!currentProfile) {
@@ -63,9 +69,15 @@ class SetUpProvisioningProfile {
         if (!currentProfileFromServer) {
             return await this.assignNewAndDeleteOldProfileAsync(ctx, distCert, currentProfile);
         }
-        const confirm = await (0, prompts_1.confirmAsync)({
-            message: `${(0, ProvisioningProfileUtils_1.formatProvisioningProfileFromApple)(currentProfileFromServer)} \n  Would you like to reuse the original profile?`,
-        });
+        const isNonInteractiveOrUserDidConfirmAsync = async () => {
+            if (ctx.nonInteractive) {
+                return true;
+            }
+            return await (0, prompts_1.confirmAsync)({
+                message: `${(0, ProvisioningProfileUtils_1.formatProvisioningProfileFromApple)(currentProfileFromServer)} \n  Would you like to reuse the original profile?`,
+            });
+        };
+        const confirm = await isNonInteractiveOrUserDidConfirmAsync();
         if (!confirm) {
             return await this.assignNewAndDeleteOldProfileAsync(ctx, distCert, currentProfile);
         }

package/build/credentials/manager/SetUpBuildCredentialsCommandAction.d.ts

@@ -14,6 +14,7 @@ export declare class SetUpBuildCredentialsCommandAction {
     readonly getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn;
     private readonly platform;
     private readonly profileName;
-    constructor(actor: Actor, graphqlClient: ExpoGraphqlClient, vcsClient: Client, analytics: Analytics, projectInfo: CredentialsContextProjectInfo | null, getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn, platform: Platform, profileName: string);
+    private readonly projectDir;
+    constructor(actor: Actor, graphqlClient: ExpoGraphqlClient, vcsClient: Client, analytics: Analytics, projectInfo: CredentialsContextProjectInfo | null, getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn, platform: Platform, profileName: string, projectDir: string);
     runAsync(): Promise<void>;
 }

package/build/credentials/manager/SetUpBuildCredentialsCommandAction.js

@@ -5,7 +5,7 @@ const eas_build_job_1 = require("@expo/eas-build-job");
 const SetUpAndroidBuildCredentials_1 = require("../manager/SetUpAndroidBuildCredentials");
 const SetUpIosBuildCredentials_1 = require("../manager/SetUpIosBuildCredentials");
 class SetUpBuildCredentialsCommandAction {
-    constructor(actor, graphqlClient, vcsClient, analytics, projectInfo, getDynamicPrivateProjectConfigAsync, platform, profileName) {
+    constructor(actor, graphqlClient, vcsClient, analytics, projectInfo, getDynamicPrivateProjectConfigAsync, platform, profileName, projectDir) {
         this.actor = actor;
         this.graphqlClient = graphqlClient;
         this.vcsClient = vcsClient;
@@ -14,12 +14,13 @@ class SetUpBuildCredentialsCommandAction {
         this.getDynamicPrivateProjectConfigAsync = getDynamicPrivateProjectConfigAsync;
         this.platform = platform;
         this.profileName = profileName;
+        this.projectDir = projectDir;
     }
     async runAsync() {
         if (this.platform === eas_build_job_1.Platform.IOS) {
-            return await new SetUpIosBuildCredentials_1.SetUpIosBuildCredentials(this, process.cwd(), this.profileName).runAsync();
+            return await new SetUpIosBuildCredentials_1.SetUpIosBuildCredentials(this, this.projectDir, this.profileName).runAsync();
         }
-        return await new SetUpAndroidBuildCredentials_1.SetUpAndroidBuildCredentials(this, process.cwd(), this.profileName).runAsync();
+        return await new SetUpAndroidBuildCredentials_1.SetUpAndroidBuildCredentials(this, this.projectDir, this.profileName).runAsync();
     }
 }
 exports.SetUpBuildCredentialsCommandAction = SetUpBuildCredentialsCommandAction;

package/build/credentials/manager/SetUpIosBuildCredentials.js

@@ -28,7 +28,7 @@ class SetUpIosBuildCredentials extends ManageIos_1.ManageIos {
             projectInfo = { exp, projectId };
         }
         const ctx = new context_1.CredentialsContext({
-            projectDir: process.cwd(),
+            projectDir: this.projectDir,
             projectInfo,
             user: this.callingAction.actor,
             graphqlClient: this.callingAction.graphqlClient,