eas-cli 0.30.0 → 0.32.0

package/build/commands/secret/create.js

@@ -16,10 +16,9 @@ const User_1 = require("../../user/User");
 const actions_1 = require("../../user/actions");
 class EnvironmentSecretCreate extends EasCommand_1.default {
     async runAsync() {
-        var _a;
         const actor = await (0, actions_1.ensureLoggedInAsync)();
         let { flags: { name, value: secretValue, scope, force }, } = this.parse(EnvironmentSecretCreate);
-        const projectDir = (_a = (await (0, projectUtils_1.findProjectRootAsync)())) !== null && _a !== void 0 ? _a : process.cwd();
+        const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
         const { exp } = (0, config_1.getConfig)(projectDir, { skipSDKVersionRequirement: true });
         const accountName = await (0, projectUtils_1.getProjectAccountNameAsync)(exp);
         const { slug } = exp;

package/build/commands/secret/delete.js

@@ -13,8 +13,7 @@ const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
 class EnvironmentSecretDelete extends EasCommand_1.default {
     async runAsync() {
-        var _a;
-        const projectDir = (_a = (await (0, projectUtils_1.findProjectRootAsync)())) !== null && _a !== void 0 ? _a : process.cwd();
+        const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
         const { exp } = (0, config_1.getConfig)(projectDir, { skipSDKVersionRequirement: true });
         const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
         const projectAccountName = await (0, projectUtils_1.getProjectAccountNameAsync)(exp);

package/build/commands/secret/list.js

@@ -12,8 +12,7 @@ const isEasEnabledForProject_1 = require("../../project/isEasEnabledForProject")
 const projectUtils_1 = require("../../project/projectUtils");
 class EnvironmentSecretList extends EasCommand_1.default {
     async runAsync() {
-        var _a;
-        const projectDir = (_a = (await (0, projectUtils_1.findProjectRootAsync)())) !== null && _a !== void 0 ? _a : process.cwd();
+        const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
         const { exp } = (0, config_1.getConfig)(projectDir, { skipSDKVersionRequirement: true });
         const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
         const projectAccountName = await (0, projectUtils_1.getProjectAccountNameAsync)(exp);

package/build/commands/submit.js

@@ -17,10 +17,9 @@ const submit_1 = require("../submit/submit");
 const urls_1 = require("../submit/utils/urls");
 class Submit extends EasCommand_1.default {
     async runAsync() {
-        var _a;
         const { flags: rawFlags } = this.parse(Submit);
         const flags = await this.sanitizeFlagsAsync(rawFlags);
-        const projectDir = (_a = (await (0, projectUtils_1.findProjectRootAsync)())) !== null && _a !== void 0 ? _a : process.cwd();
+        const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
         const { exp } = (0, config_1.getConfig)(projectDir, { skipSDKVersionRequirement: true });
         const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
         if (!(await (0, isEasEnabledForProject_1.isEasEnabledForProjectAsync)(projectId))) {
@@ -78,9 +77,7 @@ class Submit extends EasCommand_1.default {
 }
 exports.default = Submit;
 Submit.description = `submit build archive to app store
-See how to configure submits with eas.json: ${(0, log_1.learnMore)('https://docs.expo.dev/submit/eas-json/', {
-    learnMoreMessage: '',
-})}`;
+See how to configure submits with eas.json: ${(0, log_1.link)('https://docs.expo.dev/submit/eas-json/')}`;
 Submit.aliases = ['build:submit'];
 Submit.flags = {
     platform: command_1.flags.enum({

package/build/commands/webhook/create.js

@@ -13,10 +13,7 @@ class WebhookCreate extends EasCommand_1.default {
     async runAsync() {
         const { flags } = this.parse(WebhookCreate);
         const webhookInputParams = await (0, input_1.prepareInputParamsAsync)(flags);
-        const projectDir = await (0, projectUtils_1.findProjectRootAsync)(process.cwd());
-        if (!projectDir) {
-            throw new Error('Please run this command inside a project directory.');
-        }
+        const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
         const { exp } = (0, config_1.getConfig)(projectDir, { skipSDKVersionRequirement: true });
         const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
         const spinner = (0, ora_1.ora)('Creating a webhook').start();

package/build/commands/webhook/delete.js

@@ -16,10 +16,7 @@ const formatWebhook_1 = require("../../webhooks/formatWebhook");
 class WebhookDelete extends EasCommand_1.default {
     async runAsync() {
         let { args: { ID: webhookId }, } = this.parse(WebhookDelete);
-        const projectDir = await (0, projectUtils_1.findProjectRootAsync)(process.cwd());
-        if (!projectDir) {
-            throw new Error('Please run this command inside a project directory.');
-        }
+        const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
         const { exp } = (0, config_1.getConfig)(projectDir, { skipSDKVersionRequirement: true });
         const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
         let webhook = webhookId && (await WebhookQuery_1.WebhookQuery.byIdAsync(webhookId));

package/build/commands/webhook/list.js

@@ -14,10 +14,7 @@ const formatWebhook_1 = require("../../webhooks/formatWebhook");
 class WebhookList extends EasCommand_1.default {
     async runAsync() {
         const { flags: { event }, } = this.parse(WebhookList);
-        const projectDir = await (0, projectUtils_1.findProjectRootAsync)(process.cwd());
-        if (!projectDir) {
-            throw new Error('Please run this command inside a project directory.');
-        }
+        const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
         const { exp } = (0, config_1.getConfig)(projectDir, { skipSDKVersionRequirement: true });
         const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
         const projectFullName = await (0, projectUtils_1.getProjectFullNameAsync)(exp);

package/build/credentials/android/actions/SetupGoogleServiceAccountKey.js

@@ -14,14 +14,14 @@ class SetupGoogleServiceAccountKey {
         this.app = app;
     }
     async runAsync(ctx) {
-        if (ctx.nonInteractive) {
-            throw new errors_1.MissingCredentialsNonInteractiveError('Google Service Account Keys cannot be set up in --non-interactive mode.');
-        }
         const isKeySetup = await this.isGoogleServiceAccountKeySetupAsync(ctx);
         if (isKeySetup) {
             log_1.default.succeed('Google Service Account Key already set up.');
             return (0, nullthrows_1.default)(await ctx.android.getAndroidAppCredentialsWithCommonFieldsAsync(this.app), 'androidAppCredentials cannot be null if google service account key is already set up');
         }
+        if (ctx.nonInteractive) {
+            throw new errors_1.MissingCredentialsNonInteractiveError('Google Service Account Keys cannot be set up in --non-interactive mode.');
+        }
         const keysForAccount = await ctx.android.getGoogleServiceAccountKeysForAccountAsync(this.app.account);
         let googleServiceAccountKey = null;
         if (keysForAccount.length === 0) {

package/build/credentials/android/credentials.d.ts

@@ -15,6 +15,8 @@ export declare type KeystoreWithType = Keystore & {
 export declare type GoogleServiceAccountKey = {
     [key: string]: any;
     private_key: string;
+    type: string;
+    client_email: string;
 };
 export declare type AndroidCredentials = {
     experienceName: string;

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

@@ -13,6 +13,7 @@ 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 {

package/build/credentials/context.d.ts

@@ -12,7 +12,7 @@ export declare class CredentialsContext {
     readonly projectDir: string;
     readonly user: Actor;
     private shouldAskAuthenticateAppStore;
-    private _exp?;
+    private resolvedExp?;
     constructor(options: {
         exp?: ExpoConfig;
         nonInteractive?: boolean;

package/build/credentials/context.js

@@ -23,10 +23,10 @@ class CredentialsContext {
         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) {
+        this.resolvedExp = options.exp;
+        if (!this.resolvedExp) {
             try {
-                this._exp = (0, expoConfig_1.getExpoConfig)(options.projectDir);
+                this.resolvedExp = (0, expoConfig_1.getExpoConfig)(options.projectDir);
             }
             catch (error) {
                 // ignore error, context might be created outside of expo project
@@ -34,11 +34,11 @@ class CredentialsContext {
         }
     }
     get hasProjectContext() {
-        return !!this._exp;
+        return !!this.resolvedExp;
     }
     get exp() {
         this.ensureProjectContext();
-        return this._exp;
+        return this.resolvedExp;
     }
     ensureProjectContext() {
         if (this.hasProjectContext) {

package/build/credentials/errors.d.ts

@@ -1,3 +1,6 @@
 export declare class MissingCredentialsNonInteractiveError extends Error {
     constructor(message?: string);
 }
+export declare class MissingCredentialsError extends Error {
+    constructor(message?: string);
+}

package/build/credentials/errors.js

@@ -1,9 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MissingCredentialsNonInteractiveError = void 0;
+exports.MissingCredentialsError = exports.MissingCredentialsNonInteractiveError = void 0;
 class MissingCredentialsNonInteractiveError extends Error {
     constructor(message) {
         super(message !== null && message !== void 0 ? message : 'Credentials are not set up. Please run this command again in interactive mode.');
     }
 }
 exports.MissingCredentialsNonInteractiveError = MissingCredentialsNonInteractiveError;
+class MissingCredentialsError extends Error {
+    constructor(message) {
+        super(message !== null && message !== void 0 ? message : 'Credentials are not set up.');
+    }
+}
+exports.MissingCredentialsError = MissingCredentialsError;

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

@@ -0,0 +1,5 @@
+import { AscApiKey } from '../appstore/Credentials.types';
+import { AscApiKeyPath, MinimalAscApiKey } from '../credentials';
+export declare function promptForAscApiKeyAsync(): Promise<AscApiKeyPath>;
+export declare function promptForIssuerIdAsync(): Promise<string>;
+export declare function getMinimalAscApiKeyAsync(ascApiKey: AscApiKey): Promise<MinimalAscApiKey>;

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

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMinimalAscApiKeyAsync = exports.promptForIssuerIdAsync = exports.promptForAscApiKeyAsync = void 0;
+const tslib_1 = require("tslib");
+const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
+const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
+const path_1 = (0, tslib_1.__importDefault)(require("path"));
+const uuid = (0, tslib_1.__importStar)(require("uuid"));
+const log_1 = (0, tslib_1.__importStar)(require("../../../log"));
+const prompts_1 = require("../../../prompts");
+const promptForCredentials_1 = require("../../utils/promptForCredentials");
+const credentials_1 = require("../credentials");
+async function promptForAscApiKeyAsync() {
+    var _a, _b;
+    log_1.default.log(chalk_1.default.bold('An App Store Connect Api key is required to upload your app to the Apple App Store'));
+    log_1.default.log(`If you're not sure what this is or how to create one, ${(0, log_1.learnMore)('https://expo.fyi/creating-asc-api-key')}`);
+    const { keyP8Path } = await (0, prompts_1.promptAsync)({
+        type: 'text',
+        name: 'keyP8Path',
+        message: 'Path to App Store Connect Api Key:',
+        initial: 'AuthKey_ABCD.p8',
+        // eslint-disable-next-line async-protect/async-suffix
+        validate: async (filePath) => {
+            try {
+                const stats = await fs_extra_1.default.stat(filePath);
+                if (stats.isFile()) {
+                    return true;
+                }
+                return 'Input is not a file.';
+            }
+            catch {
+                return 'File does not exist.';
+            }
+        },
+    });
+    const regex = /^AuthKey_(?<keyId>\w+)\.p8$/; // Common ASC Api file name downloaded from Apple
+    const bestEffortKeyId = (_b = (_a = path_1.default.basename(keyP8Path).match(regex)) === null || _a === void 0 ? void 0 : _a.groups) === null || _b === void 0 ? void 0 : _b.keyId;
+    const ascApiKeyMetadata = await (0, promptForCredentials_1.getCredentialsFromUserAsync)(credentials_1.ascApiKeyMetadataSchema, {
+        keyId: bestEffortKeyId,
+    });
+    return { ...ascApiKeyMetadata, keyP8Path };
+}
+exports.promptForAscApiKeyAsync = promptForAscApiKeyAsync;
+async function promptForIssuerIdAsync() {
+    log_1.default.log(chalk_1.default.bold('An App Store Connect Issuer ID is required'));
+    log_1.default.log(`If you're not sure what this is or how to find yours, ${(0, log_1.learnMore)('https://expo.fyi/asc-issuer-id')}`);
+    const { issuerId } = await (0, prompts_1.promptAsync)({
+        type: 'text',
+        name: 'issuerId',
+        message: 'App Store Connect Issuer ID:',
+        validate: (input) => uuid.validate(input),
+    });
+    return issuerId;
+}
+exports.promptForIssuerIdAsync = promptForIssuerIdAsync;
+async function getMinimalAscApiKeyAsync(ascApiKey) {
+    var _a;
+    return {
+        ...ascApiKey,
+        issuerId: (_a = ascApiKey.issuerId) !== null && _a !== void 0 ? _a : (await promptForIssuerIdAsync()),
+    };
+}
+exports.getMinimalAscApiKeyAsync = getMinimalAscApiKeyAsync;

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

@@ -37,7 +37,7 @@ function formatDistributionCertificate(distributionCertificate, validSerialNumbe
     return line;
 }
 exports.formatDistributionCertificate = formatDistributionCertificate;
-async function _selectDistributionCertificateAsync(distCerts, validDistributionCertificates) {
+async function selectDistributionCertificateAsync(distCerts, validDistributionCertificates) {
     const validDistCertSerialNumbers = validDistributionCertificates === null || validDistributionCertificates === void 0 ? void 0 : validDistributionCertificates.map(distCert => distCert.serialNumber);
     const { chosenDistCert } = await (0, prompts_1.promptAsync)({
         type: 'select',
@@ -60,12 +60,12 @@ async function selectDistributionCertificateWithDependenciesAsync(ctx, account)
         return null;
     }
     if (!ctx.appStore.authCtx) {
-        return _selectDistributionCertificateAsync(distCertsForAccount);
+        return selectDistributionCertificateAsync(distCertsForAccount);
     }
     // get valid certs on the developer portal
     const certInfoFromApple = await ctx.appStore.listDistributionCertificatesAsync();
     const validDistCerts = await (0, CredentialsUtils_1.filterRevokedDistributionCertsFromEasServers)(distCertsForAccount, certInfoFromApple);
-    return _selectDistributionCertificateAsync(distCertsForAccount, validDistCerts);
+    return selectDistributionCertificateAsync(distCertsForAccount, validDistCerts);
 }
 exports.selectDistributionCertificateWithDependenciesAsync = selectDistributionCertificateWithDependenciesAsync;
 /**
@@ -79,7 +79,7 @@ async function selectValidDistributionCertificateAsync(ctx, appLookupParams) {
         return null;
     }
     if (!ctx.appStore.authCtx) {
-        return _selectDistributionCertificateAsync(distCertsForAccount);
+        return selectDistributionCertificateAsync(distCertsForAccount);
     }
     // filter by apple team
     (0, assert_1.default)(ctx.appStore.authCtx, 'authentication to the Apple App Store is required');
@@ -91,7 +91,7 @@ async function selectValidDistributionCertificateAsync(ctx, appLookupParams) {
     const certInfoFromApple = await ctx.appStore.listDistributionCertificatesAsync();
     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);
+    return selectDistributionCertificateAsync(validDistCerts);
 }
 exports.selectValidDistributionCertificateAsync = selectValidDistributionCertificateAsync;
 const APPLE_DIST_CERTS_TOO_MANY_GENERATED_ERROR = `

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

@@ -8,6 +8,7 @@ export declare class SetupAdhocProvisioningProfile {
     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/appstore/AppStoreApi.d.ts

@@ -1,4 +1,4 @@
-import { DistributionCertificate, DistributionCertificateStoreInfo, ProvisioningProfile, ProvisioningProfileStoreInfo, PushKey, PushKeyStoreInfo } from './Credentials.types';
+import { AscApiKey, AscApiKeyInfo, DistributionCertificate, DistributionCertificateStoreInfo, ProvisioningProfile, ProvisioningProfileStoreInfo, PushKey, PushKeyStoreInfo } from './Credentials.types';
 import { AuthCtx, Options as AuthenticateOptions } from './authenticate';
 import { AppLookupParams, IosCapabilitiesOptions } from './ensureAppExists';
 import { ProfileClass } from './provisioningProfile';
@@ -17,4 +17,10 @@ export default class AppStoreApi {
     createProvisioningProfileAsync(bundleIdentifier: string, distCert: DistributionCertificate, profileName: string, profileClass?: ProfileClass): Promise<ProvisioningProfile>;
     revokeProvisioningProfileAsync(bundleIdentifier: string, profileClass?: ProfileClass): Promise<void>;
     createOrReuseAdhocProvisioningProfileAsync(udids: string[], bundleIdentifier: string, distCertSerialNumber: string): Promise<ProvisioningProfile>;
+    listAscApiKeysAsync(): Promise<AscApiKeyInfo[]>;
+    getAscApiKeyAsync(keyId: string): Promise<AscApiKeyInfo>;
+    createAscApiKeyAsync({ nickname }: {
+        nickname: string;
+    }): Promise<AscApiKey>;
+    revokeAscApiKeyAsync(keyId: string): Promise<AscApiKeyInfo>;
 }

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

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const ascApiKey_1 = require("./ascApiKey");
 const authenticate_1 = require("./authenticate");
 const distributionCertificate_1 = require("./distributionCertificate");
 const ensureAppExists_1 = require("./ensureAppExists");
@@ -61,5 +62,21 @@ class AppStoreApi {
         const ctx = await this.ensureAuthenticatedAsync();
         return await (0, provisioningProfileAdhoc_1.createOrReuseAdhocProvisioningProfileAsync)(ctx, udids, bundleIdentifier, distCertSerialNumber);
     }
+    async listAscApiKeysAsync() {
+        const ctx = await this.ensureAuthenticatedAsync();
+        return await (0, ascApiKey_1.listAscApiKeysAsync)(ctx);
+    }
+    async getAscApiKeyAsync(keyId) {
+        const ctx = await this.ensureAuthenticatedAsync();
+        return await (0, ascApiKey_1.getAscApiKeyAsync)(ctx, keyId);
+    }
+    async createAscApiKeyAsync({ nickname }) {
+        const ctx = await this.ensureAuthenticatedAsync();
+        return await (0, ascApiKey_1.createAscApiKeyAsync)(ctx, { nickname });
+    }
+    async revokeAscApiKeyAsync(keyId) {
+        const ctx = await this.ensureAuthenticatedAsync();
+        return await (0, ascApiKey_1.revokeAscApiKeyAsync)(ctx, keyId);
+    }
 }
 exports.default = AppStoreApi;

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

@@ -4,8 +4,8 @@ exports.isPushKey = exports.formatPushKey = exports.isDistributionCertificate =
 const tslib_1 = require("tslib");
 const dateformat_1 = (0, tslib_1.__importDefault)(require("dateformat"));
 function formatDistributionCertificate({ name, id, status, expires, created, ownerName, }) {
-    const expiresDate = _formatTimestamp(expires);
-    const createdDate = _formatTimestamp(created);
+    const expiresDate = formatTimestamp(expires);
+    const createdDate = formatTimestamp(created);
     return `${name} (${status}) - ID: ${id} - expires: ${expiresDate} (created: ${createdDate}) - owner: ${ownerName}`;
 }
 exports.formatDistributionCertificate = formatDistributionCertificate;
@@ -31,6 +31,6 @@ function isPushKey(obj) {
         typeof obj.teamId === 'string');
 }
 exports.isPushKey = isPushKey;
-function _formatTimestamp(timestamp) {
+function formatTimestamp(timestamp) {
     return (0, dateformat_1.default)(new Date(timestamp * 1000));
 }

package/build/credentials/ios/appstore/Credentials.types.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="@expo/apple-utils/ts-declarations/expo__app-store" />
+import { UserRole } from '@expo/apple-utils';
 export interface Device {
     id: string;
     teamId: string;
@@ -59,3 +61,14 @@ export interface PushKey {
     teamId: string;
     teamName?: string;
 }
+export declare type AscApiKeyInfo = {
+    keyId: string;
+    issuerId?: string;
+    teamId: string;
+    name: string;
+    teamName?: string;
+    roles: UserRole[];
+};
+export declare type AscApiKey = AscApiKeyInfo & {
+    keyP8: string;
+};

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

@@ -0,0 +1,9 @@
+/// <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>;
+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>;
+export declare function getAscApiKeyInfo(apiKey: ApiKey, authCtx: AuthCtx): AscApiKeyInfo;

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

@@ -0,0 +1,99 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAscApiKeyInfo = exports.revokeAscApiKeyAsync = exports.createAscApiKeyAsync = exports.getAscApiKeyAsync = exports.listAscApiKeysAsync = void 0;
+const tslib_1 = require("tslib");
+const apple_utils_1 = require("@expo/apple-utils");
+const log_1 = (0, tslib_1.__importDefault)(require("../../../log"));
+const ora_1 = require("../../../ora");
+const authenticate_1 = require("./authenticate");
+async function listAscApiKeysAsync(authCtx) {
+    const spinner = (0, ora_1.ora)(`Fetching App Store Connect API Keys.`).start();
+    try {
+        const context = (0, authenticate_1.getRequestContext)(authCtx);
+        const keys = await apple_utils_1.ApiKey.getAsync(context);
+        spinner.succeed(`Fetched App Store Connect API Keys.`);
+        return keys.map(key => getAscApiKeyInfo(key, authCtx));
+    }
+    catch (error) {
+        spinner.fail(`Failed to fetch App Store Connect API Keys.`);
+        throw error;
+    }
+}
+exports.listAscApiKeysAsync = listAscApiKeysAsync;
+async function getAscApiKeyAsync(authCtx, keyId) {
+    const spinner = (0, ora_1.ora)(`Fetching App Store Connect API Key.`).start();
+    try {
+        const context = (0, authenticate_1.getRequestContext)(authCtx);
+        const apiKey = await apple_utils_1.ApiKey.infoAsync(context, { id: keyId });
+        spinner.succeed(`Fetched App Store Connect API Key (ID: ${keyId}).`);
+        return getAscApiKeyInfo(apiKey, authCtx);
+    }
+    catch (error) {
+        log_1.default.error(error);
+        spinner.fail(`Failed to fetch App Store Connect API Key.`);
+        throw error;
+    }
+}
+exports.getAscApiKeyAsync = getAscApiKeyAsync;
+async function createAscApiKeyAsync(authCtx, { nickname, allAppsVisible, roles, keyType, }) {
+    const spinner = (0, ora_1.ora)(`Creating App Store Connect API Key.`).start();
+    try {
+        const context = (0, authenticate_1.getRequestContext)(authCtx);
+        const key = await apple_utils_1.ApiKey.createAsync(context, {
+            nickname: nickname !== null && nickname !== void 0 ? nickname : `[expo] ${new Date().getTime()}`,
+            allAppsVisible: allAppsVisible !== null && allAppsVisible !== void 0 ? allAppsVisible : true,
+            roles: roles !== null && roles !== void 0 ? roles : [apple_utils_1.UserRole.ADMIN],
+            keyType: keyType !== null && keyType !== void 0 ? keyType : apple_utils_1.ApiKeyType.PUBLIC_API,
+        });
+        const keyP8 = await key.downloadAsync();
+        if (!keyP8) {
+            const { nickname, roles } = key.attributes;
+            const humanReadableKey = `App Store Connect Key '${nickname}' (${key.id}) with roles {${roles.join(',')}}`;
+            if (!key.attributes.canDownload) {
+                // this case would be unexpected because we just created the key
+                throw new Error(`${humanReadableKey} is not available for download from Apple.`);
+            }
+            else if (!key.attributes.isActive) {
+                throw new Error(`${humanReadableKey} is inactive and could not be downloaded.`);
+            }
+            throw new Error(`Failed to download .p8 file of ${humanReadableKey}.`);
+        }
+        return {
+            ...getAscApiKeyInfo(key, authCtx),
+            keyP8,
+        };
+    }
+    catch (err) {
+        spinner.fail('Failed to create App Store Connect API Key.');
+        throw err;
+    }
+}
+exports.createAscApiKeyAsync = createAscApiKeyAsync;
+async function revokeAscApiKeyAsync(authCtx, keyId) {
+    const spinner = (0, ora_1.ora)(`Revoking App Store Connect API Key.`).start();
+    try {
+        const context = (0, authenticate_1.getRequestContext)(authCtx);
+        const apiKey = await apple_utils_1.ApiKey.infoAsync(context, { id: keyId });
+        const revokedKey = await apiKey.revokeAsync();
+        spinner.succeed(`Revoked App Store Connect API Key.`);
+        return getAscApiKeyInfo(revokedKey, authCtx);
+    }
+    catch (error) {
+        log_1.default.error(error);
+        spinner.fail(`Failed to revoke App Store Connect API Key.`);
+        throw error;
+    }
+}
+exports.revokeAscApiKeyAsync = revokeAscApiKeyAsync;
+function getAscApiKeyInfo(apiKey, authCtx) {
+    var _a;
+    return {
+        name: apiKey.attributes.nickname,
+        keyId: apiKey.id,
+        issuerId: (_a = apiKey.attributes.provider) === null || _a === void 0 ? void 0 : _a.id,
+        teamId: authCtx.team.id,
+        teamName: authCtx.team.name,
+        roles: apiKey.attributes.roles,
+    };
+}
+exports.getAscApiKeyInfo = getAscApiKeyInfo;

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

@@ -1,3 +1,5 @@
+/// <reference types="@expo/apple-utils/ts-declarations/expo__app-store" />
+import { UserRole } from '@expo/apple-utils';
 import { AppleDevice } from '../../graphql/generated';
 import { CredentialSchema } from '../utils/promptForCredentials';
 import { DistributionCertificate, ProvisioningProfile, PushKey } from './appstore/Credentials.types';
@@ -36,5 +38,20 @@ export interface IosDistCredentials extends DistributionCertificate {
     type: 'dist-cert';
 }
 export declare const distributionCertificateSchema: CredentialSchema<DistributionCertificate>;
+export declare type MinimalAscApiKey = {
+    keyP8: string;
+    keyId: string;
+    issuerId: string;
+    teamId?: string;
+    teamName?: string;
+    roles?: UserRole[];
+    name?: string;
+};
+export interface AscApiKeyPath {
+    keyP8Path: string;
+    keyId: string;
+    issuerId: string;
+}
+export declare const ascApiKeyMetadataSchema: CredentialSchema<Omit<MinimalAscApiKey, 'keyP8'>>;
 export declare const pushKeySchema: CredentialSchema<PushKey>;
 export declare const provisioningProfileSchema: CredentialSchema<ProvisioningProfile>;