eas-cli 19.0.8 → 19.1.0

package/build/build/createContext.d.ts

@@ -9,7 +9,7 @@ import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGr
 import { CustomBuildConfigMetadata } from '../project/customBuildConfig';
 import { Actor } from '../user/User';
 import { Client } from '../vcs/vcs';
-export declare function createBuildContextAsync<T extends Platform>({ buildProfileName, buildProfile, easJsonCliConfig, clearCache, localBuildOptions, nonInteractive, noWait, platform, projectDir, resourceClassFlag, message, actor, graphqlClient, analytics, vcsClient, getDynamicPrivateProjectConfigAsync, customBuildConfigMetadata, buildLoggerLevel, freezeCredentials, isVerboseLoggingEnabled, whatToTest, env, }: {
+export declare function createBuildContextAsync<T extends Platform>({ buildProfileName, buildProfile, easJsonCliConfig, clearCache, localBuildOptions, nonInteractive, noWait, platform, projectDir, resourceClassFlag, message, actor, graphqlClient, analytics, vcsClient, getDynamicPrivateProjectConfigAsync, customBuildConfigMetadata, buildLoggerLevel, freezeCredentials, refreshAdHocProvisioningProfile: refreshAdHocProvisioningProfileFlag, isVerboseLoggingEnabled, whatToTest, env, }: {
     buildProfileName: string;
     buildProfile: BuildProfile<T>;
     easJsonCliConfig: EasJson['cli'];
@@ -29,6 +29,7 @@ export declare function createBuildContextAsync<T extends Platform>({ buildProfi
     customBuildConfigMetadata?: CustomBuildConfigMetadata;
     buildLoggerLevel?: LoggerLevel;
     freezeCredentials: boolean;
+    refreshAdHocProvisioningProfile?: boolean;
     isVerboseLoggingEnabled: boolean;
     whatToTest?: string;
     env: Record<string, string>;

package/build/build/createContext.js

@@ -16,7 +16,7 @@ const AnalyticsManager_1 = require("../analytics/AnalyticsManager");
 const context_1 = require("../credentials/context");
 const projectUtils_1 = require("../project/projectUtils");
 const workflow_1 = require("../project/workflow");
-async function createBuildContextAsync({ buildProfileName, buildProfile, easJsonCliConfig, clearCache = false, localBuildOptions, nonInteractive, noWait, platform, projectDir, resourceClassFlag, message, actor, graphqlClient, analytics, vcsClient, getDynamicPrivateProjectConfigAsync, customBuildConfigMetadata, buildLoggerLevel, freezeCredentials, isVerboseLoggingEnabled, whatToTest, env, }) {
+async function createBuildContextAsync({ buildProfileName, buildProfile, easJsonCliConfig, clearCache = false, localBuildOptions, nonInteractive, noWait, platform, projectDir, resourceClassFlag, message, actor, graphqlClient, analytics, vcsClient, getDynamicPrivateProjectConfigAsync, customBuildConfigMetadata, buildLoggerLevel, freezeCredentials, refreshAdHocProvisioningProfile: refreshAdHocProvisioningProfileFlag, isVerboseLoggingEnabled, whatToTest, env, }) {
     const { exp, projectId } = await getDynamicPrivateProjectConfigAsync({
         env,
     });
@@ -33,6 +33,7 @@ async function createBuildContextAsync({ buildProfileName, buildProfile, easJson
             : buildProfile?.buildConfiguration === 'Debug') ??
         false;
     const requiredPackageManager = (0, package_manager_1.resolvePackageManager)(projectDir);
+    const refreshAdHocProvisioningProfile = refreshAdHocProvisioningProfileFlag ?? false;
     const credentialsCtx = new context_1.CredentialsContext({
         projectInfo: { exp, projectId },
         nonInteractive,
@@ -44,6 +45,7 @@ async function createBuildContextAsync({ buildProfileName, buildProfile, easJson
         easJsonCliConfig,
         vcsClient,
         freezeCredentials,
+        refreshAdHocProvisioningProfile,
     });
     const devClientProperties = getDevClientEventProperties({
         platform,

package/build/build/ios/credentials.js

@@ -11,13 +11,17 @@ async function ensureIosCredentialsAsync(buildCtx, targets) {
     if (!shouldProvideCredentials(buildCtx)) {
         return;
     }
+    const { credentialsSource } = buildCtx.buildProfile;
+    if (buildCtx.credentialsCtx.refreshAdHocProvisioningProfile &&
+        credentialsSource === 'local') {
+        throw new Error('--refresh-ad-hoc-provisioning-profile cannot be used with credentialsSource "local". Use remote credentials or omit the flag.');
+    }
     const provider = new IosCredentialsProvider_1.default(buildCtx.credentialsCtx, {
         app: await (0, BuildCredentialsUtils_1.getAppFromContextAsync)(buildCtx.credentialsCtx),
         targets,
         distribution: buildCtx.buildProfile.distribution ?? 'store',
         enterpriseProvisioning: buildCtx.buildProfile.enterpriseProvisioning,
     });
-    const { credentialsSource } = buildCtx.buildProfile;
     (0, credentials_1.logCredentialsSource)(credentialsSource, eas_build_job_1.Platform.IOS);
     return {
         credentials: await provider.getCredentialsAsync(credentialsSource),

package/build/build/ios/prepareJob.js

@@ -91,6 +91,9 @@ async function prepareJobAsync(ctx, jobData) {
         // See: https://github.com/expo/eas-build/pull/454
         appId: ctx.projectId,
         initiatingUserId: ctx.user.id,
+        ...(ctx.credentialsCtx.refreshAdHocProvisioningProfile && {
+            refreshAdHocProvisioningProfile: true,
+        }),
     };
     return (0, eas_build_job_1.sanitizeBuildJob)(job);
 }

package/build/build/runBuildAndSubmit.d.ts

@@ -25,6 +25,7 @@ export interface BuildFlags {
     message?: string;
     buildLoggerLevel?: LoggerLevel;
     freezeCredentials: boolean;
+    refreshAdHocProvisioningProfile?: boolean;
     isVerboseLoggingEnabled?: boolean;
     whatToTest?: string;
     simulator?: SimulatorRunTarget;

package/build/build/runBuildAndSubmit.js

@@ -243,6 +243,7 @@ async function prepareAndStartBuildAsync({ projectDir, flags, moreBuilds, buildP
         customBuildConfigMetadata,
         buildLoggerLevel: flags.buildLoggerLevel ?? (log_1.default.isDebug ? logger_1.LoggerLevel.DEBUG : undefined),
         freezeCredentials: flags.freezeCredentials,
+        refreshAdHocProvisioningProfile: flags.refreshAdHocProvisioningProfile,
         isVerboseLoggingEnabled: flags.isVerboseLoggingEnabled ?? false,
         whatToTest: flags.whatToTest,
         env,

package/build/build/types.d.ts

@@ -31,4 +31,5 @@ export interface BuildFlags {
     message?: string;
     buildLoggerLevel?: LoggerLevel;
     freezeCredentials: boolean;
+    refreshAdHocProvisioningProfile?: boolean;
 }

package/build/commands/build/index.d.ts

@@ -21,6 +21,7 @@ export default class Build extends EasCommand {
         message: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         'build-logger-level': import("@oclif/core/lib/interfaces").OptionFlag<LoggerLevel | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         'freeze-credentials': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'refresh-ad-hoc-provisioning-profile': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'verbose-logs': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     static contextDefinition: {

package/build/commands/build/index.js

@@ -92,6 +92,10 @@ class Build extends EasCommand_1.default {
             default: false,
             description: 'Prevent the build from updating credentials in non-interactive mode',
         }),
+        'refresh-ad-hoc-provisioning-profile': core_1.Flags.boolean({
+            default: false,
+            description: 'Refresh managed ad-hoc provisioning profiles from App Store Connect before gathering build credentials',
+        }),
         'verbose-logs': core_1.Flags.boolean({
             default: false,
             description: 'Use verbose logs for the build process',
@@ -138,6 +142,14 @@ class Build extends EasCommand_1.default {
     }
     sanitizeFlags(flags) {
         const { json, nonInteractive } = (0, flags_1.resolveNonInteractiveAndJsonFlags)(flags);
+        if (flags['refresh-ad-hoc-provisioning-profile']) {
+            if (!nonInteractive) {
+                core_1.Errors.error('--refresh-ad-hoc-provisioning-profile can only be used in non-interactive mode.', { exit: 1 });
+            }
+            if (flags['freeze-credentials']) {
+                core_1.Errors.error('Cannot use --refresh-ad-hoc-provisioning-profile with --freeze-credentials.', { exit: 1 });
+            }
+        }
         if (!flags.local && flags.output) {
             core_1.Errors.error('--output is allowed only for local builds', { exit: 1 });
         }
@@ -185,6 +197,7 @@ class Build extends EasCommand_1.default {
             message,
             buildLoggerLevel: flags['build-logger-level'],
             freezeCredentials: flags['freeze-credentials'],
+            refreshAdHocProvisioningProfile: flags['refresh-ad-hoc-provisioning-profile'],
             isVerboseLoggingEnabled: flags['verbose-logs'],
             whatToTest: flags['what-to-test'],
         };

package/build/commands/build/internal.d.ts

@@ -12,6 +12,7 @@ export default class BuildInternal extends EasCommand {
         profile: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         'auto-submit': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'auto-submit-with-profile': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'refresh-ad-hoc-provisioning-profile': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     static contextDefinition: {
         vcsClient: import("../../commandUtils/context/VcsClientContextField").default;

package/build/commands/build/internal.js

@@ -37,6 +37,10 @@ class BuildInternal extends EasCommand_1.default {
             helpValue: 'PROFILE_NAME',
             exclusive: ['auto-submit'],
         }),
+        'refresh-ad-hoc-provisioning-profile': core_1.Flags.boolean({
+            default: false,
+            description: 'Refresh managed ad-hoc provisioning profiles from App Store Connect before gathering build credentials',
+        }),
     };
     static contextDefinition = {
         ...this.ContextOptions.LoggedIn,
@@ -70,6 +74,7 @@ class BuildInternal extends EasCommand_1.default {
                 profile: flags.profile,
                 nonInteractive: true,
                 freezeCredentials: false,
+                refreshAdHocProvisioningProfile: flags['refresh-ad-hoc-provisioning-profile'],
                 wait: false,
                 clearCache: false,
                 json: true,

package/build/credentials/context.d.ts

@@ -20,6 +20,7 @@ export declare class CredentialsContext {
     readonly nonInteractive: boolean;
     readonly autoAcceptCredentialReuse: boolean;
     readonly freezeCredentials: boolean;
+    readonly refreshAdHocProvisioningProfile: boolean;
     readonly projectDir: string;
     readonly user: Actor;
     readonly graphqlClient: ExpoGraphqlClient;
@@ -40,6 +41,7 @@ export declare class CredentialsContext {
         vcsClient: Client;
         freezeCredentials?: boolean;
         autoAcceptCredentialReuse?: boolean;
+        refreshAdHocProvisioningProfile?: boolean;
         env?: Env;
     });
     get hasProjectContext(): boolean;

package/build/credentials/context.js

@@ -18,6 +18,7 @@ class CredentialsContext {
     nonInteractive;
     autoAcceptCredentialReuse;
     freezeCredentials = false;
+    refreshAdHocProvisioningProfile = false;
     projectDir;
     user;
     graphqlClient;
@@ -39,6 +40,7 @@ class CredentialsContext {
         this.autoAcceptCredentialReuse = options.autoAcceptCredentialReuse ?? false;
         this.projectInfo = options.projectInfo;
         this.freezeCredentials = options.freezeCredentials ?? false;
+        this.refreshAdHocProvisioningProfile = options.refreshAdHocProvisioningProfile ?? false;
         this.usesBroadcastPushNotifications =
             options.projectInfo?.exp.ios?.usesBroadcastPushNotifications ?? false;
     }

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

@@ -1,3 +1,5 @@
 import { AppleDevice, AppleDeviceFragment } from '../../../graphql/generated';
+import { ApplePlatform } from '../appstore/constants';
+export declare function filterDevicesForApplePlatform(devices: AppleDeviceFragment[], applePlatform: ApplePlatform): AppleDeviceFragment[];
 export declare function chooseDevicesAsync(allDevices: AppleDeviceFragment[], preselectedDeviceIdentifiers?: string[]): Promise<AppleDevice[]>;
 export declare function formatDeviceLabel(device: AppleDeviceFragment): string;

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

@@ -1,9 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.filterDevicesForApplePlatform = filterDevicesForApplePlatform;
 exports.chooseDevicesAsync = chooseDevicesAsync;
 exports.formatDeviceLabel = formatDeviceLabel;
 const prompts_1 = require("../.././../prompts");
+const generated_1 = require("../../../graphql/generated");
 const AppleDevice_1 = require("../../../graphql/types/credentials/AppleDevice");
+const constants_1 = require("../appstore/constants");
+function filterDevicesForApplePlatform(devices, applePlatform) {
+    if (applePlatform === constants_1.ApplePlatform.TV_OS) {
+        throw new Error('Filtering for tvOS is not supported yet');
+    }
+    if (applePlatform === constants_1.ApplePlatform.VISION_OS) {
+        throw new Error('Filtering for visionOS is not supported yet');
+    }
+    return devices.filter(device => isDeviceCompatibleWithApplePlatform(device, applePlatform));
+}
+function isDeviceCompatibleWithApplePlatform(device, applePlatform) {
+    switch (applePlatform) {
+        case constants_1.ApplePlatform.IOS:
+            return (device.deviceClass === generated_1.AppleDeviceClass.Iphone ||
+                device.deviceClass === generated_1.AppleDeviceClass.Ipad);
+        case constants_1.ApplePlatform.MAC_OS:
+            return device.deviceClass === generated_1.AppleDeviceClass.Mac;
+    }
+}
 async function chooseDevicesAsync(allDevices, preselectedDeviceIdentifiers = []) {
     const preselectedDeviceIdentifierSet = new Set(preselectedDeviceIdentifiers);
     const isSelected = (device) => preselectedDeviceIdentifierSet.size === 0 ||

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

@@ -16,6 +16,7 @@ export declare class SetUpAdhocProvisioningProfile {
     private shouldUseExistingProfileAsync;
     private promptForReuseActionAsync;
     private registerDevicesAsync;
+    private ensureAppStoreAuthenticatedForAdhocRefreshAsync;
 }
 export declare function doUDIDsMatch(udidsA: string[], udidsB: string[]): boolean;
 export {};

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

@@ -14,12 +14,16 @@ const DeviceUtils_1 = require("./DeviceUtils");
 const SetUpDistributionCertificate_1 = require("./SetUpDistributionCertificate");
 const action_1 = tslib_1.__importStar(require("../../../devices/actions/create/action"));
 const generated_1 = require("../../../graphql/generated");
+const AppStoreConnectApiKeyQuery_1 = require("../../../graphql/queries/AppStoreConnectApiKeyQuery");
 const log_1 = tslib_1.__importDefault(require("../../../log"));
 const target_1 = require("../../../project/ios/target");
 const prompts_1 = require("../../../prompts");
 const differenceBy_1 = tslib_1.__importDefault(require("../../../utils/expodash/differenceBy"));
 const errors_1 = require("../../errors");
+const GraphqlClient_1 = require("../api/GraphqlClient");
+const authenticateTypes_1 = require("../appstore/authenticateTypes");
 const constants_1 = require("../appstore/constants");
+const resolveCredentials_1 = require("../appstore/resolveCredentials");
 const validateProvisioningProfile_1 = require("../validators/validateProvisioningProfile");
 var ReuseAction;
 (function (ReuseAction) {
@@ -34,7 +38,14 @@ class SetUpAdhocProvisioningProfile {
     }
     async runAsync(ctx) {
         const { app } = this.options;
+        if (ctx.refreshAdHocProvisioningProfile && ctx.freezeCredentials) {
+            throw new Error('Cannot refresh ad-hoc provisioning profile when credentials are frozen. Remove --freeze-credentials or --refresh-ad-hoc-provisioning-profile.');
+        }
         const distCert = await new SetUpDistributionCertificate_1.SetUpDistributionCertificate(app, generated_1.IosDistributionType.AdHoc).runAsync(ctx);
+        if (ctx.nonInteractive && ctx.refreshAdHocProvisioningProfile) {
+            await this.ensureAppStoreAuthenticatedForAdhocRefreshAsync(ctx, app);
+            return await this.runWithDistributionCertificateAsync(ctx, distCert);
+        }
         const areBuildCredentialsSetup = await this.areBuildCredentialsSetupAsync(ctx);
         if (ctx.nonInteractive) {
             if (areBuildCredentialsSetup) {
@@ -66,6 +77,9 @@ class SetUpAdhocProvisioningProfile {
         // 2. Fetch devices registered on EAS servers
         let registeredAppleDevices = await ctx.ios.getDevicesForAppleTeamAsync(ctx.graphqlClient, app, appleTeam);
         if (registeredAppleDevices.length === 0) {
+            if (ctx.nonInteractive) {
+                throw new Error('No devices are registered for this Apple team. Register devices with eas device:create first.');
+            }
             const shouldRegisterDevices = await (0, prompts_1.confirmAsync)({
                 message: `You don't have any registered devices yet. Would you like to register them now?`,
                 initial: true,
@@ -79,9 +93,11 @@ class SetUpAdhocProvisioningProfile {
         }
         // 3. Choose devices for internal distribution
         const provisionedDeviceIdentifiers = (currentBuildCredentials?.provisioningProfile?.appleDevices ?? []).map(i => i.identifier);
-        const chosenDevices = await (0, DeviceUtils_1.chooseDevicesAsync)(registeredAppleDevices, provisionedDeviceIdentifiers);
-        // 4. Reuse or create the profile on Apple Developer Portal
         const applePlatform = (0, target_1.getApplePlatformFromTarget)(target);
+        const chosenDevices = ctx.nonInteractive && ctx.refreshAdHocProvisioningProfile
+            ? (0, DeviceUtils_1.filterDevicesForApplePlatform)(registeredAppleDevices, applePlatform)
+            : await (0, DeviceUtils_1.chooseDevicesAsync)(registeredAppleDevices, provisionedDeviceIdentifiers);
+        // 4. Reuse or create the profile on Apple Developer Portal
         const profileType = applePlatform === constants_1.ApplePlatform.TV_OS
             ? apple_utils_1.ProfileType.TVOS_APP_ADHOC
             : apple_utils_1.ProfileType.IOS_APP_ADHOC;
@@ -106,18 +122,23 @@ class SetUpAdhocProvisioningProfile {
                 log_1.default.warn(`- ${(0, DeviceUtils_1.formatDeviceLabel)(missingDevice)}`);
             }
             log_1.default.log('Most commonly devices fail to to be provisioned while they are still being processed by Apple, which can take up to 24-72 hours. Check your Apple Developer Portal page at https://developer.apple.com/account/resources/devices/list, the devices in "Processing" status cannot be provisioned yet');
-            const shouldContinue = await (0, prompts_1.selectAsync)('Do you want to continue without provisioning these devices?', [
-                {
-                    title: 'Yes',
-                    value: true,
-                },
-                {
-                    title: 'No (EAS CLI will exit)',
-                    value: false,
-                },
-            ]);
-            if (!shouldContinue) {
-                core_1.Errors.exit(1);
+            if (ctx.nonInteractive && ctx.refreshAdHocProvisioningProfile) {
+                // Continue without prompting in non-interactive refresh mode.
+            }
+            else {
+                const shouldContinue = await (0, prompts_1.selectAsync)('Do you want to continue without provisioning these devices?', [
+                    {
+                        title: 'Yes',
+                        value: true,
+                    },
+                    {
+                        title: 'No (EAS CLI will exit)',
+                        value: false,
+                    },
+                ]);
+                if (!shouldContinue) {
+                    core_1.Errors.exit(1);
+                }
             }
         }
         // 7. Create (or update) app build credentials
@@ -237,8 +258,49 @@ class SetUpAdhocProvisioningProfile {
             }
         }
     }
+    async ensureAppStoreAuthenticatedForAdhocRefreshAsync(ctx, app) {
+        if ((0, resolveCredentials_1.hasAscEnvVars)()) {
+            await ctx.appStore.ensureAuthenticatedAsync({ mode: authenticateTypes_1.AuthenticationMode.API_KEY });
+            return;
+        }
+        const resolvedKey = await resolveAscApiKeyForAppCredentialsAsync({
+            graphqlClient: ctx.graphqlClient,
+            app,
+        });
+        if (!resolvedKey) {
+            throw new Error('No App Store Connect API Key found for ad-hoc provisioning profile refresh. In non-interactive mode, provide one via:\n' +
+                '  - Environment variables: EXPO_ASC_API_KEY_PATH, EXPO_ASC_KEY_ID, EXPO_ASC_ISSUER_ID\n' +
+                '  - EAS credentials service: configure an App Store Connect API Key for submissions on this app');
+        }
+        await ctx.appStore.ensureAuthenticatedAsync({
+            mode: authenticateTypes_1.AuthenticationMode.API_KEY,
+            ascApiKey: resolvedKey.ascApiKey,
+            teamId: resolvedKey.teamId,
+            teamName: resolvedKey.teamName,
+            // Provide a non-enterprise team type to avoid interactive team-type resolution.
+            // Ad-hoc profile handling below uses explicit ProfileType and does not branch on team.inHouse.
+            teamType: authenticateTypes_1.AppleTeamType.COMPANY_OR_ORGANIZATION,
+        });
+    }
 }
 exports.SetUpAdhocProvisioningProfile = SetUpAdhocProvisioningProfile;
+async function resolveAscApiKeyForAppCredentialsAsync({ graphqlClient, app, }) {
+    const ascKeyFragment = await (0, GraphqlClient_1.getAscApiKeyForAppSubmissionsAsync)(graphqlClient, app);
+    if (!ascKeyFragment) {
+        return null;
+    }
+    log_1.default.log('Using App Store Connect API Key from EAS credentials service.');
+    const fullKey = await AppStoreConnectApiKeyQuery_1.AppStoreConnectApiKeyQuery.getByIdAsync(graphqlClient, ascKeyFragment.id);
+    return {
+        ascApiKey: {
+            keyP8: fullKey.keyP8,
+            keyId: fullKey.keyIdentifier,
+            issuerId: fullKey.issuerIdentifier,
+        },
+        teamId: ascKeyFragment.appleTeam?.appleTeamIdentifier,
+        teamName: ascKeyFragment.appleTeam?.appleTeamName ?? undefined,
+    };
+}
 function doUDIDsMatch(udidsA, udidsB) {
     const setA = new Set(udidsA);
     const setB = new Set(udidsB);

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

@@ -36,6 +36,14 @@ class SetUpTargetBuildCredentials {
     }
     async setupBuildCredentialsAsync(ctx) {
         const { app, distribution, enterpriseProvisioning, target } = this.options;
+        if (ctx.refreshAdHocProvisioningProfile) {
+            if (distribution !== 'internal') {
+                throw new Error('--refresh-ad-hoc-provisioning-profile is only supported for internal distribution builds.');
+            }
+            if (enterpriseProvisioning === 'universal') {
+                throw new Error('--refresh-ad-hoc-provisioning-profile is only supported for ad-hoc internal builds.');
+            }
+        }
         if (distribution === 'internal') {
             if (enterpriseProvisioning === 'adhoc') {
                 return await new SetUpAdhocProvisioningProfile_1.SetUpAdhocProvisioningProfile({ app, target }).runAsync(ctx);