eas-cli 0.29.0 → 0.31.0

package/build/credentials/android/utils/googleServiceAccountKey.js

@@ -1,13 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readAndValidateServiceAccountKey = exports.MinimalGoogleServiceAccountKeySchema = void 0;
+exports.detectGoogleServiceAccountKeyPathAsync = exports.selectGoogleServiceAccountKeyAsync = exports.readAndValidateServiceAccountKey = exports.MinimalGoogleServiceAccountKeySchema = void 0;
 const tslib_1 = require("tslib");
 const json_file_1 = (0, tslib_1.__importDefault)(require("@expo/json-file"));
+const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
+const fast_glob_1 = (0, tslib_1.__importDefault)(require("fast-glob"));
 const joi_1 = (0, tslib_1.__importDefault)(require("joi"));
+const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const log_1 = (0, tslib_1.__importStar)(require("../../../log"));
+const prompts_1 = require("../../../prompts");
+const date_1 = require("../../../utils/date");
 exports.MinimalGoogleServiceAccountKeySchema = joi_1.default.object({
+    type: joi_1.default.string().required(),
     private_key: joi_1.default.string().required(),
+    client_email: joi_1.default.string().required(),
 });
+function fileIsServiceAccountKey(keyJsonPath) {
+    try {
+        readAndValidateServiceAccountKey(keyJsonPath);
+        return true;
+    }
+    catch (err) {
+        return false;
+    }
+}
 function readAndValidateServiceAccountKey(keyJsonPath) {
     try {
         const jsonKeyObject = json_file_1.default.read(keyJsonPath);
@@ -32,3 +48,76 @@ function readAndValidateServiceAccountKey(keyJsonPath) {
     }
 }
 exports.readAndValidateServiceAccountKey = readAndValidateServiceAccountKey;
+async function selectGoogleServiceAccountKeyAsync(keys) {
+    const sortedKeys = sortGoogleServiceAccountKeysByUpdatedAtDesc(keys);
+    const { chosenKey } = await (0, prompts_1.promptAsync)({
+        type: 'select',
+        name: 'chosenKey',
+        message: 'Select a Google Service Account Key:',
+        choices: sortedKeys.map(key => ({
+            title: formatGoogleServiceAccountKey(key),
+            value: key,
+        })),
+    });
+    return chosenKey;
+}
+exports.selectGoogleServiceAccountKeyAsync = selectGoogleServiceAccountKeyAsync;
+function sortGoogleServiceAccountKeysByUpdatedAtDesc(keys) {
+    return keys.sort((keyA, keyB) => new Date(keyB.updatedAt).getTime() - new Date(keyA.updatedAt).getTime());
+}
+function formatGoogleServiceAccountKey({ projectIdentifier, privateKeyIdentifier, clientEmail, clientIdentifier, updatedAt, }) {
+    let line = `Client Email: ${clientEmail}, Project Id: ${projectIdentifier}`;
+    line += chalk_1.default.gray(`\n    Client Id: ${clientIdentifier}, Private Key Id: ${privateKeyIdentifier}`);
+    line += chalk_1.default.gray(`\n    Updated: ${(0, date_1.fromNow)(new Date(updatedAt))} ago,`);
+    return line;
+}
+async function detectGoogleServiceAccountKeyPathAsync(projectDir) {
+    const foundFilePaths = await (0, fast_glob_1.default)('**/*.json', {
+        cwd: projectDir,
+        ignore: ['app.json', 'package*.json', 'tsconfig.json', 'node_modules'],
+    });
+    const googleServiceFiles = foundFilePaths
+        .map(file => path_1.default.join(projectDir, file))
+        .filter(fileIsServiceAccountKey);
+    if (googleServiceFiles.length > 1) {
+        const selectedPath = await displayPathChooserAsync(googleServiceFiles, projectDir);
+        if (selectedPath) {
+            return selectedPath;
+        }
+    }
+    else if (googleServiceFiles.length === 1) {
+        const [detectedPath] = googleServiceFiles;
+        if (await confirmDetectedPathAsync(detectedPath)) {
+            return detectedPath;
+        }
+    }
+    return null;
+}
+exports.detectGoogleServiceAccountKeyPathAsync = detectGoogleServiceAccountKeyPathAsync;
+async function displayPathChooserAsync(paths, projectDir) {
+    const choices = paths.map(f => ({
+        value: f,
+        title: f.startsWith(projectDir) ? path_1.default.relative(projectDir, f) : f,
+    }));
+    choices.push({
+        title: 'None of the above',
+        value: null,
+    });
+    log_1.default.log('Multiple Google Service Account JSON keys have been found inside your project directory.');
+    const { selectedPath } = await (0, prompts_1.promptAsync)({
+        name: 'selectedPath',
+        type: 'select',
+        message: 'Choose the key you want to use:',
+        choices,
+    });
+    log_1.default.addNewLineIfNone();
+    return selectedPath;
+}
+async function confirmDetectedPathAsync(path) {
+    log_1.default.log(`A Google Service Account JSON key has been found at\n  ${chalk_1.default.underline(path)}`);
+    const confirm = await (0, prompts_1.confirmAsync)({
+        message: 'Would you like to use this file?',
+    });
+    log_1.default.addNewLineIfNone();
+    return confirm;
+}

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

@@ -6,40 +6,71 @@ const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 const generated_1 = require("../../../graphql/generated");
 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"));
 const BuildCredentialsUtils_1 = require("../actions/BuildCredentialsUtils");
 function displayEmptyAndroidCredentials(appLookupParams) {
     const { projectName, androidApplicationIdentifier } = appLookupParams;
-    log_1.default.log(chalk_1.default.bold(`Android Credentials`));
-    log_1.default.log(`  Project: ${projectName}`);
-    log_1.default.log(`  Application Identifier: ${androidApplicationIdentifier}`);
-    log_1.default.log(`  No credentials set up yet!`);
+    const fields = [
+        { label: 'Android Credentials', value: '' },
+        { label: 'Project', value: projectName },
+        { label: 'Application Identifier', value: androidApplicationIdentifier },
+    ];
+    log_1.default.log((0, formatFields_1.default)(fields, { labelFormat: chalk_1.default.cyan.bold }));
+    log_1.default.log((0, formatFields_1.default)([{ label: 'No credentials set up yet!', value: '' }]));
+    log_1.default.newLine();
 }
 exports.displayEmptyAndroidCredentials = displayEmptyAndroidCredentials;
 function displayAndroidFcmCredentials(appCredentials) {
     const maybeFcm = appCredentials.androidFcm;
-    log_1.default.log(`  Push Notifications (FCM):`);
+    log_1.default.log((0, formatFields_1.default)([{ label: 'Push Notifications (FCM)', value: '' }], {
+        labelFormat: chalk_1.default.cyan.bold,
+    }));
     if (!maybeFcm) {
-        log_1.default.log(`    None assigned yet`);
+        log_1.default.log((0, formatFields_1.default)([{ label: '', value: 'None assigned yet' }]));
         log_1.default.newLine();
         return;
     }
     const { snippet, version, updatedAt } = maybeFcm;
+    const fields = [];
     if (version === generated_1.AndroidFcmVersion.Legacy) {
         const { firstFourCharacters, lastFourCharacters } = snippet;
-        log_1.default.log(`    Key: ${firstFourCharacters}...${lastFourCharacters}`);
+        fields.push({ label: 'Key', value: `${firstFourCharacters}...${lastFourCharacters}` });
     }
     else if (version === generated_1.AndroidFcmVersion.V1) {
         const { projectId, serviceAccountEmail, clientId, keyId } = snippet;
-        log_1.default.log(`    Project Id: ${projectId}`);
-        log_1.default.log(`    Service Account: ${serviceAccountEmail}`);
-        log_1.default.log(`    Client Id: ${clientId}`);
-        log_1.default.log(`    Key Id: ${keyId}`);
+        fields.push({ label: 'Project ID', value: projectId });
+        fields.push({ label: 'Client Email', value: serviceAccountEmail });
+        fields.push({ label: 'Client ID', value: clientId !== null && clientId !== void 0 ? clientId : 'Unknown' });
+        fields.push({ label: 'Private Key ID', value: keyId });
     }
-    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` });
+    log_1.default.log((0, formatFields_1.default)(fields, { labelFormat: chalk_1.default.cyan.bold }));
+    log_1.default.newLine();
+}
+function displayGoogleServiceAccountKeyForSubmissions(appCredentials) {
+    const maybeGsaKey = appCredentials.googleServiceAccountKeyForSubmissions;
+    log_1.default.log((0, formatFields_1.default)([{ label: 'Google Service Account Key For Submissions', value: '' }], {
+        labelFormat: chalk_1.default.cyan.bold,
+    }));
+    if (!maybeGsaKey) {
+        log_1.default.log((0, formatFields_1.default)([{ label: '', value: 'None assigned yet' }]));
+        log_1.default.newLine();
+        return;
+    }
+    const { projectIdentifier, privateKeyIdentifier, clientEmail, clientIdentifier, updatedAt } = maybeGsaKey;
+    const fields = [
+        { label: 'Project ID', value: projectIdentifier },
+        { label: 'Client Email', value: clientEmail },
+        { label: 'Client ID', value: clientIdentifier },
+        { label: 'Private Key ID', value: privateKeyIdentifier },
+        { label: 'Updated', value: `${(0, date_1.fromNow)(new Date(updatedAt))} ago` },
+    ];
+    log_1.default.log((0, formatFields_1.default)(fields, { labelFormat: chalk_1.default.cyan.bold }));
     log_1.default.newLine();
 }
 function displayEASAndroidAppCredentials(appCredentials) {
     displayAndroidFcmCredentials(appCredentials);
+    displayGoogleServiceAccountKeyForSubmissions(appCredentials);
     const sortedBuildCredentialsList = (0, BuildCredentialsUtils_1.sortBuildCredentials)(appCredentials.androidAppBuildCredentialsList);
     for (const buildCredentials of sortedBuildCredentialsList) {
         displayAndroidBuildCredentials(buildCredentials);
@@ -62,36 +93,44 @@ function formatFingerprint(fingerprint) {
     }
     return bytes.join(':');
 }
-function displayAndroidBuildCredentials(buildCredentials, skipConfigurationDisplay) {
-    if (!skipConfigurationDisplay) {
-        const { isDefault, name } = buildCredentials;
-        log_1.default.log(chalk_1.default.bold(`  Configuration: ${name}${isDefault ? ' (Default)' : ''}`));
-    }
+function displayAndroidBuildCredentials(buildCredentials) {
+    const { isDefault, name } = buildCredentials;
+    log_1.default.log((0, formatFields_1.default)([{ label: `Configuration: ${name}${isDefault ? ' (Default)' : ''}`, value: '' }], {
+        labelFormat: chalk_1.default.cyan.bold,
+    }));
     const maybeKeystore = buildCredentials.androidKeystore;
-    log_1.default.log(`  Keystore:`);
+    log_1.default.log((0, formatFields_1.default)([{ label: 'Keystore', value: '' }], {
+        labelFormat: chalk_1.default.cyan.bold,
+    }));
     if (maybeKeystore) {
         displayAndroidKeystore(maybeKeystore);
     }
     else {
-        log_1.default.log(`    None assigned yet`);
+        log_1.default.log((0, formatFields_1.default)([{ label: '', value: 'None assigned yet' }]));
     }
     log_1.default.newLine();
 }
 function displayAndroidKeystore(keystore) {
     const { keyAlias, type, md5CertificateFingerprint, sha1CertificateFingerprint, sha256CertificateFingerprint, updatedAt, } = keystore;
-    log_1.default.log(`    Type: ${type}`);
-    log_1.default.log(`    Key Alias: ${keyAlias}`);
-    log_1.default.log(`    MD5 Fingerprint: ${formatFingerprint(md5CertificateFingerprint !== null && md5CertificateFingerprint !== void 0 ? md5CertificateFingerprint : null)}`);
-    log_1.default.log(`    SHA1 Fingerprint: ${formatFingerprint(sha1CertificateFingerprint !== null && sha1CertificateFingerprint !== void 0 ? sha1CertificateFingerprint : null)}`);
-    log_1.default.log(`    SHA256 Fingerprint: ${formatFingerprint(sha256CertificateFingerprint !== null && sha256CertificateFingerprint !== void 0 ? sha256CertificateFingerprint : null)}`);
-    log_1.default.log(`    Updated ${(0, date_1.fromNow)(new Date(updatedAt))} ago`);
+    const fields = [
+        { label: 'Type', value: type },
+        { label: 'Key Alias', value: keyAlias },
+        { label: 'MD5 Fingerprint', value: formatFingerprint(md5CertificateFingerprint !== null && md5CertificateFingerprint !== void 0 ? md5CertificateFingerprint : null) },
+        { label: 'SHA1 Fingerprint', value: formatFingerprint(sha1CertificateFingerprint !== null && sha1CertificateFingerprint !== void 0 ? sha1CertificateFingerprint : null) },
+        { label: 'SHA256 Fingerprint', value: formatFingerprint(sha256CertificateFingerprint !== null && sha256CertificateFingerprint !== void 0 ? sha256CertificateFingerprint : null) },
+        { label: 'Updated', value: `${(0, date_1.fromNow)(new Date(updatedAt))} ago` },
+    ];
+    log_1.default.log((0, formatFields_1.default)(fields, { labelFormat: chalk_1.default.cyan.bold }));
 }
 exports.displayAndroidKeystore = displayAndroidKeystore;
 function displayAndroidAppCredentials({ appLookupParams, appCredentials, }) {
     const { projectName, androidApplicationIdentifier } = appLookupParams;
-    log_1.default.log(chalk_1.default.bold(`Android Credentials`));
-    log_1.default.log(`  Project: ${projectName}`);
-    log_1.default.log(`  Application Identifier: ${androidApplicationIdentifier}`);
+    const fields = [
+        { label: 'Android Credentials', value: '' },
+        { label: 'Project', value: projectName },
+        { label: 'Application Identifier', value: androidApplicationIdentifier },
+    ];
+    log_1.default.log((0, formatFields_1.default)(fields, { labelFormat: chalk_1.default.cyan.bold }));
     log_1.default.newLine();
     if (appCredentials) {
         displayEASAndroidAppCredentials(appCredentials);

package/build/credentials/context.d.ts

@@ -3,29 +3,25 @@ import { Actor } from '../user/User';
 import * as AndroidGraphqlClient from './android/api/GraphqlClient';
 import * as IosGraphqlClient from './ios/api/GraphqlClient';
 import AppStoreApi from './ios/appstore/AppStoreApi';
-export interface Action<T = void> {
-    runAsync(ctx: Context): Promise<T>;
-}
-interface AppleCtxOptions {
-    appleId?: string;
-    appleIdPassword?: string;
-    teamId?: string;
-}
-interface Options extends AppleCtxOptions {
-    nonInteractive?: boolean;
-    exp?: ExpoConfig;
-}
-export interface Context {
-    readonly projectDir: string;
-    readonly user: Actor;
-    readonly nonInteractive: boolean;
+export declare class CredentialsContext {
+    private options;
     readonly android: typeof AndroidGraphqlClient;
-    readonly ios: typeof IosGraphqlClient;
     readonly appStore: AppStoreApi;
-    readonly hasProjectContext: boolean;
-    readonly exp: ExpoConfig;
+    readonly ios: typeof IosGraphqlClient;
+    readonly nonInteractive: boolean;
+    readonly projectDir: string;
+    readonly user: Actor;
+    private shouldAskAuthenticateAppStore;
+    private _exp?;
+    constructor(options: {
+        exp?: ExpoConfig;
+        nonInteractive?: boolean;
+        projectDir: string;
+        user: Actor;
+    });
+    get hasProjectContext(): boolean;
+    get exp(): ExpoConfig;
     ensureProjectContext(): void;
+    logOwnerAndProject(): void;
     bestEffortAppStoreAuthenticateAsync(): Promise<void>;
 }
-export declare function createCredentialsContextAsync(projectDir: string, options: Options): Promise<Context>;
-export {};

package/build/credentials/context.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createCredentialsContextAsync = void 0;
+exports.CredentialsContext = void 0;
 const tslib_1 = require("tslib");
 const config_1 = require("@expo/config");
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
@@ -9,36 +9,29 @@ const expoConfig_1 = require("../project/expoConfig");
 const projectUtils_1 = require("../project/projectUtils");
 const prompts_1 = require("../prompts");
 const User_1 = require("../user/User");
-const actions_1 = require("../user/actions");
-const pick_1 = (0, tslib_1.__importDefault)(require("../utils/expodash/pick"));
 const AndroidGraphqlClient = (0, tslib_1.__importStar)(require("./android/api/GraphqlClient"));
 const IosGraphqlClient = (0, tslib_1.__importStar)(require("./ios/api/GraphqlClient"));
 const AppStoreApi_1 = (0, tslib_1.__importDefault)(require("./ios/appstore/AppStoreApi"));
-async function createCredentialsContextAsync(projectDir, options) {
-    const user = await (0, actions_1.ensureLoggedInAsync)();
-    let expoConfig = options.exp;
-    if (!expoConfig) {
-        try {
-            expoConfig = (0, expoConfig_1.getExpoConfig)(projectDir);
-        }
-        catch (error) {
-            // ignore error, context might be created outside of expo project
-        }
-    }
-    return new CredentialsContext(projectDir, user, expoConfig, options);
-}
-exports.createCredentialsContextAsync = createCredentialsContextAsync;
 class CredentialsContext {
-    constructor(projectDir, user, _exp, options) {
+    constructor(options) {
         var _a;
-        this.projectDir = projectDir;
-        this.user = user;
-        this._exp = _exp;
+        this.options = options;
         this.android = AndroidGraphqlClient;
+        this.appStore = new AppStoreApi_1.default();
         this.ios = IosGraphqlClient;
         this.shouldAskAuthenticateAppStore = true;
-        this.appStore = new AppStoreApi_1.default((0, pick_1.default)(options, ['appleId', 'appleIdPassword', 'teamId']));
+        this.projectDir = options.projectDir;
+        this.user = options.user;
         this.nonInteractive = (_a = options.nonInteractive) !== null && _a !== void 0 ? _a : false;
+        this._exp = options.exp;
+        if (!this._exp) {
+            try {
+                this._exp = (0, expoConfig_1.getExpoConfig)(options.projectDir);
+            }
+            catch (error) {
+                // ignore error, context might be created outside of expo project
+            }
+        }
     }
     get hasProjectContext() {
         return !!this._exp;
@@ -52,18 +45,19 @@ class CredentialsContext {
             return;
         }
         // trigger getConfig error
-        (0, config_1.getConfig)(this.projectDir, { skipSDKVersionRequirement: true });
+        (0, config_1.getConfig)(this.options.projectDir, { skipSDKVersionRequirement: true });
     }
     logOwnerAndProject() {
         var _a;
+        const { user } = this.options;
         if (this.hasProjectContext) {
-            const owner = (0, projectUtils_1.getProjectAccountName)(this.exp, this.user);
+            const owner = (0, projectUtils_1.getProjectAccountName)(this.exp, user);
             // Figure out if User A is configuring credentials as admin for User B's project
-            const isProxyUser = this.user.__typename === 'Robot' || owner !== this.user.username;
+            const isProxyUser = user.__typename === 'Robot' || owner !== user.username;
             log_1.default.log(`Accessing credentials ${isProxyUser ? 'on behalf of' : 'for'} ${owner} in project ${this.exp.slug}`);
         }
         else {
-            log_1.default.log(`Accessing credentials for ${(_a = this.exp.owner) !== null && _a !== void 0 ? _a : (0, User_1.getActorDisplayName)(this.user)}`);
+            log_1.default.log(`Accessing credentials for ${(_a = this.exp.owner) !== null && _a !== void 0 ? _a : (0, User_1.getActorDisplayName)(user)}`);
         }
     }
     async bestEffortAppStoreAuthenticateAsync() {
@@ -88,3 +82,4 @@ class CredentialsContext {
         this.shouldAskAuthenticateAppStore = false;
     }
 }
+exports.CredentialsContext = CredentialsContext;

package/build/credentials/credentialsJson/update.d.ts

@@ -1,14 +1,14 @@
 import { AndroidAppBuildCredentialsFragment, IosDistributionType } from '../../graphql/generated';
-import { Context } from '../context';
+import { CredentialsContext } from '../context';
 import { App, Target } from '../ios/types';
 /**
  * Update Android credentials.json with values from www, content of credentials.json
  * is not validated
  */
-export declare function updateAndroidCredentialsAsync(ctx: Context, buildCredentials: AndroidAppBuildCredentialsFragment): Promise<void>;
+export declare function updateAndroidCredentialsAsync(ctx: CredentialsContext, buildCredentials: AndroidAppBuildCredentialsFragment): Promise<void>;
 /**
  * Update iOS credentials in credentials.json with values from www, contents
  * of credentials.json are not validated, if www has incomplete credentials
  * credentials.json will be updated partially
  */
-export declare function updateIosCredentialsAsync(ctx: Context, app: App, targets: Target[], distributionType: IosDistributionType): Promise<void>;
+export declare function updateIosCredentialsAsync(ctx: CredentialsContext, app: App, targets: Target[], distributionType: IosDistributionType): Promise<void>;

package/build/credentials/ios/IosCredentialsProvider.d.ts

@@ -1,6 +1,6 @@
 import { Platform } from '@expo/eas-build-job';
 import { CredentialsSource, 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 {
@@ -14,7 +14,7 @@ export default class IosCredentialsProvider {
     private ctx;
     private options;
     readonly platform = Platform.IOS;
-    constructor(ctx: Context, options: Options);
+    constructor(ctx: CredentialsContext, options: Options);
     getCredentialsAsync(src: CredentialsSource.LOCAL | CredentialsSource.REMOTE): Promise<IosCredentials>;
     private getLocalAsync;
     private getRemoteAsync;

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

@@ -1,5 +1,5 @@
 import { AppleTeamFragment } from '../../../graphql/generated';
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/GraphqlClient';
-export declare function resolveAppleTeamIfAuthenticatedAsync(ctx: Context, app: AppLookupParams): Promise<AppleTeamFragment | null>;
+export declare function resolveAppleTeamIfAuthenticatedAsync(ctx: CredentialsContext, app: AppLookupParams): Promise<AppleTeamFragment | null>;
 export declare function formatAppleTeam({ appleTeamIdentifier, appleTeamName }: AppleTeamFragment): string;

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

@@ -1,8 +1,8 @@
 import { ApplePushKeyFragment, CommonIosAppCredentialsFragment } from '../../../graphql/generated';
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/GraphqlClient';
 export declare class AssignPushKey {
     private app;
     constructor(app: AppLookupParams);
-    runAsync(ctx: Context, pushKey: ApplePushKeyFragment): Promise<CommonIosAppCredentialsFragment>;
+    runAsync(ctx: CredentialsContext, pushKey: ApplePushKeyFragment): Promise<CommonIosAppCredentialsFragment>;
 }

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

@@ -1,11 +1,11 @@
 import { AppleDistributionCertificateFragment, AppleProvisioningProfileFragment, AppleTeamFragment, IosDistributionType as GraphQLIosDistributionType, IosAppBuildCredentialsFragment } from '../../../graphql/generated';
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/GraphqlClient';
 import { App, Target } from '../types';
-export declare function getAllBuildCredentialsAsync(ctx: Context, app: AppLookupParams): Promise<IosAppBuildCredentialsFragment[]>;
-export declare function getBuildCredentialsAsync(ctx: Context, app: AppLookupParams, iosDistributionType: GraphQLIosDistributionType): Promise<IosAppBuildCredentialsFragment | null>;
-export declare function getProvisioningProfileAsync(ctx: Context, app: AppLookupParams, iosDistributionType: GraphQLIosDistributionType): Promise<AppleProvisioningProfileFragment | null>;
-export declare function getDistributionCertificateAsync(ctx: Context, app: AppLookupParams, iosDistributionType: GraphQLIosDistributionType): Promise<AppleDistributionCertificateFragment | null>;
-export declare function assignBuildCredentialsAsync(ctx: Context, app: AppLookupParams, iosDistributionType: GraphQLIosDistributionType, distCert: AppleDistributionCertificateFragment, provisioningProfile: AppleProvisioningProfileFragment, appleTeam?: AppleTeamFragment): Promise<IosAppBuildCredentialsFragment>;
-export declare function getAppFromContext(ctx: Context): App;
-export declare function getAppLookupParamsFromContext(ctx: Context, target: Target): AppLookupParams;
+export declare function getAllBuildCredentialsAsync(ctx: CredentialsContext, app: AppLookupParams): Promise<IosAppBuildCredentialsFragment[]>;
+export declare function getBuildCredentialsAsync(ctx: CredentialsContext, app: AppLookupParams, iosDistributionType: GraphQLIosDistributionType): Promise<IosAppBuildCredentialsFragment | null>;
+export declare function getProvisioningProfileAsync(ctx: CredentialsContext, app: AppLookupParams, iosDistributionType: GraphQLIosDistributionType): Promise<AppleProvisioningProfileFragment | null>;
+export declare function getDistributionCertificateAsync(ctx: CredentialsContext, app: AppLookupParams, iosDistributionType: GraphQLIosDistributionType): Promise<AppleDistributionCertificateFragment | null>;
+export declare function assignBuildCredentialsAsync(ctx: CredentialsContext, app: AppLookupParams, iosDistributionType: GraphQLIosDistributionType, distCert: AppleDistributionCertificateFragment, provisioningProfile: AppleProvisioningProfileFragment, appleTeam?: AppleTeamFragment): Promise<IosAppBuildCredentialsFragment>;
+export declare function getAppFromContext(ctx: CredentialsContext): App;
+export declare function getAppLookupParamsFromContext(ctx: CredentialsContext, target: Target): AppLookupParams;

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

@@ -1,5 +1,5 @@
 import { AppleDistributionCertificateFragment, AppleProvisioningProfileFragment } from '../../../graphql/generated';
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/GraphqlClient';
 import { AppleProvisioningProfileMutationResult } from '../api/graphql/mutations/AppleProvisioningProfileMutation';
 export declare class ConfigureProvisioningProfile {
@@ -7,6 +7,6 @@ export declare class ConfigureProvisioningProfile {
     private distributionCertificate;
     private originalProvisioningProfile;
     constructor(app: AppLookupParams, distributionCertificate: AppleDistributionCertificateFragment, originalProvisioningProfile: AppleProvisioningProfileFragment);
-    runAsync(ctx: Context): Promise<AppleProvisioningProfileMutationResult | null>;
+    runAsync(ctx: CredentialsContext): Promise<AppleProvisioningProfileMutationResult | null>;
     private configureAndUpdateAsync;
 }

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

@@ -1,8 +1,8 @@
 import { Account } from '../../../user/Account';
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 import { AppleDistributionCertificateMutationResult } from '../api/graphql/mutations/AppleDistributionCertificateMutation';
 export declare class CreateDistributionCertificate {
     private account;
     constructor(account: Account);
-    runAsync(ctx: Context): Promise<AppleDistributionCertificateMutationResult>;
+    runAsync(ctx: CredentialsContext): Promise<AppleDistributionCertificateMutationResult>;
 }

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

@@ -1,11 +1,11 @@
 import { AppleDistributionCertificateFragment } from '../../../graphql/generated';
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/GraphqlClient';
 import { AppleProvisioningProfileMutationResult } from '../api/graphql/mutations/AppleProvisioningProfileMutation';
 export declare class CreateProvisioningProfile {
     private app;
     private distributionCertificate;
     constructor(app: AppLookupParams, distributionCertificate: AppleDistributionCertificateFragment);
-    runAsync(ctx: Context): Promise<AppleProvisioningProfileMutationResult>;
+    runAsync(ctx: CredentialsContext): Promise<AppleProvisioningProfileMutationResult>;
     private provideOrGenerateAsync;
 }

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

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

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

@@ -1,15 +1,15 @@
 import { AppleDistributionCertificateFragment } from '../../../graphql/generated';
 import { Account } from '../../../user/Account';
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/GraphqlClient';
 import { DistributionCertificate } from '../appstore/Credentials.types';
 export declare function formatDistributionCertificate(distributionCertificate: AppleDistributionCertificateFragment, validSerialNumbers?: string[]): string;
 /**
  * select a distribution certificate from an account (validity status shown on a best effort basis)
  * */
-export declare function selectDistributionCertificateWithDependenciesAsync(ctx: Context, account: Account): Promise<AppleDistributionCertificateFragment | null>;
+export declare function selectDistributionCertificateWithDependenciesAsync(ctx: CredentialsContext, account: Account): Promise<AppleDistributionCertificateFragment | null>;
 /**
  * select a distribution certificate from a valid set (curated on a best effort basis)
  * */
-export declare function selectValidDistributionCertificateAsync(ctx: Context, appLookupParams: AppLookupParams): Promise<AppleDistributionCertificateFragment | null>;
-export declare function provideOrGenerateDistributionCertificateAsync(ctx: Context, accountName: string): Promise<DistributionCertificate>;
+export declare function selectValidDistributionCertificateAsync(ctx: CredentialsContext, appLookupParams: AppLookupParams): Promise<AppleDistributionCertificateFragment | null>;
+export declare function provideOrGenerateDistributionCertificateAsync(ctx: CredentialsContext, accountName: string): Promise<DistributionCertificate>;

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

@@ -9,8 +9,8 @@ const log_1 = (0, tslib_1.__importStar)(require("../../../log"));
 const prompts_1 = require("../../../prompts");
 const date_1 = require("../../../utils/date");
 const promptForCredentials_1 = require("../../utils/promptForCredentials");
-const AppStoreApi_1 = require("../appstore/AppStoreApi");
 const CredentialsUtils_1 = require("../appstore/CredentialsUtils");
+const distributionCertificate_1 = require("../appstore/distributionCertificate");
 const credentials_1 = require("../credentials");
 const validateDistributionCertificate_1 = require("../validators/validateDistributionCertificate");
 const AppleTeamUtils_1 = require("./AppleTeamUtils");
@@ -89,7 +89,7 @@ async function selectValidDistributionCertificateAsync(ctx, appLookupParams) {
     });
     // filter by valid certs on the developer portal
     const certInfoFromApple = await ctx.appStore.listDistributionCertificatesAsync();
-    const validDistCerts = await (0, CredentialsUtils_1.filterRevokedDistributionCertsFromEasServers)(distCertsForAppleTeam, certInfoFromApple);
+    const validDistCerts = (0, CredentialsUtils_1.filterRevokedDistributionCertsFromEasServers)(distCertsForAppleTeam, certInfoFromApple);
     log_1.default.log(`${validDistCerts.length}/${distCertsForAccount.length} Distribution Certificates are currently valid for Apple Team ${(_a = ctx.appStore.authCtx) === null || _a === void 0 ? void 0 : _a.team.id}.`);
     return _selectDistributionCertificateAsync(validDistCerts);
 }
@@ -146,7 +146,7 @@ async function generateDistributionCertificateAsync(ctx, accountName) {
         return await ctx.appStore.createDistributionCertificateAsync();
     }
     catch (e) {
-        if (e instanceof AppStoreApi_1.AppleTooManyCertsError) {
+        if (e instanceof distributionCertificate_1.AppleTooManyCertsError) {
             const distCerts = await ctx.appStore.listDistributionCertificatesAsync();
             log_1.default.warn('Maximum number of Distribution Certificates generated on Apple Developer Portal.');
             log_1.default.warn(APPLE_DIST_CERTS_TOO_MANY_GENERATED_ERROR);

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

@@ -1,4 +1,4 @@
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 import { DistributionCertificate, ProvisioningProfile, ProvisioningProfileStoreInfo } from '../appstore/Credentials.types';
 export declare function formatProvisioningProfileFromApple(appleInfo: ProvisioningProfileStoreInfo): string;
-export declare function generateProvisioningProfileAsync(ctx: Context, bundleIdentifier: string, distCert: DistributionCertificate): Promise<ProvisioningProfile>;
+export declare function generateProvisioningProfileAsync(ctx: CredentialsContext, bundleIdentifier: string, distCert: DistributionCertificate): Promise<ProvisioningProfile>;

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

@@ -1,12 +1,12 @@
 import { ApplePushKeyFragment } from '../../../graphql/generated';
 import { Account } from '../../../user/Account';
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 import { PushKey } from '../appstore/Credentials.types';
-export declare function provideOrGeneratePushKeyAsync(ctx: Context, accountName: string): Promise<PushKey>;
+export declare function provideOrGeneratePushKeyAsync(ctx: CredentialsContext, accountName: string): Promise<PushKey>;
 /**
  * select a push key from an account (validity status shown on a best effort basis)
  * */
-export declare function selectPushKeyAsync(ctx: Context, account: Account): Promise<ApplePushKeyFragment | null>;
-export declare function getValidAndTrackedPushKeysOnEasServersAsync(ctx: Context, pushKeysForAccount: ApplePushKeyFragment[]): Promise<ApplePushKeyFragment[]>;
+export declare function selectPushKeyAsync(ctx: CredentialsContext, account: Account): Promise<ApplePushKeyFragment | null>;
+export declare function getValidAndTrackedPushKeysOnEasServersAsync(ctx: CredentialsContext, pushKeysForAccount: ApplePushKeyFragment[]): Promise<ApplePushKeyFragment[]>;
 export declare function sortPushKeys(pushKeys: ApplePushKeyFragment[], validPushKeys?: ApplePushKeyFragment[]): ApplePushKeyFragment[];
 export declare function formatPushKey(pushKey: ApplePushKeyFragment, validPushKeyIdentifiers?: string[]): string;

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

@@ -1,15 +1,15 @@
 import { AppleDistributionCertificateFragment } from '../../../graphql/generated';
 import { Account } from '../../../user/Account';
-import { Context } from '../../context';
+import { CredentialsContext } from '../../context';
 export declare class SelectAndRemoveDistributionCertificate {
     private account;
     constructor(account: Account);
-    runAsync(ctx: Context): Promise<void>;
+    runAsync(ctx: CredentialsContext): Promise<void>;
 }
 export declare class RemoveDistributionCertificate {
     private account;
     private distributionCertificate;
     constructor(account: Account, distributionCertificate: AppleDistributionCertificateFragment);
-    runAsync(ctx: Context): Promise<void>;
+    runAsync(ctx: CredentialsContext): Promise<void>;
     private removeInvalidProvisioningProfilesAsync;
 }