customerio-expo-plugin 2.0.3 → 2.1.0

package/plugin/lib/typescript/ios/withNotificationsXcodeProject.d.ts

@@ -1,3 +1,3 @@
-import { ConfigPlugin } from '@expo/config-plugins';
+import type { ConfigPlugin } from '@expo/config-plugins';
 import type { CustomerIOPluginOptionsIOS } from '../types/cio-types';
 export declare const withCioNotificationsXcodeProject: ConfigPlugin<CustomerIOPluginOptionsIOS>;

package/plugin/lib/typescript/ios/withXcodeProject.d.ts

@@ -1,3 +1,3 @@
-import { ConfigPlugin } from '@expo/config-plugins';
+import type { ConfigPlugin } from '@expo/config-plugins';
 import type { CustomerIOPluginOptionsIOS } from '../types/cio-types';
 export declare const withCioXcodeProject: ConfigPlugin<CustomerIOPluginOptionsIOS>;

package/plugin/src/android/withAndroidManifestUpdates.ts

@@ -1,4 +1,5 @@
-import { ConfigPlugin, withAndroidManifest } from '@expo/config-plugins';
+import type { ConfigPlugin } from '@expo/config-plugins';
+import { withAndroidManifest } from '@expo/config-plugins';
 import type { ManifestApplication } from '@expo/config-plugins/build/android/Manifest';
 
 import type { CustomerIOPluginOptionsAndroid } from '../types/cio-types';

package/plugin/src/android/withAppGoogleServices.ts

@@ -1,4 +1,5 @@
-import { ConfigPlugin, withAppBuildGradle } from '@expo/config-plugins';
+import type { ConfigPlugin } from '@expo/config-plugins';
+import { withAppBuildGradle } from '@expo/config-plugins';
 
 import {
   CIO_APP_APPLY_REGEX,

package/plugin/src/android/withGistMavenRepository.ts

@@ -1,4 +1,5 @@
-import { withProjectBuildGradle, ConfigPlugin } from '@expo/config-plugins';
+import { withProjectBuildGradle } from '@expo/config-plugins';
+import type { ConfigPlugin } from '@expo/config-plugins';
 
 import {
   CIO_GIST_MAVEN_REGEX,

package/plugin/src/android/withGoogleServicesJSON.ts

@@ -1,4 +1,5 @@
-import { withProjectBuildGradle, ConfigPlugin } from '@expo/config-plugins';
+import { withProjectBuildGradle } from '@expo/config-plugins';
+import type { ConfigPlugin } from '@expo/config-plugins';
 
 import { FileManagement } from './../helpers/utils/fileManagement';
 import type { CustomerIOPluginOptionsAndroid } from './../types/cio-types';

package/plugin/src/android/withProjectGoogleServices.ts

@@ -1,4 +1,5 @@
-import { ConfigPlugin, withProjectBuildGradle } from '@expo/config-plugins';
+import type { ConfigPlugin } from '@expo/config-plugins';
+import { withProjectBuildGradle } from '@expo/config-plugins';
 
 import {
   CIO_PROJECT_BUILDSCRIPTS_REGEX,

package/plugin/src/android/withProjectStrings.ts

@@ -1,4 +1,5 @@
-import { ConfigPlugin, withStringsXml } from '@expo/config-plugins';
+import type { ConfigPlugin } from '@expo/config-plugins';
+import { withStringsXml } from '@expo/config-plugins';
 import { getPluginVersion } from '../helpers/utils/pluginUtils';
 
 /**

package/plugin/src/helpers/constants/ios.ts

@@ -129,6 +129,23 @@ NSMutableDictionary *modifiedLaunchOptions = [NSMutableDictionary dictionaryWith
 //Deep link workaround for app killed state ends
 `;
 
+export const CIO_CONFIGUREDEEPLINK_KILLEDSTATE_SWIFT_SNIPPET = `
+    // Deep link workaround for app killed state start
+    var modifiedLaunchOptions = launchOptions
+    if let launchOptions = launchOptions,
+       let pushContent = launchOptions[UIApplication.LaunchOptionsKey.remoteNotification] as? [AnyHashable: Any],
+       let cio = pushContent["CIO"] as? [String: Any],
+       let push = cio["push"] as? [String: Any],
+       let link = push["link"] as? String,
+       !launchOptions.keys.contains(UIApplication.LaunchOptionsKey.url) {
+        
+        var mutableLaunchOptions = launchOptions
+        mutableLaunchOptions[UIApplication.LaunchOptionsKey.url] = URL(string: link)
+        modifiedLaunchOptions = mutableLaunchOptions
+    }
+    // Deep link workaround for app killed state ends
+`;
+
 export const CIO_REGISTER_PUSHNOTIFICATION_SNIPPET = `
 @objc(registerPushNotification)
   public func registerPushNotification() {
@@ -142,3 +159,15 @@ export const CIO_REGISTER_PUSHNOTIFICATION_SNIPPET = `
       }
     }
   }`;
+
+export const CIO_REGISTER_PUSHNOTIFICATION_SNIPPET_v2 = `
+    let center  = UNUserNotificationCenter.current()
+    center.requestAuthorization(options: [.sound, .alert, .badge]) { (granted, error) in
+      if error == nil{
+        DispatchQueue.main.async {
+          UIApplication.shared.registerForRemoteNotifications()
+        }
+      }
+    }`;
+
+export const CIO_REGISTER_PUSH_NOTIFICATION_PLACEHOLDER = /\{\{REGISTER_SNIPPET\}\}/;

package/plugin/src/helpers/native-files/ios/apn/CioSdkAppDelegateHandler.swift

@@ -0,0 +1,52 @@
+import Foundation
+import UIKit
+import UserNotifications
+import CioMessagingPushAPN
+#if canImport(EXNotifications)
+import EXNotifications
+import ExpoModulesCore
+#endif
+
+public class CioSdkAppDelegateHandler: NSObject {
+    
+  public func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) {
+
+    {{REGISTER_SNIPPET}}
+
+    MessagingPushAPN.initialize(
+      withConfig: MessagingPushConfigBuilder()
+        .autoFetchDeviceToken({{AUTO_FETCH_DEVICE_TOKEN}})
+        .showPushAppInForeground({{SHOW_PUSH_APP_IN_FOREGROUND}})
+        .autoTrackPushEvents({{AUTO_TRACK_PUSH_EVENTS}})
+        .build()
+    )
+    
+    // Code to make the CIO SDK compatible with expo-notifications package.
+    //
+    // The CIO SDK and expo-notifications both need to handle when a push gets clicked. However, iOS only allows one click handler to be set per app.
+    // To get around this limitation, we set the CIO SDK as the click handler. The CIO SDK sets itself up so that when another SDK or host iOS app
+    // sets itself as the click handler, the CIO SDK will still be able to handle when the push gets clicked, even though it's not the designated
+    // click handler in iOS at runtime.
+    //
+    // This should work for most SDKs. However, expo-notifications is unique in its implementation. It will not setup push click handling if it detects
+    // that another SDK or host iOS app has already set itself as the click handler.
+    // To get around this, we must manually set it as the click handler after the CIO SDK. That's what this code block does.
+    //
+    // Note: Initialize the native iOS SDK and setup SDK push click handling before running this code.
+    #if canImport(EXNotifications)
+      // Getting the singleton reference from Expo
+    if let notificationCenterDelegate = ModuleRegistryProvider.getSingletonModule(for: NotificationCenterManager.self) as? UNUserNotificationCenterDelegate {
+        let center = UNUserNotificationCenter.current()
+        center.delegate = notificationCenterDelegate
+      }
+    #endif
+  }
+
+  public func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
+    MessagingPush.shared.application(application, didRegisterForRemoteNotificationsWithDeviceToken: deviceToken)
+  }
+    
+  public func application(_ application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error: Error) {
+    MessagingPush.shared.application(application, didFailToRegisterForRemoteNotificationsWithError: error)
+  }
+}

package/plugin/src/helpers/native-files/ios/fcm/CioSdkAppDelegateHandler.swift

@@ -0,0 +1,74 @@
+import Foundation
+import CioMessagingPushFCM
+import FirebaseCore
+import FirebaseMessaging
+import UserNotifications
+import UIKit
+#if canImport(EXNotifications)
+import EXNotifications
+import ExpoModulesCore
+#endif
+
+public class CioSdkAppDelegateHandler: NSObject {
+    
+  public func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) {
+
+    {{REGISTER_SNIPPET}}
+
+    if (FirebaseApp.app() == nil) {
+      FirebaseApp.configure()
+    }
+    Messaging.messaging().delegate = self
+    UIApplication.shared.registerForRemoteNotifications()
+    
+    MessagingPushFCM.initialize(
+      withConfig: MessagingPushConfigBuilder()
+        .autoFetchDeviceToken({{AUTO_FETCH_DEVICE_TOKEN}})
+        .showPushAppInForeground({{SHOW_PUSH_APP_IN_FOREGROUND}})
+        .autoTrackPushEvents({{AUTO_TRACK_PUSH_EVENTS}})
+        .build()
+    )
+    
+    // Code to make the CIO SDK compatible with expo-notifications package.
+    //
+    // The CIO SDK and expo-notifications both need to handle when a push gets clicked. However, iOS only allows one click handler to be set per app.
+    // To get around this limitation, we set the CIO SDK as the click handler. The CIO SDK sets itself up so that when another SDK or host iOS app
+    // sets itself as the click handler, the CIO SDK will still be able to handle when the push gets clicked, even though it's not the designated
+    // click handler in iOS at runtime.
+    //
+    // This should work for most SDKs. However, expo-notifications is unique in its implementation. It will not setup push click handling if it detects
+    // that another SDK or host iOS app has already set itself as the click handler.
+    // To get around this, we must manually set it as the click handler after the CIO SDK. That's what this code block does.
+    //
+    // Note: Initialize the native iOS SDK and setup SDK push click handling before running this code.
+    #if canImport(EXNotifications)
+      // Getting the singleton reference from Expo
+    if let notificationCenterDelegate = ModuleRegistryProvider.getSingletonModule(for: NotificationCenterManager.self) as? UNUserNotificationCenterDelegate {
+        let center = UNUserNotificationCenter.current()
+        center.delegate = notificationCenterDelegate
+      }
+    #endif
+  }
+
+  public func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
+    
+  }
+    
+  public func application(_ application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error: Error) {
+    
+  }
+}
+
+extension CioSdkAppDelegateHandler: MessagingDelegate {
+  public func messaging(_ messaging: Messaging, didReceiveRegistrationToken fcmToken: String?) {
+    MessagingPush.shared.messaging(messaging, didReceiveRegistrationToken: fcmToken)
+  }
+
+  func userNotificationCenter(
+    _ center: UNUserNotificationCenter,
+    willPresent notification: UNNotification,
+    withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void
+  ) {
+    completionHandler([.list, .banner, .badge, .sound])
+  }
+}

package/plugin/src/helpers/utils/fileManagement.ts

@@ -7,8 +7,8 @@ import {
   mkdirSync,
   writeFileSync,
   readFileSync,
-  MakeDirectoryOptions,
 } from 'fs';
+import type { MakeDirectoryOptions } from 'fs';
 
 export class FileManagement {
   static async read(path: string): Promise<string> {

package/plugin/src/ios/utils.ts

@@ -1,10 +1,27 @@
 import type { CustomerIOPluginOptionsIOS } from '../types/cio-types';
+import type { ExpoConfig } from '@expo/config-types';
+import * as semver from 'semver';
 
 /**
  * Returns t
  * @param iosOptions The plugin iOS configuration options
  * @returns true if FCM is configured to be used as push provider
  */
-export const isFcmPushProvider = (iosOptions?: CustomerIOPluginOptionsIOS): boolean => {
-    return iosOptions?.pushNotification?.provider === "fcm";
-};
+export const isFcmPushProvider = (
+  iosOptions?: CustomerIOPluginOptionsIOS
+): boolean => {
+  return iosOptions?.pushNotification?.provider === 'fcm';
+};
+
+export const isExpoVersion53OrHigher = (config: ExpoConfig): boolean => {
+  const sdkVersion = config.sdkVersion || '';
+  
+  // If sdkVersion is not a valid semver, coerce it to a valid one if possible
+  const validVersion = semver.valid(sdkVersion) || semver.coerce(sdkVersion);
+  
+  // If we couldn't get a valid version, return false
+  if (!validVersion) return false;
+  
+  // Check if the version is greater than or equal to 53.0.0
+  return semver.gte(validVersion, '53.0.0');
+};

package/plugin/src/ios/withAppDelegateModifications.ts

@@ -1,4 +1,5 @@
-import { ConfigPlugin, withAppDelegate } from '@expo/config-plugins';
+import type { ConfigPlugin } from '@expo/config-plugins';
+import { withAppDelegate } from '@expo/config-plugins';
 import { getAppDelegateHeaderFilePath } from '@expo/config-plugins/build/ios/Paths';
 
 import {

package/plugin/src/ios/withCIOIos.ts

@@ -1,18 +1,30 @@
 import type { ExpoConfig } from '@expo/config-types';
 
-import type { CustomerIOPluginOptionsIOS, CustomerIOPluginPushNotificationOptions } from '../types/cio-types';
+import type {
+  CustomerIOPluginOptionsIOS,
+  CustomerIOPluginPushNotificationOptions,
+} from '../types/cio-types';
 import { withAppDelegateModifications } from './withAppDelegateModifications';
 import { withCioNotificationsXcodeProject } from './withNotificationsXcodeProject';
 import { withCioXcodeProject } from './withXcodeProject';
 import { withGoogleServicesJsonFile } from './withGoogleServicesJsonFile';
+import { withCIOIosSwift } from './withCIOIosSwift';
+import { isExpoVersion53OrHigher } from './utils';
 
 export function withCIOIos(
   config: ExpoConfig,
   props: CustomerIOPluginOptionsIOS
 ) {
   const cioProps = mergeDeprecatedPropertiesAndLogWarnings(props);
+  const isSwiftProject = isExpoVersion53OrHigher(config);
+
   if (cioProps.pushNotification) {
-    config = withAppDelegateModifications(config, cioProps);
+    if (isSwiftProject) {
+      config = withCIOIosSwift(config, cioProps);
+    } else {
+      config = withAppDelegateModifications(config, cioProps);
+    }
+
     config = withCioNotificationsXcodeProject(config, cioProps);
     config = withCioXcodeProject(config, cioProps);
     config = withGoogleServicesJsonFile(config, cioProps);
@@ -70,3 +82,4 @@ const mergeDeprecatedPropertiesAndLogWarnings = (
 
   return props;
 };
+