Improve entitlement generation

bndkt · Aug 16, 2022 · dd56d06 · dd56d06
1 parent 9881f70
commit dd56d06
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 29 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-app-clip",
-  "version": "0.0.23",
+  "version": "0.0.24",
   "description": "Config plugin to add an App Clip to a React Native iOS app",
   "homepage": "https://github.com/bndkt/react-native-app-clip#readme",
   "main": "build/withIosAppClip.js",

diff --git a/src/withAppClipAppConfig.ts b/src/withAppClipAppConfig.ts
@@ -1,9 +1,28 @@
 import { ConfigPlugin, InfoPlist } from "@expo/config-plugins";
+import { ExpoConfig } from "@expo/config-types";
 
 import { getAppClipBundleIdentifier, getAppClipFolder } from "./withIosAppClip";
 
+export const getAppClipEntitlements = (iosConfig: ExpoConfig["ios"]) => {
+  const appBundleIdentifier = iosConfig!.bundleIdentifier!;
+  const entitlements: InfoPlist = {
+    "com.apple.developer.parent-application-identifiers": [
+      `$(AppIdentifierPrefix)${appBundleIdentifier}`,
+    ],
+    "com.apple.developer.on-demand-install-capable": true,
+  };
+
+  iosConfig?.usesAppleSignIn &&
+    (entitlements["com.apple.developer.applesignin"] = ["Default"]);
+
+  iosConfig?.associatedDomains &&
+    (entitlements["com.apple.developer.associated-domains"] =
+      iosConfig.associatedDomains);
+
+  return entitlements;
+};
+
 export const withAppClipAppConfig: ConfigPlugin = (config) => {
-  const appBundleIdentifier = config.ios!.bundleIdentifier!;
   const appClipName = getAppClipFolder(config.name);
   const appClipBundleIdentifier = getAppClipBundleIdentifier(
     config.ios!.bundleIdentifier!
@@ -16,20 +35,6 @@ export const withAppClipAppConfig: ConfigPlugin = (config) => {
     }
   );
 
-  const newEntitlements: InfoPlist = {
-    "com.apple.developer.parent-application-identifiers": [
-      `${appBundleIdentifier}`,
-    ],
-    "com.apple.developer.on-demand-install-capable": true,
-  };
-
-  config.ios!.usesAppleSignIn &&
-    (newEntitlements["com.apple.developer.applesignin"] = ["Default"]);
-
-  config.ios!.associatedDomains &&
-    (newEntitlements["com.apple.developer.associated-domains"] =
-      config.ios!.associatedDomains);
-
   if (!appClipConfigIndex) {
     config.extra = {
       ...config.extra,
@@ -63,7 +68,7 @@ export const withAppClipAppConfig: ConfigPlugin = (config) => {
 
     appClipConfig.entitlements = {
       ...appClipConfig.entitlements,
-      ...newEntitlements,
+      ...getAppClipEntitlements(config.ios),
     };
   }
 

diff --git a/src/withAppClipEntitlements.ts b/src/withAppClipEntitlements.ts
@@ -1,19 +1,15 @@
-import {
-  ConfigPlugin,
-  InfoPlist,
-  withDangerousMod,
-} from "@expo/config-plugins";
+import { ConfigPlugin, withDangerousMod } from "@expo/config-plugins";
 import plist from "@expo/plist";
 import * as fs from "fs";
 import * as path from "path";
+import { getAppClipEntitlements } from "./withAppClipAppConfig";
 
 import { getAppClipFolder } from "./withIosAppClip";
 
 export const withAppClipEntitlements: ConfigPlugin = (config) => {
   return withDangerousMod(config, [
     "ios",
     async (config) => {
-      const bundleIdentifier = config.ios!.bundleIdentifier!;
       const appClipFolderName = getAppClipFolder(
         config.modRequest.projectName!
       );
@@ -26,14 +22,10 @@ export const withAppClipEntitlements: ConfigPlugin = (config) => {
         `${appClipFolderName}.entitlements`
       );
 
-      const appClipPlist: InfoPlist = {
-        "com.apple.developer.parent-application-identifiers": [
-          `$(AppIdentifierPrefix)${bundleIdentifier}`,
-        ],
-      };
+      const appClipEntitlements = getAppClipEntitlements(config.ios);
 
       await fs.promises.mkdir(path.dirname(filePath), { recursive: true });
-      await fs.promises.writeFile(filePath, plist.build(appClipPlist));
+      await fs.promises.writeFile(filePath, plist.build(appClipEntitlements));
 
       return config;
     },