eas-cli 0.34.1 → 0.35.0

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

@@ -7,36 +7,42 @@ 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();
+    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.`);
+        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.`);
+        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();
+    var _a;
+    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}).`);
+        spinner.succeed(`Fetched App Store Connect Api Key (ID: ${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.`);
+        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();
+    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, {
@@ -58,29 +64,32 @@ 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,
         };
     }
     catch (err) {
-        spinner.fail('Failed to create App Store Connect API Key.');
+        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();
+    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.`);
+        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.`);
+        spinner.fail(`Failed to revoke App Store Connect Api Key.`);
         throw error;
     }
 }
@@ -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/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,14 +50,19 @@ exports.distributionCertificateSchema = {
         return answers;
     },
 };
-exports.ascApiKeyMetadataSchema = {
-    name: 'App Store Connect API Key',
+exports.ascApiKeyIdSchema = {
+    name: 'App Store Connect Api Key',
     questions: [
         {
             field: 'keyId',
             type: 'string',
             question: 'Key ID:',
         },
+    ],
+};
+exports.ascApiKeyIssuerIdSchema = {
+    name: 'App Store Connect Api Key',
+    questions: [
         {
             field: 'issuerId',
             type: 'string',

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

@@ -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,
     },
@@ -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[];

package/build/credentials/manager/IosActions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBuildCredentialsActions = exports.getPushKeyActions = exports.credentialsJsonActions = exports.highLevelActions = void 0;
+exports.getBuildCredentialsActions = exports.getAscApiKeyActions = exports.getPushKeyActions = exports.credentialsJsonActions = exports.highLevelActions = void 0;
 const Actions_1 = require("./Actions");
 exports.highLevelActions = [
     {
@@ -13,6 +13,11 @@ exports.highLevelActions = [
         title: 'Push Notifications: Manage your Apple Push Notifications Key',
         scope: Actions_1.Scope.Manager,
     },
+    {
+        value: Actions_1.IosActionType.ManageAscApiKey,
+        title: 'App Store Connect: Manage your Api Key',
+        scope: Actions_1.Scope.Manager,
+    },
     {
         value: Actions_1.IosActionType.ManageCredentialsJson,
         title: 'credentials.json: Upload/Download credentials between EAS servers and your local json ',
@@ -31,7 +36,7 @@ exports.credentialsJsonActions = [
         scope: Actions_1.Scope.Project,
     },
     {
-        value: Actions_1.IosActionType.SetupBuildCredentialsFromCredentialsJson,
+        value: Actions_1.IosActionType.SetUpBuildCredentialsFromCredentialsJson,
         title: 'Upload credentials from credentials.json to EAS',
         scope: Actions_1.Scope.Project,
     },
@@ -44,8 +49,8 @@ exports.credentialsJsonActions = [
 function getPushKeyActions(ctx) {
     return [
         {
-            value: Actions_1.IosActionType.SetupPushKey,
-            title: 'Setup your project to use Push Notifications',
+            value: Actions_1.IosActionType.SetUpPushKey,
+            title: 'Set up your project to use Push Notifications',
             scope: Actions_1.Scope.Project,
         },
         {
@@ -71,12 +76,42 @@ function getPushKeyActions(ctx) {
     ];
 }
 exports.getPushKeyActions = getPushKeyActions;
+function getAscApiKeyActions(ctx) {
+    return [
+        {
+            value: Actions_1.IosActionType.SetUpAscApiKeyForSubmissions,
+            title: 'Set up your project to use an Api Key for EAS Submit',
+            scope: Actions_1.Scope.Project,
+        },
+        {
+            value: Actions_1.IosActionType.UseExistingAscApiKeyForSubmissions,
+            title: 'Use an existing Api Key for EAS Submit',
+            scope: Actions_1.Scope.Project,
+        },
+        {
+            value: Actions_1.IosActionType.CreateAscApiKeyForSubmissions,
+            title: 'Add a new Api Key For EAS Submit',
+            scope: ctx.hasProjectContext ? Actions_1.Scope.Project : Actions_1.Scope.Account,
+        },
+        {
+            value: Actions_1.IosActionType.RemoveAscApiKey,
+            title: 'Delete an Api Key',
+            scope: Actions_1.Scope.Account,
+        },
+        {
+            value: Actions_1.IosActionType.GoBackToHighLevelActions,
+            title: 'Go back',
+            scope: Actions_1.Scope.Manager,
+        },
+    ];
+}
+exports.getAscApiKeyActions = getAscApiKeyActions;
 function getBuildCredentialsActions(ctx) {
     return [
         {
             // This command will be triggered during build to ensure all credentials are ready
             // I'm leaving it here for now to simplify testing
-            value: Actions_1.IosActionType.SetupBuildCredentials,
+            value: Actions_1.IosActionType.SetUpBuildCredentials,
             title: 'All: Set up all the required credentials to build your project',
             scope: Actions_1.Scope.Project,
         },

package/build/credentials/manager/ManageAndroid.js

@@ -20,8 +20,8 @@ const DownloadKeystore_1 = require("../android/actions/DownloadKeystore");
 const RemoveFcm_1 = require("../android/actions/RemoveFcm");
 const RemoveGoogleServiceAccountKey_1 = require("../android/actions/RemoveGoogleServiceAccountKey");
 const RemoveKeystore_1 = require("../android/actions/RemoveKeystore");
-const SetupBuildCredentialsFromCredentialsJson_1 = require("../android/actions/SetupBuildCredentialsFromCredentialsJson");
-const SetupGoogleServiceAccountKey_1 = require("../android/actions/SetupGoogleServiceAccountKey");
+const SetUpBuildCredentialsFromCredentialsJson_1 = require("../android/actions/SetUpBuildCredentialsFromCredentialsJson");
+const SetUpGoogleServiceAccountKey_1 = require("../android/actions/SetUpGoogleServiceAccountKey");
 const UpdateCredentialsJson_1 = require("../android/actions/UpdateCredentialsJson");
 const UseExistingGoogleServiceAccountKey_1 = require("../android/actions/UseExistingGoogleServiceAccountKey");
 const printCredentials_1 = require("../android/utils/printCredentials");
@@ -180,8 +180,8 @@ class ManageAndroid {
         else if (action === Actions_1.AndroidActionType.RemoveGsaKey) {
             await new RemoveGoogleServiceAccountKey_1.SelectAndRemoveGoogleServiceAccountKey(appLookupParams.account).runAsync(ctx);
         }
-        else if (action === Actions_1.AndroidActionType.SetupGsaKey) {
-            await new SetupGoogleServiceAccountKey_1.SetupGoogleServiceAccountKey(appLookupParams).runAsync(ctx);
+        else if (action === Actions_1.AndroidActionType.SetUpGsaKey) {
+            await new SetUpGoogleServiceAccountKey_1.SetUpGoogleServiceAccountKey(appLookupParams).runAsync(ctx);
         }
         else if (action === Actions_1.AndroidActionType.UpdateCredentialsJson) {
             const buildCredentials = await new SelectAndroidBuildCredentials_1.SelectExistingAndroidBuildCredentials(appLookupParams).runAsync(ctx);
@@ -189,8 +189,8 @@ class ManageAndroid {
                 await new UpdateCredentialsJson_1.UpdateCredentialsJson().runAsync(ctx, buildCredentials);
             }
         }
-        else if (action === Actions_1.AndroidActionType.SetupBuildCredentialsFromCredentialsJson) {
-            await new SetupBuildCredentialsFromCredentialsJson_1.SetupBuildCredentialsFromCredentialsJson(appLookupParams).runAsync(ctx);
+        else if (action === Actions_1.AndroidActionType.SetUpBuildCredentialsFromCredentialsJson) {
+            await new SetUpBuildCredentialsFromCredentialsJson_1.SetUpBuildCredentialsFromCredentialsJson(appLookupParams).runAsync(ctx);
         }
     }
 }

package/build/credentials/manager/ManageIos.js

@@ -13,20 +13,25 @@ const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
 const Account_1 = require("../../user/Account");
 const actions_1 = require("../../user/actions");
+const AscApiKeyUtils_1 = require("../ios/actions/AscApiKeyUtils");
+const AssignAscApiKey_1 = require("../ios/actions/AssignAscApiKey");
 const AssignPushKey_1 = require("../ios/actions/AssignPushKey");
 const BuildCredentialsUtils_1 = require("../ios/actions/BuildCredentialsUtils");
+const CreateAscApiKey_1 = require("../ios/actions/CreateAscApiKey");
 const CreateDistributionCertificate_1 = require("../ios/actions/CreateDistributionCertificate");
 const CreatePushKey_1 = require("../ios/actions/CreatePushKey");
 const DistributionCertificateUtils_1 = require("../ios/actions/DistributionCertificateUtils");
 const PushKeyUtils_1 = require("../ios/actions/PushKeyUtils");
+const RemoveAscApiKey_1 = require("../ios/actions/RemoveAscApiKey");
 const RemoveDistributionCertificate_1 = require("../ios/actions/RemoveDistributionCertificate");
 const RemoveProvisioningProfile_1 = require("../ios/actions/RemoveProvisioningProfile");
 const RemovePushKey_1 = require("../ios/actions/RemovePushKey");
-const SetupAdhocProvisioningProfile_1 = require("../ios/actions/SetupAdhocProvisioningProfile");
-const SetupBuildCredentials_1 = require("../ios/actions/SetupBuildCredentials");
-const SetupBuildCredentialsFromCredentialsJson_1 = require("../ios/actions/SetupBuildCredentialsFromCredentialsJson");
-const SetupProvisioningProfile_1 = require("../ios/actions/SetupProvisioningProfile");
-const SetupPushKey_1 = require("../ios/actions/SetupPushKey");
+const SetUpAdhocProvisioningProfile_1 = require("../ios/actions/SetUpAdhocProvisioningProfile");
+const SetUpAscApiKey_1 = require("../ios/actions/SetUpAscApiKey");
+const SetUpBuildCredentials_1 = require("../ios/actions/SetUpBuildCredentials");
+const SetUpBuildCredentialsFromCredentialsJson_1 = require("../ios/actions/SetUpBuildCredentialsFromCredentialsJson");
+const SetUpProvisioningProfile_1 = require("../ios/actions/SetUpProvisioningProfile");
+const SetUpPushKey_1 = require("../ios/actions/SetUpPushKey");
 const UpdateCredentialsJson_1 = require("../ios/actions/UpdateCredentialsJson");
 const entitlements_1 = require("../ios/appstore/entitlements");
 const printCredentials_1 = require("../ios/utils/printCredentials");
@@ -42,6 +47,7 @@ class ManageIos {
     async runAsync(ctx, currentActions = IosActions_1.highLevelActions) {
         const buildCredentialsActions = (0, IosActions_1.getBuildCredentialsActions)(ctx);
         const pushKeyActions = (0, IosActions_1.getPushKeyActions)(ctx);
+        const ascApiKeyActions = (0, IosActions_1.getAscApiKeyActions)(ctx);
         await ctx.bestEffortAppStoreAuthenticateAsync();
         const accountName = ctx.hasProjectContext
             ? (0, projectUtils_1.getProjectAccountName)(ctx.exp, ctx.user)
@@ -89,6 +95,10 @@ class ManageIos {
                         currentActions = pushKeyActions;
                         continue;
                     }
+                    else if (chosenAction === Actions_1.IosActionType.ManageAscApiKey) {
+                        currentActions = ascApiKeyActions;
+                        continue;
+                    }
                     else if (chosenAction === Actions_1.IosActionType.GoBackToHighLevelActions) {
                         currentActions = IosActions_1.highLevelActions;
                         continue;
@@ -154,14 +164,20 @@ class ManageIos {
         else if (action === Actions_1.IosActionType.CreatePushKey) {
             await new CreatePushKey_1.CreatePushKey(account).runAsync(ctx);
         }
+        else if (action === Actions_1.IosActionType.CreateAscApiKeyForSubmissions) {
+            await new CreateAscApiKey_1.CreateAscApiKey(account).runAsync(ctx, AscApiKeyUtils_1.AppStoreApiKeyPurpose.SUBMISSION_SERVICE);
+        }
         else if (action === Actions_1.IosActionType.RemovePushKey) {
             await new RemovePushKey_1.SelectAndRemovePushKey(account).runAsync(ctx);
         }
+        else if (action === Actions_1.IosActionType.RemoveAscApiKey) {
+            await new RemoveAscApiKey_1.SelectAndRemoveAscApiKey(account).runAsync(ctx);
+        }
     }
     async runProjectSpecificActionAsync(ctx, app, targets, buildProfile, action) {
         var _a;
-        if (action === Actions_1.IosActionType.SetupBuildCredentials) {
-            await new SetupBuildCredentials_1.SetupBuildCredentials({
+        if (action === Actions_1.IosActionType.SetUpBuildCredentials) {
+            await new SetUpBuildCredentials_1.SetUpBuildCredentials({
                 app,
                 targets,
                 distribution: buildProfile.distribution,
@@ -173,8 +189,8 @@ class ManageIos {
             return;
         }
         const distributionType = await new SelectIosDistributionTypeGraphqlFromBuildProfile_1.SelectIosDistributionTypeGraphqlFromBuildProfile(buildProfile).runAsync(ctx);
-        if (action === Actions_1.IosActionType.SetupBuildCredentialsFromCredentialsJson) {
-            await new SetupBuildCredentialsFromCredentialsJson_1.SetupBuildCredentialsFromCredentialsJson(app, targets, distributionType).runAsync(ctx);
+        if (action === Actions_1.IosActionType.SetUpBuildCredentialsFromCredentialsJson) {
+            await new SetUpBuildCredentialsFromCredentialsJson_1.SetUpBuildCredentialsFromCredentialsJson(app, targets, distributionType).runAsync(ctx);
             return;
         }
         else if (action === Actions_1.IosActionType.UpdateCredentialsJson) {
@@ -217,14 +233,14 @@ class ManageIos {
                 }
                 return;
             }
-            case Actions_1.IosActionType.SetupPushKey: {
-                const setupPushKeyAction = await new SetupPushKey_1.SetupPushKey(appLookupParams);
+            case Actions_1.IosActionType.SetUpPushKey: {
+                const setupPushKeyAction = await new SetUpPushKey_1.SetUpPushKey(appLookupParams);
                 const isPushKeySetup = await setupPushKeyAction.isPushKeySetupAsync(ctx);
                 if (isPushKeySetup) {
                     log_1.default.log(`Push Key is already set up for ${appLookupParams.projectName} ${appLookupParams.bundleIdentifier}`);
                 }
                 else {
-                    await new SetupPushKey_1.SetupPushKey(appLookupParams).runAsync(ctx);
+                    await new SetUpPushKey_1.SetUpPushKey(appLookupParams).runAsync(ctx);
                 }
                 return;
             }
@@ -245,6 +261,29 @@ class ManageIos {
                 }
                 return;
             }
+            case Actions_1.IosActionType.SetUpAscApiKeyForSubmissions: {
+                await new SetUpAscApiKey_1.SetUpAscApiKey(appLookupParams, AscApiKeyUtils_1.AppStoreApiKeyPurpose.SUBMISSION_SERVICE).runAsync(ctx);
+                return;
+            }
+            case Actions_1.IosActionType.UseExistingAscApiKeyForSubmissions: {
+                const ascApiKey = await (0, AscApiKeyUtils_1.selectAscApiKeysFromAccountAsync)(ctx, appLookupParams.account, {
+                    filterDifferentAppleTeam: true,
+                });
+                if (ascApiKey) {
+                    await new AssignAscApiKey_1.AssignAscApiKey(appLookupParams).runAsync(ctx, ascApiKey, AscApiKeyUtils_1.AppStoreApiKeyPurpose.SUBMISSION_SERVICE);
+                }
+                return;
+            }
+            case Actions_1.IosActionType.CreateAscApiKeyForSubmissions: {
+                const ascApiKey = await new CreateAscApiKey_1.CreateAscApiKey(appLookupParams.account).runAsync(ctx, AscApiKeyUtils_1.AppStoreApiKeyPurpose.SUBMISSION_SERVICE);
+                const confirm = await (0, prompts_1.confirmAsync)({
+                    message: `Do you want ${appLookupParams.projectName} to use the new Api Key?`,
+                });
+                if (confirm) {
+                    await new AssignAscApiKey_1.AssignAscApiKey(appLookupParams).runAsync(ctx, ascApiKey, AscApiKeyUtils_1.AppStoreApiKeyPurpose.SUBMISSION_SERVICE);
+                }
+                return;
+            }
             default:
                 throw new Error('Unknown action selected');
         }
@@ -253,10 +292,10 @@ class ManageIos {
         log_1.default.log(`Setting up ${appLookupParams.projectName} to use Distribution Certificate`);
         log_1.default.log(`Creating provisioning profile...`);
         if (distributionType === generated_1.IosDistributionType.AdHoc) {
-            return await new SetupAdhocProvisioningProfile_1.SetupAdhocProvisioningProfile(appLookupParams).runWithDistributionCertificateAsync(ctx, distCert);
+            return await new SetUpAdhocProvisioningProfile_1.SetUpAdhocProvisioningProfile(appLookupParams).runWithDistributionCertificateAsync(ctx, distCert);
         }
         else {
-            return await new SetupProvisioningProfile_1.SetupProvisioningProfile(appLookupParams, distributionType).createAndAssignProfileAsync(ctx, distCert);
+            return await new SetUpProvisioningProfile_1.SetUpProvisioningProfile(appLookupParams, distributionType).createAndAssignProfileAsync(ctx, distCert);
         }
     }
     async selectTargetAsync(targets) {

package/build/credentials/utils/promptForCredentials.d.ts

@@ -13,4 +13,5 @@ export declare type CredentialSchema<T> = {
     transformResultAsync?: (answers: Partial<T>) => Promise<T>;
 };
 export declare function askForUserProvidedAsync<T>(schema: CredentialSchema<T>, initialValues?: Partial<T>): Promise<T | null>;
-export declare function getCredentialsFromUserAsync<T>(credentialsSchema: CredentialSchema<T>, initialValues: Partial<T>): Promise<T>;
+export declare function getCredentialsFromUserAsync<T>(credentialsSchema: CredentialSchema<T>, initialValues?: Partial<T>): Promise<T>;
+export declare function shouldAutoGenerateCredentialsAsync<T>(schema: CredentialSchema<T>): Promise<boolean>;

package/build/credentials/utils/promptForCredentials.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCredentialsFromUserAsync = exports.askForUserProvidedAsync = void 0;
+exports.shouldAutoGenerateCredentialsAsync = exports.getCredentialsFromUserAsync = exports.askForUserProvidedAsync = void 0;
 const tslib_1 = require("tslib");
 const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
 const path_1 = (0, tslib_1.__importDefault)(require("path"));
@@ -29,7 +29,7 @@ async function askForUserProvidedAsync(schema, initialValues = {}) {
     return await getCredentialsFromUserAsync(schema, initialValues);
 }
 exports.askForUserProvidedAsync = askForUserProvidedAsync;
-async function getCredentialsFromUserAsync(credentialsSchema, initialValues) {
+async function getCredentialsFromUserAsync(credentialsSchema, initialValues = {}) {
     var _a;
     const results = {};
     for (const question of credentialsSchema.questions) {
@@ -48,6 +48,7 @@ async function shouldAutoGenerateCredentialsAsync(schema) {
     });
     return answer;
 }
+exports.shouldAutoGenerateCredentialsAsync = shouldAutoGenerateCredentialsAsync;
 async function askQuestionAndProcessAnswerAsync(definition, initialValue) {
     const questionObject = buildQuestionObject(definition, initialValue);
     const { input } = await (0, prompts_1.promptAsync)(questionObject);

package/build/graphql/client.js

@@ -13,7 +13,7 @@ const api_1 = require("../api");
 const log_1 = (0, tslib_1.__importDefault)(require("../log"));
 const sessionStorage_1 = require("../user/sessionStorage");
 exports.graphqlClient = (0, core_1.createClient)({
-    url: (0, api_1.getExpoApiBaseUrl)() + '/--/graphql',
+    url: (0, api_1.getExpoApiBaseUrl)() + '/graphql',
     exchanges: [
         core_1.dedupExchange,
         core_1.cacheExchange,