eas-cli 16.14.1 → 16.16.0

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

@@ -4,6 +4,7 @@ exports.syncCapabilityIdentifiersForEntitlementsAsync = void 0;
 const tslib_1 = require("tslib");
 const apple_utils_1 = require("@expo/apple-utils");
 const bundleIdCapabilities_1 = require("./bundleIdCapabilities");
+const capabilityList_1 = require("./capabilityList");
 const log_1 = tslib_1.__importDefault(require("../../../log"));
 const authType_1 = require("../utils/authType");
 /**
@@ -30,7 +31,8 @@ async function syncCapabilityIdentifiersForEntitlementsAsync(bundleId, entitleme
     }
     const createdIds = [];
     const linkedIds = [];
-    const CapabilityIdMapping = bundleIdCapabilities_1.CapabilityMapping.filter(capability => capability.capabilityIdModel);
+    // these are only APPLE_PAY, ICLOUD, APP_GROUPS
+    const CapabilityIdMapping = capabilityList_1.CapabilityMapping.filter(capability => capability.capabilityIdModel);
     const updateRequest = [];
     // Iterate through the supported capabilities to build the request.
     for (const classifier of CapabilityIdMapping) {
@@ -57,49 +59,46 @@ async function syncCapabilityIdentifiersForEntitlementsAsync(bundleId, entitleme
         const existingIds = await CapabilityModel.getAsync(bundleId.context);
         // A list of server IDs for linking.
         const capabilityIdOpaqueIds = [];
+        const capabilitiesWithoutRemoteModels = capabilityIds.filter(localId => existingIds.find(model => model.attributes.identifier === localId) === undefined);
         // Iterate through all the local IDs and see if they exist on the server.
-        for (const localId of capabilityIds) {
-            let remoteIdModel = existingIds.find(model => model.attributes.identifier === localId);
-            // If a remote ID exists, then create it.
-            if (!remoteIdModel) {
-                if (log_1.default.isDebug) {
-                    log_1.default.log(`Creating capability ID: ${localId} (${CapabilityModel.type})`);
-                }
-                try {
-                    remoteIdModel = await CapabilityModel.createAsync(bundleId.context, {
-                        identifier: localId,
-                    });
-                }
-                catch (error) {
-                    // Add a more helpful error message.
-                    error.message += `\n\nRemove the value '${localId}' from the array '${classifier.entitlement}' in the iOS project entitlements.\nIf you know that the ID is registered to one of your apps, try again with a different Apple account.`;
-                    throw error;
-                }
-                // Create a list of newly created IDs for displaying in the CLI.
-                createdIds.push(localId);
-                if (log_1.default.isDebug) {
-                    log_1.default.log(`Created capability ID: ${remoteIdModel.id}`);
-                }
+        for (const localId of capabilitiesWithoutRemoteModels) {
+            let remoteIdModel = undefined;
+            if (log_1.default.isDebug) {
+                log_1.default.log(`Creating capability ID: ${localId} (${CapabilityModel.type})`);
+            }
+            try {
+                remoteIdModel = await CapabilityModel.createAsync(bundleId.context, {
+                    identifier: localId,
+                });
+            }
+            catch (error) {
+                // Add a more helpful error message.
+                error.message += `\n\nRemove the value '${localId}' from the array '${classifier.entitlement}' in the iOS project entitlements.\nIf you know that the ID is registered to one of your apps, try again with a different Apple account.`;
+                throw error;
             }
             if (log_1.default.isDebug) {
-                log_1.default.log(`Linking ID to ${CapabilityModel.type}: ${localId} (${remoteIdModel.id})`);
+                log_1.default.log(`Created capability ID: ${remoteIdModel.id}`);
             }
-            // Create a list of linked IDs for displaying in the CLI.
+            // add to a list of newly created IDs for displaying in the CLI.
+            createdIds.push(localId);
+            // add to a list of linked IDs for displaying in the CLI.
             linkedIds.push(remoteIdModel.attributes.identifier);
             capabilityIdOpaqueIds.push(remoteIdModel.id);
         }
-        updateRequest.push({
-            capabilityType: classifier.capability,
-            option: apple_utils_1.CapabilityTypeOption.ON,
-            relationships: {
-                // One of: `merchantIds`, `appGroups`, `cloudContainers`.
-                [CapabilityModel.type]: capabilityIdOpaqueIds,
-            },
-        });
+        if (capabilityIdOpaqueIds.length) {
+            updateRequest.push({
+                capabilityType: classifier.capability,
+                option: apple_utils_1.CapabilityTypeOption.ON,
+                relationships: {
+                    // One of: `merchantIds`, `appGroups`, `cloudContainers`.
+                    [CapabilityModel.type]: capabilityIdOpaqueIds,
+                },
+            });
+        }
     }
     if (updateRequest.length) {
         if (log_1.default.isDebug) {
-            log_1.default.log(`Updating bundle identifier with capability identifiers:`, updateRequest);
+            log_1.default.log(`Updating bundle identifier with capability identifiers:`, JSON.stringify(updateRequest, null, 2));
         }
         await bundleId.updateBundleIdCapabilityAsync(updateRequest);
     }

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

@@ -0,0 +1,33 @@
+/// <reference types="@expo/apple-utils/ts-declarations/expo__app-store" />
+import { BundleIdCapability, CapabilityType, MerchantId } from '@expo/apple-utils';
+import { JSONObject, JSONValue } from '@expo/json-file';
+declare const skipOp: {
+    readonly op: "skip";
+};
+declare const disableOp: {
+    readonly op: "disable";
+};
+type GetSyncOperation = (opts: {
+    existingRemote: BundleIdCapability | null;
+    entitlementValue: JSONValue;
+    entitlements: JSONObject;
+    additionalOptions: {
+        usesBroadcastPushNotifications: boolean;
+    };
+}) => {
+    op: 'enable';
+    option: JSONValue;
+} | typeof skipOp | typeof disableOp;
+export type CapabilityClassifier = {
+    name: string;
+    entitlement: string;
+    capability: CapabilityType;
+    validateOptions: (options: any) => boolean;
+    capabilityIdModel?: typeof MerchantId;
+    getSyncOperation: GetSyncOperation;
+    capabilityIdPrefix?: string;
+    options?: undefined;
+};
+export declare const CapabilityMapping: CapabilityClassifier[];
+export declare const associatedDomainsCapabilityType: CapabilityClassifier;
+export {};