eas-cli 3.18.2 → 3.18.3

package/build/channel/utils.js

@@ -1,11 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUpdateBranch = exports.logChannelDetails = exports.getBranchMapping = void 0;
+exports.getUpdateBranch = exports.getBranchMapping = void 0;
 const tslib_1 = require("tslib");
 const assert_1 = tslib_1.__importDefault(require("assert"));
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
-const log_1 = tslib_1.__importDefault(require("../log"));
-const utils_1 = require("../update/utils");
 const branch_mapping_1 = require("./branch-mapping");
 /**
  * Get the branch mapping and determine whether it is a rollout.
@@ -63,36 +60,6 @@ function getBranchMapping(branchMappingString) {
     return { branchMapping, isRollout, rolloutPercent };
 }
 exports.getBranchMapping = getBranchMapping;
-function logChannelDetails(channel) {
-    const { branchMapping, isRollout, rolloutPercent } = getBranchMapping(channel.branchMapping);
-    if (branchMapping.data.length > 2) {
-        throw new Error('Branch Mapping data must have length less than or equal to 2.');
-    }
-    const rolloutBranchIds = branchMapping.data.map(data => data.branchId);
-    const branchDescription = channel.updateBranches.flatMap(branch => {
-        const updateGroupWithBranchDescriptions = (0, utils_1.getUpdateGroupDescriptionsWithBranch)(branch.updateGroups);
-        const isRolloutBranch = isRollout && rolloutBranchIds.includes(branch.id);
-        const isBaseBranch = rolloutBranchIds.length > 0 && rolloutBranchIds[0] === branch.id;
-        let rolloutPercentNumber = undefined;
-        if (isRolloutBranch) {
-            rolloutPercentNumber = isBaseBranch ? rolloutPercent * 100 : (1 - rolloutPercent) * 100;
-        }
-        return updateGroupWithBranchDescriptions.map(({ branch, ...updateGroup }) => ({
-            branch,
-            branchRolloutPercentage: rolloutPercentNumber,
-            update: updateGroup,
-        }));
-    });
-    if (branchDescription.length === 0) {
-        log_1.default.log(chalk_1.default.dim('No branches are pointed to this channel.'));
-    }
-    else {
-        log_1.default.log(branchDescription
-            .map(description => (0, utils_1.formatBranch)(description))
-            .join(`\n\n${chalk_1.default.dim('———')}\n\n`));
-    }
-}
-exports.logChannelDetails = logChannelDetails;
 function getUpdateBranchNullable(channel, branchId) {
     const updateBranches = channel.updateBranches;
     const updateBranch = updateBranches.find(branch => branch.id === branchId);

package/build/commands/channel/edit.js

@@ -8,6 +8,7 @@ const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const graphql_1 = require("graphql");
 const graphql_tag_1 = tslib_1.__importDefault(require("graphql-tag"));
 const queries_1 = require("../../branch/queries");
+const branch_mapping_1 = require("../../channel/branch-mapping");
 const queries_2 = require("../../channel/queries");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
 const flags_1 = require("../../commandUtils/flags");
@@ -16,6 +17,7 @@ const BranchQuery_1 = require("../../graphql/queries/BranchQuery");
 const ChannelQuery_1 = require("../../graphql/queries/ChannelQuery");
 const UpdateChannelBasicInfo_1 = require("../../graphql/types/UpdateChannelBasicInfo");
 const log_1 = tslib_1.__importDefault(require("../../log"));
+const branch_mapping_2 = require("../../rollout/branch-mapping");
 const json_1 = require("../../utils/json");
 async function updateChannelBranchMappingAsync(graphqlClient, { channelId, branchMapping }) {
     const data = await (0, client_1.withErrorHandlingAsync)(graphqlClient
@@ -57,9 +59,12 @@ class ChannelEdit extends EasCommand_1.default {
                 selectionPromptTitle: 'Select a channel to edit',
                 paginatedQueryOptions: { json, nonInteractive, offset: 0 },
             });
-        if (existingChannel.updateBranches.length > 1) {
+        if ((0, branch_mapping_2.isRollout)(existingChannel)) {
             throw new Error('There is a rollout in progress. Manage it with "channel:rollout" instead.');
         }
+        else if (!(0, branch_mapping_1.hasStandardBranchMap)(existingChannel)) {
+            throw new Error('Only standard branch mappings can be edited with this command.');
+        }
         const branch = branchFlag
             ? await BranchQuery_1.BranchQuery.getBranchByNameAsync(graphqlClient, {
                 appId: projectId,

package/build/commands/channel/rollout-preview.js

@@ -83,6 +83,37 @@ ChannelRolloutPreview.flags = {
         description: 'Rollout action to perform',
         options: Object.values(ActionRawFlagValue),
         required: false,
+        relationships: [
+            {
+                type: 'all',
+                flags: [
+                    {
+                        name: 'percent',
+                        // eslint-disable-next-line async-protect/async-suffix
+                        when: async (flags) => {
+                            return (!!flags['non-interactive'] &&
+                                (flags['action'] === ActionRawFlagValue.CREATE ||
+                                    flags['action'] === ActionRawFlagValue.EDIT));
+                        },
+                    },
+                    {
+                        name: 'outcome',
+                        // eslint-disable-next-line async-protect/async-suffix
+                        when: async (flags) => !!flags['non-interactive'] && flags['action'] === ActionRawFlagValue.END,
+                    },
+                    {
+                        name: 'branch',
+                        // eslint-disable-next-line async-protect/async-suffix
+                        when: async (flags) => !!flags['non-interactive'] && flags['action'] === ActionRawFlagValue.CREATE,
+                    },
+                    {
+                        name: 'runtime-version',
+                        // eslint-disable-next-line async-protect/async-suffix
+                        when: async (flags) => !!flags['non-interactive'] && flags['action'] === ActionRawFlagValue.CREATE,
+                    },
+                ],
+            },
+        ],
     }),
     percent: core_1.Flags.integer({
         description: 'Percent of users to send to the new branch. Use with --action=edit or --action=create',

package/build/commands/update/republish.d.ts

@@ -1,23 +1,4 @@
-import { Platform } from '@expo/config';
 import EasCommand from '../../commandUtils/EasCommand';
-type UpdateRepublishRawFlags = {
-    branch?: string;
-    channel?: string;
-    group?: string;
-    message?: string;
-    platform: string;
-    'non-interactive': boolean;
-    json?: boolean;
-};
-type UpdateRepublishFlags = {
-    branchName?: string;
-    channelName?: string;
-    groupId?: string;
-    updateMessage?: string;
-    platform: Platform[];
-    nonInteractive: boolean;
-    json: boolean;
-};
 export default class UpdateRepublish extends EasCommand {
     static description: string;
     static flags: {
@@ -28,12 +9,12 @@ export default class UpdateRepublish extends EasCommand {
         group: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
         message: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
         platform: import("@oclif/core/lib/interfaces").OptionFlag<string>;
+        'private-key-path': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
     };
     static contextDefinition: {
         loggedIn: import("../../commandUtils/context/LoggedInContextField").default;
         privateProjectConfig: import("../../commandUtils/context/PrivateProjectConfigContextField").PrivateProjectConfigContextField;
     };
     runAsync(): Promise<void>;
-    sanitizeFlags(rawFlags: UpdateRepublishRawFlags): UpdateRepublishFlags;
+    private sanitizeFlags;
 }
-export {};

package/build/commands/update/republish.js

@@ -13,6 +13,7 @@ const getBranchNameFromChannelNameAsync_1 = require("../../update/getBranchNameF
 const queries_1 = require("../../update/queries");
 const republish_1 = require("../../update/republish");
 const utils_1 = require("../../update/utils");
+const code_signing_1 = require("../../utils/code-signing");
 const json_1 = require("../../utils/json");
 const defaultRepublishPlatforms = ['android', 'ios'];
 class UpdateRepublish extends EasCommand_1.default {
@@ -25,6 +26,7 @@ class UpdateRepublish extends EasCommand_1.default {
         if (flags.json) {
             (0, json_1.enableJsonOutput)();
         }
+        const codeSigningInfo = await (0, code_signing_1.getCodeSigningInfoAsync)(exp, flags.privateKeyPath);
         const existingUpdates = await getOrAskUpdatesAsync(graphqlClient, projectId, flags);
         const updatesToPublish = existingUpdates.filter(update => flags.platform.includes(update.platform));
         if (existingUpdates.length === 0) {
@@ -51,6 +53,7 @@ class UpdateRepublish extends EasCommand_1.default {
             updatesToPublish,
             targetBranch: { branchId: arbitraryUpdate.branchId, branchName: arbitraryUpdate.branchName },
             updateMessage,
+            codeSigningInfo,
             json: flags.json,
         });
     }
@@ -60,6 +63,7 @@ class UpdateRepublish extends EasCommand_1.default {
         const channelName = rawFlags.channel;
         const groupId = rawFlags.group;
         const nonInteractive = rawFlags['non-interactive'];
+        const privateKeyPath = rawFlags['private-key-path'];
         if (nonInteractive && !groupId) {
             throw new Error('Only --group can be used in non-interactive mode');
         }
@@ -73,6 +77,7 @@ class UpdateRepublish extends EasCommand_1.default {
             groupId,
             platform,
             updateMessage: rawFlags.message,
+            privateKeyPath,
             json: (_b = rawFlags.json) !== null && _b !== void 0 ? _b : false,
             nonInteractive,
         };
@@ -105,6 +110,10 @@ UpdateRepublish.flags = {
         default: 'all',
         required: false,
     }),
+    'private-key-path': core_1.Flags.string({
+        description: `File containing the PEM-encoded private key corresponding to the certificate in expo-updates' configuration. Defaults to a file named "private-key.pem" in the certificate's directory.`,
+        required: false,
+    }),
     ...flags_1.EasNonInteractiveAndJsonFlags,
 };
 UpdateRepublish.contextDefinition = {

package/build/update/republish.d.ts

@@ -1,6 +1,7 @@
 import { ExpoConfig } from '@expo/config';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { Update } from '../graphql/generated';
+import { CodeSigningInfo } from '../utils/code-signing';
 export type UpdateToRepublish = {
     groupId: string;
     branchId: string;
@@ -10,7 +11,7 @@ export type UpdateToRepublish = {
  * @param updatesToPublish The update group to republish
  * @param targetBranch The branch to repubish the update group on
  */
-export declare function republishAsync({ graphqlClient, app, updatesToPublish, targetBranch, updateMessage, json, }: {
+export declare function republishAsync({ graphqlClient, app, updatesToPublish, targetBranch, updateMessage, codeSigningInfo, json, }: {
     graphqlClient: ExpoGraphqlClient;
     app: {
         exp: ExpoConfig;
@@ -22,5 +23,6 @@ export declare function republishAsync({ graphqlClient, app, updatesToPublish, t
         branchId: string;
     };
     updateMessage: string;
+    codeSigningInfo?: CodeSigningInfo;
     json?: boolean;
 }): Promise<void>;

package/build/update/republish.js

@@ -3,18 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.republishAsync = void 0;
 const tslib_1 = require("tslib");
 const assert_1 = tslib_1.__importDefault(require("assert"));
+const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
 const url_1 = require("../build/utils/url");
+const fetch_1 = tslib_1.__importDefault(require("../fetch"));
 const PublishMutation_1 = require("../graphql/mutations/PublishMutation");
 const log_1 = tslib_1.__importStar(require("../log"));
 const ora_1 = require("../ora");
 const projectUtils_1 = require("../project/projectUtils");
+const code_signing_1 = require("../utils/code-signing");
 const formatFields_1 = tslib_1.__importDefault(require("../utils/formatFields"));
 const json_1 = require("../utils/json");
 /**
  * @param updatesToPublish The update group to republish
  * @param targetBranch The branch to repubish the update group on
  */
-async function republishAsync({ graphqlClient, app, updatesToPublish, targetBranch, updateMessage, json, }) {
+async function republishAsync({ graphqlClient, app, updatesToPublish, targetBranch, updateMessage, codeSigningInfo, json, }) {
     const { branchName: targetBranchName, branchId: targetBranchId } = targetBranch;
     // The update group properties are the same for all updates
     (0, assert_1.default)(updatesToPublish.length > 0, 'Updates to republish must be provided');
@@ -25,31 +28,51 @@ async function republishAsync({ graphqlClient, app, updatesToPublish, targetBran
         update.runtimeVersion === arbitraryUpdate.runtimeVersion;
     (0, assert_1.default)(updatesToPublish.every(isSameGroup), 'All updates must belong to the same update group');
     const { runtimeVersion } = arbitraryUpdate;
-    // If codesigning was created for the original update, we need to add it to the republish
+    // If codesigning was created for the original update, we need to add it to the republish.
+    // If one wishes to not sign the republish or sign with a different key, a normal publish should
+    // be performed.
     const shouldRepublishWithCodesigning = updatesToPublish.some(update => update.codeSigningInfo);
     if (shouldRepublishWithCodesigning) {
-        log_1.default.withTick(`The republished update will be signed with the same codesigning as the original update.`);
+        if (!codeSigningInfo) {
+            throw new Error('Must specify --private-key-path argument to sign republished update for code signing');
+        }
+        for (const update of updatesToPublish) {
+            if ((0, nullthrows_1.default)(update.codeSigningInfo).alg !== codeSigningInfo.codeSigningMetadata.alg ||
+                (0, nullthrows_1.default)(update.codeSigningInfo).keyid !== codeSigningInfo.codeSigningMetadata.keyid) {
+                throw new Error('Republished updates must use the same code signing key and algorithm as original update');
+            }
+        }
+        log_1.default.withTick(`The republished update will be signed`);
     }
     const publishIndicator = (0, ora_1.ora)('Republishing...').start();
     let updatesRepublished;
     try {
+        const updateInfoGroup = Object.fromEntries(updatesToPublish.map(update => [update.platform, JSON.parse(update.manifestFragment)]));
         updatesRepublished = await PublishMutation_1.PublishMutation.publishUpdateGroupAsync(graphqlClient, [
             {
                 branchId: targetBranchId,
                 runtimeVersion,
                 message: updateMessage,
-                updateInfoGroup: Object.fromEntries(updatesToPublish.map(update => [update.platform, JSON.parse(update.manifestFragment)])),
+                updateInfoGroup,
                 gitCommitHash: updatesToPublish[0].gitCommitHash,
-                awaitingCodeSigningInfo: shouldRepublishWithCodesigning,
+                awaitingCodeSigningInfo: !!codeSigningInfo,
             },
         ]);
-        if (shouldRepublishWithCodesigning) {
-            const codeSigningByPlatform = Object.fromEntries(updatesToPublish.map(update => [update.platform, update.codeSigningInfo]));
-            await Promise.all(updatesRepublished.map(async (update) => {
-                const codeSigning = codeSigningByPlatform[update.platform];
-                if (codeSigning) {
-                    await PublishMutation_1.PublishMutation.setCodeSigningInfoAsync(graphqlClient, update.id, codeSigning);
-                }
+        if (codeSigningInfo) {
+            log_1.default.log('🔒 Signing republished update');
+            await Promise.all(updatesRepublished.map(async (newUpdate) => {
+                const response = await (0, fetch_1.default)(newUpdate.manifestPermalink, {
+                    method: 'GET',
+                    headers: { accept: 'multipart/mixed' },
+                });
+                const manifestBody = (0, nullthrows_1.default)(await (0, code_signing_1.getManifestBodyAsync)(response));
+                (0, code_signing_1.checkManifestBodyAgainstUpdateInfoGroup)(manifestBody, (0, nullthrows_1.default)((0, nullthrows_1.default)(updateInfoGroup)[newUpdate.platform]));
+                const manifestSignature = (0, code_signing_1.signBody)(manifestBody, codeSigningInfo);
+                await PublishMutation_1.PublishMutation.setCodeSigningInfoAsync(graphqlClient, newUpdate.id, {
+                    alg: codeSigningInfo.codeSigningMetadata.alg,
+                    keyid: codeSigningInfo.codeSigningMetadata.keyid,
+                    sig: manifestSignature,
+                });
             }));
         }
         publishIndicator.succeed('Republished update');