eas-cli 0.29.0 → 0.31.0

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

@@ -1,9 +1,9 @@
 import { AppleProvisioningProfileIdentifiersFragment } from '../../../graphql/generated';
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/GraphqlClient';
 export declare class RemoveProvisioningProfiles {
     private apps;
     private provisioningProfiles;
     constructor(apps: AppLookupParams[], provisioningProfiles: AppleProvisioningProfileIdentifiersFragment[]);
-    runAsync(ctx: Context): Promise<void>;
+    runAsync(ctx: CredentialsContext): Promise<void>;
 }

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

@@ -1,14 +1,14 @@
 import { ApplePushKeyFragment } from '../../../graphql/generated';
 import { Account } from '../../../user/Account';
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 export declare class SelectAndRemovePushKey {
     private account;
     constructor(account: Account);
-    runAsync(ctx: Context): Promise<void>;
+    runAsync(ctx: CredentialsContext): Promise<void>;
 }
 export declare class RemovePushKey {
     private account;
     private pushKey;
     constructor(account: Account, pushKey: ApplePushKeyFragment);
-    runAsync(ctx: Context): Promise<void>;
+    runAsync(ctx: CredentialsContext): Promise<void>;
 }

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

@@ -1,13 +1,14 @@
 import { AppleDistributionCertificateFragment, IosAppBuildCredentialsFragment } from '../../../graphql/generated';
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/GraphqlClient';
 export declare class SetupAdhocProvisioningProfile {
     private app;
     constructor(app: AppLookupParams);
-    runAsync(ctx: Context): Promise<IosAppBuildCredentialsFragment>;
-    runWithDistributionCertificateAsync(ctx: Context, distCert: AppleDistributionCertificateFragment): Promise<IosAppBuildCredentialsFragment>;
+    runAsync(ctx: CredentialsContext): Promise<IosAppBuildCredentialsFragment>;
+    runWithDistributionCertificateAsync(ctx: CredentialsContext, distCert: AppleDistributionCertificateFragment): Promise<IosAppBuildCredentialsFragment>;
     private areBuildCredentialsSetupAsync;
     private shouldUseExistingProfileAsync;
+    private promptForReuseActionAsync;
     private registerDevicesAsync;
 }
 export declare function doUDIDsMatch(udidsA: string[], udidsB: string[]): boolean;

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

@@ -16,6 +16,12 @@ const AppleTeamUtils_1 = require("./AppleTeamUtils");
 const BuildCredentialsUtils_1 = require("./BuildCredentialsUtils");
 const DeviceUtils_1 = require("./DeviceUtils");
 const SetupDistributionCertificate_1 = require("./SetupDistributionCertificate");
+var ReuseAction;
+(function (ReuseAction) {
+    ReuseAction[ReuseAction["Yes"] = 0] = "Yes";
+    ReuseAction[ReuseAction["ShowDevices"] = 1] = "ShowDevices";
+    ReuseAction[ReuseAction["No"] = 2] = "No";
+})(ReuseAction || (ReuseAction = {}));
 class SetupAdhocProvisioningProfile {
     constructor(app) {
         this.app = app;
@@ -108,10 +114,23 @@ class SetupAdhocProvisioningProfile {
         const provisionedDevices = provisioningProfile.appleDevices;
         const allRegisteredDevicesAreProvisioned = doUDIDsMatch(registeredAppleDevices.map(({ identifier }) => identifier), provisionedDevices.map(({ identifier }) => identifier));
         if (allRegisteredDevicesAreProvisioned) {
-            return await (0, prompts_1.confirmAsync)({
-                message: `All your registered devices are present in the Provisioning Profile. Would you like to reuse it?`,
-                initial: true,
-            });
+            const reuseAction = await this.promptForReuseActionAsync();
+            if (reuseAction === ReuseAction.Yes) {
+                return true;
+            }
+            else if (reuseAction === ReuseAction.No) {
+                return false;
+            }
+            else {
+                log_1.default.newLine();
+                log_1.default.log('Devices registered in the Provisioning Profile:');
+                for (const device of provisionedDevices) {
+                    log_1.default.log(`- ${(0, DeviceUtils_1.formatDeviceLabel)(device)}`);
+                }
+                log_1.default.newLine();
+                return ((await this.promptForReuseActionAsync({ showShowDevicesOption: false })) ===
+                    ReuseAction.Yes);
+            }
         }
         else {
             const missingDevices = (0, differenceBy_1.default)(registeredAppleDevices, provisionedDevices, 'identifier');
@@ -125,6 +144,31 @@ class SetupAdhocProvisioningProfile {
             }));
         }
     }
+    async promptForReuseActionAsync({ showShowDevicesOption = true, } = {}) {
+        const { selected } = await (0, prompts_1.promptAsync)({
+            type: 'select',
+            name: 'selected',
+            message: `${showShowDevicesOption
+                ? 'All your registered devices are present in the Provisioning Profile. '
+                : ''}Would you like to reuse the profile?`,
+            choices: [
+                { title: 'Yes', value: ReuseAction.Yes },
+                ...(showShowDevicesOption
+                    ? [
+                        {
+                            title: 'Show devices and ask me again',
+                            value: ReuseAction.ShowDevices,
+                        },
+                    ]
+                    : []),
+                {
+                    title: 'No, let me choose devices again',
+                    value: ReuseAction.No,
+                },
+            ],
+        });
+        return selected;
+    }
     async registerDevicesAsync(ctx, appleTeam) {
         const action = new action_1.default(this.app.account, appleTeam);
         const method = await action.runAsync();

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

@@ -1,5 +1,5 @@
 import { DistributionType, IosEnterpriseProvisioning } from '@expo/eas-json';
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 import { IosCapabilitiesOptions } from '../appstore/ensureAppExists';
 import { App, IosCredentials, Target } from '../types';
 interface Options {
@@ -12,6 +12,6 @@ interface Options {
 export declare class SetupBuildCredentials {
     private options;
     constructor(options: Options);
-    runAsync(ctx: Context): Promise<IosCredentials>;
+    runAsync(ctx: CredentialsContext): Promise<IosCredentials>;
 }
 export {};

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

@@ -1,11 +1,11 @@
 import { IosDistributionType } from '../../../graphql/generated';
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 import { App, Target } from '../types';
 export declare class SetupBuildCredentialsFromCredentialsJson {
     private app;
     private targets;
     private distributionType;
     constructor(app: App, targets: Target[], distributionType: IosDistributionType);
-    runAsync(ctx: Context): Promise<void>;
+    runAsync(ctx: CredentialsContext): Promise<void>;
     private readCredentialsJsonAsync;
 }

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

@@ -1,17 +1,17 @@
 import { AppleDistributionCertificate, AppleDistributionCertificateFragment, IosDistributionType } from '../../../graphql/generated';
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/GraphqlClient';
 export declare class SetupDistributionCertificate {
     private app;
     private distributionType;
     private validDistCerts?;
     constructor(app: AppLookupParams, distributionType: IosDistributionType);
-    runAsync(ctx: Context): Promise<AppleDistributionCertificateFragment>;
+    runAsync(ctx: CredentialsContext): Promise<AppleDistributionCertificateFragment>;
     private runNonInteractiveAsync;
     private runInteractiveAsync;
     private isCurrentCertificateValidAsync;
     private createOrReuseDistCertAsync;
     private createNewDistCertAsync;
-    reuseDistCertAsync(ctx: Context): Promise<AppleDistributionCertificate>;
+    reuseDistCertAsync(ctx: CredentialsContext): Promise<AppleDistributionCertificate>;
     private getValidDistCertsAsync;
 }

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

@@ -1,5 +1,5 @@
 import { IosAppBuildCredentialsFragment } from '../../../graphql/generated';
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/GraphqlClient';
 /**
  * It's used when setting up credentials for internal distribution but `enterpriseProvisioning` is not set.
@@ -11,7 +11,7 @@ import { AppLookupParams } from '../api/GraphqlClient';
 export declare class SetupInternalProvisioningProfile {
     private app;
     constructor(app: AppLookupParams);
-    runAsync(ctx: Context): Promise<IosAppBuildCredentialsFragment>;
+    runAsync(ctx: CredentialsContext): Promise<IosAppBuildCredentialsFragment>;
     private setupAdhocProvisioningProfileAsync;
     private setupUniversalProvisioningProfileAsync;
     private askForDistributionTypeAndSetupAsync;

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

@@ -1,5 +1,5 @@
 import { AppleDistributionCertificateFragment, AppleProvisioningProfileFragment, IosAppBuildCredentialsFragment, IosDistributionType } from '../../../graphql/generated';
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/GraphqlClient';
 /**
  * Sets up either APP_STORE or ENTERPRISE provisioning profiles
@@ -8,10 +8,10 @@ export declare class SetupProvisioningProfile {
     private app;
     private distributionType;
     constructor(app: AppLookupParams, distributionType: IosDistributionType);
-    areBuildCredentialsSetupAsync(ctx: Context): Promise<boolean>;
-    assignNewAndDeleteOldProfileAsync(ctx: Context, distCert: AppleDistributionCertificateFragment, currentProfile: AppleProvisioningProfileFragment): Promise<IosAppBuildCredentialsFragment>;
-    createAndAssignProfileAsync(ctx: Context, distCert: AppleDistributionCertificateFragment): Promise<IosAppBuildCredentialsFragment>;
-    configureAndAssignProfileAsync(ctx: Context, distCert: AppleDistributionCertificateFragment, originalProvisioningProfile: AppleProvisioningProfileFragment): Promise<IosAppBuildCredentialsFragment | null>;
-    runAsync(ctx: Context): Promise<IosAppBuildCredentialsFragment>;
+    areBuildCredentialsSetupAsync(ctx: CredentialsContext): Promise<boolean>;
+    assignNewAndDeleteOldProfileAsync(ctx: CredentialsContext, distCert: AppleDistributionCertificateFragment, currentProfile: AppleProvisioningProfileFragment): Promise<IosAppBuildCredentialsFragment>;
+    createAndAssignProfileAsync(ctx: CredentialsContext, distCert: AppleDistributionCertificateFragment): Promise<IosAppBuildCredentialsFragment>;
+    configureAndAssignProfileAsync(ctx: CredentialsContext, distCert: AppleDistributionCertificateFragment, originalProvisioningProfile: AppleProvisioningProfileFragment): Promise<IosAppBuildCredentialsFragment | null>;
+    runAsync(ctx: CredentialsContext): Promise<IosAppBuildCredentialsFragment>;
     private getCurrentProfileStoreInfo;
 }

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

@@ -1,10 +1,10 @@
 import { CommonIosAppCredentialsFragment } from '../../../graphql/generated';
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/GraphqlClient';
 export declare class SetupPushKey {
     private app;
     constructor(app: AppLookupParams);
-    isPushKeySetupAsync(ctx: Context): Promise<boolean>;
-    runAsync(ctx: Context): Promise<CommonIosAppCredentialsFragment | null>;
+    isPushKeySetupAsync(ctx: CredentialsContext): Promise<boolean>;
+    runAsync(ctx: CredentialsContext): Promise<CommonIosAppCredentialsFragment | null>;
     private createOrReusePushKeyAsync;
 }

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

@@ -1,6 +1,6 @@
 import { DistributionType, IosEnterpriseProvisioning } from '@expo/eas-json';
 import { IosAppBuildCredentialsFragment } from '../../../graphql/generated';
-import { Action, Context } from '../../context';
+import { CredentialsContext } from '../../context';
 import { AppLookupParams as GraphQLAppLookupParams } from '../api/GraphqlClient';
 import { IosCapabilitiesOptions } from '../appstore/ensureAppExists';
 interface Options {
@@ -9,10 +9,10 @@ interface Options {
     enterpriseProvisioning?: IosEnterpriseProvisioning;
     iosCapabilitiesOptions?: IosCapabilitiesOptions;
 }
-export declare class SetupTargetBuildCredentials implements Action<IosAppBuildCredentialsFragment> {
+export declare class SetupTargetBuildCredentials {
     private options;
     constructor(options: Options);
-    runAsync(ctx: Context): Promise<IosAppBuildCredentialsFragment>;
-    setupBuildCredentialsAsync(ctx: Context): Promise<IosAppBuildCredentialsFragment>;
+    runAsync(ctx: CredentialsContext): Promise<IosAppBuildCredentialsFragment>;
+    setupBuildCredentialsAsync(ctx: CredentialsContext): Promise<IosAppBuildCredentialsFragment>;
 }
 export {};

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

@@ -1,5 +1,5 @@
 import { AppleDistributionCertificateFragment, AppleProvisioningProfileFragment, AppleTeamFragment, IosAppBuildCredentialsFragment, IosDistributionType } from '../../../graphql/generated';
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 import { IosTargetCredentials } from '../../credentialsJson/types';
 import { AppLookupParams } from '../api/GraphqlClient';
 export declare class SetupTargetBuildCredentialsFromCredentialsJson {
@@ -7,8 +7,8 @@ export declare class SetupTargetBuildCredentialsFromCredentialsJson {
     private distributionType;
     private targetCredentials;
     constructor(app: AppLookupParams, distributionType: IosDistributionType, targetCredentials: IosTargetCredentials);
-    runAsync(ctx: Context): Promise<IosAppBuildCredentialsFragment>;
-    getDistributionCertificateToAssignAsync(ctx: Context, appleTeam: AppleTeamFragment, currentDistributionCertificate: AppleDistributionCertificateFragment | null): Promise<AppleDistributionCertificateFragment>;
-    getProvisioningProfileToAssignAsync(ctx: Context, appleTeam: AppleTeamFragment, currentProvisioningProfile: AppleProvisioningProfileFragment | null): Promise<AppleProvisioningProfileFragment>;
-    createNewProvisioningProfileAsync(ctx: Context, appleTeam: AppleTeamFragment): Promise<AppleProvisioningProfileFragment>;
+    runAsync(ctx: CredentialsContext): Promise<IosAppBuildCredentialsFragment>;
+    getDistributionCertificateToAssignAsync(ctx: CredentialsContext, appleTeam: AppleTeamFragment, currentDistributionCertificate: AppleDistributionCertificateFragment | null): Promise<AppleDistributionCertificateFragment>;
+    getProvisioningProfileToAssignAsync(ctx: CredentialsContext, appleTeam: AppleTeamFragment, currentProvisioningProfile: AppleProvisioningProfileFragment | null): Promise<AppleProvisioningProfileFragment>;
+    createNewProvisioningProfileAsync(ctx: CredentialsContext, appleTeam: AppleTeamFragment): Promise<AppleProvisioningProfileFragment>;
 }

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

@@ -1,10 +1,10 @@
 import { IosDistributionType } from '../../../graphql/generated';
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 import { App, Target } from '../types';
 export declare class UpdateCredentialsJson {
     private app;
     private targets;
     private distributionType;
     constructor(app: App, targets: Target[], distributionType: IosDistributionType);
-    runAsync(ctx: Context): Promise<void>;
+    runAsync(ctx: CredentialsContext): Promise<void>;
 }

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

@@ -1,20 +1,10 @@
 import { DistributionCertificate, DistributionCertificateStoreInfo, ProvisioningProfile, ProvisioningProfileStoreInfo, PushKey, PushKeyStoreInfo } from './Credentials.types';
-import { AuthCtx } from './authenticate';
-import { AppleTooManyCertsError } from './distributionCertificate';
+import { AuthCtx, Options as AuthenticateOptions } from './authenticate';
 import { AppLookupParams, IosCapabilitiesOptions } from './ensureAppExists';
 import { ProfileClass } from './provisioningProfile';
-interface Options {
-    appleIdPassword?: string;
-    appleId?: string;
-    teamId?: string;
-}
-export { AppleTooManyCertsError };
-declare class AppStoreApi {
-    readonly options?: Options | undefined;
-    private _authCtx?;
-    constructor(options?: Options | undefined);
-    get authCtx(): AuthCtx | undefined;
-    ensureAuthenticatedAsync(): Promise<AuthCtx>;
+export default class AppStoreApi {
+    authCtx?: AuthCtx;
+    ensureAuthenticatedAsync(options?: AuthenticateOptions): Promise<AuthCtx>;
     ensureBundleIdExistsAsync(app: AppLookupParams, options?: IosCapabilitiesOptions): Promise<void>;
     listDistributionCertificatesAsync(): Promise<DistributionCertificateStoreInfo[]>;
     createDistributionCertificateAsync(): Promise<DistributionCertificate>;
@@ -28,4 +18,3 @@ declare class AppStoreApi {
     revokeProvisioningProfileAsync(bundleIdentifier: string, profileClass?: ProfileClass): Promise<void>;
     createOrReuseAdhocProvisioningProfileAsync(udids: string[], bundleIdentifier: string, distCertSerialNumber: string): Promise<ProvisioningProfile>;
 }
-export default AppStoreApi;

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

@@ -1,25 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AppleTooManyCertsError = void 0;
 const authenticate_1 = require("./authenticate");
 const distributionCertificate_1 = require("./distributionCertificate");
-Object.defineProperty(exports, "AppleTooManyCertsError", { enumerable: true, get: function () { return distributionCertificate_1.AppleTooManyCertsError; } });
 const ensureAppExists_1 = require("./ensureAppExists");
 const provisioningProfile_1 = require("./provisioningProfile");
 const provisioningProfileAdhoc_1 = require("./provisioningProfileAdhoc");
 const pushKey_1 = require("./pushKey");
 class AppStoreApi {
-    constructor(options) {
-        this.options = options;
-    }
-    get authCtx() {
-        return this._authCtx;
-    }
-    async ensureAuthenticatedAsync() {
-        if (!this._authCtx) {
-            this._authCtx = await (0, authenticate_1.authenticateAsync)(this.options);
+    async ensureAuthenticatedAsync(options) {
+        if (!this.authCtx) {
+            this.authCtx = await (0, authenticate_1.authenticateAsync)(options);
         }
-        return this._authCtx;
+        return this.authCtx;
     }
     async ensureBundleIdExistsAsync(app, options) {
         const ctx = await this.ensureAuthenticatedAsync();

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

@@ -6,17 +6,7 @@ const config_plugins_1 = require("@expo/config-plugins");
 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_1 = (0, tslib_1.__importDefault)(require("fs"));
-function getEntitlementsJson(projectDir) {
-    try {
-        const entitlementsPath = config_plugins_1.IOSConfig.Paths.getEntitlementsPath(projectDir);
-        if (entitlementsPath) {
-            return plist_1.default.parse(fs_1.default.readFileSync(entitlementsPath, 'utf8'));
-        }
-    }
-    catch { }
-    return null;
-}
+const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
 async function getManagedEntitlementsJsonAsync(projectDir) {
     var _a;
     let { exp } = (0, prebuild_config_1.getPrebuildConfig)(projectDir, { platforms: ['ios'] });
@@ -30,13 +20,24 @@ async function getManagedEntitlementsJsonAsync(projectDir) {
 exports.getManagedEntitlementsJsonAsync = getManagedEntitlementsJsonAsync;
 async function resolveEntitlementsJsonAsync(projectDir, workflow) {
     if (workflow === eas_build_job_1.Workflow.GENERIC) {
-        return getEntitlementsJson(projectDir) || {};
+        return (await getEntitlementsJsonAsync(projectDir)) || {};
     }
     else if (workflow === eas_build_job_1.Workflow.MANAGED) {
-        return getManagedEntitlementsJsonAsync(projectDir);
+        return await getManagedEntitlementsJsonAsync(projectDir);
     }
     else {
         throw new Error(`Unknown workflow: ${workflow}`);
     }
 }
 exports.resolveEntitlementsJsonAsync = resolveEntitlementsJsonAsync;
+async function getEntitlementsJsonAsync(projectDir) {
+    try {
+        const entitlementsPath = config_plugins_1.IOSConfig.Paths.getEntitlementsPath(projectDir);
+        if (entitlementsPath) {
+            const entitlementsContents = await fs_extra_1.default.readFile(entitlementsPath, 'utf8');
+            return plist_1.default.parse(entitlementsContents);
+        }
+    }
+    catch { }
+    return null;
+}

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

@@ -8,6 +8,7 @@ const generated_1 = require("../../../graphql/generated");
 const AppleDevice_1 = require("../../../graphql/types/credentials/AppleDevice");
 const log_1 = (0, tslib_1.__importDefault)(require("../../../log"));
 const date_1 = require("../../../utils/date");
+const formatFields_1 = (0, tslib_1.__importDefault)(require("../../../utils/formatFields"));
 function prettyIosDistributionType(distributionType) {
     switch (distributionType) {
         case generated_1.IosDistributionType.AppStore:
@@ -24,10 +25,14 @@ function prettyIosDistributionType(distributionType) {
 }
 function displayEmptyIosCredentials(appLookupParams) {
     const { projectName, bundleIdentifier } = appLookupParams;
-    log_1.default.log(chalk_1.default.bold(`iOS Credentials`));
-    log_1.default.log(`  Project: ${projectName}`);
-    log_1.default.log(`  Bundle Identifier: ${bundleIdentifier}`);
-    log_1.default.log(`  No credentials set up yet!`);
+    const fields = [
+        { label: 'iOS Credentials', value: '' },
+        { label: 'Project', value: projectName },
+        { label: 'Bundle Identifier', value: bundleIdentifier },
+    ];
+    fields.push({ label: '', value: 'No credentials set up yet!' });
+    fields.push({ label: '', value: '' });
+    log_1.default.log((0, formatFields_1.default)(fields, { labelFormat: chalk_1.default.cyan.bold }));
 }
 exports.displayEmptyIosCredentials = displayEmptyIosCredentials;
 /**
@@ -49,36 +54,41 @@ function sortBuildCredentialsByDistributionType(iosAppBuildCredentialsList) {
 function displayIosCredentials(app, appCredentialsMap, targets) {
     const projectFullName = `@${app.account.name}/${app.projectName}`;
     const isMultitarget = targets.length > 1;
-    log_1.default.log(chalk_1.default.bold(`iOS Credentials`));
-    log_1.default.addNewLineIfNone();
-    log_1.default.log(`  Project: ${chalk_1.default.bold(projectFullName)}`);
+    const fields = [
+        { label: 'iOS Credentials', value: '' },
+        { label: 'Project', value: projectFullName },
+    ];
     for (const { targetName, bundleIdentifier } of targets) {
         if (isMultitarget) {
-            log_1.default.newLine();
-            log_1.default.log(`  Target: ${chalk_1.default.bold(targetName)}`);
+            fields.push({ label: '', value: '' });
+            fields.push({ label: 'Target', value: targetName });
         }
-        log_1.default.log(`  Bundle Identifier: ${chalk_1.default.bold(bundleIdentifier)}`);
+        fields.push({ label: 'Bundle Identifier', value: bundleIdentifier });
         const targetAppCredentials = appCredentialsMap[targetName];
         if (!targetAppCredentials) {
-            log_1.default.newLine();
-            log_1.default.log(`  No credentials set up yet!`);
-            log_1.default.newLine();
+            fields.push({ label: '', value: '' });
+            fields.push({ label: '', value: 'No credentials set up yet!' });
+            fields.push({ label: '', value: '' });
             continue;
         }
         const { appleTeam, pushKey } = targetAppCredentials;
         if (appleTeam) {
             const { appleTeamIdentifier, appleTeamName } = appleTeam;
-            log_1.default.log(`  Apple Team: ${appleTeamIdentifier} ${appleTeamName ? `(${appleTeamName})` : ''}`);
+            fields.push({
+                label: 'Apple Team',
+                value: `${appleTeamIdentifier} ${appleTeamName ? `(${appleTeamName})` : ''}`,
+            });
         }
-        log_1.default.newLine();
+        fields.push({ label: '', value: '' });
         if (pushKey) {
-            displayApplePushKey(pushKey);
+            displayApplePushKey(pushKey, fields);
         }
         const sortedIosAppBuildCredentialsList = sortBuildCredentialsByDistributionType(targetAppCredentials.iosAppBuildCredentialsList);
         for (const iosAppBuildCredentials of sortedIosAppBuildCredentialsList) {
-            displayIosAppBuildCredentials(iosAppBuildCredentials);
+            displayIosAppBuildCredentials(iosAppBuildCredentials, fields);
         }
     }
+    log_1.default.log((0, formatFields_1.default)(fields, { labelFormat: chalk_1.default.cyan.bold }));
 }
 exports.displayIosCredentials = displayIosCredentials;
 function displayProjectCredentials(app, appBuildCredentials, targets) {
@@ -89,78 +99,100 @@ function displayProjectCredentials(app, appBuildCredentials, targets) {
     }, {});
     const isMultitarget = targets.length > 1;
     log_1.default.addNewLineIfNone();
-    log_1.default.log(chalk_1.default.bold('Project Credentials Configuration:'));
-    log_1.default.log(`  Project: ${chalk_1.default.bold(projectFullName)}`);
+    log_1.default.log(chalk_1.default.cyan.bold('Project Credentials Configuration'));
+    log_1.default.newLine();
+    const fields = [{ label: 'Project', value: projectFullName }];
     for (const [targetName, buildCredentials] of Object.entries(appBuildCredentials)) {
         if (isMultitarget) {
-            log_1.default.newLine();
-            log_1.default.log(`  Target: ${chalk_1.default.bold(targetName)}`);
+            fields.push({ label: '', value: '' });
+            fields.push({ label: 'Target', value: targetName });
         }
-        log_1.default.log(`  Bundle Identifier: ${chalk_1.default.bold(targetToBundleId[targetName])}`);
-        displayIosAppBuildCredentials(buildCredentials);
+        fields.push({ label: 'Bundle Identifier', value: targetToBundleId[targetName] });
+        displayIosAppBuildCredentials(buildCredentials, fields);
     }
+    log_1.default.log((0, formatFields_1.default)(fields, { labelFormat: chalk_1.default.cyan.bold }));
 }
 exports.displayProjectCredentials = displayProjectCredentials;
-function displayIosAppBuildCredentials(buildCredentials) {
-    log_1.default.log(`  Configuration: ${chalk_1.default.bold(prettyIosDistributionType(buildCredentials.iosDistributionType))}`);
-    log_1.default.newLine();
+function displayIosAppBuildCredentials(buildCredentials, fields) {
+    fields.push({ label: '', value: '' });
+    fields.push({
+        label: `${prettyIosDistributionType(buildCredentials.iosDistributionType)} Configuration`,
+        value: '',
+    });
+    fields.push({ label: '', value: '' });
     const maybeDistCert = buildCredentials.distributionCertificate;
-    log_1.default.log(`  Distribution Certificate:`);
+    fields.push({ label: 'Distribution Certificate', value: '' });
     if (maybeDistCert) {
         const { serialNumber, updatedAt, validityNotAfter, appleTeam } = maybeDistCert;
-        log_1.default.log(`    Serial Number: ${serialNumber}`);
-        log_1.default.log(`    Expiration Date: ${(0, dateformat_1.default)(validityNotAfter, 'expiresHeaderFormat')}`);
+        fields.push({ label: 'Serial Number', value: serialNumber });
+        fields.push({
+            label: 'Expiration Date',
+            value: (0, dateformat_1.default)(validityNotAfter, 'expiresHeaderFormat'),
+        });
         if (appleTeam) {
             const { appleTeamIdentifier, appleTeamName } = appleTeam;
-            log_1.default.log(`    Apple Team: ${appleTeamIdentifier} ${appleTeamName ? `(${appleTeamName})` : ''}`);
+            fields.push({
+                label: 'Apple Team',
+                value: `${appleTeamIdentifier} ${appleTeamName ? `(${appleTeamName})` : ''}`,
+            });
         }
-        log_1.default.log(`    Updated ${(0, date_1.fromNow)(new Date(updatedAt))} ago`);
+        fields.push({ label: 'Updated', value: `${(0, date_1.fromNow)(new Date(updatedAt))} ago` });
     }
     else {
-        log_1.default.log(`    None assigned yet`);
+        fields.push({ label: '', value: 'None assigned yet' });
     }
-    log_1.default.newLine();
+    fields.push({ label: '', value: '' });
     const maybeProvProf = buildCredentials.provisioningProfile;
-    log_1.default.log(`  Provisioning Profile:`);
+    fields.push({ label: 'Provisioning Profile', value: '' });
     if (maybeProvProf) {
         const { expiration, updatedAt, status, developerPortalIdentifier, appleTeam, appleDevices } = maybeProvProf;
         if (developerPortalIdentifier) {
-            log_1.default.log(`    Developer Portal ID: ${developerPortalIdentifier}`);
+            fields.push({ label: 'Developer Portal ID', value: developerPortalIdentifier });
         }
-        log_1.default.log(`    Status: ${status}`);
-        log_1.default.log(`    Expiration Date: ${(0, dateformat_1.default)(expiration, 'expiresHeaderFormat')}`);
+        fields.push({ label: 'Status', value: status });
+        fields.push({ label: 'Expiration', value: (0, dateformat_1.default)(expiration, 'expiresHeaderFormat') });
         if (appleTeam) {
             const { appleTeamIdentifier, appleTeamName } = appleTeam;
-            log_1.default.log(`    Apple Team: ${appleTeamIdentifier} ${appleTeamName ? `(${appleTeamName})` : ''}`);
+            fields.push({
+                label: 'Apple Team',
+                value: `${appleTeamIdentifier} ${appleTeamName ? `(${appleTeamName})` : ''}`,
+            });
         }
         if (appleDevices && appleDevices.length > 0) {
-            log_1.default.log(`    Provisioned devices:`);
-            for (const appleDevice of appleDevices) {
-                log_1.default.log(`    - ${formatAppleDevice(appleDevice)}`);
+            const [firstAppleDevice, ...rest] = appleDevices;
+            fields.push({
+                label: 'Provisioned devices',
+                value: `- ${formatAppleDevice(firstAppleDevice)}`,
+            });
+            for (const appleDevice of rest) {
+                fields.push({ label: '', value: `- ${formatAppleDevice(appleDevice)}` });
             }
         }
-        log_1.default.log(`    Updated ${(0, date_1.fromNow)(new Date(updatedAt))} ago`);
+        fields.push({ label: 'Updated', value: `${(0, date_1.fromNow)(new Date(updatedAt))} ago` });
     }
     else {
-        log_1.default.log(`    None assigned yet`);
+        fields.push({ label: '', value: 'None assigned yet' });
     }
-    log_1.default.newLine();
+    fields.push({ label: '', value: '' });
 }
-function displayApplePushKey(maybePushKey) {
-    log_1.default.log(`  Push Key:`);
+function displayApplePushKey(maybePushKey, fields) {
+    fields.push({ label: 'Push Key', value: '' });
     if (maybePushKey) {
         const { keyIdentifier, appleTeam, updatedAt } = maybePushKey;
-        log_1.default.log(`    Developer Portal ID: ${keyIdentifier}`);
+        fields.push({ label: 'Developer Portal ID', value: keyIdentifier });
         if (appleTeam) {
             const { appleTeamIdentifier, appleTeamName } = appleTeam;
-            log_1.default.log(`    Apple Team: ${appleTeamIdentifier} ${appleTeamName ? `(${appleTeamName})` : ''}`);
+            fields.push({
+                label: 'Apple Team',
+                value: `${appleTeamIdentifier} ${appleTeamName ? `(${appleTeamName})` : ''}`,
+            });
         }
-        log_1.default.log(`    Updated ${(0, date_1.fromNow)(new Date(updatedAt))} ago`);
+        fields.push({ label: 'Updated', value: `${(0, date_1.fromNow)(new Date(updatedAt))} ago` });
     }
     else {
-        log_1.default.log(`    None assigned yet`);
+        fields.push({ label: '', value: 'None assigned yet' });
     }
-    log_1.default.newLine();
+    fields.push({ label: '', value: '' });
 }
 function formatAppleDevice(device) {
     let deviceString = '';

package/build/credentials/ios/validators/validateDistributionCertificate.d.ts

@@ -1,3 +1,3 @@
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 import { DistributionCertificate } from '../appstore/Credentials.types';
-export declare function validateDistributionCertificateAsync(ctx: Context, distributionCertificate: DistributionCertificate): Promise<boolean>;
+export declare function validateDistributionCertificateAsync(ctx: CredentialsContext, distributionCertificate: DistributionCertificate): Promise<boolean>;

package/build/credentials/ios/validators/validateProvisioningProfile.d.ts

@@ -1,4 +1,4 @@
 import { IosAppBuildCredentialsFragment } from '../../../graphql/generated';
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/GraphqlClient';
-export declare function validateProvisioningProfileAsync(ctx: Context, app: AppLookupParams, buildCredentials: Partial<IosAppBuildCredentialsFragment> | null): Promise<boolean>;
+export declare function validateProvisioningProfileAsync(ctx: CredentialsContext, app: AppLookupParams, buildCredentials: Partial<IosAppBuildCredentialsFragment> | null): Promise<boolean>;