customerio-expo-plugin 2.7.0 → 2.7.2

package/plugin/src/android/withCIOAndroid.ts

@@ -12,24 +12,30 @@ import { withProjectStrings } from './withProjectStrings';
 
 export function withCIOAndroid(
   config: ExpoConfig,
-  sdkConfig: NativeSDKConfig | undefined,
-  props: CustomerIOPluginOptionsAndroid
+  sdkConfig?: NativeSDKConfig,
+  props?: CustomerIOPluginOptionsAndroid,
 ): ExpoConfig {
-  config = withGistMavenRepository(config, props);
-  config = withProjectGoogleServices(config, props);
-  config = withAppGoogleServices(config, props);
-  config = withGoogleServicesJSON(config, props);
-  config = withProjectStrings(config);
-  if (props.setHighPriorityPushHandler !== undefined) {
-    config = withAndroidManifestUpdates(config, props);
-  }
-  if (props.pushNotification?.channel) {
-    config = withNotificationChannelMetadata(config, props);
+  // Only run notification setup if props are provided
+  if (props) {
+    config = withGistMavenRepository(config, props);
+    config = withProjectGoogleServices(config, props);
+    config = withAppGoogleServices(config, props);
+    config = withGoogleServicesJSON(config, props);
+    if (props.setHighPriorityPushHandler !== undefined) {
+      config = withAndroidManifestUpdates(config, props);
+    }
+    if (props.pushNotification?.channel) {
+      config = withNotificationChannelMetadata(config, props);
+    }
   }
+
   // Add auto initialization if sdkConfig is provided
   if (sdkConfig) {
     config = withMainApplicationModifications(config, sdkConfig);
   }
 
+  // Update project strings for user agent metadata
+  config = withProjectStrings(config);
+
   return config;
 }

package/plugin/src/android/withGistMavenRepository.ts

@@ -1,11 +1,12 @@
-import { withProjectBuildGradle } from '@expo/config-plugins';
 import type { ConfigPlugin } from '@expo/config-plugins';
+import { withProjectBuildGradle } from '@expo/config-plugins';
 
 import {
   CIO_GIST_MAVEN_REGEX,
   CIO_PROJECT_ALLPROJECTS_REGEX,
   CIO_PROJECT_GIST_MAVEN_SNIPPET,
 } from '../helpers/constants/android';
+import { logger } from '../utils/logger';
 import type { CustomerIOPluginOptionsAndroid } from './../types/cio-types';
 
 export const withGistMavenRepository: ConfigPlugin<
@@ -19,7 +20,7 @@ export const withGistMavenRepository: ConfigPlugin<
         `$1\n${CIO_PROJECT_GIST_MAVEN_SNIPPET}`
       );
     } else {
-      console.log('build.gradle snippet alreade exists. Skipping...');
+      logger.info('build.gradle snippet already exists. Skipping...');
     }
 
     return props;

package/plugin/src/android/withGoogleServicesJSON.ts

@@ -1,6 +1,7 @@
 import type { ConfigPlugin } from '@expo/config-plugins';
 import { withProjectBuildGradle } from '@expo/config-plugins';
 
+import { logger } from '../utils/logger';
 import { FileManagement } from './../helpers/utils/fileManagement';
 import type { CustomerIOPluginOptionsAndroid } from './../types/cio-types';
 
@@ -21,17 +22,17 @@ export const withGoogleServicesJSON: ConfigPlugin<
             `${androidPath}/app/google-services.json`
           );
         } catch {
-          console.log(
+          logger.info(
             `There was an error copying your google-services.json file. You can copy it manually into ${androidPath}/app/google-services.json`
           );
         }
       } else {
-        console.log(
+        logger.info(
           `The Google Services file provided in ${googleServicesFile} doesn't seem to exist. You can copy it manually into ${androidPath}/app/google-services.json`
         );
       }
     } else {
-      console.log(
+      logger.info(
         `File already exists: ${androidPath}/app/google-services.json. Skipping...`
       );
     }

package/plugin/src/android/withMainApplicationModifications.ts

@@ -6,6 +6,7 @@ import { PLATFORM } from '../helpers/constants/common';
 import { patchNativeSDKInitializer } from '../helpers/utils/patchPluginNativeCode';
 import type { NativeSDKConfig } from '../types/cio-types';
 import { addCodeToMethod, addImportToFile, copyTemplateFile } from '../utils/android';
+import { logger } from '../utils/logger';
 
 export const withMainApplicationModifications: ConfigPlugin<NativeSDKConfig> = (configOuter, sdkConfig) => {
   return withMainApplication(configOuter, async (config) => {
@@ -42,7 +43,7 @@ const setupCustomerIOSDKInitializer = (
       content = addCodeToMethod(content, CIO_MAINAPPLICATION_ONCREATE_REGEX, CIO_NATIVE_SDK_INITIALIZE_SNIPPET);
     }
   } catch (error) {
-    console.warn(`Could not setup ${SDK_INITIALIZER_CLASS}:`, error);
+    logger.warn(`Could not setup ${SDK_INITIALIZER_CLASS}:`, error);
     return config.modResults.contents;
   }
 

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

@@ -1,7 +1,6 @@
 import CioDataPipelines
 import CioInternalCommon
 import CioMessagingInApp
-import customerio_reactnative
 
 class CustomerIOSDKInitializer {
     static func initialize() {
@@ -27,9 +26,16 @@ class CustomerIOSDKInitializer {
         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)
+            let inAppConfig = MessagingInAppConfigBuilder(siteId: siteId, region: region).build()
+            MessagingInApp.initialize(withConfig: inAppConfig)
+            let logger = DIGraphShared.shared.logger
+            // Retrieves ReactInAppEventListener from DI graph, populated when it is accessed in React Native SDK.
+            if let listener: InAppEventListener? = DIGraphShared.shared.getOverriddenInstance() {
+                logger.debug("[Expo][InApp] React InAppEventListener found in DI graph and set")
+                MessagingInApp.shared.setEventListener(listener)
+            } else {
+                logger.debug("[Expo][InApp] React InAppEventListener not found in DI graph, will be set by React Native module when accessed")
+            }
         }
     }
 

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

@@ -1,14 +1,15 @@
+import type { MakeDirectoryOptions } from 'fs';
 import {
-  readFile,
-  writeFile,
   appendFile,
-  existsSync,
   copyFileSync,
+  existsSync,
   mkdirSync,
-  writeFileSync,
+  readFile,
   readFileSync,
+  writeFile,
+  writeFileSync,
 } from 'fs';
-import type { MakeDirectoryOptions } from 'fs';
+import { logger } from '../../utils/logger';
 
 export class FileManagement {
   static async read(path: string): Promise<string> {
@@ -55,7 +56,7 @@ export class FileManagement {
     try {
       copyFileSync(src, dest);
     } catch (err) {
-      console.log(`Error copying file from ${src} to ${dest}: `, err);
+      logger.error(`Error copying file from ${src} to ${dest}: `, err);
     }
   }
 
@@ -63,7 +64,7 @@ export class FileManagement {
     try {
       mkdirSync(path, options);
     } catch (err) {
-      console.log(`Error creating directory ${path}: `, err);
+      logger.error(`Error creating directory ${path}: `, err);
     }
   }
 
@@ -71,7 +72,7 @@ export class FileManagement {
     try {
       writeFileSync(path, data);
     } catch (err) {
-      console.log(`Error writing to file ${path}: `, err);
+      logger.error(`Error writing to file ${path}: `, err);
     }
   }
 
@@ -79,7 +80,7 @@ export class FileManagement {
     try {
       return readFileSync(path, 'utf-8');
     } catch (err) {
-      console.log(`Error reading file ${path}: `, err);
+      logger.error(`Error reading file ${path}: `, err);
     }
 
     return '';

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

@@ -1,4 +1,5 @@
 import type { CustomerIOPluginOptionsIOS } from '../../types/cio-types';
+import { logger } from '../../utils/logger';
 import { getRelativePathToRNSDK } from '../constants/ios';
 import { injectCodeByRegex } from './codeInjection';
 import { FileManagement } from './fileManagement';
@@ -36,7 +37,7 @@ ${blockEnd}
       ).join('\n')
     );
   } else {
-    console.log('CustomerIO Podfile snippets already exists. Skipping...');
+    logger.info('CustomerIO Podfile snippets already exists. Skipping...');
   }
 }
 

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

@@ -1,6 +1,7 @@
 import type { NativeSDKConfig } from '../../types/cio-types';
-import { PLATFORM, type Platform } from '../constants/common';
 import { getPluginVersion } from '../../utils/plugin';
+import { validateNativeSDKConfig } from '../../utils/validation';
+import { PLATFORM, type Platform } from '../constants/common';
 
 /**
  * Shared utility function to perform common SDK config replacements
@@ -11,6 +12,10 @@ export function patchNativeSDKInitializer(
   platform: Platform,
   sdkConfig: NativeSDKConfig
 ): string {
+  // Validate SDK configuration to ensure all fields are present and 
+  // correct at the time of patching in prebuild
+  validateNativeSDKConfig(sdkConfig);
+
   let content = rawContent;
 
   // Helper function to replace placeholders with platform-specific fallback values

package/plugin/src/index.ts

@@ -4,7 +4,6 @@ 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(
@@ -20,18 +19,9 @@ function withCustomerIOPlugin(
     );
   }
 
-  // Validate SDK config if provided
-  if (props.config) {
-    validateNativeSDKConfig(props.config);
-  }
-
-  if (props.ios) {
-    config = withCIOIos(config, props.config, props.ios);
-  }
-
-  if (props.android) {
-    config = withCIOAndroid(config, props.config, props.android);
-  }
+  // Apply platform specific modifications
+  config = withCIOIos(config, props.config, props.ios);
+  config = withCIOAndroid(config, props.config, props.android);
 
   return config;
 }

package/plugin/src/ios/withAppDelegateModifications.ts

@@ -32,6 +32,7 @@ import {
 } from '../helpers/utils/codeInjection';
 import { FileManagement } from '../helpers/utils/fileManagement';
 import type { CustomerIOPluginOptionsIOS } from '../types/cio-types';
+import { logger } from '../utils/logger';
 import { isFcmPushProvider } from './utils';
 
 const addImport = (stringContents: string, appName: string) => {
@@ -268,7 +269,7 @@ export const withAppDelegateModifications: ConfigPlugin<
 
       config.modResults.contents = stringContents;
     } else {
-      console.log('Customerio AppDelegate changes already exist. Skipping...');
+      logger.info('Customerio AppDelegate changes already exist. Skipping...');
     }
 
     return config;

package/plugin/src/ios/withCIOIos.ts

@@ -1,11 +1,11 @@
 import type { ExpoConfig } from '@expo/config-types';
-
 import type {
   CustomerIOPluginOptionsIOS,
   CustomerIOPluginPushNotificationOptions,
   NativeSDKConfig,
 } from '../types/cio-types';
 import { mergeConfigWithEnvValues } from '../utils/config';
+import { logger } from '../utils/logger';
 import { isExpoVersion53OrHigher } from './utils';
 import { withAppDelegateModifications } from './withAppDelegateModifications';
 import { withCIOIosSwift } from './withCIOIosSwift';
@@ -15,13 +15,13 @@ import { withCioXcodeProject } from './withXcodeProject';
 
 export function withCIOIos(
   config: ExpoConfig,
-  sdkConfig: NativeSDKConfig | undefined,
-  props: CustomerIOPluginOptionsIOS
+  sdkConfig?: NativeSDKConfig,
+  props?: CustomerIOPluginOptionsIOS,
 ) {
   const isSwiftProject = isExpoVersion53OrHigher(config);
   const platformConfig = mergeDeprecatedPropertiesAndLogWarnings(props);
 
-  if (platformConfig.pushNotification) {
+  if (platformConfig?.pushNotification) {
     if (isSwiftProject) {
       config = withCIOIosSwift(config, sdkConfig, platformConfig);
     } else {
@@ -49,14 +49,18 @@ export function withCIOIos(
   while the rest of the plugin code remains unchanged.
 */
 const mergeDeprecatedPropertiesAndLogWarnings = (
-  props: CustomerIOPluginOptionsIOS
-) => {
+  props?: CustomerIOPluginOptionsIOS,
+): CustomerIOPluginOptionsIOS | undefined => {
   // The deprecatedTopLevelProperties maps the top level properties
   // that are deprecated to the new ios.pushNotification.* properties
   // that should be used instead. The deprecated properties are
   // still available for backwards compatibility, but they will
   // be removed in the future.
 
+  if (!props) {
+    return props
+  }
+
   const deprecatedTopLevelProperties = {
     showPushAppInForeground: props.showPushAppInForeground,
     autoTrackPushEvents: props.autoTrackPushEvents,
@@ -68,7 +72,7 @@ const mergeDeprecatedPropertiesAndLogWarnings = (
   // loop over all the deprecated properties and log a warning if they are set
   Object.entries(deprecatedTopLevelProperties).forEach(([key, value]) => {
     if (value !== undefined) {
-      console.warn(
+      logger.warn(
         `The ios.${key} property is deprecated. Please use ios.pushNotification.${key} instead.`
       );
 
@@ -82,7 +86,7 @@ const mergeDeprecatedPropertiesAndLogWarnings = (
           [propKey]: value,
         };
       } else {
-        console.warn(
+        logger.warn(
           `The ios.${key} property is deprecated. Since the value of ios.pushNotification.${key} is set, it will be used.`
         );
       }

package/plugin/src/ios/withCIOIosSwift.ts

@@ -18,6 +18,7 @@ import { replaceCodeByRegex } from '../helpers/utils/codeInjection';
 import { FileManagement } from '../helpers/utils/fileManagement';
 import { patchNativeSDKInitializer } from '../helpers/utils/patchPluginNativeCode';
 import type { CustomerIOPluginOptionsIOS, NativeSDKConfig } from '../types/cio-types';
+import { logger } from '../utils/logger';
 import { getIosNativeFilesPath } from '../utils/plugin';
 import { copyFileToXcode, getOrCreateCustomerIOGroup } from '../utils/xcode';
 import { isFcmPushProvider } from './utils';
@@ -31,13 +32,13 @@ const CIO_SDK_APP_DELEGATE_HANDLER_FILENAME = `${CIO_SDK_APP_DELEGATE_HANDLER_CL
  */
 const copyAndConfigureAppDelegateHandler = (
   config: ExportedConfigWithProps<XcodeProject>,
-  sdkConfig: NativeSDKConfig | undefined,
-  props: CustomerIOPluginOptionsIOS,
+  sdkConfig?: NativeSDKConfig,
+  props?: CustomerIOPluginOptionsIOS,
 ): ExportedConfigWithProps<XcodeProject> => {
   // Destination path in the iOS project
   const projectName = config.modRequest.projectName || '';
   if (!projectName) {
-    console.warn(
+    logger.warn(
       'Project name is undefined, cannot copy CustomerIO files'
     );
     return config;
@@ -49,7 +50,7 @@ const copyAndConfigureAppDelegateHandler = (
   const iosProjectRoot = path.join(projectRoot, 'ios');
 
   const group = getOrCreateCustomerIOGroup(xcodeProject, projectName);
-  if (props.pushNotification) {
+  if (props?.pushNotification) {
     // Copy CioSdkAppDelegateHandler.swift for full push notification + auto-init support
     copyAndConfigurePushAppDelegateHandler({
       xcodeProject,
@@ -193,8 +194,8 @@ const copyAndConfigureNativeSDKInitializer = ({
 
 export const withCIOIosSwift = (
   configOuter: ExpoConfig,
-  sdkConfig: NativeSDKConfig | undefined,
-  props: CustomerIOPluginOptionsIOS,
+  sdkConfig?: NativeSDKConfig,
+  props?: CustomerIOPluginOptionsIOS,
 ) => {
   // First, copy required swift files to iOS folder and add it to Xcode project
   configOuter = withXcodeProject(configOuter, async (config) => {
@@ -202,7 +203,7 @@ export const withCIOIosSwift = (
   });
 
   // Modify the AppDelegate based on configuration
-  if (props.pushNotification) {
+  if (props?.pushNotification) {
     // With push notifications: delegate to CioSdkAppDelegateHandler for both push and auto-init
     return withAppDelegate(configOuter, async (config) => {
       return modifyAppDelegateWithPushAppDelegateHandler(config, props);
@@ -230,7 +231,7 @@ const modifyAppDelegateWithPushAppDelegateHandler = (
 
   // Check if modifications have already been applied
   if (appDelegateContent.includes(CIO_SDK_APP_DELEGATE_HANDLER_CLASS)) {
-    console.log(
+    logger.info(
       'CustomerIO Swift AppDelegate changes already exist. Skipping...'
     );
     return config;
@@ -274,7 +275,7 @@ const modifyAppDelegateWithNativeSDKInitializer = (
 
   // Check if modifications have already been applied
   if (appDelegateContent.includes(CIO_NATIVE_SDK_INITIALIZE_CALL)) {
-    console.log(
+    logger.info(
       'CustomerIO Swift AppDelegate changes already exist. Skipping...'
     );
     return config;
@@ -314,7 +315,7 @@ const addHandlerPropertyDeclaration = (content: string): string => {
   const match = content.match(classDeclarationRegex);
 
   if (!match) {
-    console.warn('Could not find AppDelegate class declaration');
+    logger.warn('Could not find AppDelegate class declaration');
     return content;
   }
 
@@ -339,7 +340,7 @@ const modifyDidFinishLaunchingWithOptions = (content: string, codeToInject: stri
   const returnStatementMatch = content.match(returnStatementRegex);
 
   if (!returnStatementMatch) {
-    console.warn(
+    logger.warn(
       'Could not find return statement with super.application in didFinishLaunchingWithOptions'
     );
     return content;
@@ -394,7 +395,7 @@ const addDidRegisterForRemoteNotificationsWithDeviceToken = (
     const classEndMatch = content.match(classEndRegex);
 
     if (!classEndMatch) {
-      console.warn('Could not find end of AppDelegate class');
+      logger.warn('Could not find end of AppDelegate class');
       return content;
     }
 
@@ -452,7 +453,7 @@ const addDidFailToRegisterForRemoteNotificationsWithError = (
     const classEndMatch = content.match(classEndRegex);
 
     if (!classEndMatch) {
-      console.warn('Could not find end of AppDelegate class');
+      logger.warn('Could not find end of AppDelegate class');
       return content;
     }
 
@@ -489,7 +490,7 @@ const addHandleDeeplinkInKilledState = (content: string): string => {
   const returnStatementMatch = content.match(returnStatementRegex);
 
   if (!returnStatementMatch) {
-    console.warn('Could not find return statement with launchOptions');
+    logger.warn('Could not find return statement with launchOptions');
     return content;
   }
 

package/plugin/src/ios/withGoogleServicesJsonFile.ts

@@ -2,6 +2,7 @@ import type { ConfigPlugin, XcodeProject } from '@expo/config-plugins';
 import { IOSConfig, withXcodeProject } from '@expo/config-plugins';
 
 import type { CustomerIOPluginOptionsIOS } from '../types/cio-types';
+import { logger } from '../utils/logger';
 import { FileManagement } from './../helpers/utils/fileManagement';
 import { isFcmPushProvider } from './utils';
 
@@ -15,7 +16,7 @@ export const withGoogleServicesJsonFile: ConfigPlugin<
       return props;
     }
 
-    console.log(
+    logger.info(
       'Only specify Customer.io ios.pushNotification.googleServicesFile config if you are not already including' +
       ' GoogleService-Info.plist as part of Firebase integration'
     );
@@ -26,7 +27,7 @@ export const withGoogleServicesJsonFile: ConfigPlugin<
     const appName = props.modRequest.projectName;
 
     if (FileManagement.exists(`${iosPath}/GoogleService-Info.plist`)) {
-      console.log(
+      logger.info(
         `File already exists: ${iosPath}/GoogleService-Info.plist. Skipping...`
       );
       return props;
@@ -37,7 +38,7 @@ export const withGoogleServicesJsonFile: ConfigPlugin<
     ) {
       // 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
-      console.log(
+      logger.info(
         `File already exists: ${iosPath}/${appName}/GoogleService-Info.plist. Skipping...`
       );
       return props;
@@ -45,7 +46,7 @@ export const withGoogleServicesJsonFile: ConfigPlugin<
 
     if (googleServicesFile && FileManagement.exists(googleServicesFile)) {
       if (config.ios?.googleServicesFile) {
-        console.warn(
+        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'
         );
@@ -59,12 +60,12 @@ export const withGoogleServicesJsonFile: ConfigPlugin<
 
         addFileToXcodeProject(props.modResults, 'GoogleService-Info.plist');
       } catch {
-        console.error(
+        logger.error(
           `There was an error copying your GoogleService-Info.plist file. You can copy it manually into ${iosPath}/GoogleService-Info.plist`
         );
       }
     } else {
-      console.error(
+      logger.error(
         `The Google Services file provided in ${googleServicesFile} doesn't seem to exist. You can copy it manually into ${iosPath}/GoogleService-Info.plist`
       );
     }
@@ -78,7 +79,7 @@ function addFileToXcodeProject(project: XcodeProject, fileName: string) {
   const filepath = fileName;
 
   if (!IOSConfig.XcodeUtils.ensureGroupRecursively(project, groupName)) {
-    console.error(
+    logger.error(
       `Error copying GoogleService-Info.plist. Failed to find or create '${groupName}' group in Xcode.`
     );
     return;

package/plugin/src/ios/withNotificationsXcodeProject.ts

@@ -9,7 +9,9 @@ import {
 import { replaceCodeByRegex } from '../helpers/utils/codeInjection';
 import { injectCIONotificationPodfileCode } from '../helpers/utils/injectCIOPodfileCode';
 import type { CustomerIOPluginOptionsIOS, RichPushConfig } from '../types/cio-types';
+import { logger } from '../utils/logger';
 import { getIosNativeFilesPath } from '../utils/plugin';
+import { validateRichPushConfig } from '../utils/validation';
 import { FileManagement } from './../helpers/utils/fileManagement';
 import { isExpoVersion53OrHigher, isFcmPushProvider } from './utils';
 
@@ -34,7 +36,7 @@ const addNotificationServiceExtension = async (
     }
     return xcodeProject;
   } catch (error: unknown) {
-    console.error(error);
+    logger.error(String(error));
     return null;
   }
 };
@@ -120,7 +122,7 @@ const addRichPushXcodeProj = async (
   // Check if `CIO_NOTIFICATION_TARGET_NAME` group already exist in the project
   // If true then skip creating a new group to avoid duplicate folders
   if (xcodeProject.pbxTargetByName(CIO_NOTIFICATION_TARGET_NAME)) {
-    console.warn(
+    logger.warn(
       `${CIO_NOTIFICATION_TARGET_NAME} already exists in project. Skipping...`
     );
     return;
@@ -194,7 +196,7 @@ const addRichPushXcodeProj = async (
   projObjects.PBXContainerItemProxy = projObjects.PBXTargetDependency || {};
 
   if (xcodeProject.pbxTargetByName(CIO_NOTIFICATION_TARGET_NAME)) {
-    console.warn(
+    logger.warn(
       `${CIO_NOTIFICATION_TARGET_NAME} already exists in project. Skipping...`
     );
     return;
@@ -295,35 +297,30 @@ const updateNseEnv = (
   const cdpApiKey = richPushConfig?.cdpApiKey;
   const region = richPushConfig?.region;
 
-  if (!cdpApiKey) {
-    throw new Error(
-      'NotificationServiceExtension failed: cdpApiKey missing. Provide in config.cdpApiKey or ios.pushNotification.env.cdpApiKey.'
-    );
+  if (!validateRichPushConfig(richPushConfig)) {
+    return;
   }
   envFileContent = replaceCodeByRegex(
     envFileContent,
     CDP_API_KEY_RE,
-    cdpApiKey
+    cdpApiKey || 'MISSING_API_KEY',
   );
 
-  if (region) {
-    const regionMap = {
-      us: 'Region.US',
-      eu: 'Region.EU',
-    };
-    const mappedRegion =
-      regionMap[region.toLowerCase() as keyof typeof regionMap] || '';
-    if (!mappedRegion) {
-      console.warn(
-        `${region} is an invalid region. Please use the values from the docs: https://customer.io/docs/sdk/expo/getting-started/#configure-the-plugin`
-      );
-    } else {
-      envFileContent = replaceCodeByRegex(
-        envFileContent,
-        REGION_RE,
-        mappedRegion
-      );
-    }
+  // Simplify region mapping with case insensitive keys and fallback for invalid regions
+  const regionKey = region?.toLowerCase() ?? '';
+  const regionMap = {
+    us: 'Region.US',
+    eu: 'Region.EU',
+  } as const;
+  const mappedRegion = regionMap[regionKey as keyof typeof regionMap];
+  if (!mappedRegion) {
+    logger.warn(
+      `${regionKey} is an invalid region. Please use the values from the docs: https://docs.customer.io/integrations/sdk/expo/getting-started/packages-options/#configuring-the-expo-plugin`
+    );
+    // Fallback to US if invalid region provided
+    envFileContent = replaceCodeByRegex(envFileContent, REGION_RE, regionMap.us);
+  } else {
+    envFileContent = replaceCodeByRegex(envFileContent, REGION_RE, mappedRegion);
   }
 
   FileManagement.writeFile(envFileName, envFileContent);
@@ -355,7 +352,7 @@ async function addPushNotificationFile(
       targetFile
     );
   } else {
-    console.log(`${getTargetFile(targetFileName)} already exists. Skipping...`);
+    logger.info(`${getTargetFile(targetFileName)} already exists. Skipping...`);
     return;
   }
 
@@ -377,18 +374,17 @@ const updatePushFile = (
   let envFileContent = FileManagement.readFile(envFileName);
   const disableNotificationRegistration =
     options.pushNotification?.disableNotificationRegistration;
-  const { cdpApiKey, region } = options.pushNotification?.env || {
-    cdpApiKey: undefined,
+  const richPushConfig = options.pushNotification?.env;
+  const { cdpApiKey, region } = richPushConfig || {
+    cdpApiKey: 'MISSING_API_KEY',
     region: undefined,
   };
-  if (!cdpApiKey) {
-    throw new Error(
-      'Adding NotificationServiceExtension failed: ios.pushNotification.env.cdpApiKey is missing from app.config.js or app.json.'
-    );
+  if (!validateRichPushConfig(richPushConfig)) {
+    return;
   }
 
   let snippet = '';
-  // unless this property is explicity set to true, push notification
+  // unless this property is explicitly set to true, push notification
   // registration will be added to the AppDelegate
   if (disableNotificationRegistration !== true) {
     snippet = CIO_REGISTER_PUSHNOTIFICATION_SNIPPET;
@@ -398,7 +394,7 @@ const updatePushFile = (
   envFileContent = replaceCodeByRegex(
     envFileContent,
     /\{\{CDP_API_KEY\}\}/,
-    cdpApiKey
+    cdpApiKey,
   );
 
   if (region) {