customerio-expo-plugin 1.0.0-beta.3 → 1.0.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "customerio-expo-plugin",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.6",
   "description": "Expo config plugin for the Customer IO React Native SDK",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/src/android/withAndroidManifestUpdates.ts

@@ -0,0 +1,49 @@
+import { ConfigPlugin, withAndroidManifest } from '@expo/config-plugins';
+import type { ManifestApplication } from '@expo/config-plugins/build/android/Manifest';
+
+import type { CustomerIOPluginOptionsAndroid } from '../types/cio-types';
+
+export const withAndroidManifestUpdates: ConfigPlugin<
+  CustomerIOPluginOptionsAndroid
+> = (configOuter) => {
+  return withAndroidManifest(configOuter, (props) => {
+    const application = props.modResults.manifest
+      .application as ManifestApplication[];
+    const customerIOMessagingpush =
+      'io.customer.messagingpush.CustomerIOFirebaseMessagingService';
+
+    if (!application[0]['service']) {
+      application[0]['service'] = [];
+    }
+
+    const hasService = application[0]['service'].some(
+      (service) => service['$']['android:name'] === customerIOMessagingpush
+    );
+
+    if (!hasService) {
+      application[0]['service'].push({
+        '$': {
+          'android:name': customerIOMessagingpush,
+          'android:exported': 'false',
+        },
+        'intent-filter': [
+          {
+            action: [
+              {
+                $: {
+                  'android:name': 'com.google.firebase.MESSAGING_EVENT',
+                },
+              },
+            ],
+          },
+        ],
+      });
+      console.log(
+        'Successfully set CustomerIO push handler as priority in AndroidManifest.xml'
+      );
+    }
+
+    props.modResults.manifest.application = application;
+    return props;
+  });
+};

package/src/android/withCIOAndroid.ts

@@ -1,6 +1,7 @@
 import type { ExpoConfig } from '@expo/config-types';
 
 import type { CustomerIOPluginOptionsAndroid } from '../types/cio-types';
+import { withAndroidManifestUpdates } from './withAndroidManifestUpdates';
 import { withAppGoogleServices } from './withAppGoogleServices';
 import { withGistMavenRepository } from './withGistMavenRepository';
 import { withGoogleServicesJSON } from './withGoogleServicesJSON';
@@ -14,6 +15,9 @@ export function withCIOAndroid(
   config = withProjectGoogleServices(config, props);
   config = withAppGoogleServices(config, props);
   config = withGoogleServicesJSON(config, props);
+  if (props.setHighPriorityPushHandler) {
+    config = withAndroidManifestUpdates(config, props);
+  }
 
   return config;
 }

package/src/helpers/constants/ios.ts

@@ -74,3 +74,18 @@ target '${CIO_NOTIFICATION_TARGET_NAME}' do
   use_frameworks! :linkage => :static
 ${CIO_PODFILE_SNIPPET}
 end`;
+
+export const CIO_REGISTER_PUSHNOTIFICATION_SNIPPET = `
+@objc(registerPushNotification:)
+  public func registerPushNotification(withNotificationDelegate notificationDelegate: UNUserNotificationCenterDelegate) {
+
+    let center  = UNUserNotificationCenter.current()
+    center.delegate = notificationDelegate
+    center.requestAuthorization(options: [.sound, .alert, .badge]) { (granted, error) in
+      if error == nil{
+        DispatchQueue.main.async {
+          UIApplication.shared.registerForRemoteNotifications()
+        }
+      }
+    }
+  }`;

package/src/helpers/native-files/ios/PushService.swift

@@ -9,19 +9,7 @@ public class CIOAppPushNotificationsHandler : NSObject {
 
   public override init() {}
 
-  @objc(registerPushNotification:)
-  public func registerPushNotification(withNotificationDelegate notificationDelegate: UNUserNotificationCenterDelegate) {
-
-    let center  = UNUserNotificationCenter.current()
-    center.delegate = notificationDelegate
-    center.requestAuthorization(options: [.sound, .alert, .badge]) { (granted, error) in
-      if error == nil{
-        DispatchQueue.main.async {
-          UIApplication.shared.registerForRemoteNotifications()
-        }
-      }
-    }
-  }
+  {{REGISTER_SNIPPET}}
 
   @objc(application:deviceToken:)
   public func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {

package/src/ios/withAppDelegateModifications.ts

@@ -22,6 +22,7 @@ import {
   injectCodeByMultiLineRegexAndReplaceLine,
 } from '../helpers/utils/codeInjection';
 import { FileManagement } from '../helpers/utils/fileManagement';
+import type { CustomerIOPluginOptionsIOS } from '../types/cio-types';
 
 const pushCodeSnippets = [
   CIO_DIDRECEIVENOTIFICATIONRESPONSEHANDLER_SNIPPET,
@@ -119,9 +120,9 @@ const addAppdelegateHeaderModification = (stringContents: string) => {
   return stringContents;
 };
 
-export const withAppDelegateModifications: ConfigPlugin<any> = (
-  configOuter
-) => {
+export const withAppDelegateModifications: ConfigPlugin<
+  CustomerIOPluginOptionsIOS
+> = (configOuter, props) => {
   return withAppDelegate(configOuter, async (config) => {
     let stringContents = config.modResults.contents;
     const regex = new RegExp(
@@ -142,7 +143,9 @@ export const withAppDelegateModifications: ConfigPlugin<any> = (
         config.modRequest.projectName as string
       );
       stringContents = addNotificationHandlerDeclaration(stringContents);
-      stringContents = addNotificationConfiguration(stringContents);
+      if (!props.disableNotificationRegistration) {
+        stringContents = addNotificationConfiguration(stringContents);
+      }
       stringContents = addAdditionalMethodsForPushNotifications(stringContents);
       stringContents =
         addDidFailToRegisterForRemoteNotificationsWithError(stringContents);

package/src/ios/withNotificationsXcodeProject.ts

@@ -3,6 +3,7 @@ import xcode from 'xcode';
 
 import {
   CIO_NOTIFICATION_TARGET_NAME,
+  CIO_REGISTER_PUSHNOTIFICATION_SNIPPET,
   DEFAULT_BUNDLE_VERSION,
   LOCAL_PATH_TO_CIO_NSE_FILES,
 } from '../helpers/constants/ios';
@@ -84,6 +85,7 @@ export const withCioNotificationsXcodeProject: ConfigPlugin<
     }
 
     const options = {
+      ...props,
       appleTeamId,
       bundleIdentifier,
       bundleShortVersion,
@@ -329,6 +331,7 @@ async function addPushNotificationFile(
   const file = 'PushService.swift';
   const appPath = `${iosPath}/${appName}`;
   const getTargetFile = (filename: string) => `${appPath}/${filename}`;
+  const targetFile = getTargetFile(file);
 
   // Check whether {file} exists in the project. If false, then add the file
   // If {file} exists then skip and return
@@ -337,7 +340,6 @@ async function addPushNotificationFile(
       recursive: true,
     });
 
-    const targetFile = getTargetFile(file);
     FileManagement.copyFile(
       `${LOCAL_PATH_TO_CIO_NSE_FILES}/${file}`,
       targetFile
@@ -347,9 +349,29 @@ async function addPushNotificationFile(
     return;
   }
 
+  updatePushFile(options, targetFile);
+
   const group = xcodeProject.pbxCreateGroup('CustomerIONotifications');
   const classesKey = xcodeProject.findPBXGroupKey({ name: `${appName}` });
   xcodeProject.addToPbxGroup(group, classesKey);
 
   xcodeProject.addSourceFile(`${appName}/${file}`, null, group);
 }
+
+const updatePushFile = (
+  options: CustomerIOPluginOptionsIOS,
+  envFileName: string
+) => {
+  const REGISTER_RE = /\{\{REGISTER_SNIPPET\}\}/;
+
+  let envFileContent = FileManagement.readFile(envFileName);
+
+  let snippet = '';
+  if (!options.disableNotificationRegistration) {
+    snippet = CIO_REGISTER_PUSHNOTIFICATION_SNIPPET;
+  }
+
+  envFileContent = replaceCodeByRegex(envFileContent, REGISTER_RE, snippet);
+
+  FileManagement.writeFile(envFileName, envFileContent);
+};

package/src/types/cio-types.ts

@@ -15,6 +15,7 @@ export type CustomerIOPluginOptionsIOS = {
   iosDeploymentTarget?: string;
   appleTeamId?: string;
   appName?: string;
+  disableNotificationRegistration?: boolean;
   useFrameworks?: 'static' | 'dynamic';
   pushNotification?: {
     useRichPush: boolean;
@@ -29,6 +30,7 @@ export type CustomerIOPluginOptionsIOS = {
 export type CustomerIOPluginOptionsAndroid = {
   androidPath: string;
   googleServicesFile?: string;
+  setHighPriorityPushHandler?: boolean;
 };
 
 export type CustomerIOPluginOptions = {