customerio-expo-plugin 1.0.0-beta.11 → 1.0.0-beta.13

package/lib/typescript/types/cio-types.d.ts

@@ -12,6 +12,8 @@ export type CustomerIOPluginOptionsIOS = {
     appleTeamId?: string;
     appName?: string;
     disableNotificationRegistration?: boolean;
+    handleNotificationClick?: boolean;
+    handleDeeplinkInKilledState?: boolean;
     useFrameworks?: 'static' | 'dynamic';
     pushNotification?: {
         useRichPush: boolean;

package/package.json

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

package/src/helpers/constants/ios.ts

@@ -6,16 +6,26 @@ let pluginPackageRoot = f.next().filename;
 // This is the path to the root of the customerio-expo-plugin package
 pluginPackageRoot = path.dirname(pluginPackageRoot);
 
+export const LOCAL_PATH_TO_RN_SDK = path.join(
+  pluginPackageRoot,
+  '../customerio-reactnative'
+)
+
 export const LOCAL_PATH_TO_CIO_NSE_FILES = path.join(
   pluginPackageRoot,
   'src/helpers/native-files/ios'
 );
+
+export function getRelativePathToRNSDK(currentFile: string) {
+  return path.relative(path.dirname(currentFile), LOCAL_PATH_TO_RN_SDK);
+}
+
 export const IOS_DEPLOYMENT_TARGET = '13.0';
 export const GROUP_IDENTIFIER_TEMPLATE_REGEX = /{{GROUP_IDENTIFIER}}/gm;
 export const BUNDLE_SHORT_VERSION_TEMPLATE_REGEX = /{{BUNDLE_SHORT_VERSION}}/gm;
 export const BUNDLE_VERSION_TEMPLATE_REGEX = /{{BUNDLE_VERSION}}/gm;
 export const CIO_DIDFINISHLAUNCHINGMETHOD_REGEX =
-  /(- \(BOOL\)application:\(UIApplication \*\)application didFinishLaunchingWithOptions:\(NSDictionary \*\)launchOptions(\s|\n)*?\{)((.|\n)*)\[super(\s)application:application(\s)didFinishLaunchingWithOptions:launchOptions\];/;
+  /.*\[super(\s)application:application(\s)didFinishLaunchingWithOptions:launchOptions\];/;
 
 export const CIO_DIDFAILTOREGISTERFORREMOTENOTIFICATIONSWITHERROR_REGEX =
   /return \[super application:application didFailToRegisterForRemoteNotificationsWithError:error\];/;
@@ -30,20 +40,31 @@ export const CIO_APPDELEGATEDECLARATION_REGEX =
   /@implementation AppDelegate(.|\n)/;
 
 export const CIO_APPDELEGATEHEADER_REGEX =
-  /@interface AppDelegate : EXAppDelegateWrapper <RCTBridgeDelegate>/;
+  /(@interface AppDelegate\s*:\s*EXAppDelegateWrapper\s*)(<([^>]+)>)?/;
+
+export const CIO_RCTBRIDGE_DEEPLINK_MODIFIEDOPTIONS_REGEX = 
+/^\s*RCTBridge\s*\*\s*\w+\s*=\s*\[\s*self\.reactDelegate\s+createBridgeWithDelegate:self\s+launchOptions:launchOptions\s*\];\s*$/gm;
+
+export const CIO_LAUNCHOPTIONS_DEEPLINK_MODIFIEDOPTIONS_REGEX = 
+/^\s*return\s\[\s*super\s*application:\s*application\s*didFinishLaunchingWithOptions\s*:\s*launchOptions\s*\];/gm;
+
+export const CIO_DEEPLINK_COMMENT_REGEX = /\sDeep link workaround for app killed state start/gm;
 export const DEFAULT_BUNDLE_VERSION = '1';
 export const DEFAULT_BUNDLE_SHORT_VERSION = '1.0';
 export const CIO_TARGET_NAME = 'CustomerIOSDK';
 export const CIO_NOTIFICATION_TARGET_NAME = 'NotificationService';
-export const CIO_APPDELEGATEHEADER_SNIPPET = `
-#import <UserNotifications/UserNotifications.h>
-
-@interface AppDelegate : EXAppDelegateWrapper <RCTBridgeDelegate, UNUserNotificationCenterDelegate>
-`;
 
+export const CIO_APPDELEGATEHEADER_IMPORT_SNIPPET = `#import <UserNotifications/UserNotifications.h>`;
+export const CIO_APPDELEGATEHEADER_USER_NOTIFICATION_CENTER_SNIPPET = 'UNUserNotificationCenterDelegate';
 export const CIO_PUSHNOTIFICATIONHANDLERDECLARATION_SNIPPET = `
 CIOAppPushNotificationsHandler* pnHandlerObj = [[CIOAppPushNotificationsHandler alloc] init];
 `;
+export const CIO_RCTBRIDGE_DEEPLINK_MODIFIEDOPTIONS_SNIPPET = `
+RCTBridge *bridge = [self.reactDelegate createBridgeWithDelegate:self launchOptions:modifiedLaunchOptions];
+`;
+
+export const CIO_LAUNCHOPTIONS_MODIFIEDOPTIONS_SNIPPET = `
+return [super application:application didFinishLaunchingWithOptions:modifiedLaunchOptions];`
 
 export const CIO_DIDFAILTOREGISTERFORREMOTENOTIFICATIONSWITHERROR_SNIPPET = `
   [super application:application didFailToRegisterForRemoteNotificationsWithError:error];
@@ -57,7 +78,27 @@ export const CIO_DIDREGISTERFORREMOTENOTIFICATIONSWITHDEVICETOKEN_SNIPPET = `
 
 export const CIO_CONFIGURECIOSDKPUSHNOTIFICATION_SNIPPET = `
   // Register for push notifications
-  [pnHandlerObj registerPushNotification:self];
+  [pnHandlerObj registerPushNotification];
+`;
+
+export const CIO_CONFIGURECIOSDKUSERNOTIFICATIONCENTER_SNIPPET = `
+  UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
+  center.delegate = self;
+`;
+
+export const CIO_CONFIGUREDEEPLINK_KILLEDSTATE_SNIPPET = `
+// Deep link workaround for app killed state start
+NSMutableDictionary *modifiedLaunchOptions = [NSMutableDictionary dictionaryWithDictionary:launchOptions];
+  if (launchOptions[UIApplicationLaunchOptionsRemoteNotificationKey]) {
+      NSDictionary *pushContent = launchOptions[UIApplicationLaunchOptionsRemoteNotificationKey];
+      if (pushContent[@"CIO"] && pushContent[@"CIO"][@"push"] && pushContent[@"CIO"][@"push"][@"link"]) {
+        NSString *initialURL = pushContent[@"CIO"][@"push"][@"link"];
+          if (!launchOptions[UIApplicationLaunchOptionsURLKey]) {
+              modifiedLaunchOptions[UIApplicationLaunchOptionsURLKey] = [NSURL URLWithString:initialURL];
+          }
+      }
+  }
+//Deep link workaround for app killed state ends
 `;
 
 // Enable push handling - notification response
@@ -73,11 +114,10 @@ export const CIO_WILLPRESENTNOTIFICATIONHANDLER_SNIPPET = `
   completionHandler( UNNotificationPresentationOptionAlert + UNNotificationPresentationOptionSound);
 }`;
 export const CIO_REGISTER_PUSHNOTIFICATION_SNIPPET = `
-@objc(registerPushNotification:)
-  public func registerPushNotification(withNotificationDelegate notificationDelegate: UNUserNotificationCenterDelegate) {
+@objc(registerPushNotification)
+  public func registerPushNotification() {
 
     let center  = UNUserNotificationCenter.current()
-    center.delegate = notificationDelegate
     center.requestAuthorization(options: [.sound, .alert, .badge]) { (granted, error) in
       if error == nil{
         DispatchQueue.main.async {

package/src/helpers/utils/codeInjection.ts

@@ -22,6 +22,14 @@ export function injectCodeByMultiLineRegex(
   return fileContent.replace(lineRegex, `$&\n${snippet}`);
 }
 
+export function injectCodeBeforeMultiLineRegex(
+  fileContent: string,
+  lineRegex: RegExp,
+  snippet: string
+) {
+  return fileContent.replace(lineRegex, `${snippet}\n$&`);
+}
+
 export function replaceCodeByRegex(
   fileContent: string,
   lineRegex: RegExp,
@@ -30,6 +38,9 @@ export function replaceCodeByRegex(
   return fileContent.replace(lineRegex, snippet);
 }
 
+export function matchRegexExists(fileContent: string, regex: RegExp) {
+  return regex.test(fileContent);
+}
 export function injectCodeByMultiLineRegexAndReplaceLine(
   fileContent: string,
   lineRegex: RegExp,

package/src/helpers/utils/injectCIOPodfileCode.ts

@@ -1,4 +1,5 @@
 import type { CustomerIOPluginOptionsIOS } from '../../types/cio-types';
+import { getRelativePathToRNSDK } from '../constants/ios';
 import { injectCodeByRegex } from './codeInjection';
 import { FileManagement } from './fileManagement';
 
@@ -18,7 +19,7 @@ export async function injectCIOPodfileCode(iosPath: string) {
 
     const snippetToInjectInPodfile = `
 ${blockStart}
-  pod 'customerio-reactnative/apn', :path => '../node_modules/customerio-reactnative'
+  pod 'customerio-reactnative/apn', :path => '${getRelativePathToRNSDK(filename)}'
 ${blockEnd}
 `.trim();
 
@@ -52,7 +53,7 @@ export async function injectCIONotificationPodfileCode(
 ${blockStart}
 target 'NotificationService' do
   ${useFrameworks === 'static' ? 'use_frameworks! :linkage => :static' : ''}
-  pod 'customerio-reactnative-richpush/apn', :path => '../node_modules/customerio-reactnative'
+  pod 'customerio-reactnative-richpush/apn', :path => '${getRelativePathToRNSDK(filename)}'
 end
 ${blockEnd}
 `.trim();

package/src/ios/withAppDelegateModifications.ts

@@ -3,23 +3,34 @@ import { getAppDelegateHeaderFilePath } from '@expo/config-plugins/build/ios/Pat
 
 import {
   CIO_APPDELEGATEDECLARATION_REGEX,
+  CIO_APPDELEGATEHEADER_IMPORT_SNIPPET,
   CIO_APPDELEGATEHEADER_REGEX,
-  CIO_APPDELEGATEHEADER_SNIPPET,
+  CIO_APPDELEGATEHEADER_USER_NOTIFICATION_CENTER_SNIPPET,
   CIO_CONFIGURECIOSDKPUSHNOTIFICATION_SNIPPET,
+  CIO_CONFIGURECIOSDKUSERNOTIFICATIONCENTER_SNIPPET,
+  CIO_CONFIGUREDEEPLINK_KILLEDSTATE_SNIPPET,
   CIO_DIDFAILTOREGISTERFORREMOTENOTIFICATIONSWITHERRORFULL_REGEX,
+  CIO_RCTBRIDGE_DEEPLINK_MODIFIEDOPTIONS_REGEX,
   CIO_DIDFAILTOREGISTERFORREMOTENOTIFICATIONSWITHERROR_REGEX,
   CIO_DIDFAILTOREGISTERFORREMOTENOTIFICATIONSWITHERROR_SNIPPET,
   CIO_DIDFINISHLAUNCHINGMETHOD_REGEX,
   CIO_DIDRECEIVENOTIFICATIONRESPONSEHANDLER_SNIPPET,
   CIO_DIDREGISTERFORREMOTENOTIFICATIONSWITHDEVICETOKEN_REGEX,
   CIO_DIDREGISTERFORREMOTENOTIFICATIONSWITHDEVICETOKEN_SNIPPET,
+  CIO_LAUNCHOPTIONS_DEEPLINK_MODIFIEDOPTIONS_REGEX,
   CIO_PUSHNOTIFICATIONHANDLERDECLARATION_SNIPPET,
   CIO_WILLPRESENTNOTIFICATIONHANDLER_SNIPPET,
+  CIO_LAUNCHOPTIONS_MODIFIEDOPTIONS_SNIPPET,
+  CIO_RCTBRIDGE_DEEPLINK_MODIFIEDOPTIONS_SNIPPET,
+  CIO_DEEPLINK_COMMENT_REGEX,
 } from '../helpers/constants/ios';
 import {
+  injectCodeBeforeMultiLineRegex,
   injectCodeByLineNumber,
   injectCodeByMultiLineRegex,
   injectCodeByMultiLineRegexAndReplaceLine,
+  replaceCodeByRegex,
+  matchRegexExists
 } from '../helpers/utils/codeInjection';
 import { FileManagement } from '../helpers/utils/fileManagement';
 import type { CustomerIOPluginOptionsIOS } from '../types/cio-types';
@@ -67,7 +78,7 @@ const addNotificationHandlerDeclaration = (stringContents: string) => {
 };
 
 const addNotificationConfiguration = (stringContents: string) => {
-  stringContents = injectCodeByMultiLineRegex(
+  stringContents = injectCodeBeforeMultiLineRegex(
     stringContents,
     CIO_DIDFINISHLAUNCHINGMETHOD_REGEX,
     CIO_CONFIGURECIOSDKPUSHNOTIFICATION_SNIPPET
@@ -76,6 +87,26 @@ const addNotificationConfiguration = (stringContents: string) => {
   return stringContents;
 };
 
+const addUserNotificationCenterConfiguration = (stringContents: string) => {
+  stringContents = injectCodeBeforeMultiLineRegex(
+    stringContents,
+    CIO_DIDFINISHLAUNCHINGMETHOD_REGEX,
+    CIO_CONFIGURECIOSDKUSERNOTIFICATIONCENTER_SNIPPET
+  );
+
+  return stringContents;
+};
+
+const addHandleDeeplinkInKilledStateConfiguration = (stringContents: string, regex: RegExp) => {
+  stringContents = injectCodeBeforeMultiLineRegex(
+    stringContents,
+    regex,
+    CIO_CONFIGUREDEEPLINK_KILLEDSTATE_SNIPPET
+  );
+
+  return stringContents;
+};
+
 const addDidFailToRegisterForRemoteNotificationsWithError = (
   stringContents: string
 ) => {
@@ -111,15 +142,54 @@ const addAdditionalMethodsForPushNotifications = (stringContents: string) => {
 };
 
 const addAppdelegateHeaderModification = (stringContents: string) => {
-  stringContents = injectCodeByMultiLineRegexAndReplaceLine(
-    stringContents,
+  // Add UNUserNotificationCenterDelegate if needed
+  stringContents = stringContents.replace(
     CIO_APPDELEGATEHEADER_REGEX,
-    CIO_APPDELEGATEHEADER_SNIPPET
+    (match, interfaceDeclaration, _groupedDelegates, existingDelegates) => {
+      if (existingDelegates && existingDelegates.includes(CIO_APPDELEGATEHEADER_USER_NOTIFICATION_CENTER_SNIPPET)) {
+        // The AppDelegate declaration already includes UNUserNotificationCenterDelegate, so we don't need to modify it
+        return match;
+      } else if (existingDelegates) {
+        // Other delegates exist, append ours
+        return `${CIO_APPDELEGATEHEADER_IMPORT_SNIPPET}
+${interfaceDeclaration}<${existingDelegates}, ${CIO_APPDELEGATEHEADER_USER_NOTIFICATION_CENTER_SNIPPET}>
+`;
+      } else {
+        // No delegates exist, add ours
+        return `${CIO_APPDELEGATEHEADER_IMPORT_SNIPPET}
+${interfaceDeclaration.trim()} <${CIO_APPDELEGATEHEADER_USER_NOTIFICATION_CENTER_SNIPPET}>
+`;
+      }
+    }
   );
 
   return stringContents;
 };
 
+const addHandleDeeplinkInKilledState = (stringContents: string) => {
+  // Find if the deep link code snippet is already present
+  if (matchRegexExists(stringContents, CIO_DEEPLINK_COMMENT_REGEX)) {
+    return stringContents
+  }
+
+  // Check if the app delegate is using RCTBridge or LaunchOptions
+  var snippet = undefined
+  var regex = CIO_LAUNCHOPTIONS_DEEPLINK_MODIFIEDOPTIONS_REGEX;
+  if (matchRegexExists(stringContents, CIO_RCTBRIDGE_DEEPLINK_MODIFIEDOPTIONS_REGEX)) {
+    snippet = CIO_RCTBRIDGE_DEEPLINK_MODIFIEDOPTIONS_SNIPPET;
+    regex = CIO_RCTBRIDGE_DEEPLINK_MODIFIEDOPTIONS_REGEX;
+  }
+  else if (matchRegexExists(stringContents, CIO_LAUNCHOPTIONS_DEEPLINK_MODIFIEDOPTIONS_REGEX)) {
+    snippet = CIO_LAUNCHOPTIONS_MODIFIEDOPTIONS_SNIPPET;
+  }
+  // Add code only if the app delegate is using RCTBridge or LaunchOptions
+  if (snippet !== undefined) {
+  stringContents = addHandleDeeplinkInKilledStateConfiguration(stringContents, regex);
+  stringContents = replaceCodeByRegex(stringContents, regex, snippet);
+  }
+  return stringContents
+}
+
 export const withAppDelegateModifications: ConfigPlugin<
   CustomerIOPluginOptionsIOS
 > = (configOuter, props) => {
@@ -151,6 +221,20 @@ export const withAppDelegateModifications: ConfigPlugin<
       ) {
         stringContents = addNotificationConfiguration(stringContents);
       }
+      if (
+        props.handleNotificationClick === undefined ||
+        props.handleNotificationClick === true
+      ) {
+        stringContents = addUserNotificationCenterConfiguration(stringContents);
+      }
+
+      if (
+        props.handleDeeplinkInKilledState !== undefined &&
+        props.handleDeeplinkInKilledState === true
+      ) {
+        stringContents = addHandleDeeplinkInKilledState(stringContents);
+      }
+  
       stringContents = addAdditionalMethodsForPushNotifications(stringContents);
       stringContents =
         addDidFailToRegisterForRemoteNotificationsWithError(stringContents);

package/src/types/cio-types.ts

@@ -16,6 +16,8 @@ export type CustomerIOPluginOptionsIOS = {
   appleTeamId?: string;
   appName?: string;
   disableNotificationRegistration?: boolean;
+  handleNotificationClick?:boolean;
+  handleDeeplinkInKilledState?:boolean;
   useFrameworks?: 'static' | 'dynamic';
   pushNotification?: {
     useRichPush: boolean;