eas-cli 0.48.1 → 0.50.0

package/build/build/build.js

@@ -4,9 +4,12 @@ exports.waitForBuildEndAsync = exports.prepareBuildRequestForPlatformAsync = voi
 const tslib_1 = require("tslib");
 const eas_build_job_1 = require("@expo/eas-build-job");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const cli_progress_1 = tslib_1.__importDefault(require("cli-progress"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
 const common_1 = require("../analytics/common");
 const events_1 = require("../analytics/events");
+const api_1 = require("../api");
 const generated_1 = require("../graphql/generated");
 const BuildQuery_1 = require("../graphql/queries/BuildQuery");
 const log_1 = tslib_1.__importStar(require("../log"));
@@ -54,7 +57,6 @@ async function prepareBuildRequestForPlatformAsync(builder) {
         credentials: credentialsResult === null || credentialsResult === void 0 ? void 0 : credentialsResult.credentials,
     });
     return async () => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         if (ctx.localBuildOptions.enable) {
             await (0, local_1.runLocalBuildAsync)(job, ctx.localBuildOptions);
             return undefined;
@@ -64,31 +66,35 @@ async function prepareBuildRequestForPlatformAsync(builder) {
                 return await sendBuildRequestAsync(builder, job, metadata);
             }
             catch (error) {
-                if (((_c = (_b = (_a = error === null || error === void 0 ? void 0 : error.graphQLErrors) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.extensions) === null || _c === void 0 ? void 0 : _c.errorCode) === 'TURTLE_DEPRECATED_JOB_FORMAT') {
-                    log_1.default.error('EAS Build API has changed, please upgrade to the latest eas-cli version.');
-                    throw new Error('Build request failed.');
-                }
-                else if (((_f = (_e = (_d = error === null || error === void 0 ? void 0 : error.graphQLErrors) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.extensions) === null || _f === void 0 ? void 0 : _f.errorCode) === 'EAS_BUILD_DOWN_FOR_MAINTENANCE') {
-                    log_1.default.error('EAS Build is down for maintenance, please try again later. Check https://status.expo.dev/ for updates.');
-                    throw new Error('Build request failed.');
-                }
-                else if (((_j = (_h = (_g = error === null || error === void 0 ? void 0 : error.graphQLErrors) === null || _g === void 0 ? void 0 : _g[0]) === null || _h === void 0 ? void 0 : _h.extensions) === null || _j === void 0 ? void 0 : _j.errorCode) === 'EAS_BUILD_FREE_TIER_DISABLED') {
-                    log_1.default.error('EAS Build free tier is temporarily disabled, please try again later. Check https://status.expo.dev/ for updates.');
-                    throw new Error('Build request failed.');
-                }
-                else if (((_m = (_l = (_k = error === null || error === void 0 ? void 0 : error.graphQLErrors) === null || _k === void 0 ? void 0 : _k[0]) === null || _l === void 0 ? void 0 : _l.extensions) === null || _m === void 0 ? void 0 : _m.errorCode) === 'EAS_BUILD_TOO_MANY_PENDING_BUILDS') {
-                    log_1.default.error(`You have already reached the maximum number of pending ${platform_1.requestedPlatformDisplayNames[job.platform]} builds for your account. Try again later.`);
-                    throw new Error('Build request failed.');
-                }
-                else if (error === null || error === void 0 ? void 0 : error.graphQLErrors) {
-                    log_1.default.error('Build request failed. Make sure you are using the latest eas-cli version. If the problem persists, please report the issue.');
-                }
-                throw error;
+                handleBuildRequestError(error, job.platform);
             }
         }
     };
 }
 exports.prepareBuildRequestForPlatformAsync = prepareBuildRequestForPlatformAsync;
+function handleBuildRequestError(error, platform) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    if (((_c = (_b = (_a = error === null || error === void 0 ? void 0 : error.graphQLErrors) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.extensions) === null || _c === void 0 ? void 0 : _c.errorCode) === 'TURTLE_DEPRECATED_JOB_FORMAT') {
+        log_1.default.error('EAS Build API has changed, please upgrade to the latest eas-cli version.');
+        throw new Error('Build request failed.');
+    }
+    else if (((_f = (_e = (_d = error === null || error === void 0 ? void 0 : error.graphQLErrors) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.extensions) === null || _f === void 0 ? void 0 : _f.errorCode) === 'EAS_BUILD_DOWN_FOR_MAINTENANCE') {
+        log_1.default.error('EAS Build is down for maintenance, please try again later. Check https://status.expo.dev/ for updates.');
+        throw new Error('Build request failed.');
+    }
+    else if (((_j = (_h = (_g = error === null || error === void 0 ? void 0 : error.graphQLErrors) === null || _g === void 0 ? void 0 : _g[0]) === null || _h === void 0 ? void 0 : _h.extensions) === null || _j === void 0 ? void 0 : _j.errorCode) === 'EAS_BUILD_FREE_TIER_DISABLED') {
+        log_1.default.error('EAS Build free tier is temporarily disabled, please try again later. Check https://status.expo.dev/ for updates.');
+        throw new Error('Build request failed.');
+    }
+    else if (((_m = (_l = (_k = error === null || error === void 0 ? void 0 : error.graphQLErrors) === null || _k === void 0 ? void 0 : _k[0]) === null || _l === void 0 ? void 0 : _l.extensions) === null || _m === void 0 ? void 0 : _m.errorCode) === 'EAS_BUILD_TOO_MANY_PENDING_BUILDS') {
+        log_1.default.error(`You have already reached the maximum number of pending ${platform_1.requestedPlatformDisplayNames[platform]} builds for your account. Try again later.`);
+        throw new Error('Build request failed.');
+    }
+    else if (error === null || error === void 0 ? void 0 : error.graphQLErrors) {
+        log_1.default.error('Build request failed. Make sure you are using the latest eas-cli version. If the problem persists, please report the issue.');
+    }
+    throw error;
+}
 async function uploadProjectAsync(ctx) {
     let projectTarballPath;
     try {
@@ -130,96 +136,177 @@ async function sendBuildRequestAsync(builder, job, metadata) {
         trackingCtx: ctx.trackingCtx,
     });
 }
-async function waitForBuildEndAsync(buildIds, { timeoutSec = 3600, intervalSec = 30 } = {}) {
-    log_1.default.log(`Waiting for build${buildIds.length > 1 ? 's' : ''} to complete. You can press Ctrl+C to exit.`);
-    const spinner = (0, ora_1.ora)().start();
-    let time = new Date().getTime();
-    const endTime = time + timeoutSec * 1000;
-    while (time <= endTime) {
-        const builds = await Promise.all(buildIds.map(async (buildId) => {
-            try {
-                return await BuildQuery_1.BuildQuery.byIdAsync(buildId, { useCache: false });
-            }
-            catch (err) {
-                log_1.default.debug('Failed to fetch the build status', err);
-                return null;
-            }
-        }));
-        if (builds.length === 1) {
-            const [build] = builds;
-            if (build !== null) {
-                switch (build.status) {
-                    case generated_1.BuildStatus.Finished:
-                        spinner.succeed('Build finished');
-                        return builds;
-                    case generated_1.BuildStatus.New:
-                        spinner.text = 'Build created';
-                        break;
-                    case generated_1.BuildStatus.InQueue:
-                        spinner.text = 'Build queued...';
-                        break;
-                    case generated_1.BuildStatus.Canceled:
-                        spinner.text = 'Build canceled';
-                        spinner.stopAndPersist();
-                        return builds;
-                    case generated_1.BuildStatus.InProgress:
-                        spinner.text = 'Build in progress...';
-                        break;
-                    case generated_1.BuildStatus.Errored:
-                        spinner.fail('Build failed');
-                        if (build.error) {
-                            return builds;
-                        }
-                        else {
-                            throw new Error(`Standalone build failed!`);
-                        }
-                    default:
-                        spinner.warn('Unknown status');
-                        throw new Error(`Unknown build status: ${build.status} - aborting!`);
+async function waitForBuildEndAsync({ buildIds, accountName }, { 
+// 2 hours (max build time limit) + 10 minutes (possible queue time )
+timeoutSec = 2 * 60 * 60 + 10 * 60, intervalSec = 10, } = {}) {
+    const b = `build${buildIds.length > 1 ? 's' : ''}`;
+    log_1.default.log(`Waiting for ${b} to complete. You can press Ctrl+C to exit.`);
+    const spinner = (0, ora_1.ora)(`Waiting for ${b} to complete.`).start();
+    const endTime = new Date().getTime() + timeoutSec * 1000;
+    while (new Date().getTime() <= endTime) {
+        const builds = await getBuildsSafelyAsync(buildIds);
+        const { refetch } = builds.length === 1
+            ? await handleSingleBuildProgressAsync({ build: builds[0], accountName }, { spinner })
+            : await handleMultipleBuildsProgressAsync({ builds }, { spinner });
+        if (!refetch) {
+            return builds;
+        }
+        await (0, promise_1.sleepAsync)(intervalSec * 1000);
+    }
+    spinner.fail('Timed out');
+    throw new Error('Timeout reached! It is taking longer than expected to finish the build, aborting...');
+}
+exports.waitForBuildEndAsync = waitForBuildEndAsync;
+async function getBuildsSafelyAsync(buildIds) {
+    const promises = buildIds.map(async (buildId) => {
+        try {
+            return await BuildQuery_1.BuildQuery.byIdAsync(buildId, { useCache: false });
+        }
+        catch (err) {
+            log_1.default.debug('Failed to fetch the build status', err);
+            return null;
+        }
+    });
+    return await Promise.all(promises);
+}
+let queueProgressBarStarted = false;
+const queueProgressBar = new cli_progress_1.default.SingleBar({ format: '|{bar}| {estimatedWaitTime}' }, cli_progress_1.default.Presets.rect);
+async function handleSingleBuildProgressAsync({ build, accountName }, { spinner }) {
+    if (build === null) {
+        spinner.text = 'Could not fetch the build status. Check your network connection.';
+        return { refetch: true };
+    }
+    if (queueProgressBarStarted && (build === null || build === void 0 ? void 0 : build.status) && build.status !== generated_1.BuildStatus.InQueue) {
+        if (build.status === generated_1.BuildStatus.InProgress) {
+            queueProgressBar.update(queueProgressBar.getTotal(), {
+                estimatedWaitTime: '',
+            });
+        }
+        queueProgressBar.stop();
+        log_1.default.newLine();
+        queueProgressBarStarted = false;
+        spinner.start('Build is about to start');
+    }
+    switch (build.status) {
+        case generated_1.BuildStatus.Finished:
+            spinner.succeed('Build finished');
+            return { refetch: false };
+        case generated_1.BuildStatus.New:
+            spinner.text = `Build is waiting to enter the queue. Check your concurrency limit at ${chalk_1.default.underline(formatAccountSubscriptionsUrl(accountName))}.`;
+            break;
+        case generated_1.BuildStatus.InQueue: {
+            spinner.text = 'Build queued...';
+            const progressBarPayload = typeof build.estimatedWaitTimeLeftSeconds === 'number'
+                ? { estimatedWaitTime: formatEstimatedWaitTime(build.estimatedWaitTimeLeftSeconds) }
+                : { estimatedWaitTime: '' };
+            if (!queueProgressBarStarted &&
+                typeof build.initialQueuePosition === 'number' &&
+                typeof build.queuePosition === 'number') {
+                spinner.stopAndPersist();
+                if (build.priority !== generated_1.BuildPriority.High) {
+                    log_1.default.newLine();
+                    log_1.default.log('Start builds sooner in the priority queue.');
+                    log_1.default.log(`Sign up for EAS Production or Enterprise at ${chalk_1.default.underline(formatAccountSubscriptionsUrl(accountName))}`);
                 }
+                log_1.default.newLine();
+                log_1.default.log('Waiting in queue');
+                queueProgressBar.start(build.initialQueuePosition + 1, build.initialQueuePosition - build.queuePosition + 1, progressBarPayload);
+                queueProgressBarStarted = true;
             }
-            else {
-                if (!spinner.text) {
-                    spinner.text = 'Could not fetch the build status. Check your network connection.';
-                }
+            if (typeof build.queuePosition === 'number') {
+                queueProgressBar.update(build.queuePosition, progressBarPayload);
             }
+            break;
         }
-        else {
-            if (builds.filter(build => (build === null || build === void 0 ? void 0 : build.status) === generated_1.BuildStatus.Finished).length === builds.length) {
-                spinner.succeed('All builds have finished');
-                return builds;
-            }
-            else if (builds.filter(build => (build === null || build === void 0 ? void 0 : build.status)
-                ? [generated_1.BuildStatus.Finished, generated_1.BuildStatus.Errored, generated_1.BuildStatus.Canceled].includes(build.status)
-                : false).length === builds.length) {
-                spinner.fail('Some of the builds were canceled or failed.');
-                return builds;
+        case generated_1.BuildStatus.Canceled:
+            spinner.fail('Build canceled');
+            return { refetch: false };
+        case generated_1.BuildStatus.InProgress:
+            spinner.text = 'Build in progress...';
+            break;
+        case generated_1.BuildStatus.Errored:
+            spinner.fail('Build failed');
+            if (build.error) {
+                return { refetch: false };
             }
             else {
-                const newBuilds = builds.filter(build => (build === null || build === void 0 ? void 0 : build.status) === generated_1.BuildStatus.New).length;
-                const inQueue = builds.filter(build => (build === null || build === void 0 ? void 0 : build.status) === generated_1.BuildStatus.InQueue).length;
-                const inProgress = builds.filter(build => (build === null || build === void 0 ? void 0 : build.status) === generated_1.BuildStatus.InProgress).length;
-                const errored = builds.filter(build => (build === null || build === void 0 ? void 0 : build.status) === generated_1.BuildStatus.Errored).length;
-                const finished = builds.filter(build => (build === null || build === void 0 ? void 0 : build.status) === generated_1.BuildStatus.Finished).length;
-                const canceled = builds.filter(build => (build === null || build === void 0 ? void 0 : build.status) === generated_1.BuildStatus.Canceled).length;
-                const unknown = builds.length - newBuilds - inQueue - inProgress - errored - finished - canceled;
-                spinner.text = [
-                    newBuilds && `Builds created: ${newBuilds}`,
-                    inQueue && `Builds in queue: ${inQueue}`,
-                    inProgress && `Builds in progress: ${inProgress}`,
-                    canceled && `Builds canceled: ${canceled}`,
-                    errored && chalk_1.default.red(`Builds failed: ${errored}`),
-                    finished && chalk_1.default.green(`Builds finished: ${finished}`),
-                    unknown && chalk_1.default.red(`Builds with unknown status: ${unknown}`),
-                ]
-                    .filter(i => i)
-                    .join('\t');
+                throw new Error('Standalone build failed!');
             }
+        default:
+            spinner.warn('Unknown status');
+            throw new Error(`Unknown build status: ${build.status} - aborting!`);
+    }
+    return { refetch: true };
+}
+const statusToDisplayName = {
+    [generated_1.BuildStatus.New]: 'waiting to enter the queue (concurrency limit reached)',
+    [generated_1.BuildStatus.InQueue]: 'in queue',
+    [generated_1.BuildStatus.InProgress]: 'in progress',
+    [generated_1.BuildStatus.Canceled]: 'canceled',
+    [generated_1.BuildStatus.Finished]: 'finished',
+    [generated_1.BuildStatus.Errored]: 'failed',
+};
+const platforms = [generated_1.AppPlatform.Android, generated_1.AppPlatform.Ios];
+async function handleMultipleBuildsProgressAsync({ builds: maybeBuilds }, { spinner }) {
+    const buildCount = maybeBuilds.length;
+    const builds = maybeBuilds.filter(isBuildFragment);
+    const allFinished = builds.filter(build => build.status === generated_1.BuildStatus.Finished).length === buildCount;
+    const allSettled = builds.filter(build => [generated_1.BuildStatus.Finished, generated_1.BuildStatus.Errored, generated_1.BuildStatus.Canceled].includes(build.status)).length === buildCount;
+    if (allSettled) {
+        if (allFinished) {
+            spinner.succeed(formatSettledBuildsText(builds));
         }
-        time = new Date().getTime();
-        await (0, promise_1.sleepAsync)(intervalSec * 1000);
+        else {
+            spinner.fail(formatSettledBuildsText(builds));
+        }
+        return { refetch: false };
+    }
+    else {
+        spinner.text = formatPendingBuildsText(builds);
+        return { refetch: true };
     }
-    spinner.warn('Timed out');
-    throw new Error('Timeout reached! It is taking longer than expected to finish the build, aborting...');
 }
-exports.waitForBuildEndAsync = waitForBuildEndAsync;
+function formatSettledBuildsText(builds) {
+    return platforms
+        .map(platform => {
+        const build = (0, nullthrows_1.default)(builds.find(build => build.platform === platform), `Build for platform ${platform} must be defined in this context`);
+        return `${platform_1.appPlatformEmojis[platform]} ${platform_1.appPlatformDisplayNames[platform]} build - status: ${chalk_1.default.bold(statusToDisplayName[build.status])}`;
+    })
+        .join('\n  ');
+}
+function formatPendingBuildsText(builds) {
+    return platforms
+        .map(platform => {
+        const build = builds.find(build => build.platform === platform);
+        const status = build ? statusToDisplayName[build.status] : 'unknown';
+        let extraInfo = '';
+        if ((build === null || build === void 0 ? void 0 : build.status) === generated_1.BuildStatus.InQueue &&
+            typeof build.initialQueuePosition === 'number' &&
+            typeof build.queuePosition === 'number') {
+            const percent = Math.floor(((build.initialQueuePosition - build.queuePosition + 1) /
+                (build.initialQueuePosition + 1)) *
+                100);
+            const estimatedWaitTime = typeof build.estimatedWaitTimeLeftSeconds === 'number'
+                ? ` - ${formatEstimatedWaitTime(build.estimatedWaitTimeLeftSeconds)}`
+                : '';
+            extraInfo = ` - queue progress: ${chalk_1.default.bold(`${percent}%`)}${estimatedWaitTime}`;
+        }
+        return `${platform_1.appPlatformEmojis[platform]} ${platform_1.appPlatformDisplayNames[platform]} build - status: ${chalk_1.default.bold(status)}${extraInfo}`;
+    })
+        .join('\n  ');
+}
+function isBuildFragment(maybeBuild) {
+    return maybeBuild !== null;
+}
+function formatEstimatedWaitTime(estimatedWaitTimeLeftSeconds) {
+    if (estimatedWaitTimeLeftSeconds < 5 * 60) {
+        return 'starting soon...';
+    }
+    else {
+        const n = Math.floor(estimatedWaitTimeLeftSeconds / (10 * 60)) + 1;
+        return `starting in about ${n}0 minutes...`;
+    }
+}
+function formatAccountSubscriptionsUrl(accountName) {
+    return new URL(`/accounts/${accountName}/settings/subscriptions`, (0, api_1.getExpoWebsiteBaseUrl)()).toString();
+}

package/build/build/local.js

@@ -6,7 +6,7 @@ const spawn_async_1 = tslib_1.__importDefault(require("@expo/spawn-async"));
 const semver_1 = tslib_1.__importDefault(require("semver"));
 const ora_1 = require("../ora");
 const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
-const PLUGIN_PACKAGE_VERSION = '0.0.66';
+const PLUGIN_PACKAGE_VERSION = '0.0.74';
 async function runLocalBuildAsync(job, options) {
     var _a;
     const { command, args } = await getCommandAndArgsAsync(job);

package/build/build/runBuildAndSubmit.js

@@ -98,7 +98,11 @@ async function runBuildAndSubmitAsync(projectDir, flags) {
         }
         return;
     }
-    const builds = await (0, build_2.waitForBuildEndAsync)(startedBuilds.map(({ build }) => build.id));
+    const { accountName } = Object.values(buildCtxByPlatform)[0];
+    const builds = await (0, build_2.waitForBuildEndAsync)({
+        buildIds: startedBuilds.map(({ build }) => build.id),
+        accountName,
+    });
     (0, printBuildInfo_1.printBuildResults)(builds, flags.json);
     const haveAllBuildsFailedOrCanceled = builds.every(build => (build === null || build === void 0 ? void 0 : build.status) && [generated_1.BuildStatus.Errored, generated_1.BuildStatus.Canceled].includes(build === null || build === void 0 ? void 0 : build.status));
     if (haveAllBuildsFailedOrCanceled || !flags.autoSubmit) {

package/build/build/utils/printBuildInfo.js

@@ -82,8 +82,7 @@ function printDeprecationWarnings(deprecationInfo) {
         log_1.default.warn(deprecationInfo.message);
     }
     else if (deprecationInfo.type === generated_1.EasBuildDeprecationInfoType.UserFacing) {
-        log_1.default.warn('This command is using API that soon will be deprecated, please update eas-cli.');
-        log_1.default.warn('There might be some changes necessary to your project config, latest eas-cli will provide more specific error messages.');
+        log_1.default.warn('This command is using API that soon will be deprecated.');
         log_1.default.warn(deprecationInfo.message);
     }
     else {

package/build/build/utils/url.js

@@ -6,21 +6,19 @@ const assert_1 = tslib_1.__importDefault(require("assert"));
 const api_1 = require("../../api");
 const generated_1 = require("../../graphql/generated");
 function getProjectDashboardUrl(accountName, projectName) {
-    return `${(0, api_1.getExpoWebsiteBaseUrl)()}/accounts/${accountName}/projects/${projectName}`;
+    return new URL(`/accounts/${accountName}/projects/${projectName}`, (0, api_1.getExpoWebsiteBaseUrl)()).toString();
 }
 exports.getProjectDashboardUrl = getProjectDashboardUrl;
 function getBuildLogsUrl(build) {
     const { project } = build;
-    if (project.__typename === 'App') {
-        return `${(0, api_1.getExpoWebsiteBaseUrl)()}/accounts/${project.ownerAccount.name}/builds/${build.id}`;
-    }
-    else {
-        return `${(0, api_1.getExpoWebsiteBaseUrl)()}/builds/${build.id}`;
-    }
+    const url = project.__typename !== 'App'
+        ? `/builds/${build.id}`
+        : `/accounts/${project.ownerAccount.name}/projects/${project.slug}/builds/${build.id}`;
+    return new URL(url, (0, api_1.getExpoWebsiteBaseUrl)()).toString();
 }
 exports.getBuildLogsUrl = getBuildLogsUrl;
 function getArtifactUrl(artifactId) {
-    return `${(0, api_1.getExpoWebsiteBaseUrl)()}/artifacts/${artifactId}`;
+    return new URL(`/artifacts/${artifactId}`, (0, api_1.getExpoWebsiteBaseUrl)()).toString();
 }
 exports.getArtifactUrl = getArtifactUrl;
 function getInternalDistributionInstallUrl(build) {

package/build/credentials/context.js

@@ -12,6 +12,7 @@ const User_1 = require("../user/User");
 const AndroidGraphqlClient = tslib_1.__importStar(require("./android/api/GraphqlClient"));
 const IosGraphqlClient = tslib_1.__importStar(require("./ios/api/GraphqlClient"));
 const AppStoreApi_1 = tslib_1.__importDefault(require("./ios/appstore/AppStoreApi"));
+const authenticateTypes_1 = require("./ios/appstore/authenticateTypes");
 class CredentialsContext {
     constructor(options) {
         var _a, _b;
@@ -73,6 +74,10 @@ class CredentialsContext {
         if (this.nonInteractive) {
             return;
         }
+        if (this.appStore.defaultAuthenticationMode === authenticateTypes_1.AuthenticationMode.API_KEY) {
+            await this.appStore.ensureAuthenticatedAsync();
+            return;
+        }
         log_1.default.log(chalk_1.default.green('If you provide your Apple account credentials we will be able to generate all necessary build credentials and fully validate them.'));
         log_1.default.log(chalk_1.default.green('This is optional, but without Apple account access you will need to provide all the missing values manually and we can only run minimal validation on them.'));
         const confirm = await (0, prompts_1.confirmAsync)({

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

@@ -70,7 +70,6 @@ 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),

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

@@ -46,7 +46,7 @@ class ConfigureProvisioningProfile {
             certP12: certificateP12,
             certPassword: certificatePassword,
             distCertSerialNumber: serialNumber,
-            teamId: authCtx.appleId,
+            teamId: authCtx.team.id,
         });
         const bundleIdTag = `(${app.bundleIdentifier})`;
         const slugTag = `@${app.account.name}/${app.projectName}`;

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

@@ -45,7 +45,7 @@ class CreateProvisioningProfile {
             certP12: this.distributionCertificate.certificateP12,
             certPassword: this.distributionCertificate.certificatePassword,
             distCertSerialNumber: this.distributionCertificate.serialNumber,
-            teamId: (_c = (_b = this.distributionCertificate.appleTeam) === null || _b === void 0 ? void 0 : _b.appleTeamIdentifier) !== null && _c !== void 0 ? _c : appleAuthCtx.appleId,
+            teamId: (_c = (_b = this.distributionCertificate.appleTeam) === null || _b === void 0 ? void 0 : _b.appleTeamIdentifier) !== null && _c !== void 0 ? _c : appleAuthCtx.team.id,
         });
     }
 }

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

@@ -1,9 +1,13 @@
 import { AscApiKey, AscApiKeyInfo, DistributionCertificate, DistributionCertificateStoreInfo, ProvisioningProfile, ProvisioningProfileStoreInfo, PushKey, PushKeyStoreInfo } from './Credentials.types';
-import { AuthCtx, Options as AuthenticateOptions } from './authenticate';
+import { Options as AuthenticateOptions } from './authenticate';
+import { AuthCtx, AuthenticationMode, UserAuthCtx } from './authenticateTypes';
 import { AppLookupParams, IosCapabilitiesOptions } from './ensureAppExists';
 import { ProfileClass } from './provisioningProfile';
 export default class AppStoreApi {
     authCtx?: AuthCtx;
+    defaultAuthenticationMode: AuthenticationMode;
+    constructor();
+    ensureUserAuthenticatedAsync(options?: AuthenticateOptions): Promise<UserAuthCtx>;
     ensureAuthenticatedAsync(options?: AuthenticateOptions): Promise<AuthCtx>;
     ensureBundleIdExistsAsync(app: AppLookupParams, options?: IosCapabilitiesOptions): Promise<void>;
     listDistributionCertificatesAsync(): Promise<DistributionCertificateStoreInfo[]>;

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

@@ -1,16 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const log_1 = tslib_1.__importDefault(require("../../../log"));
 const ascApiKey_1 = require("./ascApiKey");
 const authenticate_1 = require("./authenticate");
+const authenticateTypes_1 = require("./authenticateTypes");
 const distributionCertificate_1 = require("./distributionCertificate");
 const ensureAppExists_1 = require("./ensureAppExists");
 const provisioningProfile_1 = require("./provisioningProfile");
 const provisioningProfileAdhoc_1 = require("./provisioningProfileAdhoc");
 const pushKey_1 = require("./pushKey");
+const resolveCredentials_1 = require("./resolveCredentials");
 class AppStoreApi {
+    constructor() {
+        this.defaultAuthenticationMode = (0, resolveCredentials_1.hasAscEnvVars)()
+            ? authenticateTypes_1.AuthenticationMode.API_KEY
+            : authenticateTypes_1.AuthenticationMode.USER;
+    }
+    async ensureUserAuthenticatedAsync(options) {
+        if (this.authCtx && !(0, authenticate_1.isUserAuthCtx)(this.authCtx)) {
+            // already authenticated, but with the wrong type
+            log_1.default.log(`Only user authentication is supported. Reauthenticating as user...`);
+            this.authCtx = undefined;
+        }
+        const updatedAuthCtx = await this.ensureAuthenticatedAsync({
+            ...options,
+            mode: authenticateTypes_1.AuthenticationMode.USER,
+        });
+        return (0, authenticate_1.assertUserAuthCtx)(updatedAuthCtx);
+    }
     async ensureAuthenticatedAsync(options) {
+        var _a;
         if (!this.authCtx) {
-            this.authCtx = await (0, authenticate_1.authenticateAsync)(options);
+            const mode = (_a = options === null || options === void 0 ? void 0 : options.mode) !== null && _a !== void 0 ? _a : this.defaultAuthenticationMode;
+            this.authCtx = await (0, authenticate_1.authenticateAsync)({ mode, ...options });
         }
         return this.authCtx;
     }
@@ -31,16 +54,16 @@ class AppStoreApi {
         return await (0, distributionCertificate_1.revokeDistributionCertificateAsync)(ctx, ids);
     }
     async listPushKeysAsync() {
-        const ctx = await this.ensureAuthenticatedAsync();
-        return await (0, pushKey_1.listPushKeysAsync)(ctx);
+        const userCtx = await this.ensureUserAuthenticatedAsync();
+        return await (0, pushKey_1.listPushKeysAsync)(userCtx);
     }
     async createPushKeyAsync(name) {
-        const ctx = await this.ensureAuthenticatedAsync();
-        return await (0, pushKey_1.createPushKeyAsync)(ctx, name);
+        const userCtx = await this.ensureUserAuthenticatedAsync();
+        return await (0, pushKey_1.createPushKeyAsync)(userCtx, name);
     }
     async revokePushKeyAsync(ids) {
-        const ctx = await this.ensureAuthenticatedAsync();
-        return await (0, pushKey_1.revokePushKeyAsync)(ctx, ids);
+        const userCtx = await this.ensureUserAuthenticatedAsync();
+        return await (0, pushKey_1.revokePushKeyAsync)(userCtx, ids);
     }
     async useExistingProvisioningProfileAsync(bundleIdentifier, provisioningProfile, distCert) {
         const ctx = await this.ensureAuthenticatedAsync();
@@ -63,20 +86,20 @@ class AppStoreApi {
         return await (0, provisioningProfileAdhoc_1.createOrReuseAdhocProvisioningProfileAsync)(ctx, udids, bundleIdentifier, distCertSerialNumber);
     }
     async listAscApiKeysAsync() {
-        const ctx = await this.ensureAuthenticatedAsync();
-        return await (0, ascApiKey_1.listAscApiKeysAsync)(ctx);
+        const userCtx = await this.ensureUserAuthenticatedAsync();
+        return await (0, ascApiKey_1.listAscApiKeysAsync)(userCtx);
     }
     async getAscApiKeyAsync(keyId) {
-        const ctx = await this.ensureAuthenticatedAsync();
-        return await (0, ascApiKey_1.getAscApiKeyAsync)(ctx, keyId);
+        const userCtx = await this.ensureUserAuthenticatedAsync();
+        return await (0, ascApiKey_1.getAscApiKeyAsync)(userCtx, keyId);
     }
     async createAscApiKeyAsync({ nickname }) {
-        const ctx = await this.ensureAuthenticatedAsync();
-        return await (0, ascApiKey_1.createAscApiKeyAsync)(ctx, { nickname });
+        const userCtx = await this.ensureUserAuthenticatedAsync();
+        return await (0, ascApiKey_1.createAscApiKeyAsync)(userCtx, { nickname });
     }
     async revokeAscApiKeyAsync(keyId) {
-        const ctx = await this.ensureAuthenticatedAsync();
-        return await (0, ascApiKey_1.revokeAscApiKeyAsync)(ctx, keyId);
+        const userCtx = await this.ensureUserAuthenticatedAsync();
+        return await (0, ascApiKey_1.revokeAscApiKeyAsync)(userCtx, keyId);
     }
 }
 exports.default = AppStoreApi;

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

@@ -1,9 +1,25 @@
 /// <reference types="@expo/apple-utils/ts-declarations/expo__app-store" />
 import { ApiKey, ApiKeyProps } from '@expo/apple-utils';
 import { AscApiKey, AscApiKeyInfo } from './Credentials.types';
-import { AuthCtx } from './authenticate';
-export declare function listAscApiKeysAsync(authCtx: AuthCtx): Promise<AscApiKeyInfo[]>;
-export declare function getAscApiKeyAsync(authCtx: AuthCtx, keyId: string): Promise<AscApiKeyInfo | null>;
-export declare function createAscApiKeyAsync(authCtx: AuthCtx, { nickname, allAppsVisible, roles, keyType, }: Partial<Pick<ApiKeyProps, 'nickname' | 'roles' | 'allAppsVisible' | 'keyType'>>): Promise<AscApiKey>;
-export declare function revokeAscApiKeyAsync(authCtx: AuthCtx, keyId: string): Promise<AscApiKeyInfo>;
+import { AuthCtx, UserAuthCtx } from './authenticateTypes';
+/**
+ * List App Store Connect API Keys.
+ * **Does not support App Store Connect API (CI).**
+ */
+export declare function listAscApiKeysAsync(userAuthCtx: UserAuthCtx): Promise<AscApiKeyInfo[]>;
+/**
+ * Get an App Store Connect API Key.
+ * **Does not support App Store Connect API (CI).**
+ */
+export declare function getAscApiKeyAsync(userAuthCtx: UserAuthCtx, keyId: string): Promise<AscApiKeyInfo | null>;
+/**
+ * Create an App Store Connect API Key.
+ * **Does not support App Store Connect API (CI).**
+ */
+export declare function createAscApiKeyAsync(userAuthCtx: UserAuthCtx, { nickname, allAppsVisible, roles, keyType, }: Partial<Pick<ApiKeyProps, 'nickname' | 'roles' | 'allAppsVisible' | 'keyType'>>): Promise<AscApiKey>;
+/**
+ * Revoke an App Store Connect API Key.
+ * **Does not support App Store Connect API (CI).**
+ */
+export declare function revokeAscApiKeyAsync(userAuthCtx: UserAuthCtx, keyId: string): Promise<AscApiKeyInfo>;
 export declare function getAscApiKeyInfo(apiKey: ApiKey, authCtx: AuthCtx): AscApiKeyInfo;