customerio-expo-plugin 3.4.0 → 3.5.0

package/plugin/src/ios/withCIOIosSwift.ts

@@ -232,12 +232,19 @@ export const withCIOIosSwift = (
   if (props?.pushNotification) {
     // With push notifications: delegate to CioSdkAppDelegateHandler for both push and auto-init
     return withAppDelegate(configOuter, async (config) => {
-      return modifyAppDelegateWithPushAppDelegateHandler(config, props);
+      config.modResults.contents = modifyAppDelegateForPushHandler(
+        config.modResults.contents,
+        props
+      );
+      return config;
     });
   } else if (sdkConfig) {
     // Without push notifications: directly inject auto initialization into AppDelegate
     return withAppDelegate(configOuter, async (config) => {
-      return modifyAppDelegateWithNativeSDKInitializer(config);
+      config.modResults.contents = modifyAppDelegateForNativeSDKInitializer(
+        config.modResults.contents
+      );
+      return config;
     });
   } else {
     return configOuter;
@@ -245,77 +252,53 @@ export const withCIOIosSwift = (
 };
 
 /**
- * Modify the AppDelegate to integrate with Customer.io SDK
+ * Pure string transform: produces the Swift AppDelegate contents wired to delegate to
+ * `CioSdkAppDelegateHandler` for both push notifications and (when configured) auto-init.
+ * Idempotent — returns `contents` unchanged when the handler is already present.
  */
-const modifyAppDelegateWithPushAppDelegateHandler = (
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  config: any,
+export function modifyAppDelegateForPushHandler(
+  contents: string,
   props: CustomerIOPluginOptionsIOS
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-): any => {
-  const appDelegateContent = config.modResults.contents;
-
-  // Check if modifications have already been applied
-  if (appDelegateContent.includes(CIO_SDK_APP_DELEGATE_HANDLER_CLASS)) {
+): string {
+  if (contents.includes(CIO_SDK_APP_DELEGATE_HANDLER_CLASS)) {
     logger.info(
       'CustomerIO Swift AppDelegate changes already exist. Skipping...'
     );
-    return config;
+    return contents;
   }
 
-  // Add the handler property declaration
-  let modifiedContent = addHandlerPropertyDeclaration(appDelegateContent);
-
-  // Modify didFinishLaunchingWithOptions to initialize and call the handler
-  modifiedContent = modifyDidFinishLaunchingWithOptions(
-    modifiedContent,
+  let next = addHandlerPropertyDeclaration(contents);
+  next = modifyDidFinishLaunchingWithOptions(
+    next,
     `  cioSdkHandler.application(application, didFinishLaunchingWithOptions: launchOptions)\n\n    `
   );
+  next = addDidRegisterForRemoteNotificationsWithDeviceToken(next);
+  next = addDidFailToRegisterForRemoteNotificationsWithError(next);
 
-  // Add didRegisterForRemoteNotificationsWithDeviceToken implementation
-  modifiedContent =
-    addDidRegisterForRemoteNotificationsWithDeviceToken(modifiedContent);
-
-  // Add didFailToRegisterForRemoteNotificationsWithError implementation
-  modifiedContent =
-    addDidFailToRegisterForRemoteNotificationsWithError(modifiedContent);
-
-  // Add deep link handling for killed state if enabled
   if (props.pushNotification?.handleDeeplinkInKilledState === true) {
-    modifiedContent = addHandleDeeplinkInKilledState(modifiedContent);
+    next = addHandleDeeplinkInKilledState(next);
   }
 
-  config.modResults.contents = modifiedContent;
-  return config;
-};
+  return next;
+}
 
 /**
- * Modify the AppDelegate to integrate with Customer.io SDK
+ * Pure string transform: injects the auto-init snippet into the Swift AppDelegate's
+ * didFinishLaunchingWithOptions for the no-push path. Idempotent.
  */
-const modifyAppDelegateWithNativeSDKInitializer = (
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  config: any,
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-): any => {
-  const appDelegateContent = config.modResults.contents;
-
-  // Check if modifications have already been applied
-  if (appDelegateContent.includes(CIO_NATIVE_SDK_INITIALIZE_CALL)) {
+export function modifyAppDelegateForNativeSDKInitializer(contents: string): string {
+  if (contents.includes(CIO_NATIVE_SDK_INITIALIZE_CALL)) {
     logger.info(
       'CustomerIO Swift AppDelegate changes already exist. Skipping...'
     );
-    return config;
+    return contents;
   }
 
-  // Modify didFinishLaunchingWithOptions to initialize and call the handler
-  const modifiedContent = modifyDidFinishLaunchingWithOptions(
-    appDelegateContent,
+  return modifyDidFinishLaunchingWithOptions(
+    contents,
     CIO_NATIVE_SDK_INITIALIZE_SNIPPET,
   );
-
-  config.modResults.contents = modifiedContent;
-  return config;
-};
+}
 
 /**
  * Check if a method exists in the AppDelegate content

package/plugin/src/ios/withGoogleServicesJsonFile.ts

@@ -6,6 +6,65 @@ import { logger } from '../utils/logger';
 import { FileManagement } from './../helpers/utils/fileManagement';
 import { isFcmPushProvider } from './utils';
 
+export type CopyGoogleServicePlistOptions = {
+  iosPath: string;
+  appName: string | undefined;
+  googleServicesFile: string | undefined;
+  expoIosGoogleServicesFileSet: boolean;
+  xcodeProject: XcodeProject;
+};
+
+/**
+ * Copies the FCM GoogleService-Info.plist into the iOS project (when needed) and registers it
+ * in the Xcode project's Resources group. Idempotent — no-ops if a plist is already present
+ * at either of the two well-known locations Expo / RN Firebase use.
+ */
+export function copyGoogleServicePlistFile({
+  iosPath,
+  appName,
+  googleServicesFile,
+  expoIosGoogleServicesFileSet,
+  xcodeProject,
+}: CopyGoogleServicePlistOptions): void {
+  const destination = `${iosPath}/GoogleService-Info.plist`;
+
+  if (FileManagement.exists(destination)) {
+    logger.info(`File already exists: ${destination}. Skipping...`);
+    return;
+  }
+
+  if (appName && FileManagement.exists(`${iosPath}/${appName}/GoogleService-Info.plist`)) {
+    // This is where RN Firebase potentially copies GoogleService-Info.plist
+    // Do not copy if it's already done by Firebase to avoid conflict in Resources
+    logger.info(
+      `File already exists: ${iosPath}/${appName}/GoogleService-Info.plist. Skipping...`
+    );
+    return;
+  }
+
+  if (googleServicesFile && FileManagement.exists(googleServicesFile)) {
+    if (expoIosGoogleServicesFileSet) {
+      logger.warn(
+        'Specifying both Expo ios.googleServicesFile and Customer.io ios.pushNotification.googleServicesFile can cause a conflict' +
+        ' duplicating GoogleService-Info.plist in the iOS project resources. Please remove Customer.io ios.pushNotification.googleServicesFile'
+      );
+    }
+
+    try {
+      FileManagement.copyFile(googleServicesFile, destination);
+      addFileToXcodeProject(xcodeProject, 'GoogleService-Info.plist');
+    } catch {
+      logger.error(
+        `There was an error copying your GoogleService-Info.plist file. You can copy it manually into ${destination}`
+      );
+    }
+  } else {
+    logger.error(
+      `The Google Services file provided in ${googleServicesFile} doesn't seem to exist. You can copy it manually into ${destination}`
+    );
+  }
+}
+
 export const withGoogleServicesJsonFile: ConfigPlugin<
   CustomerIOPluginOptionsIOS
 > = (config, cioProps) => {
@@ -21,54 +80,13 @@ export const withGoogleServicesJsonFile: ConfigPlugin<
       ' GoogleService-Info.plist as part of Firebase integration'
     );
 
-    // googleServicesFile
-    const iosPath = props.modRequest.platformProjectRoot;
-    const googleServicesFile = cioProps.pushNotification?.googleServicesFile;
-    const appName = props.modRequest.projectName;
-
-    if (FileManagement.exists(`${iosPath}/GoogleService-Info.plist`)) {
-      logger.info(
-        `File already exists: ${iosPath}/GoogleService-Info.plist. Skipping...`
-      );
-      return props;
-    }
-
-    if (
-      FileManagement.exists(`${iosPath}/${appName}/GoogleService-Info.plist`)
-    ) {
-      // This is where RN Firebase potentially copies GoogleService-Info.plist
-      // Do not copy if it's already done by Firebase to avoid conflict in Resources
-      logger.info(
-        `File already exists: ${iosPath}/${appName}/GoogleService-Info.plist. Skipping...`
-      );
-      return props;
-    }
-
-    if (googleServicesFile && FileManagement.exists(googleServicesFile)) {
-      if (config.ios?.googleServicesFile) {
-        logger.warn(
-          'Specifying both Expo ios.googleServicesFile and Customer.io ios.pushNotification.googleServicesFile can cause a conflict' +
-          ' duplicating GoogleService-Info.plist in the iOS project resources. Please remove Customer.io ios.pushNotification.googleServicesFile'
-        );
-      }
-
-      try {
-        FileManagement.copyFile(
-          googleServicesFile,
-          `${iosPath}/GoogleService-Info.plist`
-        );
-
-        addFileToXcodeProject(props.modResults, 'GoogleService-Info.plist');
-      } catch {
-        logger.error(
-          `There was an error copying your GoogleService-Info.plist file. You can copy it manually into ${iosPath}/GoogleService-Info.plist`
-        );
-      }
-    } else {
-      logger.error(
-        `The Google Services file provided in ${googleServicesFile} doesn't seem to exist. You can copy it manually into ${iosPath}/GoogleService-Info.plist`
-      );
-    }
+    copyGoogleServicePlistFile({
+      iosPath: props.modRequest.platformProjectRoot,
+      appName: props.modRequest.projectName,
+      googleServicesFile: cioProps.pushNotification?.googleServicesFile,
+      expoIosGoogleServicesFileSet: Boolean(config.ios?.googleServicesFile),
+      xcodeProject: props.modResults,
+    });
 
     return props;
   });