customerio-expo-plugin 2.4.0 → 2.6.0

package/plugin/src/android/withNotificationChannelMetadata.ts

@@ -19,7 +19,7 @@ const addMetadataIfNotExists = (
 
   // Check if metadata already exists
   const hasMetadata = application['meta-data'].some(
-    (metadata) => metadata['$']['android:name'] === name
+    (metadata) => metadata.$['android:name'] === name
   );
 
   // Add metadata if it doesn't exist
@@ -37,11 +37,15 @@ export const withNotificationChannelMetadata: ConfigPlugin<
   CustomerIOPluginOptionsAndroid
 > = (config, props) => {
   return withAndroidManifest(config, (manifestProps) => {
-    const application = manifestProps.modResults.manifest.application as ManifestApplication[];
+    const application = manifestProps.modResults.manifest
+      .application as ManifestApplication[];
     const channel = props.pushNotification?.channel;
 
     // Only proceed if channel configuration exists
-    if (channel && (channel.id || channel.name || channel.importance !== undefined)) {
+    if (
+      channel &&
+      (channel.id || channel.name || channel.importance !== undefined)
+    ) {
       if (channel.id) {
         addMetadataIfNotExists(
           application[0],

package/plugin/src/android/withProjectStrings.ts

@@ -1,12 +1,13 @@
 import type { ConfigPlugin } from '@expo/config-plugins';
 import { withStringsXml } from '@expo/config-plugins';
-import { getPluginVersion } from '../helpers/utils/pluginUtils';
+import type { ResourceXML } from '@expo/config-plugins/build/android/Resources';
+import { getPluginVersion } from '../utils/plugin';
 
 /**
  * Adds or updates string resources in Android's strings.xml required by the plugin
  */
-export const withProjectStrings: ConfigPlugin = (config) => {
-  return withStringsXml(config, (config) => {
+export const withProjectStrings: ConfigPlugin = (configOuter) => {
+  return withStringsXml(configOuter, (config) => {
     const stringsXml = config.modResults;
     const pluginVersion = getPluginVersion();
 
@@ -17,7 +18,10 @@ export const withProjectStrings: ConfigPlugin = (config) => {
     // can be generated correctly for Expo apps
     addStringsToXml(stringsXml, [
       { name: 'customer_io_react_native_sdk_client_source', value: 'Expo' },
-      { name: 'customer_io_react_native_sdk_client_version', value: pluginVersion },
+      {
+        name: 'customer_io_react_native_sdk_client_version',
+        value: pluginVersion,
+      },
     ]);
 
     return config;
@@ -31,25 +35,31 @@ export const withProjectStrings: ConfigPlugin = (config) => {
  * @returns Updated strings.xml object
  */
 export function addStringsToXml(
-  stringsXml: any,
-  stringResources: { name: string, value: string }[]
+  stringsXml: ResourceXML,
+  stringResources: { name: string; value: string }[]
 ) {
   // Ensure the resource exists
   if (!stringsXml.resources) {
     stringsXml.resources = { string: [] };
   }
+  // Ensure the string array exists
+  if (!stringsXml.resources.string) {
+    stringsXml.resources.string = [];
+  }
 
+  // Get a reference to the string array after ensuring it exists
+  const stringArray = stringsXml.resources.string;
   stringResources.forEach(({ name, value }) => {
-    const existingStringIndex = stringsXml.resources.string.findIndex(
-      (item: { $: { name: string } }) => item.$?.name === name
+    const existingStringIndex = stringArray.findIndex(
+      (item) => item.$?.name === name
     );
 
     if (existingStringIndex !== -1) {
       // Update the existing string
-      stringsXml.resources.string[existingStringIndex]._ = value;
+      stringArray[existingStringIndex]._ = value;
     } else {
       // Add a new string resource
-      stringsXml.resources.string.push({
+      stringArray.push({
         $: { name },
         _: value,
       });

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

@@ -12,3 +12,10 @@ export const CIO_APP_GOOGLE_SNIPPET =
   'apply plugin: "com.google.gms.google-services"  // Google Services plugin';
 export const CIO_PROJECT_GOOGLE_SNIPPET =
   '        classpath "com.google.gms:google-services:4.3.13"  // Google Services plugin';
+
+export const CIO_MAINAPPLICATION_ONCREATE_REGEX = /override\s+fun\s+onCreate\s*\(\s*\)\s*\{[\s\S]*?\}/;
+// Actual method call, also used to detect if Customer.io auto initialization is already present
+export const CIO_NATIVE_SDK_INITIALIZE_CALL = 'CustomerIOSDKInitializer.initialize(this)';
+// Complete code snippet to inject into MainActivity.onCreate()
+export const CIO_NATIVE_SDK_INITIALIZE_SNIPPET = `// Auto Initialize Native Customer.io SDK
+    ${CIO_NATIVE_SDK_INITIALIZE_CALL}`;

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

@@ -0,0 +1,12 @@
+/**
+ * Platform constants for native SDK initialization
+ */
+export const PLATFORM = {
+  IOS: 'ios',
+  ANDROID: 'android',
+} as const;
+
+/**
+ * Platform type definition
+ */
+export type Platform = typeof PLATFORM[keyof typeof PLATFORM];

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

@@ -1,23 +1,15 @@
-const finder = require('find-package-json');
 const path = require('path');
 const resolveFrom = require('resolve-from');
 
-const f = finder(__dirname);
-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_CIO_NSE_FILES = path.join(
-  pluginPackageRoot,
-  'plugin/src/helpers/native-files/ios'
-);
-
 export function getRelativePathToRNSDK(iosPath: string) {
   // Root path of the Expo project
   const rootAppPath = path.dirname(iosPath);
 
   // Path of the cio RN package.json file. Example: test-app/node_modules/customerio-reactnative/package.json
-  const pluginPackageJsonPath = resolveFrom.silent(rootAppPath, `customerio-reactnative/package.json`);
+  const pluginPackageJsonPath = resolveFrom.silent(
+    rootAppPath,
+    `customerio-reactnative/package.json`
+  );
 
   // Example: ../node_modules/customerio-reactnative
   return path.relative(iosPath, path.dirname(pluginPackageJsonPath));
@@ -170,4 +162,10 @@ export const CIO_REGISTER_PUSHNOTIFICATION_SNIPPET_v2 = `
       }
     }`;
 
-export const CIO_REGISTER_PUSH_NOTIFICATION_PLACEHOLDER = /\{\{REGISTER_SNIPPET\}\}/;
+export const CIO_REGISTER_PUSH_NOTIFICATION_PLACEHOLDER = /\{\{REGISTER_SNIPPET\}\}/;
+// Regex to match MessagingPush initialization in AppDelegate (different from NSE initialization)
+export const CIO_MESSAGING_PUSH_APP_DELEGATE_INIT_REGEX = /(MessagingPush(?:APN|FCM)\.initialize)/;
+export const CIO_NATIVE_SDK_INITIALIZE_CALL = 'CustomerIOSDKInitializer.initialize()';
+export const CIO_NATIVE_SDK_INITIALIZE_SNIPPET = `// Auto Initialize Native Customer.io SDK
+    ${CIO_NATIVE_SDK_INITIALIZE_CALL}
+    `;

package/plugin/src/helpers/native-files/android/CustomerIOSDKInitializer.kt

@@ -0,0 +1,64 @@
+package io.customer.sdk.expo
+
+import android.app.Application
+import io.customer.datapipelines.config.ScreenView
+import io.customer.messaginginapp.MessagingInAppModuleConfig
+import io.customer.messaginginapp.ModuleMessagingInApp
+import io.customer.messagingpush.MessagingPushModuleConfig
+import io.customer.messagingpush.ModuleMessagingPushFCM
+import io.customer.reactnative.sdk.messaginginapp.ReactInAppEventListener
+import io.customer.sdk.CustomerIOBuilder
+import io.customer.sdk.core.util.CioLogLevel
+import io.customer.sdk.data.model.Region
+
+object CustomerIOSDKInitializer {
+    fun initialize(application: Application) = with(
+        CustomerIOBuilder(application, "{{CDP_API_KEY}}")
+    ) {
+        val siteId: String? = {{SITE_ID}}
+        val migrationSiteId: String? = {{MIGRATION_SITE_ID}}
+        val region = Region.getRegion({{REGION}})
+
+        setIfDefined({{LOG_LEVEL}}, CustomerIOBuilder::logLevel) { CioLogLevel.getLogLevel(it) }
+        setIfDefined(region, CustomerIOBuilder::region)
+        setIfDefined({{AUTO_TRACK_DEVICE_ATTRIBUTES}}, CustomerIOBuilder::autoTrackDeviceAttributes)
+        setIfDefined({{TRACK_APPLICATION_LIFECYCLE_EVENTS}}, CustomerIOBuilder::trackApplicationLifecycleEvents)
+        setIfDefined({{SCREEN_VIEW_USE}}, CustomerIOBuilder::screenViewUse) { ScreenView.getScreenView(it) }
+        setIfDefined(migrationSiteId, CustomerIOBuilder::migrationSiteId)
+
+        // Add messaging modules if siteId is provided
+        if (!(siteId.isNullOrBlank())) {
+            addCustomerIOModule(
+                ModuleMessagingInApp(
+                    MessagingInAppModuleConfig.Builder(siteId, region)
+                        .setEventListener(ReactInAppEventListener())
+                        .build()
+                )
+            )
+        }
+        addCustomerIOModule(
+            ModuleMessagingPushFCM(
+                MessagingPushModuleConfig.Builder().build()
+            )
+        )
+
+        build()
+    }
+}
+
+// Apply a value after transforming it, only if both the original and transformed values are non-nil
+private inline fun <R, T> CustomerIOBuilder.setIfDefined(
+    value: R?,
+    block: CustomerIOBuilder.(T) -> CustomerIOBuilder,
+    transform: (R) -> T,
+): CustomerIOBuilder = value?.let { block(transform(it)) } ?: this
+
+// Apply a value to a setter only if it's non-nil
+private inline fun <T> CustomerIOBuilder.setIfDefined(
+    value: T?,
+    block: CustomerIOBuilder.(T) -> CustomerIOBuilder,
+): CustomerIOBuilder = setIfDefined(
+    value = value,
+    block = block,
+    transform = { it },
+)

package/plugin/src/helpers/native-files/ios/CustomerIOSDKInitializer.swift

@@ -0,0 +1,54 @@
+import CioDataPipelines
+import CioInternalCommon
+import CioMessagingInApp
+import customerio_reactnative
+
+class CustomerIOSDKInitializer {
+    static func initialize() {
+        // Override SDK client info to include Expo metadata in user agent
+        let pluginVersion = "{{EXPO_PLUGIN_VERSION}}"
+        DIGraphShared.shared.override(
+            value: CustomerIOSdkClient(source: "Expo", sdkVersion: pluginVersion),
+            forType: SdkClient.self
+        )
+
+        let cdpApiKey = "{{CDP_API_KEY}}"
+        let siteId: String? = {{SITE_ID}}
+        let region = CioInternalCommon.Region.getRegion(from: {{REGION}})
+
+        let builder = SDKConfigBuilder(cdpApiKey: cdpApiKey)
+        setIfDefined(value: {{LOG_LEVEL}}, thenPassItTo: builder.logLevel, transformingBy: CioLogLevel.getLogLevel)
+        setIfDefined(value: region, thenPassItTo: builder.region)
+        setIfDefined(value: {{AUTO_TRACK_DEVICE_ATTRIBUTES}}, thenPassItTo: builder.autoTrackDeviceAttributes)
+        setIfDefined(value: {{TRACK_APPLICATION_LIFECYCLE_EVENTS}}, thenPassItTo: builder.trackApplicationLifecycleEvents)
+        setIfDefined(value: {{SCREEN_VIEW_USE}}, thenPassItTo: builder.screenViewUse) { ScreenView.getScreenView($0) }
+        setIfDefined(value: {{MIGRATION_SITE_ID}}, thenPassItTo: builder.migrationSiteId)
+
+        CustomerIO.initialize(withConfig: builder.build())
+
+        if let siteId = siteId {
+          let inAppConfig = MessagingInAppConfigBuilder(siteId: siteId, region: region).build()
+          MessagingInApp.initialize(withConfig: inAppConfig)
+          MessagingInApp.shared.setEventListener(ReactInAppEventListener.shared)
+        }
+    }
+
+    /// Apply a value to a setter only if it's non-nil
+    private static func setIfDefined<Raw>(
+        value rawValue: Raw?,
+        thenPassItTo handler: (Raw) -> Any
+    ) {
+        setIfDefined(value: rawValue, thenPassItTo: handler) { $0 }
+    }
+
+    /// Apply a value after transforming it, only if both the original and transformed values are non-nil
+    private static func setIfDefined<Raw, Transformed>(
+        value rawValue: Raw?,
+        thenPassItTo handler: (Transformed) -> Any,
+        transformingBy transform: (Raw) -> Transformed?
+    ) {
+        if let value = rawValue, let result = transform(value) {
+            _ = handler(result)
+        }
+    }
+}

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

@@ -3,7 +3,10 @@ import { getRelativePathToRNSDK } from '../constants/ios';
 import { injectCodeByRegex } from './codeInjection';
 import { FileManagement } from './fileManagement';
 
-export async function injectCIOPodfileCode(iosPath: string, isFcmPushProvider: boolean) {
+export async function injectCIOPodfileCode(
+  iosPath: string,
+  isFcmPushProvider: boolean
+) {
   const blockStart = '# --- CustomerIO Host App START ---';
   const blockEnd = '# --- CustomerIO Host App END ---';
 
@@ -19,9 +22,8 @@ export async function injectCIOPodfileCode(iosPath: string, isFcmPushProvider: b
 
     const snippetToInjectInPodfile = `
 ${blockStart}
-  pod 'customerio-reactnative/${isFcmPushProvider ? "fcm" : "apn"}', :path => '${getRelativePathToRNSDK(
-    iosPath
-  )}'
+  pod 'customerio-reactnative/${isFcmPushProvider ? 'fcm' : 'apn'
+      }', :path => '${getRelativePathToRNSDK(iosPath)}'
 ${blockEnd}
 `.trim();
 
@@ -56,9 +58,8 @@ export async function injectCIONotificationPodfileCode(
 ${blockStart}
 target 'NotificationService' do
   ${useFrameworks === 'static' ? 'use_frameworks! :linkage => :static' : ''}
-  pod 'customerio-reactnative-richpush/${isFcmPushProvider ? "fcm" : "apn"}', :path => '${getRelativePathToRNSDK(
-    iosPath
-  )}'
+  pod 'customerio-reactnative-richpush/${isFcmPushProvider ? 'fcm' : 'apn'
+      }', :path => '${getRelativePathToRNSDK(iosPath)}'
 end
 ${blockEnd}
 `.trim();

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

@@ -0,0 +1,97 @@
+import type { NativeSDKConfig } from '../../types/cio-types';
+import { PLATFORM, type Platform } from '../constants/common';
+import { getPluginVersion } from '../../utils/plugin';
+
+/**
+ * Shared utility function to perform common SDK config replacements
+ * for both iOS and Android template files
+ */
+export function patchNativeSDKInitializer(
+  rawContent: string,
+  platform: Platform,
+  sdkConfig: NativeSDKConfig
+): string {
+  let content = rawContent;
+
+  // Helper function to replace placeholders with platform-specific fallback values
+  const replaceValue = <T>(
+    placeholder: RegExp,
+    value: T | undefined,
+    transform: (configValue: T) => string,
+    fallback: string = platform === PLATFORM.ANDROID ? 'null' : 'nil'
+  ) => {
+    if (value !== undefined && value !== null) {
+      content = content.replace(placeholder, transform(value));
+    } else {
+      content = content.replace(placeholder, fallback);
+    }
+  };
+
+  // Replace EXPO_PLUGIN_VERSION with actual plugin version
+  const pluginVersion = getPluginVersion();
+  content = content.replace(/\{\{EXPO_PLUGIN_VERSION\}\}/g, pluginVersion);
+
+  // Replace CDP API Key (required field)
+  content = content.replace(/\{\{CDP_API_KEY\}\}/g, sdkConfig.cdpApiKey);
+
+  // Handle region - use empty string as fallback (nil not supported for region)
+  replaceValue(
+    /\{\{REGION\}\}/g,
+    sdkConfig.region,
+    (configValue) => `"${configValue}"`,
+    '""'
+  );
+
+  // Handle logLevel - use nil/null as fallback
+  replaceValue(
+    /\{\{LOG_LEVEL\}\}/g,
+    sdkConfig.logLevel,
+    (configValue) => `"${configValue}"`
+  );
+
+  // Handle optional boolean configurations
+  replaceValue(
+    /\{\{AUTO_TRACK_DEVICE_ATTRIBUTES\}\}/g,
+    sdkConfig.autoTrackDeviceAttributes,
+    (configValue) => configValue.toString()
+  );
+
+  replaceValue(
+    /\{\{TRACK_APPLICATION_LIFECYCLE_EVENTS\}\}/g,
+    sdkConfig.trackApplicationLifecycleEvents,
+    (configValue) => configValue.toString()
+  );
+
+  // Handle screenViewUse - use nil/null as fallback
+  replaceValue(
+    /\{\{SCREEN_VIEW_USE\}\}/g,
+    sdkConfig.screenViewUse,
+    (configValue) => `"${configValue}"`
+  );
+
+  // Handle siteId/migrationSiteId business logic
+  let siteId = sdkConfig.siteId;
+  let migrationSiteId = sdkConfig.migrationSiteId;
+
+  // Business rule: if only siteId provided, copy to migrationSiteId; if only migrationSiteId provided, set siteId to undefined
+  if (siteId && !migrationSiteId) {
+    migrationSiteId = siteId;
+  } else if (migrationSiteId && !siteId) {
+    siteId = undefined;
+  }
+
+  // Replace siteId and migrationSiteId placeholders (trim whitespace and handle empty strings)
+  replaceValue(
+    /\{\{SITE_ID\}\}/g,
+    siteId?.trim() || undefined,
+    (configValue) => `"${configValue}"`
+  );
+
+  replaceValue(
+    /\{\{MIGRATION_SITE_ID\}\}/g,
+    migrationSiteId?.trim() || undefined,
+    (configValue) => `"${configValue}"`
+  );
+
+  return content;
+}

package/plugin/src/index.ts

@@ -1,20 +1,36 @@
 import type { ExpoConfig } from '@expo/config-types';
 
 import { withCIOAndroid } from './android/withCIOAndroid';
+import { isExpoVersion53OrHigher } from './ios/utils';
 import { withCIOIos } from './ios/withCIOIos';
 import type { CustomerIOPluginOptions } from './types/cio-types';
+import { validateNativeSDKConfig } from './utils/validation';
 
 // Entry point for config plugin
 function withCustomerIOPlugin(
   config: ExpoConfig,
   props: CustomerIOPluginOptions
 ) {
+  // Check if config is being used with unsupported Expo version
+  if (props.config && !isExpoVersion53OrHigher(config)) {
+    throw new Error(
+      'CustomerIO auto initialization (config property) requires Expo SDK 53 or higher. ' +
+      'Please upgrade to Expo SDK 53+ or use manual initialization instead. ' +
+      'See documentation for manual setup instructions.'
+    );
+  }
+
+  // Validate SDK config if provided
+  if (props.config) {
+    validateNativeSDKConfig(props.config);
+  }
+
   if (props.ios) {
-    config = withCIOIos(config, props.ios);
+    config = withCIOIos(config, props.config, props.ios);
   }
 
   if (props.android) {
-    config = withCIOAndroid(config, props.android);
+    config = withCIOAndroid(config, props.config, props.android);
   }
 
   return config;

package/plugin/src/ios/utils.ts

@@ -1,9 +1,9 @@
-import type { CustomerIOPluginOptionsIOS } from '../types/cio-types';
 import type { ExpoConfig } from '@expo/config-types';
 import * as semver from 'semver';
+import type { CustomerIOPluginOptionsIOS } from '../types/cio-types';
 
 /**
- * Returns t
+ * Returns true if FCM is configured to be used as push provider
  * @param iosOptions The plugin iOS configuration options
  * @returns true if FCM is configured to be used as push provider
  */
@@ -15,13 +15,13 @@ export const isFcmPushProvider = (
 
 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

@@ -9,26 +9,26 @@ import {
   CIO_APPDELEGATEHEADER_USER_NOTIFICATION_CENTER_SNIPPET,
   CIO_CONFIGURECIOSDKPUSHNOTIFICATION_SNIPPET,
   CIO_CONFIGUREDEEPLINK_KILLEDSTATE_SNIPPET,
-  CIO_RCTBRIDGE_DEEPLINK_MODIFIEDOPTIONS_REGEX,
+  CIO_DEEPLINK_COMMENT_REGEX,
   CIO_DIDFAILTOREGISTERFORREMOTENOTIFICATIONSWITHERROR_REGEX,
   CIO_DIDFAILTOREGISTERFORREMOTENOTIFICATIONSWITHERROR_SNIPPET,
   CIO_DIDFINISHLAUNCHINGMETHOD_REGEX,
   CIO_DIDREGISTERFORREMOTENOTIFICATIONSWITHDEVICETOKEN_REGEX,
   CIO_DIDREGISTERFORREMOTENOTIFICATIONSWITHDEVICETOKEN_SNIPPET,
+  CIO_INITIALIZECIOSDK_SNIPPET,
   CIO_LAUNCHOPTIONS_DEEPLINK_MODIFIEDOPTIONS_REGEX,
-  CIO_PUSHNOTIFICATIONHANDLERDECLARATION_SNIPPET,
   CIO_LAUNCHOPTIONS_MODIFIEDOPTIONS_SNIPPET,
+  CIO_PUSHNOTIFICATIONHANDLERDECLARATION_SNIPPET,
+  CIO_RCTBRIDGE_DEEPLINK_MODIFIEDOPTIONS_REGEX,
   CIO_RCTBRIDGE_DEEPLINK_MODIFIEDOPTIONS_SNIPPET,
-  CIO_DEEPLINK_COMMENT_REGEX,
-  CIO_INITIALIZECIOSDK_SNIPPET,
 } from '../helpers/constants/ios';
 import {
   injectCodeBeforeMultiLineRegex,
   injectCodeByLineNumber,
   injectCodeByMultiLineRegex,
   injectCodeByMultiLineRegexAndReplaceLine,
-  replaceCodeByRegex,
   matchRegexExists,
+  replaceCodeByRegex,
 } from '../helpers/utils/codeInjection';
 import { FileManagement } from '../helpers/utils/fileManagement';
 import type { CustomerIOPluginOptionsIOS } from '../types/cio-types';
@@ -140,7 +140,9 @@ const addExpoNotificationsHeaderModification = (stringContents: string) => {
   return stringContents;
 };
 
-const addFirebaseDelegateForwardDeclarationIfNeeded = (stringContents: string) => {
+const addFirebaseDelegateForwardDeclarationIfNeeded = (
+  stringContents: string
+) => {
   stringContents = injectCodeByLineNumber(
     stringContents,
     0,
@@ -187,7 +189,7 @@ const addHandleDeeplinkInKilledState = (stringContents: string) => {
   }
 
   // Check if the app delegate is using RCTBridge or LaunchOptions
-  let snippet = undefined;
+  let snippet;
   let regex = CIO_LAUNCHOPTIONS_DEEPLINK_MODIFIEDOPTIONS_REGEX;
   if (
     matchRegexExists(
@@ -258,7 +260,8 @@ export const withAppDelegateModifications: ConfigPlugin<
         addDidRegisterForRemoteNotificationsWithDeviceToken(stringContents);
 
       if (isFcmPushProvider(props)) {
-        stringContents = addFirebaseDelegateForwardDeclarationIfNeeded(stringContents);
+        stringContents =
+          addFirebaseDelegateForwardDeclarationIfNeeded(stringContents);
       }
 
       stringContents = addExpoNotificationsHeaderModification(stringContents);

package/plugin/src/ios/withCIOIos.ts

@@ -3,31 +3,40 @@ import type { ExpoConfig } from '@expo/config-types';
 import type {
   CustomerIOPluginOptionsIOS,
   CustomerIOPluginPushNotificationOptions,
+  NativeSDKConfig,
 } from '../types/cio-types';
+import { mergeConfigWithEnvValues } from '../utils/config';
+import { isExpoVersion53OrHigher } from './utils';
 import { withAppDelegateModifications } from './withAppDelegateModifications';
+import { withCIOIosSwift } from './withCIOIosSwift';
+import { withGoogleServicesJsonFile } from './withGoogleServicesJsonFile';
 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,
+  sdkConfig: NativeSDKConfig | undefined,
   props: CustomerIOPluginOptionsIOS
 ) {
-  const cioProps = mergeDeprecatedPropertiesAndLogWarnings(props);
   const isSwiftProject = isExpoVersion53OrHigher(config);
+  const platformConfig = mergeDeprecatedPropertiesAndLogWarnings(props);
 
-  if (cioProps.pushNotification) {
+  if (platformConfig.pushNotification) {
     if (isSwiftProject) {
-      config = withCIOIosSwift(config, cioProps);
+      config = withCIOIosSwift(config, sdkConfig, platformConfig);
     } else {
-      config = withAppDelegateModifications(config, cioProps);
+      // Auto initialization is only supported in Swift projects (Expo SDK 53+)
+      // Legacy Objective-C projects only support push notifications
+      config = withAppDelegateModifications(config, platformConfig);
     }
 
-    config = withCioNotificationsXcodeProject(config, cioProps);
-    config = withCioXcodeProject(config, cioProps);
-    config = withGoogleServicesJsonFile(config, cioProps);
+    platformConfig.pushNotification.env = platformConfig.pushNotification.env
+      || mergeConfigWithEnvValues(platformConfig, sdkConfig);
+    config = withCioNotificationsXcodeProject(config, platformConfig);
+    config = withCioXcodeProject(config, platformConfig);
+    config = withGoogleServicesJsonFile(config, platformConfig);
+  } else if (sdkConfig && isSwiftProject) {
+    config = withCIOIosSwift(config, sdkConfig, platformConfig);
   }
 
   return config;
@@ -82,4 +91,3 @@ const mergeDeprecatedPropertiesAndLogWarnings = (
 
   return props;
 };
-