onesignal-expo-plugin 1.0.1 → 1.1.1

package/IOS_CREDENTIALS_EAS.md

@@ -5,20 +5,55 @@ To distribute your iOS application, you must set up all the credentials required
 * Provisioning profiles
 * Push notification certificate
 
-If you are using EAS, you may be letting Expo handle all your credentials. This is fine for your distribution and provisioning credentials. However, the push notification certificate *must* be handled separately since you are using OneSignal.
+If you are using EAS, you may be letting Expo handle all your credentials. This is fine for your distribution and provisioning credentials. However, the push notification certificate *must* be set up separately since you are using OneSignal.
 
-As of 3/22/2022, OneSignal does not support p8 files and EAS does not support p12 files which results in a particlar issue when cloud building through EAS while using the Expo managed credentials service. Since the EAS CLI only prompts for p8 files at the time of writing, the only way to complete the cloud build is to input "n" (no) when prompted for setting up push notifications through the CLI. However, this leads to the identifier not having the push capability required to set up push successfully. Until EAS adds more granular control over credentials or OneSignal adds p8 support or Expo adds p12 support, developers will have no option except to use local credentials only.
+### Push Notification Certificate
+To set up OneSignal on iOS, you will need a [push notification certificate](https://documentation.onesignal.com/docs/generate-an-ios-push-certificate). The push certificate is used to send notifications to devices and has nothing to do with the build process. After you have uploaded the certificate to OneSignal, it should just work.
 
-If you have developed on iOS before, you may be used to XCode helping with syncing things like capabilities across app targets. In Expo/EAS, we are likely not using XCode at all. Thus, we need to make sure that we set up everything manually via the Apple Developers portal.
+### Capabilities
+As of eas-cli `v0.52.0`, the previous capabilities issues should now be resolved. See the [release notes](https://github.com/expo/eas-cli/releases/tag/v0.52.0) for details.
 
-### TLDR
-To set up push notifications with OneSignal + Expo, you *must* manage all credentials yourself and use local credentials when cloud building through EAS.
+You can still view the old instructions by clicking below.
+
+<details>
+  <summary>Click to expand</summary>
 
 ---
+To receive notifications, you must add the `aps-environment` capability (Push Notifications) to your app at build time. The OneSignal plugin tries to facilitate this as much as possible but there could be complications if you added other capabilities/entitlements or another config plugin did. This is because EAS doesn't currently respect entitlement files on a per-target basis. If there are more than one entitlements files, it simply picks one and applies it to both targets.
+
+Due to this, there are two setup paths:
+1. A **simple setup** is one in which the only [capability](https://docs.expo.dev/build-reference/ios-capabilities/) on your main target is "Push Notifications."
+2. A more **complex setup** is one in which you have other capabilities.
+
+This also affects how you should set up your credentials. Use the following table to know whether to proceed with local or managed credentials:
+| Push Notification capability only |                                                                       |
+|-----------------------------------|-----------------------------------------------------------------------|
+| Local credentials                 | Works but unnecessary to go through extra effort to use local signing |
+| Managed credentials               | Works (simple setup)                                                                 |
+
+| Multiple capabilities |                                  |
+|-----------------------|----------------------------------|
+| Local credentials     | Works but requires complex setup |
+| Managed credentials   | Works unreliably                 |
+
+If you are unsure, run `expo prebuild` and look at the native entitlements file of your main target (in `ios` directory). Other config plugins may be adding capabilities here. Or check the full [capabilities](https://docs.expo.dev/build-reference/ios-capabilities/#supported-capabilities) list supported by Expo.
+
+
+#### Simple setup explanation
+Since there is only one capability (Push Notifications) required by your app, everything should just work. OneSignal will automatically add the capability to your app along with the necessary App Groups and EAS should sync them with your Apple Developer account. You can choose to use managed signing on EAS without a problem. This works because OneSignal will add the capability to both targets' entitlements files.
+
+#### Complex setup explanation
+Having additional capabilities on your app will result in a more complex setup, including having to use local credentials. The following is an explanation of why. It is not imperative to understand but we have included it for context.
+
+The OneSignal plugin will create an additional target: `OneSignalNotificationServiceExtension`. This target is the iOS service extension that adds support for Confirmed Deliveries, badges, media attachments, action buttons, and influenced opens (Firebase Analytics). Learn more [here](https://documentation.onesignal.com/docs/service-extensions). The plugin will automatically add app groups to both targets' entitlements files which are required if you want to make use of these features. They allow your app to execute code when a notification is received, even if your app is not active.
 
-# Setup
+Each target has an entitlement file. If there are multiple entitlements files per project, EAS will randomly pick one and apply it to both targets. To mitigate this, we have added the push capability entilement to both files (even though it's really only necessary in the main target). This can still pose a problem if it picks the NSE's entitlements file since it *could* break any other capabilities in your project, given that file will not have capabilities added to your main target by yourself or other plugins.
 
-## 1. Credentials setup
+The following section details how to mitigate these issues and not break your other capabilities.
+
+## Complex Setup
+
+### 1. Credentials setup
 To build successfully, you will need to create and use local credentials (one for production and development). Add `"credentialsSource": "local"` to your `eas.json` file.
 
 **Example:**
@@ -39,23 +74,20 @@ To build successfully, you will need to create and use local credentials (one fo
       "distribution": "internal",
       "credentialsSource": "local"
     }
-  },
-  "cli": {
-    "version": ">= 0.40.0"
   }
 }
 ```
 
-## 2. Identifiers
+### 2. Identifiers
 In your [Apple developer console](https://developer.apple.com) create two identifiers with the following format:
-   - `com.example.app` <-- you likely already have this one
-   - `com.example.app.OneSignalNotificationServiceExtension`
+   - `<com.example.app>` <-- you likely already have this one
+   - `<com.example.app>.OneSignalNotificationServiceExtension`
 
-### When modifying your existing main app identifier:
+#### When modifying your existing main app identifier:
    - add the App Groups capability like so: `group.<identifier>.onesignal`
    - keep / add the "Push Notifications" capability
 
-### When creating a new identifier for `OneSignalNotificationServiceExtension`:
+#### When creating a new identifier for `OneSignalNotificationServiceExtension`:
    - select AppId from the list of identifier types
    - select App when choosing between App and App Clip
    - add the App Groups capability like so: `group.<identifier>.onesignal`
@@ -64,10 +96,10 @@ In your [Apple developer console](https://developer.apple.com) create two identi
 #### Note on App Groups at Build Time:
 Make sure to build with both identifiers containing the AppGroup simultaneously. To troubleshoot, remove them both and then rebuild with both identifiers' AppGroup capabilities enabled.
 
-## 3. Provisioning
+### 3. Provisioning
 Create AdHoc (local development) and AppStore (production) provisioning profiles with both identifiers (four provisioning profiles total). Both provisioning profiles should use the same distribution certificate that is used by your app. Download the profiles.
 
-## 4. Add the profiles to your `credentials.json` file:
+### 4. Add the profiles to your `credentials.json` file:
 Use the same distribution certificate for the `OneSignalNotificationServiceExtension` as is used for your app (no need to create a new cert).
 
 We recommend creating a `certs` directory in your project with subdirectories for each build type (e.g: `certs/adhoc` & `certs/appstore`). Doing so, you can more easily switch which provisioning profiles get used at build time.
@@ -103,16 +135,20 @@ We recommend creating a `certs` directory in your project with subdirectories fo
 
 **Note:** your push certificate (p12) file should not appear anywhere in the `credentials.json` file.
 
----
+## Build (complex setup continued)
+
+**IMPORTANT**: run the `eas build` command with `EXPO_NO_CAPABILITY_SYNC` if you want to prevent EAS from syncing capabilities (e.g: overwriting the steps you took in the complex setup).
 
-# Build
 ### Release
 If you are ready for a production build, you should use the AppStore provisioning profiles you created. Make sure your `credentials.json` file is using the correct profiles.
 
 ### Development
 The development build will use the AdHoc provisioning profiles you created. Make sure your `credentials.json` file is using the correct profiles.
 
-#### Expo development client
+---
+</details>
+
+### Expo development client
 If you haven't already, add the expo development client to your project:
 
 ```sh
@@ -121,8 +157,6 @@ expo install expo-dev-client
 
 Make sure `"developmentClient": true,` is set in your `eas.json` development build profile.
 
-## All Builds
-
 ### Run the EAS build command
 ```sh
 eas build --profile <build profile> --platform ios
@@ -132,7 +166,5 @@ where `<build profile>` refers to the build profile in your `eas.json` file (e.g
 ### Build success
 At this point, your build should succeed. You can check its progress by opening the build link in the terminal.
 
----
-
-# How to run on your device
+## How to run on your device
 See our [EAS guide](EAS.md) for instructions.

package/README.md

@@ -1,6 +1,8 @@
 <h1 align="center">Welcome to onesignal-expo-plugin 👋</h1>
 <p>
-  <img alt="Version" src="https://img.shields.io/badge/version-1.0.1-blue.svg?cacheSeconds=2592000" />
+  <a href="https://www.npmjs.com/package/onesignal-expo-plugin" target="_blank">
+    <img alt="Version" src="https://img.shields.io/npm/v/onesignal-expo-plugin.svg">
+  </a>
   <a href="https://github.com/OneSignal/onesignal-expo-plugin#readme" target="_blank">
     <img alt="Documentation" src="https://img.shields.io/badge/documentation-yes-brightgreen.svg" />
   </a>
@@ -41,7 +43,7 @@ yarn add react-native-onesignal
 
 ## Configuration in app.json / app.config.js
 ### Plugin
-Add the plugin to the [plugin array](https://docs.expo.dev/versions/latest/config/app/):
+Add the plugin to the **front** of the [plugin array](https://docs.expo.dev/versions/latest/config/app/). It should be added automatically if you ran `expo install`. Just make sure it is the first plugin in the array and to configure any desired plugin props:
 
 **app.json**
 ```json
@@ -174,5 +176,5 @@ Give a ⭐️ if this project helped you!
 
 ## 📝 License
 
-Copyright © 2021 [OneSignal](https://github.com/OneSignal).<br />
+Copyright © 2022 [OneSignal](https://github.com/OneSignal).<br />
 This project is [MIT](https://github.com/OneSignal/onesignal-expo-plugin/blob/main/LICENSE) licensed.

package/build/onesignal/withOneSignalAndroid.js

@@ -5,25 +5,9 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withOneSignalAndroid = void 0;
-const config_plugins_1 = require("@expo/config-plugins");
-const androidConstants_1 = require("../support/androidConstants");
-const OneSignalLog_1 = require("../support/OneSignalLog");
-const withGradleBuildConfig = (config) => {
-    return (0, config_plugins_1.withAppBuildGradle)(config, (newConfig) => {
-        let { contents } = newConfig.modResults;
-        // make sure we haven't previously added dependencies
-        if (!contents.includes(androidConstants_1.ONESIGNAL_GRADLE)) {
-            contents = `${androidConstants_1.ONESIGNAL_GRADLE}\n${contents}`;
-        }
-        else {
-            OneSignalLog_1.OneSignalLog.log("OneSignal dependencies already added to build.gradle. Skipping...");
-        }
-        newConfig.modResults.contents = contents;
-        return newConfig;
-    });
-};
 const withOneSignalAndroid = (config, props) => {
-    withGradleBuildConfig(config, props);
+    //commented out until https://github.com/expo/eas-cli/issues/1226 is confirmed fixed
+    //OneSignalLog.log("No specific actions required for OneSignal on Android...");
     return config;
 };
 exports.withOneSignalAndroid = withOneSignalAndroid;

package/build/onesignal/withOneSignalIos.js

@@ -35,6 +35,8 @@ const updatePodfile_1 = require("../support/updatePodfile");
 const NseUpdaterManager_1 = __importDefault(require("../support/NseUpdaterManager"));
 const OneSignalLog_1 = require("../support/OneSignalLog");
 const FileManager_1 = require("../support/FileManager");
+const assert_1 = __importDefault(require("assert"));
+const getEasManagedCredentialsConfigExtra_1 = __importDefault(require("../support/eas/getEasManagedCredentialsConfigExtra"));
 /**
  * Add 'aps-environment' record with current environment to '<project-name>.entitlements' file
  * @see https://documentation.onesignal.com/docs/react-native-sdk-setup#step-4-install-for-ios-using-cocoapods-for-ios-apps
@@ -101,20 +103,33 @@ const withOneSignalNSE = (config, onesignalProps) => {
             mode: onesignalProps === null || onesignalProps === void 0 ? void 0 : onesignalProps.mode,
             iPhoneDeploymentTarget: onesignalProps === null || onesignalProps === void 0 ? void 0 : onesignalProps.iPhoneDeploymentTarget
         };
-        xcodeProjectAddNse(props.modRequest.projectName || "", options, "node_modules/onesignal-expo-plugin/build/support/serviceExtensionFiles/");
+        // support for monorepos where node_modules can be up to 5 parents
+        // above the project directory.
+        let dir = "node_modules";
+        for (let x = 0; x < 5 && !FileManager_1.FileManager.dirExists(dir); x++) {
+            dir = "../" + dir;
+        }
+        xcodeProjectAddNse(props.modRequest.projectName || "", options, dir + "/onesignal-expo-plugin/build/support/serviceExtensionFiles/");
         return props;
     });
 };
+const withEasManagedCredentials = (config) => {
+    var _a;
+    (0, assert_1.default)((_a = config.ios) === null || _a === void 0 ? void 0 : _a.bundleIdentifier, "Missing 'ios.bundleIdentifier' in app config.");
+    config.extra = (0, getEasManagedCredentialsConfigExtra_1.default)(config);
+    return config;
+};
 const withOneSignalIos = (config, props) => {
     withAppEnvironment(config, props);
     withRemoteNotificationsPermissions(config, props);
     withAppGroupPermissions(config, props);
     withOneSignalNSE(config, props);
+    withEasManagedCredentials(config, props);
     return config;
 };
 exports.withOneSignalIos = withOneSignalIos;
 function xcodeProjectAddNse(appName, options, sourceDir) {
-    const { iosPath, devTeam, bundleIdentifier, bundleVersion, bundleShortVersion, iPhoneDeploymentTarget, mode } = options;
+    const { iosPath, devTeam, bundleIdentifier, bundleVersion, bundleShortVersion, iPhoneDeploymentTarget } = options;
     // not awaiting in order to not block main thread
     (0, updatePodfile_1.updatePodfile)(iosPath).catch(err => { OneSignalLog_1.OneSignalLog.error(err); });
     const projPath = `${iosPath}/${appName}.xcodeproj/project.pbxproj`;
@@ -139,7 +154,7 @@ function xcodeProjectAddNse(appName, options, sourceDir) {
         }
         /* MODIFY COPIED EXTENSION FILES */
         const nseUpdater = new NseUpdaterManager_1.default(iosPath);
-        await nseUpdater.updateNSEEntitlements(`group.${bundleIdentifier}.onesignal`, mode);
+        await nseUpdater.updateNSEEntitlements(`group.${bundleIdentifier}.onesignal`);
         await nseUpdater.updateNSEBundleVersion(bundleVersion !== null && bundleVersion !== void 0 ? bundleVersion : iosConstants_1.DEFAULT_BUNDLE_VERSION);
         await nseUpdater.updateNSEBundleShortVersion(bundleShortVersion !== null && bundleShortVersion !== void 0 ? bundleShortVersion : iosConstants_1.DEFAULT_BUNDLE_SHORT_VERSION);
         // Create new PBXGroup for the extension

package/build/support/FileManager.js

@@ -54,5 +54,8 @@ class FileManager {
         const fileContents = await FileManager.readFile(path1);
         await FileManager.writeFile(path2, fileContents);
     }
+    static dirExists(path) {
+        return fs.existsSync(path);
+    }
 }
 exports.FileManager = FileManager;

package/build/support/NseUpdaterManager.js

@@ -10,10 +10,9 @@ class NseUpdaterManager {
         this.nsePath = '';
         this.nsePath = `${iosPath}/${iosConstants_1.NSE_TARGET_NAME}`;
     }
-    async updateNSEEntitlements(groupIdentifier, mode) {
+    async updateNSEEntitlements(groupIdentifier) {
         const entitlementsFilePath = `${this.nsePath}/${entitlementsFileName}`;
         let entitlementsFile = await FileManager_1.FileManager.readFile(entitlementsFilePath);
-        entitlementsFile = entitlementsFile.replace(iosConstants_1.APS_ENVIRONMENT_MODE, mode);
         entitlementsFile = entitlementsFile.replace(iosConstants_1.GROUP_IDENTIFIER_TEMPLATE_REGEX, groupIdentifier);
         await FileManager_1.FileManager.writeFile(entitlementsFilePath, entitlementsFile);
     }

package/build/support/eas/getEasManagedCredentialsConfigExtra.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const iosConstants_1 = require("../iosConstants");
+function getEasManagedCredentialsConfigExtra(config) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+    return {
+        ...config.extra,
+        eas: {
+            ...(_a = config.extra) === null || _a === void 0 ? void 0 : _a.eas,
+            build: {
+                ...(_c = (_b = config.extra) === null || _b === void 0 ? void 0 : _b.eas) === null || _c === void 0 ? void 0 : _c.build,
+                experimental: {
+                    ...(_f = (_e = (_d = config.extra) === null || _d === void 0 ? void 0 : _d.eas) === null || _e === void 0 ? void 0 : _e.build) === null || _f === void 0 ? void 0 : _f.experimental,
+                    ios: {
+                        ...(_k = (_j = (_h = (_g = config.extra) === null || _g === void 0 ? void 0 : _g.eas) === null || _h === void 0 ? void 0 : _h.build) === null || _j === void 0 ? void 0 : _j.experimental) === null || _k === void 0 ? void 0 : _k.ios,
+                        appExtensions: [
+                            ...((_r = (_q = (_p = (_o = (_m = (_l = config.extra) === null || _l === void 0 ? void 0 : _l.eas) === null || _m === void 0 ? void 0 : _m.build) === null || _o === void 0 ? void 0 : _o.experimental) === null || _p === void 0 ? void 0 : _p.ios) === null || _q === void 0 ? void 0 : _q.appExtensions) !== null && _r !== void 0 ? _r : []),
+                            {
+                                // keep in sync with native changes in NSE
+                                targetName: iosConstants_1.NSE_TARGET_NAME,
+                                bundleIdentifier: `${(_s = config === null || config === void 0 ? void 0 : config.ios) === null || _s === void 0 ? void 0 : _s.bundleIdentifier}.${iosConstants_1.NSE_TARGET_NAME}`,
+                                entitlements: {
+                                    'com.apple.security.application-groups': [
+                                        `group.${(_t = config === null || config === void 0 ? void 0 : config.ios) === null || _t === void 0 ? void 0 : _t.bundleIdentifier}.onesignal`
+                                    ]
+                                },
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+    };
+}
+exports.default = getEasManagedCredentialsConfigExtra;

package/build/support/iosConstants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NSE_TARGET_NAME = exports.DEFAULT_BUNDLE_SHORT_VERSION = exports.DEFAULT_BUNDLE_VERSION = exports.BUNDLE_VERSION_TEMPLATE_REGEX = exports.BUNDLE_SHORT_VERSION_TEMPLATE_REGEX = exports.APS_ENVIRONMENT_MODE = exports.GROUP_IDENTIFIER_TEMPLATE_REGEX = exports.NSE_PODFILE_REGEX = exports.NSE_PODFILE_SNIPPET = exports.TARGETED_DEVICE_FAMILY = exports.IPHONEOS_DEPLOYMENT_TARGET = void 0;
+exports.NSE_TARGET_NAME = exports.DEFAULT_BUNDLE_SHORT_VERSION = exports.DEFAULT_BUNDLE_VERSION = exports.BUNDLE_VERSION_TEMPLATE_REGEX = exports.BUNDLE_SHORT_VERSION_TEMPLATE_REGEX = exports.GROUP_IDENTIFIER_TEMPLATE_REGEX = exports.NSE_PODFILE_REGEX = exports.NSE_PODFILE_SNIPPET = exports.TARGETED_DEVICE_FAMILY = exports.IPHONEOS_DEPLOYMENT_TARGET = void 0;
 exports.IPHONEOS_DEPLOYMENT_TARGET = "11.0";
 exports.TARGETED_DEVICE_FAMILY = `"1,2"`;
 exports.NSE_PODFILE_SNIPPET = `
@@ -9,7 +9,6 @@ target 'OneSignalNotificationServiceExtension' do
 end`;
 exports.NSE_PODFILE_REGEX = /target 'OneSignalNotificationServiceExtension'/;
 exports.GROUP_IDENTIFIER_TEMPLATE_REGEX = /{{GROUP_IDENTIFIER}}/gm;
-exports.APS_ENVIRONMENT_MODE = /{{APS_ENVIRONMENT_MODE}}/gm;
 exports.BUNDLE_SHORT_VERSION_TEMPLATE_REGEX = /{{BUNDLE_SHORT_VERSION}}/gm;
 exports.BUNDLE_VERSION_TEMPLATE_REGEX = /{{BUNDLE_VERSION}}/gm;
 exports.DEFAULT_BUNDLE_VERSION = '1';

package/build/support/serviceExtensionFiles/OneSignalNotificationServiceExtension.entitlements

@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-  <key>aps-environment</key>
-  <string>{{APS_ENVIRONMENT_MODE}}</string>
 	<key>com.apple.security.application-groups</key>
 	<array>
 		<string>{{GROUP_IDENTIFIER}}</string>

package/onesignal/withOneSignalAndroid.ts

@@ -3,32 +3,15 @@
  * @see https://documentation.onesignal.com/docs/react-native-sdk-setup#step-4-install-for-ios-using-cocoapods-for-ios-apps
  */
 
-import { ConfigPlugin, withAppBuildGradle } from '@expo/config-plugins';
-import { ONESIGNAL_GRADLE } from '../support/androidConstants';
+import { ConfigPlugin } from '@expo/config-plugins';
 import { OneSignalLog } from '../support/OneSignalLog';
 import { OneSignalPluginProps } from '../types/types';
 
-const withGradleBuildConfig: ConfigPlugin<OneSignalPluginProps> = (config) => {
-  return withAppBuildGradle(config, (newConfig) => {
-    let { contents } = newConfig.modResults;
-
-    // make sure we haven't previously added dependencies
-    if (!contents.includes(ONESIGNAL_GRADLE)) {
-      contents = `${ONESIGNAL_GRADLE}\n${contents}`;
-    } else {
-      OneSignalLog.log("OneSignal dependencies already added to build.gradle. Skipping...");
-    }
-
-    newConfig.modResults.contents = contents;
-    return newConfig;
-  });
-};
-
 export const withOneSignalAndroid: ConfigPlugin<OneSignalPluginProps> = (
   config,
   props,
 ) => {
-  withGradleBuildConfig(config, props);
-
+  //commented out until https://github.com/expo/eas-cli/issues/1226 is confirmed fixed
+  //OneSignalLog.log("No specific actions required for OneSignal on Android...");
   return config;
 };

package/onesignal/withOneSignalIos.ts

@@ -23,6 +23,9 @@ import NseUpdaterManager from "../support/NseUpdaterManager";
 import { OneSignalLog } from "../support/OneSignalLog";
 import { FileManager } from "../support/FileManager";
 import { OneSignalPluginProps, PluginOptions } from "../types/types";
+import assert from 'assert';
+import getEasManagedCredentialsConfigExtra from "../support/eas/getEasManagedCredentialsConfigExtra";
+import { ExpoConfig } from '@expo/config-types';
 
 /**
  * Add 'aps-environment' record with current environment to '<project-name>.entitlements' file
@@ -102,16 +105,29 @@ const withOneSignalNSE: ConfigPlugin<OneSignalPluginProps> = (config, onesignalP
       iPhoneDeploymentTarget: onesignalProps?.iPhoneDeploymentTarget
     };
 
+    // support for monorepos where node_modules can be up to 5 parents
+    // above the project directory.
+    let dir = "node_modules"
+    for(let x=0; x < 5 && !FileManager.dirExists(dir); x++) {
+      dir = "../" + dir
+    }
+
     xcodeProjectAddNse(
       props.modRequest.projectName || "",
       options,
-      "node_modules/onesignal-expo-plugin/build/support/serviceExtensionFiles/"
+      dir + "/onesignal-expo-plugin/build/support/serviceExtensionFiles/"
     );
 
     return props;
   });
 }
 
+const withEasManagedCredentials: ConfigPlugin<OneSignalPluginProps> = (config) => {
+  assert(config.ios?.bundleIdentifier, "Missing 'ios.bundleIdentifier' in app config.")
+  config.extra = getEasManagedCredentialsConfigExtra(config as ExpoConfig);
+  return config;
+}
+
 export const withOneSignalIos: ConfigPlugin<OneSignalPluginProps> = (
   config,
   props
@@ -120,6 +136,7 @@ export const withOneSignalIos: ConfigPlugin<OneSignalPluginProps> = (
   withRemoteNotificationsPermissions(config, props);
   withAppGroupPermissions(config, props);
   withOneSignalNSE(config, props);
+  withEasManagedCredentials(config, props);
   return config;
 };
 
@@ -128,7 +145,7 @@ export function xcodeProjectAddNse(
   options: PluginOptions,
   sourceDir: string
 ): void {
-  const { iosPath, devTeam, bundleIdentifier, bundleVersion, bundleShortVersion, iPhoneDeploymentTarget, mode } = options;
+  const { iosPath, devTeam, bundleIdentifier, bundleVersion, bundleShortVersion, iPhoneDeploymentTarget } = options;
 
   // not awaiting in order to not block main thread
   updatePodfile(iosPath).catch(err => { OneSignalLog.error(err) });
@@ -153,7 +170,7 @@ export function xcodeProjectAddNse(
     /* COPY OVER EXTENSION FILES */
     fs.mkdirSync(`${iosPath}/${NSE_TARGET_NAME}`, { recursive: true });
 
-    for(let i = 0; i < extFiles.length; i++) {
+    for (let i = 0; i < extFiles.length; i++) {
       const extFile = extFiles[i];
       const targetFile = `${iosPath}/${NSE_TARGET_NAME}/${extFile}`;
       await FileManager.copyFile(`${sourceDir}${extFile}`, targetFile);
@@ -161,7 +178,7 @@ export function xcodeProjectAddNse(
 
     /* MODIFY COPIED EXTENSION FILES */
     const nseUpdater = new NseUpdaterManager(iosPath);
-    await nseUpdater.updateNSEEntitlements(`group.${bundleIdentifier}.onesignal`, mode)
+    await nseUpdater.updateNSEEntitlements(`group.${bundleIdentifier}.onesignal`)
     await nseUpdater.updateNSEBundleVersion(bundleVersion ?? DEFAULT_BUNDLE_VERSION);
     await nseUpdater.updateNSEBundleShortVersion(bundleShortVersion ?? DEFAULT_BUNDLE_SHORT_VERSION);
 
@@ -171,7 +188,7 @@ export function xcodeProjectAddNse(
     // Add the new PBXGroup to the top level group. This makes the
     // files / folder appear in the file explorer in Xcode.
     const groups = xcodeProject.hash.project.objects["PBXGroup"];
-    Object.keys(groups).forEach(function (key) {
+    Object.keys(groups).forEach(function(key) {
       if (groups[key].name === undefined) {
         xcodeProject.addToPbxGroup(extGroup.uuid, key);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onesignal-expo-plugin",
-  "version": "1.0.1",
+  "version": "1.1.1",
   "description": "The OneSignal Expo plugin allows you to use OneSignal without leaving the managed workflow. Developed in collaboration with SweetGreen.",
   "main": "./app.plugin.js",
   "scripts": {
@@ -24,7 +24,8 @@
   "contributors": [
     "Karen Grigoryan",
     "Rodrigo Gomez-Palacio",
-    "Charlie Cruzan"
+    "Charlie Cruzan",
+    "Wojciech Kozyra"
   ],
   "license": "MIT",
   "bugs": {

package/support/FileManager.ts

@@ -35,4 +35,8 @@ export class FileManager {
     const fileContents = await FileManager.readFile(path1);
     await FileManager.writeFile(path2, fileContents);
   }
+
+  static dirExists(path: string): boolean {
+    return fs.existsSync(path)
+  }
 }

package/support/NseUpdaterManager.ts

@@ -1,7 +1,5 @@
-import { Mode } from '../types/types';
 import { FileManager } from './FileManager';
 import {
-  APS_ENVIRONMENT_MODE,
   BUNDLE_SHORT_VERSION_TEMPLATE_REGEX,
   BUNDLE_VERSION_TEMPLATE_REGEX,
   GROUP_IDENTIFIER_TEMPLATE_REGEX,
@@ -18,11 +16,10 @@ export default class NseUpdaterManager {
     this.nsePath = `${iosPath}/${NSE_TARGET_NAME}`;
   }
 
-  async updateNSEEntitlements(groupIdentifier: string, mode: Mode): Promise<void> {
+  async updateNSEEntitlements(groupIdentifier: string): Promise<void> {
     const entitlementsFilePath = `${this.nsePath}/${entitlementsFileName}`;
     let entitlementsFile = await FileManager.readFile(entitlementsFilePath);
 
-    entitlementsFile = entitlementsFile.replace(APS_ENVIRONMENT_MODE, mode);
     entitlementsFile = entitlementsFile.replace(GROUP_IDENTIFIER_TEMPLATE_REGEX, groupIdentifier);
     await FileManager.writeFile(entitlementsFilePath, entitlementsFile);
   }

package/support/eas/getEasManagedCredentialsConfigExtra.ts

@@ -0,0 +1,33 @@
+import { NSE_TARGET_NAME } from "../iosConstants";
+import { ExpoConfig } from '@expo/config-types';
+
+export default function getEasManagedCredentialsConfigExtra(config: ExpoConfig): {[k: string]: any} {
+  return {
+    ...config.extra,
+    eas: {
+      ...config.extra?.eas,
+      build: {
+        ...config.extra?.eas?.build,
+        experimental: {
+          ...config.extra?.eas?.build?.experimental,
+          ios: {
+            ...config.extra?.eas?.build?.experimental?.ios,
+            appExtensions: [
+              ...(config.extra?.eas?.build?.experimental?.ios?.appExtensions ?? []),
+              {
+                // keep in sync with native changes in NSE
+                targetName: NSE_TARGET_NAME,
+                bundleIdentifier: `${config?.ios?.bundleIdentifier}.${NSE_TARGET_NAME}`,
+                entitlements: {
+                  'com.apple.security.application-groups': [
+                    `group.${config?.ios?.bundleIdentifier}.onesignal`
+                  ]
+                },
+              }
+            ]
+          }
+        }
+      }
+    }
+  }
+}

package/support/iosConstants.ts

@@ -9,7 +9,6 @@ end`;
 export const NSE_PODFILE_REGEX = /target 'OneSignalNotificationServiceExtension'/;
 
 export const GROUP_IDENTIFIER_TEMPLATE_REGEX = /{{GROUP_IDENTIFIER}}/gm;
-export const APS_ENVIRONMENT_MODE = /{{APS_ENVIRONMENT_MODE}}/gm;
 export const BUNDLE_SHORT_VERSION_TEMPLATE_REGEX = /{{BUNDLE_SHORT_VERSION}}/gm;
 export const BUNDLE_VERSION_TEMPLATE_REGEX = /{{BUNDLE_VERSION}}/gm;
 

package/support/serviceExtensionFiles/OneSignalNotificationServiceExtension.entitlements

@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-  <key>aps-environment</key>
-  <string>{{APS_ENVIRONMENT_MODE}}</string>
 	<key>com.apple.security.application-groups</key>
 	<array>
 		<string>{{GROUP_IDENTIFIER}}</string>

package/build/support/androidConstants.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ONESIGNAL_GRADLE = void 0;
-exports.ONESIGNAL_GRADLE = `buildscript {
-    repositories {
-        gradlePluginPortal()
-    }
-    dependencies {
-        classpath 'gradle.plugin.com.onesignal:onesignal-gradle-plugin:[0.12.10, 0.99.99]'
-    }
-}
-
-apply plugin: 'com.onesignal.androidsdk.onesignal-gradle-plugin'`;

package/support/androidConstants.ts

@@ -1,11 +0,0 @@
-export const ONESIGNAL_GRADLE =
-`buildscript {
-    repositories {
-        gradlePluginPortal()
-    }
-    dependencies {
-        classpath 'gradle.plugin.com.onesignal:onesignal-gradle-plugin:[0.12.10, 0.99.99]'
-    }
-}
-
-apply plugin: 'com.onesignal.androidsdk.onesignal-gradle-plugin'`;