eas-cli 16.13.4 → 16.14.1

package/build/commands/update/roll-back-to-embedded.js

@@ -3,27 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const eas_json_1 = require("@expo/eas-json");
 const core_1 = require("@oclif/core");
-const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
 const queries_1 = require("../../branch/queries");
-const url_1 = require("../../build/utils/url");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
 const flags_1 = require("../../commandUtils/flags");
 const pagination_1 = require("../../commandUtils/pagination");
-const fetch_1 = tslib_1.__importDefault(require("../../fetch"));
 const generated_1 = require("../../graphql/generated");
-const PublishMutation_1 = require("../../graphql/mutations/PublishMutation");
-const RuntimeQuery_1 = require("../../graphql/queries/RuntimeQuery");
-const log_1 = tslib_1.__importStar(require("../../log"));
-const ora_1 = require("../../ora");
 const projectUtils_1 = require("../../project/projectUtils");
 const publish_1 = require("../../project/publish");
 const configure_1 = require("../../update/configure");
-const utils_1 = require("../../update/utils");
+const queries_2 = require("../../update/queries");
+const roll_back_to_embedded_1 = require("../../update/roll-back-to-embedded");
 const code_signing_1 = require("../../utils/code-signing");
-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");
-const relay_1 = require("../../utils/relay");
 const statuspageService_1 = require("../../utils/statuspageService");
 class UpdateRollBackToEmbedded extends EasCommand_1.default {
     static description = 'roll back to the embedded update';
@@ -116,134 +107,23 @@ class UpdateRollBackToEmbedded extends EasCommand_1.default {
             branchName,
         });
         const selectedRuntime = runtimeVersionArg ??
-            (await UpdateRollBackToEmbedded.selectRuntimeAsync(graphqlClient, {
+            (await (0, queries_2.selectRuntimeOnBranchAsync)(graphqlClient, {
                 appId: projectId,
                 branchName,
             }))?.version;
         if (!selectedRuntime) {
             core_1.Errors.error('Must select a runtime or provide the --runtimeVersion flag', { exit: 1 });
         }
-        const runtimeToPlatformsAndFingerprintInfoMapping = (0, publish_1.getRuntimeToPlatformsAndFingerprintInfoMappingFromRuntimeVersionInfoObjects)(realizedPlatforms.map(platform => ({
-            platform,
-            runtimeVersionInfo: {
-                runtimeVersion: selectedRuntime,
-                expoUpdatesRuntimeFingerprint: null,
-                expoUpdatesRuntimeFingerprintHash: null,
-            },
-        })));
-        let newUpdates;
-        const publishSpinner = (0, ora_1.ora)('Publishing...').start();
-        try {
-            newUpdates = await this.publishRollbacksAsync({
-                graphqlClient,
-                updateMessage,
-                branchId: branch.id,
-                codeSigningInfo,
-                runtimeToPlatformsAndFingerprintInfoMapping,
-                realizedPlatforms,
-            });
-            publishSpinner.succeed('Published!');
-        }
-        catch (e) {
-            publishSpinner.fail('Failed to publish updates');
-            throw e;
-        }
-        if (jsonFlag) {
-            (0, json_1.printJsonOnlyOutput)((0, utils_1.getUpdateJsonInfosForUpdates)(newUpdates));
-        }
-        else {
-            log_1.default.addNewLineIfNone();
-            for (const runtime of (0, uniqBy_1.default)(runtimeToPlatformsAndFingerprintInfoMapping, version => version.runtimeVersion)) {
-                const newUpdatesForRuntimeVersion = newUpdates.filter(update => update.runtimeVersion === runtime.runtimeVersion);
-                if (newUpdatesForRuntimeVersion.length === 0) {
-                    throw new Error(`Publish response is missing updates with runtime ${runtime.runtimeVersion}.`);
-                }
-                const platforms = newUpdatesForRuntimeVersion.map(update => update.platform);
-                const newAndroidUpdate = newUpdatesForRuntimeVersion.find(update => update.platform === 'android');
-                const newIosUpdate = newUpdatesForRuntimeVersion.find(update => update.platform === 'ios');
-                const updateGroupId = newUpdatesForRuntimeVersion[0].group;
-                const projectName = exp.slug;
-                const accountName = (await (0, projectUtils_1.getOwnerAccountForProjectIdAsync)(graphqlClient, projectId)).name;
-                const updateGroupUrl = (0, url_1.getUpdateGroupUrl)(accountName, projectName, updateGroupId);
-                const updateGroupLink = (0, log_1.link)(updateGroupUrl, { dim: false });
-                log_1.default.log((0, formatFields_1.default)([
-                    { label: 'Branch', value: branchName },
-                    { label: 'Runtime version', value: runtime.runtimeVersion },
-                    { label: 'Platform', value: platforms.join(', ') },
-                    { label: 'Update group ID', value: updateGroupId },
-                    ...(newAndroidUpdate
-                        ? [{ label: 'Android update ID', value: newAndroidUpdate.id }]
-                        : []),
-                    ...(newIosUpdate ? [{ label: 'iOS update ID', value: newIosUpdate.id }] : []),
-                    { label: 'Message', value: updateMessage ?? '' },
-                    { label: 'EAS Dashboard', value: updateGroupLink },
-                ]));
-                log_1.default.addNewLineIfNone();
-            }
-        }
-    }
-    async publishRollbacksAsync({ graphqlClient, updateMessage, branchId, codeSigningInfo, runtimeToPlatformsAndFingerprintInfoMapping, realizedPlatforms, }) {
-        const rollbackInfoGroups = Object.fromEntries(realizedPlatforms.map(platform => [platform, true]));
-        // Sort the updates into different groups based on their platform specific runtime versions
-        const updateGroups = runtimeToPlatformsAndFingerprintInfoMapping.map(({ runtimeVersion, platforms }) => {
-            const localRollbackInfoGroup = Object.fromEntries(platforms.map(platform => [platform, rollbackInfoGroups[platform]]));
-            return {
-                branchId,
-                rollBackToEmbeddedInfoGroup: localRollbackInfoGroup,
-                runtimeVersion,
-                message: updateMessage,
-                awaitingCodeSigningInfo: !!codeSigningInfo,
-            };
-        });
-        const newUpdates = await PublishMutation_1.PublishMutation.publishUpdateGroupAsync(graphqlClient, updateGroups);
-        if (codeSigningInfo) {
-            log_1.default.log('🔒 Signing roll back');
-            const updatesTemp = [...newUpdates];
-            const updateGroupsAndTheirUpdates = updateGroups.map(updateGroup => {
-                const newUpdates = updatesTemp.splice(0, Object.keys((0, nullthrows_1.default)(updateGroup.rollBackToEmbeddedInfoGroup)).length);
-                return {
-                    updateGroup,
-                    newUpdates,
-                };
-            });
-            await Promise.all(updateGroupsAndTheirUpdates.map(async ({ newUpdates }) => {
-                await Promise.all(newUpdates.map(async (newUpdate) => {
-                    const response = await (0, fetch_1.default)(newUpdate.manifestPermalink, {
-                        method: 'GET',
-                        headers: { accept: 'multipart/mixed' },
-                    });
-                    const directiveBody = (0, nullthrows_1.default)(await (0, code_signing_1.getDirectiveBodyAsync)(response));
-                    (0, code_signing_1.checkDirectiveBodyAgainstUpdateInfoGroup)(directiveBody);
-                    const directiveSignature = (0, code_signing_1.signBody)(directiveBody, codeSigningInfo);
-                    await PublishMutation_1.PublishMutation.setCodeSigningInfoAsync(graphqlClient, newUpdate.id, {
-                        alg: codeSigningInfo.codeSigningMetadata.alg,
-                        keyid: codeSigningInfo.codeSigningMetadata.keyid,
-                        sig: directiveSignature,
-                    });
-                }));
-            }));
-        }
-        return newUpdates;
-    }
-    static async selectRuntimeAsync(graphqlClient, { appId, branchName, batchSize = 5, }) {
-        const queryAsync = async (queryParams) => {
-            return await RuntimeQuery_1.RuntimeQuery.getRuntimesOnBranchAsync(graphqlClient, {
-                appId,
-                name: branchName,
-                first: queryParams.first,
-                after: queryParams.after,
-                last: queryParams.last,
-                before: queryParams.before,
-            });
-        };
-        const getTitleAsync = async (runtime) => {
-            return runtime.version;
-        };
-        return await (0, relay_1.selectPaginatedAsync)({
-            queryAsync,
-            getTitleAsync,
-            printedType: 'target runtime',
-            pageSize: batchSize,
+        await (0, roll_back_to_embedded_1.publishRollBackToEmbeddedUpdateAsync)({
+            graphqlClient,
+            projectId,
+            exp,
+            updateMessage,
+            branch,
+            codeSigningInfo,
+            platforms: realizedPlatforms,
+            runtimeVersion: selectedRuntime,
+            json: jsonFlag,
         });
     }
     sanitizeFlags(flags) {

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

@@ -5,7 +5,7 @@ async function resolveAppleTeamIfAuthenticatedAsync(ctx, app) {
     if (!ctx.appStore.authCtx) {
         return null;
     }
-    return await ctx.ios.createOrGetExistingAppleTeamAsync(ctx.graphqlClient, app.account, {
+    return await ctx.ios.createOrGetExistingAppleTeamAndUpdateNameIfChangedAsync(ctx.graphqlClient, app.account.id, {
         appleTeamIdentifier: ctx.appStore.authCtx.team.id,
         appleTeamName: ctx.appStore.authCtx.team.name,
     });

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

@@ -26,7 +26,7 @@ class SetUpTargetBuildCredentialsFromCredentialsJson {
         const appInfo = `@${this.app.account.name}/${this.app.projectName} (${this.app.bundleIdentifier})`;
         // new credentials from local json
         const appleTeamFromProvisioningProfile = (0, provisioningProfile_1.readAppleTeam)(this.targetCredentials.provisioningProfile);
-        const appleTeam = await ctx.ios.createOrGetExistingAppleTeamAsync(ctx.graphqlClient, this.app.account, {
+        const appleTeam = await ctx.ios.createOrGetExistingAppleTeamAndUpdateNameIfChangedAsync(ctx.graphqlClient, this.app.account.id, {
             appleTeamIdentifier: appleTeamFromProvisioningProfile.teamId,
             appleTeamName: appleTeamFromProvisioningProfile.teamName,
         });

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

@@ -24,7 +24,7 @@ export declare function updateIosAppCredentialsAsync(graphqlClient: ExpoGraphqlC
     applePushKeyId?: string;
     ascApiKeyIdForSubmissions?: string;
 }): Promise<CommonIosAppCredentialsFragment>;
-export declare function createOrGetExistingAppleTeamAsync(graphqlClient: ExpoGraphqlClient, account: AccountFragment, { appleTeamIdentifier, appleTeamName }: {
+export declare function createOrGetExistingAppleTeamAndUpdateNameIfChangedAsync(graphqlClient: ExpoGraphqlClient, accountId: string, { appleTeamIdentifier, appleTeamName }: {
     appleTeamIdentifier: string;
     appleTeamName?: string;
 }): Promise<AppleTeamFragment>;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+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.createOrGetExistingAppleTeamAndUpdateNameIfChangedAsync = 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 = tslib_1.__importDefault(require("nullthrows"));
@@ -117,16 +117,22 @@ async function createOrGetExistingIosAppCredentialsWithBuildCredentialsAsync(gra
         }));
     }
 }
-async function createOrGetExistingAppleTeamAsync(graphqlClient, account, { appleTeamIdentifier, appleTeamName }) {
-    const appleTeam = await AppleTeamQuery_1.AppleTeamQuery.getByAppleTeamIdentifierAsync(graphqlClient, account.id, appleTeamIdentifier);
+async function createOrGetExistingAppleTeamAndUpdateNameIfChangedAsync(graphqlClient, accountId, { appleTeamIdentifier, appleTeamName }) {
+    const appleTeam = await AppleTeamQuery_1.AppleTeamQuery.getByAppleTeamIdentifierAsync(graphqlClient, accountId, appleTeamIdentifier);
     if (appleTeam) {
+        const didAppleTeamNameChange = appleTeamName && appleTeam && appleTeamName !== appleTeam.appleTeamName;
+        if (didAppleTeamNameChange) {
+            return await AppleTeamMutation_1.AppleTeamMutation.updateAppleTeamAsync(graphqlClient, {
+                appleTeamName,
+            }, appleTeam.id);
+        }
         return appleTeam;
     }
     else {
-        return await AppleTeamMutation_1.AppleTeamMutation.createAppleTeamAsync(graphqlClient, { appleTeamIdentifier, appleTeamName }, account.id);
+        return await AppleTeamMutation_1.AppleTeamMutation.createAppleTeamAsync(graphqlClient, { appleTeamIdentifier, appleTeamName }, accountId);
     }
 }
-exports.createOrGetExistingAppleTeamAsync = createOrGetExistingAppleTeamAsync;
+exports.createOrGetExistingAppleTeamAndUpdateNameIfChangedAsync = createOrGetExistingAppleTeamAndUpdateNameIfChangedAsync;
 async function createOrGetExistingAppleAppIdentifierAsync(graphqlClient, { account, projectName, bundleIdentifier, parentBundleIdentifier }, appleTeam) {
     const appleAppIdentifier = await AppleAppIdentifierQuery_1.AppleAppIdentifierQuery.byBundleIdentifierAsync(graphqlClient, account.name, bundleIdentifier);
     if (appleAppIdentifier) {
@@ -188,7 +194,7 @@ async function getDistributionCertificatesForAccountAsync(graphqlClient, account
 }
 exports.getDistributionCertificatesForAccountAsync = getDistributionCertificatesForAccountAsync;
 async function createDistributionCertificateAsync(graphqlClient, account, distCert) {
-    const appleTeam = await createOrGetExistingAppleTeamAsync(graphqlClient, account, {
+    const appleTeam = await createOrGetExistingAppleTeamAndUpdateNameIfChangedAsync(graphqlClient, account.id, {
         appleTeamIdentifier: distCert.teamId,
         appleTeamName: distCert.teamName,
     });
@@ -206,7 +212,7 @@ async function deleteDistributionCertificateAsync(graphqlClient, distributionCer
 }
 exports.deleteDistributionCertificateAsync = deleteDistributionCertificateAsync;
 async function createPushKeyAsync(graphqlClient, account, pushKey) {
-    const appleTeam = await createOrGetExistingAppleTeamAsync(graphqlClient, account, {
+    const appleTeam = await createOrGetExistingAppleTeamAndUpdateNameIfChangedAsync(graphqlClient, account.id, {
         appleTeamIdentifier: pushKey.teamId,
         appleTeamName: pushKey.teamName,
     });
@@ -232,7 +238,7 @@ async function deletePushKeyAsync(graphqlClient, pushKeyId) {
 exports.deletePushKeyAsync = deletePushKeyAsync;
 async function createAscApiKeyAsync(graphqlClient, account, ascApiKey) {
     const maybeAppleTeam = ascApiKey.teamId
-        ? await createOrGetExistingAppleTeamAsync(graphqlClient, account, {
+        ? await createOrGetExistingAppleTeamAndUpdateNameIfChangedAsync(graphqlClient, account.id, {
             appleTeamIdentifier: ascApiKey.teamId,
             appleTeamName: ascApiKey.teamName,
         })

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

@@ -1,8 +1,6 @@
 import { ExpoGraphqlClient } from '../../../../../commandUtils/context/contextUtils/createGraphqlClient';
-import { AccountFragment, AppleTeamFragment, AppleTeamInput } from '../../../../../graphql/generated';
-export type AppleTeamMutationResult = AppleTeamFragment & {
-    account: AccountFragment;
-};
+import { AppleTeamFragment, AppleTeamInput, AppleTeamUpdateInput } from '../../../../../graphql/generated';
 export declare const AppleTeamMutation: {
-    createAppleTeamAsync(graphqlClient: ExpoGraphqlClient, appleTeamInput: AppleTeamInput, accountId: string): Promise<AppleTeamMutationResult>;
+    createAppleTeamAsync(graphqlClient: ExpoGraphqlClient, appleTeamInput: AppleTeamInput, accountId: string): Promise<AppleTeamFragment>;
+    updateAppleTeamAsync(graphqlClient: ExpoGraphqlClient, appleTeamInput: AppleTeamUpdateInput, appleTeamEntityId: string): Promise<AppleTeamFragment>;
 };

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

@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
 const graphql_1 = require("graphql");
 const graphql_tag_1 = tslib_1.__importDefault(require("graphql-tag"));
 const client_1 = require("../../../../../graphql/client");
-const Account_1 = require("../../../../../graphql/types/Account");
 const AppleTeam_1 = require("../../../../../graphql/types/credentials/AppleTeam");
 exports.AppleTeamMutation = {
     async createAppleTeamAsync(graphqlClient, appleTeamInput, accountId) {
@@ -16,15 +15,10 @@ exports.AppleTeamMutation = {
                 createAppleTeam(appleTeamInput: $appleTeamInput, accountId: $accountId) {
                   id
                   ...AppleTeamFragment
-                  account {
-                    id
-                    ...AccountFragment
-                  }
                 }
               }
             }
             ${(0, graphql_1.print)(AppleTeam_1.AppleTeamFragmentNode)}
-            ${(0, graphql_1.print)(Account_1.AccountFragmentNode)}
           `, {
             appleTeamInput,
             accountId,
@@ -32,4 +26,26 @@ exports.AppleTeamMutation = {
             .toPromise());
         return data.appleTeam.createAppleTeam;
     },
+    async updateAppleTeamAsync(graphqlClient, appleTeamInput, appleTeamEntityId) {
+        const data = await (0, client_1.withErrorHandlingAsync)(graphqlClient
+            .mutation((0, graphql_tag_1.default) `
+            mutation UpdateAppleTeamMutation(
+              $appleTeamInput: AppleTeamUpdateInput!
+              $appleTeamEntityId: ID!
+            ) {
+              appleTeam {
+                updateAppleTeam(appleTeamUpdateInput: $appleTeamInput, id: $appleTeamEntityId) {
+                  id
+                  ...AppleTeamFragment
+                }
+              }
+            }
+            ${(0, graphql_1.print)(AppleTeam_1.AppleTeamFragmentNode)}
+          `, {
+            appleTeamInput,
+            appleTeamEntityId,
+        })
+            .toPromise());
+        return data.appleTeam.updateAppleTeam;
+    },
 };

package/build/devices/manager.js

@@ -5,8 +5,7 @@ const tslib_1 = require("tslib");
 const assert_1 = tslib_1.__importDefault(require("assert"));
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const action_1 = tslib_1.__importDefault(require("./actions/create/action"));
-const AppleTeamMutation_1 = require("../credentials/ios/api/graphql/mutations/AppleTeamMutation");
-const AppleTeamQuery_1 = require("../credentials/ios/api/graphql/queries/AppleTeamQuery");
+const GraphqlClient_1 = require("../credentials/ios/api/GraphqlClient");
 const log_1 = tslib_1.__importDefault(require("../log"));
 const projectUtils_1 = require("../project/projectUtils");
 const prompts_1 = require("../prompts");
@@ -27,7 +26,7 @@ class DeviceManager {
         log_1.default.addNewLineIfNone();
         const account = await this.resolveAccountAsync();
         const appleAuthCtx = await this.ctx.appStore.ensureAuthenticatedAsync();
-        const appleTeam = await ensureAppleTeamExistsAsync(this.ctx.graphqlClient, account.id, {
+        const appleTeam = await (0, GraphqlClient_1.createOrGetExistingAppleTeamAndUpdateNameIfChangedAsync)(this.ctx.graphqlClient, account.id, {
             appleTeamIdentifier: appleAuthCtx.team.id,
             appleTeamName: appleAuthCtx.team.name,
         });
@@ -81,15 +80,3 @@ class AccountResolver {
     }
 }
 exports.AccountResolver = AccountResolver;
-async function ensureAppleTeamExistsAsync(graphqlClient, accountId, { appleTeamIdentifier, appleTeamName }) {
-    const appleTeam = await AppleTeamQuery_1.AppleTeamQuery.getByAppleTeamIdentifierAsync(graphqlClient, accountId, appleTeamIdentifier);
-    if (appleTeam) {
-        return appleTeam;
-    }
-    else {
-        return await AppleTeamMutation_1.AppleTeamMutation.createAppleTeamAsync(graphqlClient, {
-            appleTeamIdentifier,
-            appleTeamName,
-        }, accountId);
-    }
-}