eas-cli 3.13.2 → 3.14.0

package/build/commandUtils/EasCommand.js

@@ -80,7 +80,9 @@ class EasCommand extends core_1.Command {
             log_1.default.error(err.message);
         }
         log_1.default.debug(err);
-        throw new Error(baseMessage);
+        const sanitizedError = new Error(baseMessage);
+        sanitizedError.stack = err.stack;
+        throw sanitizedError;
     }
 }
 exports.default = EasCommand;

package/build/commandUtils/context/contextUtils/getProjectIdAsync.js

@@ -21,7 +21,7 @@ const findProjectDirAndVerifyProjectSetupAsync_1 = require("./findProjectDirAndV
 async function saveProjectIdToAppConfigAsync(projectDir, projectId, options = {}) {
     var _a;
     const exp = (0, expoConfig_1.getPrivateExpoConfig)(projectDir, options);
-    const result = await (0, config_1.modifyConfigAsync)(projectDir, {
+    const result = await (0, expoConfig_1.createOrModifyExpoConfigAsync)(projectDir, {
         extra: { ...exp.extra, eas: { ...(_a = exp.extra) === null || _a === void 0 ? void 0 : _a.eas, projectId } },
     }, { skipSDKVersionRequirement: true });
     switch (result.type) {
@@ -101,10 +101,10 @@ async function getProjectIdAsync(sessionManager, exp, options) {
         switch (user.__typename) {
             case 'User':
                 return user.username;
+            case 'SSOUser':
+                return user.username;
             case 'Robot':
                 throw new Error('The "owner" manifest property is required when using robot users. See: https://docs.expo.dev/versions/latest/config/app/#owner');
-            case 'SSOUser':
-                throw new Error('SSO users are not supported yet.');
         }
     };
     const projectId = await (0, fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync_1.fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync)(graphqlClient, {

package/build/commands/account/login.d.ts

@@ -2,6 +2,9 @@ import EasCommand from '../../commandUtils/EasCommand';
 export default class AccountLogin extends EasCommand {
     static description: string;
     static aliases: string[];
+    static flags: {
+        sso: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+    };
     static contextDefinition: {
         sessionManager: import("../../commandUtils/context/SessionManagementContextField").default;
     };

package/build/commands/account/login.js

@@ -2,12 +2,14 @@
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+const core_1 = require("@oclif/core");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
 const log_1 = tslib_1.__importDefault(require("../../log"));
 class AccountLogin extends EasCommand_1.default {
     async runAsync() {
+        const { flags: { sso }, } = await this.parse(AccountLogin);
         const { sessionManager } = await this.getContextAsync(AccountLogin, { nonInteractive: false });
-        await sessionManager.showLoginPromptAsync();
+        await sessionManager.showLoginPromptAsync({ sso });
         log_1.default.log('Logged in');
     }
 }
@@ -15,6 +17,15 @@ exports.default = AccountLogin;
 _a = AccountLogin;
 AccountLogin.description = 'log in with your Expo account';
 AccountLogin.aliases = ['login'];
+AccountLogin.flags = {
+    // can pass either --sso or -s
+    sso: core_1.Flags.boolean({
+        description: 'Login with SSO',
+        char: 's',
+        default: false,
+        hidden: true,
+    }),
+};
 AccountLogin.contextDefinition = {
     ..._a.ContextOptions.SessionManagment,
 };

package/build/commands/build/configure.js

@@ -14,6 +14,7 @@ const projectUtils_1 = require("../../project/projectUtils");
 const workflow_1 = require("../../project/workflow");
 const prompts_1 = require("../../prompts");
 const UpdatesModule_1 = require("../../update/android/UpdatesModule");
+const configure_2 = require("../../update/configure");
 const UpdatesModule_2 = require("../../update/ios/UpdatesModule");
 const vcs_1 = require("../../vcs");
 class BuildConfigure extends EasCommand_1.default {
@@ -33,10 +34,13 @@ class BuildConfigure extends EasCommand_1.default {
         }
         // ensure eas.json exists
         log_1.default.newLine();
-        await (0, configure_1.ensureProjectConfiguredAsync)({
+        const didCreateEasJson = await (0, configure_1.ensureProjectConfiguredAsync)({
             projectDir,
             nonInteractive: false,
         });
+        if (didCreateEasJson && (0, projectUtils_1.isUsingEASUpdate)(exp, projectId)) {
+            await (0, configure_2.ensureEASUpdateIsConfiguredInEasJsonAsync)(projectDir);
+        }
         // configure expo-updates
         if (expoUpdatesIsInstalled) {
             if ([platform_1.RequestedPlatform.Android, platform_1.RequestedPlatform.All].includes(platform)) {

package/build/commands/project/init.js

@@ -24,7 +24,7 @@ class ProjectInit extends EasCommand_1.default {
         log_1.default.withTick(`Project successfully linked (ID: ${chalk_1.default.bold(projectId)}) (modified app.json)`);
     }
     static async modifyExpoConfigAsync(projectDir, modifications) {
-        const result = await (0, config_1.modifyConfigAsync)(projectDir, modifications);
+        const result = await (0, expoConfig_1.createOrModifyExpoConfigAsync)(projectDir, modifications);
         switch (result.type) {
             case 'success':
                 break;

package/build/commands/update/configure.js

@@ -4,10 +4,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const configure_1 = require("../../build/configure");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
 const flags_1 = require("../../commandUtils/flags");
-const log_1 = tslib_1.__importDefault(require("../../log"));
-const configure_1 = require("../../update/configure");
+const log_1 = tslib_1.__importStar(require("../../log"));
+const configure_2 = require("../../update/configure");
+const vcs_1 = require("../../vcs");
 class UpdateConfigure extends EasCommand_1.default {
     async runAsync() {
         const { flags } = await this.parse(UpdateConfigure);
@@ -16,27 +18,24 @@ class UpdateConfigure extends EasCommand_1.default {
             nonInteractive: flags['non-interactive'],
         });
         log_1.default.log('💡 The following process will configure your project to run EAS Update. These changes only apply to your local project files and you can safely revert them at any time.');
-        await (0, configure_1.ensureEASUpdateIsConfiguredAsync)(graphqlClient, {
+        await (0, vcs_1.getVcsClient)().ensureRepoExistsAsync();
+        await (0, configure_2.ensureEASUpdateIsConfiguredAsync)(graphqlClient, {
             exp,
             projectId,
             projectDir,
             platform,
         });
-        await (0, configure_1.ensureEASUpdateIsConfiguredInEasJsonAsync)(projectDir);
+        await (0, configure_2.ensureEASUpdateIsConfiguredInEasJsonAsync)(projectDir);
         log_1.default.addNewLineIfNone();
         log_1.default.log(`🎉 Your app is configured with EAS Update!`);
         log_1.default.newLine();
-        log_1.default.log(`${chalk_1.default.bold('Next steps')}:`);
-        log_1.default.newLine();
-        log_1.default.log('Update a production build:');
-        log_1.default.log(`1. Create a new build. Example: ${chalk_1.default.bold('eas build --profile production')}.`);
-        log_1.default.log('2. Make changes in your project.');
-        log_1.default.log(`3. Publish an update. Example: ${chalk_1.default.bold('eas update --channel production')}.`);
-        log_1.default.log('4. Force close and reopen the app at least twice to view the update.');
-        log_1.default.newLine();
-        log_1.default.log('Preview an update:');
-        log_1.default.log(`1. Publish an update to a branch. Example: ${chalk_1.default.bold('eas update --branch new-feature')}.`);
-        log_1.default.log('2. In Expo Go or a development build, navigate to Projects > [project name] > Branch > Open.');
+        const easJsonExists = await (0, configure_1.easJsonExistsAsync)(projectDir);
+        if (!easJsonExists) {
+            log_1.default.log(`- Run ${chalk_1.default.bold('eas build:configure')} to complete your installation`);
+        }
+        log_1.default.log(`- ${(0, log_1.learnMore)('https://docs.expo.dev/eas-update/introduction/', {
+            learnMoreMessage: 'Learn more about other capabilities of EAS Update',
+        })}`);
     }
 }
 exports.default = UpdateConfigure;

package/build/commands/update/index.js

@@ -21,6 +21,7 @@ const publish_1 = require("../../project/publish");
 const configure_1 = require("../../update/configure");
 const utils_1 = require("../../update/utils");
 const code_signing_1 = require("../../utils/code-signing");
+const areSetsEqual_1 = tslib_1.__importDefault(require("../../utils/expodash/areSetsEqual"));
 const uniqBy_1 = tslib_1.__importDefault(require("../../utils/expodash/uniqBy"));
 const formatFields_1 = tslib_1.__importDefault(require("../../utils/formatFields"));
 const json_1 = require("../../utils/json");
@@ -86,9 +87,45 @@ class UpdatePublish extends EasCommand_1.default {
             const collectedAssets = await (0, publish_1.collectAssetsAsync)(distRoot);
             const assets = (0, publish_1.filterExportedPlatformsByFlag)(collectedAssets, platformFlag);
             realizedPlatforms = Object.keys(assets);
-            const uploadResults = await (0, publish_1.uploadAssetsAsync)(graphqlClient, assets, projectId, (totalAssets, missingAssets) => {
-                assetSpinner.text = `Uploading (${totalAssets - missingAssets}/${totalAssets})`;
-            });
+            // Timeout mechanism:
+            // - Start with 60 second timeout. 60 seconds is chosen because the cloud function that processes
+            //   uploaded assets has a timeout of 60 seconds.
+            // - Each time one or more assets reports as ready, reset the timeout to 60 seconds.
+            // - Start upload. Internally, uploadAssetsAsync uploads them all and then checks for successful
+            //   processing every (5 + n) seconds with a linear backoff of n + 1 second.
+            // - At the same time as upload is started, start timeout checker which checks every 1 second to see
+            //   if timeout has been reached. When timeout expires, send a cancellation signal to currently running
+            //   upload function call to instruct it to stop uploading or checking for successful processing.
+            let lastUploadedStorageKeys = new Set();
+            let lastAssetUploadResults = [];
+            let timeAtWhichToTimeout = Date.now() + 60 * 1000; // sixty seconds from now
+            const cancelationToken = { isCanceledOrFinished: false };
+            const uploadResults = await Promise.race([
+                (0, publish_1.uploadAssetsAsync)(graphqlClient, assets, projectId, cancelationToken, assetUploadResults => {
+                    const currentUploadedStorageKeys = new Set(assetUploadResults.filter(r => r.finished).map(r => r.asset.storageKey));
+                    if (!(0, areSetsEqual_1.default)(currentUploadedStorageKeys, lastUploadedStorageKeys)) {
+                        timeAtWhichToTimeout = Date.now() + 60 * 1000; // reset timeout to sixty seconds from now
+                        lastUploadedStorageKeys = currentUploadedStorageKeys;
+                        lastAssetUploadResults = assetUploadResults;
+                    }
+                    const totalAssets = assetUploadResults.length;
+                    const missingAssetCount = assetUploadResults.filter(a => !a.finished).length;
+                    assetSpinner.text = `Uploading (${totalAssets - missingAssetCount}/${totalAssets})`;
+                }),
+                (async () => {
+                    while (Date.now() < timeAtWhichToTimeout) {
+                        if (cancelationToken.isCanceledOrFinished) {
+                            break;
+                        }
+                        await new Promise(res => setTimeout(res, 1000)); // wait 1 second
+                    }
+                    cancelationToken.isCanceledOrFinished = true;
+                    const timedOutAssets = lastAssetUploadResults
+                        .filter(r => !r.finished)
+                        .map(r => { var _b; return `\n- ${(_b = r.asset.originalPath) !== null && _b !== void 0 ? _b : r.asset.path}`; });
+                    throw new Error(`Asset processing timed out for assets: ${timedOutAssets}`);
+                })(),
+            ]);
             uploadedAssetCount = uploadResults.uniqueUploadedAssetCount;
             assetLimitPerUpdateGroup = uploadResults.assetLimitPerUpdateGroup;
             unsortedUpdateInfoGroups = await (0, publish_1.buildUnsortedUpdateInfoGroupAsync)(assets, exp);

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

@@ -18,6 +18,7 @@ export declare function updateAndroidAppCredentialsAsync(graphqlClient: ExpoGrap
 export declare function updateAndroidAppBuildCredentialsAsync(graphqlClient: ExpoGraphqlClient, buildCredentials: AndroidAppBuildCredentialsFragment, { androidKeystoreId, }: {
     androidKeystoreId: string;
 }): Promise<AndroidAppBuildCredentialsFragment>;
+export declare function setDefaultAndroidAppBuildCredentialsAsync(graphqlClient: ExpoGraphqlClient, buildCredentials: AndroidAppBuildCredentialsFragment): Promise<AndroidAppBuildCredentialsFragment>;
 export declare function createAndroidAppBuildCredentialsAsync(graphqlClient: ExpoGraphqlClient, appLookupParams: AppLookupParams, { name, isDefault, androidKeystoreId, }: {
     name: string;
     isDefault: boolean;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatProjectFullName = exports.getGoogleServiceAccountKeysForAccountAsync = exports.deleteGoogleServiceAccountKeyAsync = exports.createGoogleServiceAccountKeyAsync = exports.deleteFcmAsync = exports.createFcmAsync = exports.deleteKeystoreAsync = exports.createKeystoreAsync = exports.createOrUpdateDefaultIosAppBuildCredentialsAsync = exports.createOrUpdateAndroidAppBuildCredentialsByNameAsync = exports.getAndroidAppBuildCredentialsByNameAsync = exports.getDefaultAndroidAppBuildCredentialsAsync = exports.createAndroidAppBuildCredentialsAsync = exports.updateAndroidAppBuildCredentialsAsync = exports.updateAndroidAppCredentialsAsync = exports.createOrGetExistingAndroidAppCredentialsWithBuildCredentialsAsync = exports.getLegacyAndroidAppBuildCredentialsAsync = exports.getLegacyAndroidAppCredentialsWithCommonFieldsAsync = exports.getAndroidAppBuildCredentialsListAsync = exports.getAndroidAppCredentialsWithCommonFieldsAsync = void 0;
+exports.formatProjectFullName = exports.getGoogleServiceAccountKeysForAccountAsync = exports.deleteGoogleServiceAccountKeyAsync = exports.createGoogleServiceAccountKeyAsync = exports.deleteFcmAsync = exports.createFcmAsync = exports.deleteKeystoreAsync = exports.createKeystoreAsync = exports.createOrUpdateDefaultIosAppBuildCredentialsAsync = exports.createOrUpdateAndroidAppBuildCredentialsByNameAsync = exports.getAndroidAppBuildCredentialsByNameAsync = exports.getDefaultAndroidAppBuildCredentialsAsync = exports.createAndroidAppBuildCredentialsAsync = exports.setDefaultAndroidAppBuildCredentialsAsync = exports.updateAndroidAppBuildCredentialsAsync = exports.updateAndroidAppCredentialsAsync = exports.createOrGetExistingAndroidAppCredentialsWithBuildCredentialsAsync = exports.getLegacyAndroidAppBuildCredentialsAsync = exports.getLegacyAndroidAppCredentialsWithCommonFieldsAsync = exports.getAndroidAppBuildCredentialsListAsync = exports.getAndroidAppCredentialsWithCommonFieldsAsync = void 0;
 const AppQuery_1 = require("../../../graphql/queries/AppQuery");
 const AndroidAppBuildCredentialsMutation_1 = require("./graphql/mutations/AndroidAppBuildCredentialsMutation");
 const AndroidAppCredentialsMutation_1 = require("./graphql/mutations/AndroidAppCredentialsMutation");
@@ -66,14 +66,12 @@ async function updateAndroidAppBuildCredentialsAsync(graphqlClient, buildCredent
     return await AndroidAppBuildCredentialsMutation_1.AndroidAppBuildCredentialsMutation.setKeystoreAsync(graphqlClient, buildCredentials.id, androidKeystoreId);
 }
 exports.updateAndroidAppBuildCredentialsAsync = updateAndroidAppBuildCredentialsAsync;
+async function setDefaultAndroidAppBuildCredentialsAsync(graphqlClient, buildCredentials) {
+    return await AndroidAppBuildCredentialsMutation_1.AndroidAppBuildCredentialsMutation.setDefaultAndroidAppBuildCredentialsAsync(graphqlClient, buildCredentials.id);
+}
+exports.setDefaultAndroidAppBuildCredentialsAsync = setDefaultAndroidAppBuildCredentialsAsync;
 async function createAndroidAppBuildCredentialsAsync(graphqlClient, appLookupParams, { name, isDefault, androidKeystoreId, }) {
-    var _a;
     const androidAppCredentials = await createOrGetExistingAndroidAppCredentialsWithBuildCredentialsAsync(graphqlClient, appLookupParams);
-    const buildCredentialsList = androidAppCredentials.androidAppBuildCredentialsList;
-    const existingDefaultBuildCredentials = (_a = buildCredentialsList.find(buildCredentials => buildCredentials.isDefault)) !== null && _a !== void 0 ? _a : null;
-    if (existingDefaultBuildCredentials && isDefault) {
-        throw new Error('Cannot create new default Android Build Credentials. A set of default credentials exists already.');
-    }
     return await AndroidAppBuildCredentialsMutation_1.AndroidAppBuildCredentialsMutation.createAndroidAppBuildCredentialsAsync(graphqlClient, {
         name,
         isDefault,

package/build/credentials/android/api/graphql/mutations/AndroidAppBuildCredentialsMutation.d.ts

@@ -3,5 +3,6 @@ import { AndroidAppBuildCredentialsFragment, AndroidAppBuildCredentialsInput } f
 export type AndroidAppBuildCredentialsMetadataInput = Omit<AndroidAppBuildCredentialsInput, 'keystoreId'>;
 export declare const AndroidAppBuildCredentialsMutation: {
     createAndroidAppBuildCredentialsAsync(graphqlClient: ExpoGraphqlClient, androidAppBuildCredentialsInput: AndroidAppBuildCredentialsInput, androidAppCredentialsId: string): Promise<AndroidAppBuildCredentialsFragment>;
+    setDefaultAndroidAppBuildCredentialsAsync(graphqlClient: ExpoGraphqlClient, androidAppBuildCredentialsId: string): Promise<AndroidAppBuildCredentialsFragment>;
     setKeystoreAsync(graphqlClient: ExpoGraphqlClient, androidAppBuildCredentialsId: string, keystoreId: string): Promise<AndroidAppBuildCredentialsFragment>;
 };

package/build/credentials/android/api/graphql/mutations/AndroidAppBuildCredentialsMutation.js

@@ -34,6 +34,29 @@ exports.AndroidAppBuildCredentialsMutation = {
         (0, assert_1.default)(data.androidAppBuildCredentials.createAndroidAppBuildCredentials, 'GraphQL: `createAndroidAppBuildCredentials` not defined in server response');
         return data.androidAppBuildCredentials.createAndroidAppBuildCredentials;
     },
+    async setDefaultAndroidAppBuildCredentialsAsync(graphqlClient, androidAppBuildCredentialsId) {
+        const data = await (0, client_1.withErrorHandlingAsync)(graphqlClient
+            .mutation((0, graphql_tag_1.default) `
+            mutation AndroidAppBuildCredentialsMutation(
+              $androidAppBuildCredentialsId: ID!
+              $isDefault: Boolean!
+            ) {
+              androidAppBuildCredentials {
+                setDefault(id: $androidAppBuildCredentialsId, isDefault: $isDefault) {
+                  id
+                  ...AndroidAppBuildCredentialsFragment
+                }
+              }
+            }
+            ${(0, graphql_1.print)(AndroidAppBuildCredentials_1.AndroidAppBuildCredentialsFragmentNode)}
+          `, {
+            androidAppBuildCredentialsId,
+            isDefault: true,
+        })
+            .toPromise());
+        (0, assert_1.default)(data, `GraphQL: 'setDefault' not defined in server response ${JSON.stringify(data)}}`);
+        return data;
+    },
     async setKeystoreAsync(graphqlClient, androidAppBuildCredentialsId, keystoreId) {
         const data = await (0, client_1.withErrorHandlingAsync)(graphqlClient
             .mutation((0, graphql_tag_1.default) `

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

@@ -401,6 +401,20 @@ exports.CapabilityMapping = [
         validateOptions: createValidateStringArrayOptions(['app-usage', 'system-installation']),
         getOptions: getDefinedOptions,
     },
+    {
+        name: 'Apple Pay Later Merchandising',
+        entitlement: 'com.apple.developer.pay-later-merchandising',
+        capability: apple_utils_1.CapabilityType.APPLE_PAY_LATER_MERCHANDISING,
+        validateOptions: createValidateStringArrayOptions(['payinfour-merchandising']),
+        getOptions: getDefinedOptions,
+    },
+    {
+        name: 'Sensitive Content Analysis',
+        entitlement: 'com.apple.developer.sensitivecontentanalysis.client',
+        capability: apple_utils_1.CapabilityType.SENSITIVE_CONTENT_ANALYSIS,
+        validateOptions: createValidateStringArrayOptions(['analysis']),
+        getOptions: getDefinedOptions,
+    },
     {
         // Not in Xcode
         // https://developer-mdn.apple.com/documentation/devicecheck/preparing_to_use_the_app_attest_service
@@ -586,6 +600,35 @@ exports.CapabilityMapping = [
         validateOptions: validateBooleanOptions,
         getOptions: getBooleanOptions,
     },
+    {
+        entitlement: 'com.apple.developer.shared-with-you.collaboration',
+        name: 'Messages Collaboration',
+        capability: apple_utils_1.CapabilityType.MESSAGES_COLLABORATION,
+        validateOptions: validateBooleanOptions,
+        getOptions: getBooleanOptions,
+    },
+    {
+        entitlement: 'com.apple.developer.submerged-shallow-depth-and-pressure',
+        name: 'Shallow Depth and Pressure',
+        capability: apple_utils_1.CapabilityType.SHALLOW_DEPTH_PRESSURE,
+        validateOptions: validateBooleanOptions,
+        getOptions: getBooleanOptions,
+    },
+    {
+        entitlement: 'com.apple.developer.proximity-reader.identity.display',
+        name: 'Tap to Present ID on iPhone (Display Only)',
+        capability: apple_utils_1.CapabilityType.TAP_TO_DISPLAY_ID,
+        validateOptions: validateBooleanOptions,
+        getOptions: getBooleanOptions,
+    },
+    {
+        entitlement: 'com.apple.developer.matter.allow-setup-payload',
+        name: 'Matter Allow Setup Payload',
+        capability: apple_utils_1.CapabilityType.MATTER_ALLOW_SETUP_PAYLOAD,
+        validateOptions: validateBooleanOptions,
+        getOptions: getBooleanOptions,
+    },
+    // VMNET
     // These don't appear to have entitlements, so it's unclear how we can automatically enable / disable them at this time.
     // TODO: Maybe add a warning about manually enabling features?
     // ?? -- links `StoreKit.framework`

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

@@ -16,16 +16,17 @@ export declare enum AndroidActionType {
     GoBackToCaller = 4,
     GoBackToHighLevelActions = 5,
     CreateKeystore = 6,
-    DownloadKeystore = 7,
-    RemoveKeystore = 8,
-    CreateFcm = 9,
-    RemoveFcm = 10,
-    CreateGsaKey = 11,
-    UseExistingGsaKey = 12,
-    RemoveGsaKey = 13,
-    SetUpGsaKey = 14,
-    UpdateCredentialsJson = 15,
-    SetUpBuildCredentialsFromCredentialsJson = 16
+    SetDefaultKeystore = 7,
+    DownloadKeystore = 8,
+    RemoveKeystore = 9,
+    CreateFcm = 10,
+    RemoveFcm = 11,
+    CreateGsaKey = 12,
+    UseExistingGsaKey = 13,
+    RemoveGsaKey = 14,
+    SetUpGsaKey = 15,
+    UpdateCredentialsJson = 16,
+    SetUpBuildCredentialsFromCredentialsJson = 17
 }
 export declare enum IosActionType {
     ManageCredentialsJson = 0,

package/build/credentials/manager/Actions.js

@@ -16,16 +16,17 @@ var AndroidActionType;
     AndroidActionType[AndroidActionType["GoBackToCaller"] = 4] = "GoBackToCaller";
     AndroidActionType[AndroidActionType["GoBackToHighLevelActions"] = 5] = "GoBackToHighLevelActions";
     AndroidActionType[AndroidActionType["CreateKeystore"] = 6] = "CreateKeystore";
-    AndroidActionType[AndroidActionType["DownloadKeystore"] = 7] = "DownloadKeystore";
-    AndroidActionType[AndroidActionType["RemoveKeystore"] = 8] = "RemoveKeystore";
-    AndroidActionType[AndroidActionType["CreateFcm"] = 9] = "CreateFcm";
-    AndroidActionType[AndroidActionType["RemoveFcm"] = 10] = "RemoveFcm";
-    AndroidActionType[AndroidActionType["CreateGsaKey"] = 11] = "CreateGsaKey";
-    AndroidActionType[AndroidActionType["UseExistingGsaKey"] = 12] = "UseExistingGsaKey";
-    AndroidActionType[AndroidActionType["RemoveGsaKey"] = 13] = "RemoveGsaKey";
-    AndroidActionType[AndroidActionType["SetUpGsaKey"] = 14] = "SetUpGsaKey";
-    AndroidActionType[AndroidActionType["UpdateCredentialsJson"] = 15] = "UpdateCredentialsJson";
-    AndroidActionType[AndroidActionType["SetUpBuildCredentialsFromCredentialsJson"] = 16] = "SetUpBuildCredentialsFromCredentialsJson";
+    AndroidActionType[AndroidActionType["SetDefaultKeystore"] = 7] = "SetDefaultKeystore";
+    AndroidActionType[AndroidActionType["DownloadKeystore"] = 8] = "DownloadKeystore";
+    AndroidActionType[AndroidActionType["RemoveKeystore"] = 9] = "RemoveKeystore";
+    AndroidActionType[AndroidActionType["CreateFcm"] = 10] = "CreateFcm";
+    AndroidActionType[AndroidActionType["RemoveFcm"] = 11] = "RemoveFcm";
+    AndroidActionType[AndroidActionType["CreateGsaKey"] = 12] = "CreateGsaKey";
+    AndroidActionType[AndroidActionType["UseExistingGsaKey"] = 13] = "UseExistingGsaKey";
+    AndroidActionType[AndroidActionType["RemoveGsaKey"] = 14] = "RemoveGsaKey";
+    AndroidActionType[AndroidActionType["SetUpGsaKey"] = 15] = "SetUpGsaKey";
+    AndroidActionType[AndroidActionType["UpdateCredentialsJson"] = 16] = "UpdateCredentialsJson";
+    AndroidActionType[AndroidActionType["SetUpBuildCredentialsFromCredentialsJson"] = 17] = "SetUpBuildCredentialsFromCredentialsJson";
 })(AndroidActionType = exports.AndroidActionType || (exports.AndroidActionType = {}));
 var IosActionType;
 (function (IosActionType) {

package/build/credentials/manager/AndroidActions.js

@@ -52,6 +52,11 @@ exports.buildCredentialsActions = [
         title: 'Set up a new keystore',
         scope: Actions_1.Scope.Project,
     },
+    {
+        value: Actions_1.AndroidActionType.SetDefaultKeystore,
+        title: 'Change default keystore',
+        scope: Actions_1.Scope.Project,
+    },
     {
         value: Actions_1.AndroidActionType.DownloadKeystore,
         title: 'Download existing keystore',

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

@@ -0,0 +1,8 @@
+import { AndroidAppBuildCredentialsFragment } from '../../graphql/generated';
+import { AppLookupParams } from '../android/api/GraphqlClient';
+import { CredentialsContext } from '../context';
+export declare class CreateAndroidBuildCredentials {
+    private app;
+    constructor(app: AppLookupParams);
+    runAsync(ctx: CredentialsContext): Promise<AndroidAppBuildCredentialsFragment>;
+}

package/build/credentials/manager/CreateAndroidBuildCredentials.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CreateAndroidBuildCredentials = void 0;
+const tslib_1 = require("tslib");
+const log_1 = tslib_1.__importDefault(require("../../log"));
+const prompts_1 = require("../../prompts");
+const BuildCredentialsUtils_1 = require("../android/actions/BuildCredentialsUtils");
+const CreateKeystore_1 = require("../android/actions/CreateKeystore");
+class CreateAndroidBuildCredentials {
+    constructor(app) {
+        this.app = app;
+    }
+    async runAsync(ctx) {
+        const name = await (0, BuildCredentialsUtils_1.promptForNameAsync)();
+        const buildCredentialsList = await ctx.android.getAndroidAppBuildCredentialsListAsync(ctx.graphqlClient, this.app);
+        let isDefault = true;
+        if (buildCredentialsList.length > 0) {
+            isDefault = await (0, prompts_1.confirmAsync)({
+                message: 'Do you want to set this as your default build credentials?',
+                initial: false,
+            });
+        }
+        const keystore = await new CreateKeystore_1.CreateKeystore(this.app.account).runAsync(ctx);
+        const createAndroidCredentials = await ctx.android.createAndroidAppBuildCredentialsAsync(ctx.graphqlClient, this.app, {
+            name,
+            isDefault,
+            androidKeystoreId: keystore.id,
+        });
+        log_1.default.succeed(`Created Android build credentials ${createAndroidCredentials.name}`);
+        return createAndroidCredentials;
+    }
+}
+exports.CreateAndroidBuildCredentials = CreateAndroidBuildCredentials;

package/build/credentials/manager/ManageAndroid.js

@@ -12,7 +12,6 @@ const AssignGoogleServiceAccountKey_1 = require("../android/actions/AssignGoogle
 const BuildCredentialsUtils_1 = require("../android/actions/BuildCredentialsUtils");
 const CreateFcm_1 = require("../android/actions/CreateFcm");
 const CreateGoogleServiceAccountKey_1 = require("../android/actions/CreateGoogleServiceAccountKey");
-const CreateKeystore_1 = require("../android/actions/CreateKeystore");
 const DownloadKeystore_1 = require("../android/actions/DownloadKeystore");
 const RemoveFcm_1 = require("../android/actions/RemoveFcm");
 const RemoveGoogleServiceAccountKey_1 = require("../android/actions/RemoveGoogleServiceAccountKey");
@@ -25,9 +24,11 @@ const printCredentials_1 = require("../android/utils/printCredentials");
 const context_1 = require("../context");
 const Actions_1 = require("./Actions");
 const AndroidActions_1 = require("./AndroidActions");
+const CreateAndroidBuildCredentials_1 = require("./CreateAndroidBuildCredentials");
 const HelperActions_1 = require("./HelperActions");
 const SelectAndroidBuildCredentials_1 = require("./SelectAndroidBuildCredentials");
 const SelectBuildProfileFromEasJson_1 = require("./SelectBuildProfileFromEasJson");
+const SetDefaultAndroidKeystore_1 = require("./SetDefaultAndroidKeystore");
 class ManageAndroid {
     constructor(callingAction, projectDir) {
         this.callingAction = callingAction;
@@ -134,20 +135,10 @@ class ManageAndroid {
         (0, assert_1.default)(ctx.hasProjectContext, 'You must be in your project directory in order to perform this action');
         const appLookupParams = await (0, BuildCredentialsUtils_1.getAppLookupParamsFromContextAsync)(ctx, gradleContext);
         if (action === Actions_1.AndroidActionType.CreateKeystore) {
-            const selectBuildCredentialsResult = await new SelectAndroidBuildCredentials_1.SelectAndroidBuildCredentials(appLookupParams).runAsync(ctx);
-            const keystore = await new CreateKeystore_1.CreateKeystore(appLookupParams.account).runAsync(ctx);
-            if (selectBuildCredentialsResult.resultType ===
-                SelectAndroidBuildCredentials_1.SelectAndroidBuildCredentialsResultType.CREATE_REQUEST) {
-                await ctx.android.createAndroidAppBuildCredentialsAsync(ctx.graphqlClient, appLookupParams, {
-                    ...selectBuildCredentialsResult.result,
-                    androidKeystoreId: keystore.id,
-                });
-            }
-            else {
-                await ctx.android.updateAndroidAppBuildCredentialsAsync(ctx.graphqlClient, selectBuildCredentialsResult.result, {
-                    androidKeystoreId: keystore.id,
-                });
-            }
+            await new CreateAndroidBuildCredentials_1.CreateAndroidBuildCredentials(appLookupParams).runAsync(ctx);
+        }
+        else if (action === Actions_1.AndroidActionType.SetDefaultKeystore) {
+            await new SetDefaultAndroidKeystore_1.SetDefaultAndroidKeystore(appLookupParams).runAsync(ctx);
         }
         else if (action === Actions_1.AndroidActionType.DownloadKeystore) {
             const buildCredentials = await new SelectAndroidBuildCredentials_1.SelectExistingAndroidBuildCredentials(appLookupParams).runAsync(ctx);

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

@@ -0,0 +1,8 @@
+import { AndroidAppBuildCredentialsFragment } from '../../graphql/generated';
+import { AppLookupParams } from '../android/api/GraphqlClient';
+import { CredentialsContext } from '../context';
+export declare class SetDefaultAndroidKeystore {
+    private app;
+    constructor(app: AppLookupParams);
+    runAsync(ctx: CredentialsContext): Promise<AndroidAppBuildCredentialsFragment | undefined>;
+}

package/build/credentials/manager/SetDefaultAndroidKeystore.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SetDefaultAndroidKeystore = void 0;
+const tslib_1 = require("tslib");
+const log_1 = tslib_1.__importDefault(require("../../log"));
+const prompts_1 = require("../../prompts");
+const BuildCredentialsUtils_1 = require("../android/actions/BuildCredentialsUtils");
+class SetDefaultAndroidKeystore {
+    constructor(app) {
+        this.app = app;
+    }
+    async runAsync(ctx) {
+        const buildCredentialsList = await ctx.android.getAndroidAppBuildCredentialsListAsync(ctx.graphqlClient, this.app);
+        if (buildCredentialsList.length === 0) {
+            log_1.default.log(`You don't have any Android build credentials`);
+            return;
+        }
+        const sortedBuildCredentialsList = (0, BuildCredentialsUtils_1.sortBuildCredentials)(buildCredentialsList);
+        const sortedBuildCredentialsChoices = sortedBuildCredentialsList.map(buildCredentials => ({
+            title: buildCredentials.isDefault
+                ? `${buildCredentials.name} (Default)`
+                : buildCredentials.name,
+            value: buildCredentials,
+        }));
+        const { buildCredentialsResult } = await (0, prompts_1.promptAsync)({
+            type: 'select',
+            name: 'buildCredentialsResult',
+            message: 'Select build credentials',
+            choices: [...sortedBuildCredentialsChoices, { title: 'Cancel', value: null }],
+        });
+        if (!(buildCredentialsResult === null || buildCredentialsResult === void 0 ? void 0 : buildCredentialsResult.androidKeystore)) {
+            return;
+        }
+        log_1.default.log('Updating the default build credentials for this project...');
+        return await ctx.android.setDefaultAndroidAppBuildCredentialsAsync(ctx.graphqlClient, {
+            ...buildCredentialsResult,
+            isDefault: true,
+        });
+    }
+}
+exports.SetDefaultAndroidKeystore = SetDefaultAndroidKeystore;