eas-cli 0.34.1 → 0.37.0

package/build/credentials/ios/api/GraphqlClient.js

@@ -1,10 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deletePushKeyAsync = exports.getPushKeyForAppAsync = exports.getPushKeysForAccountAsync = exports.createPushKeyAsync = exports.deleteDistributionCertificateAsync = exports.createDistributionCertificateAsync = exports.getDistributionCertificatesForAccountAsync = exports.getDistributionCertificateForAppAsync = exports.deleteProvisioningProfilesAsync = exports.updateProvisioningProfileAsync = exports.getProvisioningProfileAsync = exports.createProvisioningProfileAsync = exports.getDevicesForAppleTeamAsync = exports.createOrGetExistingAppleAppIdentifierAsync = exports.createOrGetExistingAppleTeamAsync = exports.updateIosAppCredentialsAsync = exports.createOrGetIosAppCredentialsWithCommonFieldsAsync = exports.getIosAppCredentialsWithCommonFieldsAsync = exports.getIosAppCredentialsWithBuildCredentialsAsync = exports.createOrUpdateIosAppBuildCredentialsAsync = void 0;
+exports.deleteAscApiKeyAsync = exports.getAscApiKeyForAppSubmissionsAsync = exports.getAscApiKeysForAccountAsync = exports.createAscApiKeyAsync = exports.deletePushKeyAsync = exports.getPushKeyForAppAsync = exports.getPushKeysForAccountAsync = exports.createPushKeyAsync = exports.deleteDistributionCertificateAsync = exports.createDistributionCertificateAsync = exports.getDistributionCertificatesForAccountAsync = exports.getDistributionCertificateForAppAsync = exports.deleteProvisioningProfilesAsync = exports.updateProvisioningProfileAsync = exports.getProvisioningProfileAsync = exports.createProvisioningProfileAsync = exports.getDevicesForAppleTeamAsync = exports.createOrGetExistingAppleAppIdentifierAsync = exports.createOrGetExistingAppleTeamAsync = exports.updateIosAppCredentialsAsync = exports.createOrGetIosAppCredentialsWithCommonFieldsAsync = exports.getIosAppCredentialsWithCommonFieldsAsync = exports.getIosAppCredentialsWithBuildCredentialsAsync = exports.createOrUpdateIosAppBuildCredentialsAsync = void 0;
 const tslib_1 = require("tslib");
+const apple_utils_1 = require("@expo/apple-utils");
 const nullthrows_1 = (0, tslib_1.__importDefault)(require("nullthrows"));
+const generated_1 = require("../../../graphql/generated");
 const bundleIdentifier_1 = require("../../../project/ios/bundleIdentifier");
 const errors_1 = require("../errors");
+const AppStoreConnectApiKeyMutation_1 = require("./graphql/mutations/AppStoreConnectApiKeyMutation");
 const AppleAppIdentifierMutation_1 = require("./graphql/mutations/AppleAppIdentifierMutation");
 const AppleDistributionCertificateMutation_1 = require("./graphql/mutations/AppleDistributionCertificateMutation");
 const AppleProvisioningProfileMutation_1 = require("./graphql/mutations/AppleProvisioningProfileMutation");
@@ -13,6 +16,7 @@ const AppleTeamMutation_1 = require("./graphql/mutations/AppleTeamMutation");
 const IosAppBuildCredentialsMutation_1 = require("./graphql/mutations/IosAppBuildCredentialsMutation");
 const IosAppCredentialsMutation_1 = require("./graphql/mutations/IosAppCredentialsMutation");
 const AppQuery_1 = require("./graphql/queries/AppQuery");
+const AppStoreConnectApiKeyQuery_1 = require("./graphql/queries/AppStoreConnectApiKeyQuery");
 const AppleAppIdentifierQuery_1 = require("./graphql/queries/AppleAppIdentifierQuery");
 const AppleDeviceQuery_1 = require("./graphql/queries/AppleDeviceQuery");
 const AppleDistributionCertificateQuery_1 = require("./graphql/queries/AppleDistributionCertificateQuery");
@@ -82,11 +86,15 @@ async function createOrGetIosAppCredentialsWithCommonFieldsAsync(appLookupParams
     return await IosAppCredentialsMutation_1.IosAppCredentialsMutation.createIosAppCredentialsAsync({ appleTeamId: appleTeam === null || appleTeam === void 0 ? void 0 : appleTeam.id }, app.id, appleAppIdentifier.id);
 }
 exports.createOrGetIosAppCredentialsWithCommonFieldsAsync = createOrGetIosAppCredentialsWithCommonFieldsAsync;
-async function updateIosAppCredentialsAsync(appCredentials, { applePushKeyId, }) {
+async function updateIosAppCredentialsAsync(appCredentials, { applePushKeyId, ascApiKeyIdForSubmissions, }) {
     let updatedAppCredentials = appCredentials;
     if (applePushKeyId) {
         updatedAppCredentials = await IosAppCredentialsMutation_1.IosAppCredentialsMutation.setPushKeyAsync(updatedAppCredentials.id, applePushKeyId);
     }
+    if (ascApiKeyIdForSubmissions) {
+        updatedAppCredentials =
+            await IosAppCredentialsMutation_1.IosAppCredentialsMutation.setAppStoreConnectApiKeyForSubmissionsAsync(updatedAppCredentials.id, ascApiKeyIdForSubmissions);
+    }
     return updatedAppCredentials;
 }
 exports.updateIosAppCredentialsAsync = updateIosAppCredentialsAsync;
@@ -224,4 +232,68 @@ async function deletePushKeyAsync(pushKeyId) {
     return await ApplePushKeyMutation_1.ApplePushKeyMutation.deleteApplePushKeyAsync(pushKeyId);
 }
 exports.deletePushKeyAsync = deletePushKeyAsync;
+async function createAscApiKeyAsync(account, ascApiKey) {
+    var _a, _b, _c;
+    const maybeAppleTeam = ascApiKey.teamId
+        ? await createOrGetExistingAppleTeamAsync(account, {
+            appleTeamIdentifier: ascApiKey.teamId,
+            appleTeamName: ascApiKey.teamName,
+        })
+        : null;
+    return await AppStoreConnectApiKeyMutation_1.AppStoreConnectApiKeyMutation.createAppStoreConnectApiKeyAsync({
+        issuerIdentifier: ascApiKey.issuerId,
+        keyIdentifier: ascApiKey.keyId,
+        keyP8: ascApiKey.keyP8,
+        name: (_a = ascApiKey.name) !== null && _a !== void 0 ? _a : null,
+        roles: (_c = (_b = ascApiKey.roles) === null || _b === void 0 ? void 0 : _b.map(role => convertUserRoleToGraphqlType(role))) !== null && _c !== void 0 ? _c : null,
+        appleTeamId: maybeAppleTeam ? maybeAppleTeam.id : null,
+    }, account.id);
+}
+exports.createAscApiKeyAsync = createAscApiKeyAsync;
+async function getAscApiKeysForAccountAsync(account) {
+    return await AppStoreConnectApiKeyQuery_1.AppStoreConnectApiKeyQuery.getAllForAccountAsync(account.name);
+}
+exports.getAscApiKeysForAccountAsync = getAscApiKeysForAccountAsync;
+async function getAscApiKeyForAppSubmissionsAsync(appLookupParams) {
+    var _a;
+    const maybeIosAppCredentials = await getIosAppCredentialsWithCommonFieldsAsync(appLookupParams);
+    return (_a = maybeIosAppCredentials === null || maybeIosAppCredentials === void 0 ? void 0 : maybeIosAppCredentials.appStoreConnectApiKeyForSubmissions) !== null && _a !== void 0 ? _a : null;
+}
+exports.getAscApiKeyForAppSubmissionsAsync = getAscApiKeyForAppSubmissionsAsync;
+async function deleteAscApiKeyAsync(ascApiKeyId) {
+    return await AppStoreConnectApiKeyMutation_1.AppStoreConnectApiKeyMutation.deleteAppStoreConnectApiKeyAsync(ascApiKeyId);
+}
+exports.deleteAscApiKeyAsync = deleteAscApiKeyAsync;
+function convertUserRoleToGraphqlType(userRole) {
+    switch (userRole) {
+        case apple_utils_1.UserRole.ADMIN:
+            return generated_1.AppStoreConnectUserRole.Admin;
+        case apple_utils_1.UserRole.ACCESS_TO_REPORTS:
+            return generated_1.AppStoreConnectUserRole.AccessToReports;
+        case apple_utils_1.UserRole.ACCOUNT_HOLDER:
+            return generated_1.AppStoreConnectUserRole.AccountHolder;
+        case apple_utils_1.UserRole.APP_MANAGER:
+            return generated_1.AppStoreConnectUserRole.AppManager;
+        case apple_utils_1.UserRole.CLOUD_MANAGED_APP_DISTRIBUTION:
+            return generated_1.AppStoreConnectUserRole.CloudManagedAppDistribution;
+        case apple_utils_1.UserRole.CLOUD_MANAGED_DEVELOPER_ID:
+            return generated_1.AppStoreConnectUserRole.CloudManagedDeveloperId;
+        case apple_utils_1.UserRole.CREATE_APPS:
+            return generated_1.AppStoreConnectUserRole.CreateApps;
+        case apple_utils_1.UserRole.CUSTOMER_SUPPORT:
+            return generated_1.AppStoreConnectUserRole.CustomerSupport;
+        case apple_utils_1.UserRole.DEVELOPER:
+            return generated_1.AppStoreConnectUserRole.Developer;
+        case apple_utils_1.UserRole.FINANCE:
+            return generated_1.AppStoreConnectUserRole.Finance;
+        case apple_utils_1.UserRole.MARKETING:
+            return generated_1.AppStoreConnectUserRole.Marketing;
+        case apple_utils_1.UserRole.READ_ONLY:
+            return generated_1.AppStoreConnectUserRole.ReadOnly;
+        case apple_utils_1.UserRole.SALES:
+            return generated_1.AppStoreConnectUserRole.Sales;
+        case apple_utils_1.UserRole.TECHNICAL:
+            return generated_1.AppStoreConnectUserRole.Technical;
+    }
+}
 const formatProjectFullName = ({ account, projectName }) => `@${account.name}/${projectName}`;

package/build/credentials/ios/api/graphql/mutations/AppStoreConnectApiKeyMutation.d.ts

@@ -0,0 +1,5 @@
+import { AppStoreConnectApiKeyFragment, AppStoreConnectApiKeyInput } from '../../../../../graphql/generated';
+export declare const AppStoreConnectApiKeyMutation: {
+    createAppStoreConnectApiKeyAsync(appStoreConnectApiKeyInput: AppStoreConnectApiKeyInput, accountId: string): Promise<AppStoreConnectApiKeyFragment>;
+    deleteAppStoreConnectApiKeyAsync(appStoreConnectApiKeyId: string): Promise<void>;
+};

package/build/credentials/ios/api/graphql/mutations/AppStoreConnectApiKeyMutation.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AppStoreConnectApiKeyMutation = void 0;
+const tslib_1 = require("tslib");
+const assert_1 = (0, tslib_1.__importDefault)(require("assert"));
+const graphql_1 = require("graphql");
+const graphql_tag_1 = (0, tslib_1.__importDefault)(require("graphql-tag"));
+const client_1 = require("../../../../../graphql/client");
+const AppStoreConnectApiKey_1 = require("../../../../../graphql/types/credentials/AppStoreConnectApiKey");
+exports.AppStoreConnectApiKeyMutation = {
+    async createAppStoreConnectApiKeyAsync(appStoreConnectApiKeyInput, accountId) {
+        const data = await (0, client_1.withErrorHandlingAsync)(client_1.graphqlClient
+            .mutation((0, graphql_tag_1.default) `
+            mutation CreateAppStoreConnectApiKeyMutation(
+              $appStoreConnectApiKeyInput: AppStoreConnectApiKeyInput!
+              $accountId: ID!
+            ) {
+              appStoreConnectApiKey {
+                createAppStoreConnectApiKey(
+                  appStoreConnectApiKeyInput: $appStoreConnectApiKeyInput
+                  accountId: $accountId
+                ) {
+                  id
+                  ...AppStoreConnectApiKeyFragment
+                }
+              }
+            }
+            ${(0, graphql_1.print)(AppStoreConnectApiKey_1.AppStoreConnectApiKeyFragmentNode)}
+          `, {
+            appStoreConnectApiKeyInput,
+            accountId,
+        })
+            .toPromise());
+        (0, assert_1.default)(data.appStoreConnectApiKey.createAppStoreConnectApiKey, 'GraphQL: `createAppStoreConnectApiKey` not defined in server response');
+        return data.appStoreConnectApiKey.createAppStoreConnectApiKey;
+    },
+    async deleteAppStoreConnectApiKeyAsync(appStoreConnectApiKeyId) {
+        await (0, client_1.withErrorHandlingAsync)(client_1.graphqlClient
+            .mutation((0, graphql_tag_1.default) `
+            mutation DeleteAppStoreConnectApiKeyMutation($appStoreConnectApiKeyId: ID!) {
+              appStoreConnectApiKey {
+                deleteAppStoreConnectApiKey(id: $appStoreConnectApiKeyId) {
+                  id
+                }
+              }
+            }
+          `, {
+            appStoreConnectApiKeyId,
+        }, {
+            additionalTypenames: ['AppStoreConnectApiKey', 'IosAppCredentials'],
+        })
+            .toPromise());
+    },
+};

package/build/credentials/ios/api/graphql/mutations/IosAppCredentialsMutation.d.ts

@@ -2,4 +2,5 @@ import { CommonIosAppCredentialsFragment, IosAppCredentialsInput } from '../../.
 export declare const IosAppCredentialsMutation: {
     createIosAppCredentialsAsync(iosAppCredentialsInput: IosAppCredentialsInput, appId: string, appleAppIdentifierId: string): Promise<CommonIosAppCredentialsFragment>;
     setPushKeyAsync(iosAppCredentialsId: string, pushKeyId: string): Promise<CommonIosAppCredentialsFragment>;
+    setAppStoreConnectApiKeyForSubmissionsAsync(iosAppCredentialsId: string, ascApiKeyId: string): Promise<CommonIosAppCredentialsFragment>;
 };

package/build/credentials/ios/api/graphql/mutations/IosAppCredentialsMutation.js

@@ -56,4 +56,29 @@ exports.IosAppCredentialsMutation = {
             .toPromise());
         return data.iosAppCredentials.setPushKey;
     },
+    async setAppStoreConnectApiKeyForSubmissionsAsync(iosAppCredentialsId, ascApiKeyId) {
+        const data = await (0, client_1.withErrorHandlingAsync)(client_1.graphqlClient
+            .mutation((0, graphql_tag_1.default) `
+            mutation SetAppStoreConnectApiKeyForSubmissionsMutation(
+              $iosAppCredentialsId: ID!
+              $ascApiKeyId: ID!
+            ) {
+              iosAppCredentials {
+                setAppStoreConnectApiKeyForSubmissions(
+                  id: $iosAppCredentialsId
+                  ascApiKeyId: $ascApiKeyId
+                ) {
+                  id
+                  ...CommonIosAppCredentialsFragment
+                }
+              }
+            }
+            ${(0, graphql_1.print)(IosAppCredentials_1.CommonIosAppCredentialsFragmentNode)}
+          `, {
+            iosAppCredentialsId,
+            ascApiKeyId,
+        })
+            .toPromise());
+        return data.iosAppCredentials.setAppStoreConnectApiKeyForSubmissions;
+    },
 };

package/build/credentials/ios/api/graphql/queries/AppStoreConnectApiKeyQuery.d.ts

@@ -0,0 +1,4 @@
+import { AppStoreConnectApiKeyFragment } from '../../../../../graphql/generated';
+export declare const AppStoreConnectApiKeyQuery: {
+    getAllForAccountAsync(accountName: string): Promise<AppStoreConnectApiKeyFragment[]>;
+};

package/build/credentials/ios/api/graphql/queries/AppStoreConnectApiKeyQuery.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AppStoreConnectApiKeyQuery = void 0;
+const tslib_1 = require("tslib");
+const graphql_1 = require("graphql");
+const graphql_tag_1 = (0, tslib_1.__importDefault)(require("graphql-tag"));
+const client_1 = require("../../../../../graphql/client");
+const AppStoreConnectApiKey_1 = require("../../../../../graphql/types/credentials/AppStoreConnectApiKey");
+exports.AppStoreConnectApiKeyQuery = {
+    async getAllForAccountAsync(accountName) {
+        const data = await (0, client_1.withErrorHandlingAsync)(client_1.graphqlClient
+            .query((0, graphql_tag_1.default) `
+            query AppStoreConnectApiKeyByAccountQuery($accountName: String!) {
+              account {
+                byName(accountName: $accountName) {
+                  id
+                  appStoreConnectApiKeys {
+                    id
+                    ...AppStoreConnectApiKeyFragment
+                  }
+                }
+              }
+            }
+            ${(0, graphql_1.print)(AppStoreConnectApiKey_1.AppStoreConnectApiKeyFragmentNode)}
+          `, {
+            accountName,
+        }, {
+            additionalTypenames: ['AppStoreConnectApiKey'],
+        })
+            .toPromise());
+        return data.account.byName.appStoreConnectApiKeys;
+    },
+};

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

@@ -18,7 +18,7 @@ export default class AppStoreApi {
     revokeProvisioningProfileAsync(bundleIdentifier: string, profileClass?: ProfileClass): Promise<void>;
     createOrReuseAdhocProvisioningProfileAsync(udids: string[], bundleIdentifier: string, distCertSerialNumber: string): Promise<ProvisioningProfile>;
     listAscApiKeysAsync(): Promise<AscApiKeyInfo[]>;
-    getAscApiKeyAsync(keyId: string): Promise<AscApiKeyInfo>;
+    getAscApiKeyAsync(keyId: string): Promise<AscApiKeyInfo | null>;
     createAscApiKeyAsync({ nickname }: {
         nickname: string;
     }): Promise<AscApiKey>;

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

@@ -68,6 +68,7 @@ export declare type AscApiKeyInfo = {
     name: string;
     teamName?: string;
     roles: UserRole[];
+    isRevoked: boolean;
 };
 export declare type AscApiKey = AscApiKeyInfo & {
     keyP8: string;

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

@@ -3,7 +3,7 @@ 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 getAscApiKeyAsync(authCtx: AuthCtx, keyId: string): Promise<AscApiKeyInfo | null>;
 export declare function createAscApiKeyAsync(authCtx: AuthCtx, { nickname, allAppsVisible, roles, keyType, }: Partial<Pick<ApiKeyProps, 'nickname' | 'roles' | 'allAppsVisible' | 'keyType'>>): Promise<AscApiKey>;
 export declare function revokeAscApiKeyAsync(authCtx: AuthCtx, keyId: string): Promise<AscApiKeyInfo>;
 export declare function getAscApiKeyInfo(apiKey: ApiKey, authCtx: AuthCtx): AscApiKeyInfo;

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

@@ -21,6 +21,7 @@ async function listAscApiKeysAsync(authCtx) {
 }
 exports.listAscApiKeysAsync = listAscApiKeysAsync;
 async function getAscApiKeyAsync(authCtx, keyId) {
+    var _a;
     const spinner = (0, ora_1.ora)(`Fetching App Store Connect API Key.`).start();
     try {
         const context = (0, authenticate_1.getRequestContext)(authCtx);
@@ -29,6 +30,11 @@ async function getAscApiKeyAsync(authCtx, keyId) {
         return getAscApiKeyInfo(apiKey, authCtx);
     }
     catch (error) {
+        const message = (_a = error === null || error === void 0 ? void 0 : error.message) !== null && _a !== void 0 ? _a : '';
+        if (message.includes("There is no resource of type 'apiKeys' with id")) {
+            spinner.stop();
+            return null;
+        }
         log_1.default.error(error);
         spinner.fail(`Failed to fetch App Store Connect API Key.`);
         throw error;
@@ -58,8 +64,11 @@ async function createAscApiKeyAsync(authCtx, { nickname, allAppsVisible, roles,
             }
             throw new Error(`Failed to download .p8 file of ${humanReadableKey}.`);
         }
+        // this object has more optional parameters populated
+        const fullKey = await apple_utils_1.ApiKey.infoAsync(context, { id: key.id });
+        spinner.succeed(`Created App Store Connect API Key.`);
         return {
-            ...getAscApiKeyInfo(key, authCtx),
+            ...getAscApiKeyInfo(fullKey, authCtx),
             keyP8,
         };
     }
@@ -94,6 +103,7 @@ function getAscApiKeyInfo(apiKey, authCtx) {
         teamId: authCtx.team.id,
         teamName: authCtx.team.name,
         roles: apiKey.attributes.roles,
+        isRevoked: !!apiKey.attributes.revokingDate,
     };
 }
 exports.getAscApiKeyInfo = getAscApiKeyInfo;

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

@@ -1,4 +1,4 @@
 import { Workflow } from '@expo/eas-build-job';
 import { JSONObject } from '@expo/json-file';
-export declare function getManagedEntitlementsJsonAsync(projectDir: string): Promise<JSONObject>;
-export declare function resolveEntitlementsJsonAsync(projectDir: string, workflow: Workflow): Promise<JSONObject>;
+export declare function getManagedEntitlementsJsonAsync(projectDir: string, env: Record<string, string>): Promise<JSONObject>;
+export declare function resolveEntitlementsJsonAsync(projectDir: string, workflow: Workflow, env: Record<string, string>): Promise<JSONObject>;

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

@@ -1,29 +1,37 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveEntitlementsJsonAsync = exports.getManagedEntitlementsJsonAsync = void 0;
-const tslib_1 = require("tslib");
 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_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
-async function getManagedEntitlementsJsonAsync(projectDir) {
+const plist_1 = require("../../../utils/plist");
+async function getManagedEntitlementsJsonAsync(projectDir, env) {
     var _a;
-    let { exp } = (0, prebuild_config_1.getPrebuildConfig)(projectDir, { platforms: ['ios'] });
-    exp = await (0, config_plugins_1.compileModsAsync)(exp, {
-        projectRoot: projectDir,
-        platforms: ['ios'],
-        introspect: true,
-    });
-    return ((_a = exp.ios) === null || _a === void 0 ? void 0 : _a.entitlements) || {};
+    const originalProcessEnv = process.env;
+    try {
+        process.env = {
+            ...process.env,
+            ...env,
+        };
+        const { exp } = (0, prebuild_config_1.getPrebuildConfig)(projectDir, { platforms: ['ios'] });
+        const expWithMods = await (0, config_plugins_1.compileModsAsync)(exp, {
+            projectRoot: projectDir,
+            platforms: ['ios'],
+            introspect: true,
+        });
+        return ((_a = expWithMods.ios) === null || _a === void 0 ? void 0 : _a.entitlements) || {};
+    }
+    finally {
+        process.env = originalProcessEnv;
+    }
 }
 exports.getManagedEntitlementsJsonAsync = getManagedEntitlementsJsonAsync;
-async function resolveEntitlementsJsonAsync(projectDir, workflow) {
+async function resolveEntitlementsJsonAsync(projectDir, workflow, env) {
     if (workflow === eas_build_job_1.Workflow.GENERIC) {
         return (await getEntitlementsJsonAsync(projectDir)) || {};
     }
     else if (workflow === eas_build_job_1.Workflow.MANAGED) {
-        return await getManagedEntitlementsJsonAsync(projectDir);
+        return await getManagedEntitlementsJsonAsync(projectDir, env);
     }
     else {
         throw new Error(`Unknown workflow: ${workflow}`);
@@ -31,13 +39,12 @@ async function resolveEntitlementsJsonAsync(projectDir, 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);
-        }
+    const entitlementsPath = config_plugins_1.IOSConfig.Paths.getEntitlementsPath(projectDir);
+    if (entitlementsPath) {
+        const plist = await (0, plist_1.readPlistAsync)(entitlementsPath);
+        return plist ? plist : null;
+    }
+    else {
+        return null;
     }
-    catch { }
-    return null;
 }

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

@@ -52,6 +52,7 @@ export interface AscApiKeyPath {
     keyId: string;
     issuerId: string;
 }
-export declare const ascApiKeyMetadataSchema: CredentialSchema<Omit<MinimalAscApiKey, 'keyP8'>>;
+export declare const ascApiKeyIdSchema: CredentialSchema<Pick<MinimalAscApiKey, 'keyId'>>;
+export declare const ascApiKeyIssuerIdSchema: CredentialSchema<Pick<MinimalAscApiKey, 'issuerId'>>;
 export declare const pushKeySchema: CredentialSchema<PushKey>;
 export declare const provisioningProfileSchema: CredentialSchema<ProvisioningProfile>;

package/build/credentials/ios/credentials.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.provisioningProfileSchema = exports.pushKeySchema = exports.ascApiKeyMetadataSchema = exports.distributionCertificateSchema = exports.getAppLookupParams = void 0;
+exports.provisioningProfileSchema = exports.pushKeySchema = exports.ascApiKeyIssuerIdSchema = exports.ascApiKeyIdSchema = exports.distributionCertificateSchema = exports.getAppLookupParams = void 0;
 const tslib_1 = require("tslib");
 const log_1 = (0, tslib_1.__importDefault)(require("../../log"));
 const p12Certificate_1 = require("./utils/p12Certificate");
@@ -50,7 +50,7 @@ exports.distributionCertificateSchema = {
         return answers;
     },
 };
-exports.ascApiKeyMetadataSchema = {
+exports.ascApiKeyIdSchema = {
     name: 'App Store Connect API Key',
     questions: [
         {
@@ -58,6 +58,11 @@ exports.ascApiKeyMetadataSchema = {
             type: 'string',
             question: 'Key ID:',
         },
+    ],
+};
+exports.ascApiKeyIssuerIdSchema = {
+    name: 'App Store Connect API Key',
+    questions: [
         {
             field: 'issuerId',
             type: 'string',

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

@@ -198,7 +198,7 @@ function displayApplePushKey(maybePushKey, fields) {
     fields.push({ label: '', value: '' });
 }
 function displayAscApiKey(maybeAscApiKey, fields) {
-    fields.push({ label: 'App Store Connect Api Key', value: '' });
+    fields.push({ label: 'App Store Connect API Key', value: '' });
     if (maybeAscApiKey) {
         const { keyIdentifier, issuerIdentifier, appleTeam, name, roles, updatedAt } = maybeAscApiKey;
         fields.push({ label: 'Developer Portal ID', value: keyIdentifier });

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

@@ -0,0 +1,5 @@
+import { AppStoreConnectApiKeyFragment } from '../../../graphql/generated';
+import { CredentialsContext } from '../../context';
+import { MinimalAscApiKey } from '../credentials';
+export declare function isAscApiKeyValidAndTrackedAsync(ctx: CredentialsContext, ascApiKey: MinimalAscApiKey): Promise<boolean>;
+export declare function getValidAndTrackedAscApiKeysAsync(ctx: CredentialsContext, ascApiKeys: AppStoreConnectApiKeyFragment[]): Promise<AppStoreConnectApiKeyFragment[]>;

package/build/credentials/ios/validators/validateAscApiKey.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getValidAndTrackedAscApiKeysAsync = exports.isAscApiKeyValidAndTrackedAsync = void 0;
+async function isAscApiKeyValidAndTrackedAsync(ctx, ascApiKey) {
+    const ascApiKeyInfo = await ctx.appStore.getAscApiKeyAsync(ascApiKey.keyId);
+    return isKeyValid(ascApiKeyInfo);
+}
+exports.isAscApiKeyValidAndTrackedAsync = isAscApiKeyValidAndTrackedAsync;
+async function getValidAndTrackedAscApiKeysAsync(ctx, ascApiKeys) {
+    const ascApiKeysInfo = await ctx.appStore.listAscApiKeysAsync();
+    const validAscApiKeysInfo = ascApiKeysInfo.filter(keyInfo => isKeyValid(keyInfo));
+    const validKeyIdentifiers = new Set(validAscApiKeysInfo.map(keyInfo => keyInfo.keyId));
+    return ascApiKeys.filter(key => validKeyIdentifiers.has(key.keyIdentifier));
+}
+exports.getValidAndTrackedAscApiKeysAsync = getValidAndTrackedAscApiKeysAsync;
+function isKeyValid(ascApiKeyInfo) {
+    if (!ascApiKeyInfo) {
+        return false;
+    }
+    return !ascApiKeyInfo.isRevoked;
+}

package/build/credentials/manager/Actions.d.ts

@@ -23,25 +23,30 @@ export declare enum AndroidActionType {
     CreateGsaKey = 11,
     UseExistingGsaKey = 12,
     RemoveGsaKey = 13,
-    SetupGsaKey = 14,
+    SetUpGsaKey = 14,
     UpdateCredentialsJson = 15,
-    SetupBuildCredentialsFromCredentialsJson = 16
+    SetUpBuildCredentialsFromCredentialsJson = 16
 }
 export declare enum IosActionType {
     ManageCredentialsJson = 0,
     ManageBuildCredentials = 1,
     ManagePushKey = 2,
-    GoBackToCaller = 3,
-    GoBackToHighLevelActions = 4,
-    SetupBuildCredentials = 5,
-    SetupBuildCredentialsFromCredentialsJson = 6,
-    UpdateCredentialsJson = 7,
-    UseExistingDistributionCertificate = 8,
-    RemoveProvisioningProfile = 9,
-    CreateDistributionCertificate = 10,
-    RemoveDistributionCertificate = 11,
-    SetupPushKey = 12,
-    CreatePushKey = 13,
-    UseExistingPushKey = 14,
-    RemovePushKey = 15
+    ManageAscApiKey = 3,
+    GoBackToCaller = 4,
+    GoBackToHighLevelActions = 5,
+    SetUpBuildCredentials = 6,
+    SetUpBuildCredentialsFromCredentialsJson = 7,
+    UpdateCredentialsJson = 8,
+    UseExistingDistributionCertificate = 9,
+    RemoveProvisioningProfile = 10,
+    CreateDistributionCertificate = 11,
+    RemoveDistributionCertificate = 12,
+    SetUpPushKey = 13,
+    CreatePushKey = 14,
+    UseExistingPushKey = 15,
+    RemovePushKey = 16,
+    SetUpAscApiKeyForSubmissions = 17,
+    UseExistingAscApiKeyForSubmissions = 18,
+    CreateAscApiKeyForSubmissions = 19,
+    RemoveAscApiKey = 20
 }

package/build/credentials/manager/Actions.js

@@ -23,26 +23,31 @@ var AndroidActionType;
     AndroidActionType[AndroidActionType["CreateGsaKey"] = 11] = "CreateGsaKey";
     AndroidActionType[AndroidActionType["UseExistingGsaKey"] = 12] = "UseExistingGsaKey";
     AndroidActionType[AndroidActionType["RemoveGsaKey"] = 13] = "RemoveGsaKey";
-    AndroidActionType[AndroidActionType["SetupGsaKey"] = 14] = "SetupGsaKey";
+    AndroidActionType[AndroidActionType["SetUpGsaKey"] = 14] = "SetUpGsaKey";
     AndroidActionType[AndroidActionType["UpdateCredentialsJson"] = 15] = "UpdateCredentialsJson";
-    AndroidActionType[AndroidActionType["SetupBuildCredentialsFromCredentialsJson"] = 16] = "SetupBuildCredentialsFromCredentialsJson";
+    AndroidActionType[AndroidActionType["SetUpBuildCredentialsFromCredentialsJson"] = 16] = "SetUpBuildCredentialsFromCredentialsJson";
 })(AndroidActionType = exports.AndroidActionType || (exports.AndroidActionType = {}));
 var IosActionType;
 (function (IosActionType) {
     IosActionType[IosActionType["ManageCredentialsJson"] = 0] = "ManageCredentialsJson";
     IosActionType[IosActionType["ManageBuildCredentials"] = 1] = "ManageBuildCredentials";
     IosActionType[IosActionType["ManagePushKey"] = 2] = "ManagePushKey";
-    IosActionType[IosActionType["GoBackToCaller"] = 3] = "GoBackToCaller";
-    IosActionType[IosActionType["GoBackToHighLevelActions"] = 4] = "GoBackToHighLevelActions";
-    IosActionType[IosActionType["SetupBuildCredentials"] = 5] = "SetupBuildCredentials";
-    IosActionType[IosActionType["SetupBuildCredentialsFromCredentialsJson"] = 6] = "SetupBuildCredentialsFromCredentialsJson";
-    IosActionType[IosActionType["UpdateCredentialsJson"] = 7] = "UpdateCredentialsJson";
-    IosActionType[IosActionType["UseExistingDistributionCertificate"] = 8] = "UseExistingDistributionCertificate";
-    IosActionType[IosActionType["RemoveProvisioningProfile"] = 9] = "RemoveProvisioningProfile";
-    IosActionType[IosActionType["CreateDistributionCertificate"] = 10] = "CreateDistributionCertificate";
-    IosActionType[IosActionType["RemoveDistributionCertificate"] = 11] = "RemoveDistributionCertificate";
-    IosActionType[IosActionType["SetupPushKey"] = 12] = "SetupPushKey";
-    IosActionType[IosActionType["CreatePushKey"] = 13] = "CreatePushKey";
-    IosActionType[IosActionType["UseExistingPushKey"] = 14] = "UseExistingPushKey";
-    IosActionType[IosActionType["RemovePushKey"] = 15] = "RemovePushKey";
+    IosActionType[IosActionType["ManageAscApiKey"] = 3] = "ManageAscApiKey";
+    IosActionType[IosActionType["GoBackToCaller"] = 4] = "GoBackToCaller";
+    IosActionType[IosActionType["GoBackToHighLevelActions"] = 5] = "GoBackToHighLevelActions";
+    IosActionType[IosActionType["SetUpBuildCredentials"] = 6] = "SetUpBuildCredentials";
+    IosActionType[IosActionType["SetUpBuildCredentialsFromCredentialsJson"] = 7] = "SetUpBuildCredentialsFromCredentialsJson";
+    IosActionType[IosActionType["UpdateCredentialsJson"] = 8] = "UpdateCredentialsJson";
+    IosActionType[IosActionType["UseExistingDistributionCertificate"] = 9] = "UseExistingDistributionCertificate";
+    IosActionType[IosActionType["RemoveProvisioningProfile"] = 10] = "RemoveProvisioningProfile";
+    IosActionType[IosActionType["CreateDistributionCertificate"] = 11] = "CreateDistributionCertificate";
+    IosActionType[IosActionType["RemoveDistributionCertificate"] = 12] = "RemoveDistributionCertificate";
+    IosActionType[IosActionType["SetUpPushKey"] = 13] = "SetUpPushKey";
+    IosActionType[IosActionType["CreatePushKey"] = 14] = "CreatePushKey";
+    IosActionType[IosActionType["UseExistingPushKey"] = 15] = "UseExistingPushKey";
+    IosActionType[IosActionType["RemovePushKey"] = 16] = "RemovePushKey";
+    IosActionType[IosActionType["SetUpAscApiKeyForSubmissions"] = 17] = "SetUpAscApiKeyForSubmissions";
+    IosActionType[IosActionType["UseExistingAscApiKeyForSubmissions"] = 18] = "UseExistingAscApiKeyForSubmissions";
+    IosActionType[IosActionType["CreateAscApiKeyForSubmissions"] = 19] = "CreateAscApiKeyForSubmissions";
+    IosActionType[IosActionType["RemoveAscApiKey"] = 20] = "RemoveAscApiKey";
 })(IosActionType = exports.IosActionType || (exports.IosActionType = {}));

package/build/credentials/manager/AndroidActions.js

@@ -10,7 +10,7 @@ exports.highLevelActions = [
     },
     {
         value: Actions_1.AndroidActionType.ManageFcm,
-        title: 'Push Notifications: Manage your FCM Api Key',
+        title: 'Push Notifications: Manage your FCM API Key',
         scope: Actions_1.Scope.Manager,
     },
     {
@@ -36,7 +36,7 @@ exports.credentialsJsonActions = [
         scope: Actions_1.Scope.Project,
     },
     {
-        value: Actions_1.AndroidActionType.SetupBuildCredentialsFromCredentialsJson,
+        value: Actions_1.AndroidActionType.SetUpBuildCredentialsFromCredentialsJson,
         title: 'Upload credentials from credentials.json to EAS',
         scope: Actions_1.Scope.Project,
     },
@@ -71,12 +71,12 @@ exports.buildCredentialsActions = [
 exports.fcmActions = [
     {
         value: Actions_1.AndroidActionType.CreateFcm,
-        title: 'Upload an FCM Api Key',
+        title: 'Upload an FCM API Key',
         scope: Actions_1.Scope.Project,
     },
     {
         value: Actions_1.AndroidActionType.RemoveFcm,
-        title: 'Delete your FCM Api Key',
+        title: 'Delete your FCM API Key',
         scope: Actions_1.Scope.Project,
     },
     {
@@ -87,8 +87,8 @@ exports.fcmActions = [
 ];
 exports.gsaKeyActions = [
     {
-        value: Actions_1.AndroidActionType.SetupGsaKey,
-        title: 'Setup a Google Service Account Key',
+        value: Actions_1.AndroidActionType.SetUpGsaKey,
+        title: 'Set up a Google Service Account Key',
         scope: Actions_1.Scope.Project,
     },
     {

package/build/credentials/manager/IosActions.d.ts

@@ -3,4 +3,5 @@ import { ActionInfo } from './Actions';
 export declare const highLevelActions: ActionInfo[];
 export declare const credentialsJsonActions: ActionInfo[];
 export declare function getPushKeyActions(ctx: CredentialsContext): ActionInfo[];
+export declare function getAscApiKeyActions(ctx: CredentialsContext): ActionInfo[];
 export declare function getBuildCredentialsActions(ctx: CredentialsContext): ActionInfo[];