@allboatsrise/expo-marketingcloudsdk 46.0.1 → 46.2.0

package/ios/EXMarketingCloudSdk/EXMarketingCloudSdk.h

@@ -1,19 +1,14 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
-#import <UserNotifications/UserNotifications.h>
 #import <ExpoModulesCore/EXSingletonModule.h>
 #import <ExpoModulesCore/EXModuleRegistryConsumer.h>
+#import <EXNotifications/EXNotificationsDelegate.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface EXMarketingCloudSdk : EXSingletonModule <UIApplicationDelegate, UNUserNotificationCenterDelegate, EXModuleRegistryConsumer>
+@interface EXMarketingCloudSdk : EXSingletonModule <UIApplicationDelegate, EXModuleRegistryConsumer, EXNotificationsDelegate>
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(nullable NSDictionary<UIApplicationLaunchOptionsKey,id> *)launchOptions;
-- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler;
-
-- (void)userNotificationCenter:(UNUserNotificationCenter *)center willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(UNNotificationPresentationOptions))completionHandler;
-- (void)userNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void (^)(void))completionHandler;
-- (void)userNotificationCenter:(UNUserNotificationCenter *)center openSettingsForNotification:(nullable UNNotification *)notification;
 
 @end
 

package/ios/EXMarketingCloudSdk/EXMarketingCloudSdk.m

@@ -1,10 +1,11 @@
 #import <MarketingCloudSDK/MarketingCloudSDK.h>
 #import <EXMarketingCloudSdk/EXMarketingCloudSdk.h>
 #import <ExpoModulesCore/EXDefines.h>
+#import <EXNotifications/EXNotificationCenterDelegate.h>
 
 @interface EXMarketingCloudSdk ()
 
-@property (nonatomic, weak) EXModuleRegistry *moduleRegistry;
+@property (nonatomic, weak) id<EXNotificationCenterDelegate> notificationCenterDelegate;
 
 @end
 
@@ -16,86 +17,55 @@ EX_REGISTER_SINGLETON_MODULE(MarketingCloud);
 
 - (void)setModuleRegistry:(EXModuleRegistry *)moduleRegistry
 {
-  _moduleRegistry = moduleRegistry;
+  _notificationCenterDelegate = [moduleRegistry getSingletonModuleForName:@"NotificationCenterDelegate"];
 }
 
 # pragma mark - UIApplicationDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary<UIApplicationLaunchOptionsKey,id> *)launchOptions
 {
-  NSString *sfmcApplicationId = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"SFMCApplicationId"];
   NSString *sfmcAccessToken = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"SFMCAccessToken"];
   NSNumber *sfmcAnalyticsEnabled = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"SFMCAnalyticsEnabled"];
+  NSString *sfmcAppId = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"SFMCApplicationId"];
+  NSNumber *sfmcAppControlsBadging = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"SFMCApplicationControlsBadging"];
+  NSNumber *sfmcDelayRegistrationUntilContactKeyIsSet = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"SFMCDelayRegistrationUntilContactKeyIsSet"];
+  NSNumber *sfmcInboxEnabled = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"SFMCInboxEnabled"];
+  NSNumber *sfmcLocationEnabled = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"SFMCLocationEnabled"];
+  NSString *sfmcMid = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"SFMCMid"];
   NSString *sfmcServerUrl = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"SFMCServerUrl"];
 
   MarketingCloudSDKConfigBuilder *mcsdkBuilder = [MarketingCloudSDKConfigBuilder new];
-  [mcsdkBuilder sfmc_setApplicationId:sfmcApplicationId];
   [mcsdkBuilder sfmc_setAccessToken:sfmcAccessToken];
   [mcsdkBuilder sfmc_setAnalyticsEnabled:sfmcAnalyticsEnabled];
+  [mcsdkBuilder sfmc_setApplicationId:sfmcAppId];
+  [mcsdkBuilder sfmc_setApplicationControlsBadging:sfmcAppControlsBadging];
+  [mcsdkBuilder sfmc_setDelayRegistrationUntilContactKeyIsSet:sfmcDelayRegistrationUntilContactKeyIsSet];
+  [mcsdkBuilder sfmc_setInboxEnabled:sfmcInboxEnabled];
+  [mcsdkBuilder sfmc_setLocationEnabled:sfmcLocationEnabled];
+  if ([sfmcMid length] > 0) [mcsdkBuilder sfmc_setMid:sfmcMid];
   [mcsdkBuilder sfmc_setMarketingCloudServerUrl:sfmcServerUrl];
 
   NSError *error = nil;
   BOOL success = [[MarketingCloudSDK sharedInstance] sfmc_configureWithDictionary:[mcsdkBuilder sfmc_build] error:&error];
 
-  if (success == YES) {
-        dispatch_async(dispatch_get_main_queue(), ^{
-          // set the UNUserNotificationCenter delegate - the delegate must be set here in
-          // didFinishLaunchingWithOptions
-          [UNUserNotificationCenter currentNotificationCenter].delegate = self;
-          [[UIApplication sharedApplication] registerForRemoteNotifications];
-
-          [[UNUserNotificationCenter currentNotificationCenter]
-              requestAuthorizationWithOptions:UNAuthorizationOptionAlert |
-                                              UNAuthorizationOptionSound |
-                                              UNAuthorizationOptionBadge
-              completionHandler:^(BOOL granted, NSError *_Nullable error) {
-                if (error == nil) {
-                    if (granted == YES) {
-                        dispatch_async(dispatch_get_main_queue(), ^{
-                                        });
-                    }
-                }
-              }];
-        });
-    } else {
-        //  MarketingCloudSDK sfmc_configure failed
-        os_log_debug(OS_LOG_DEFAULT, "MarketingCloudSDK sfmc_configure failed with error = %@",
-                     error);
-    }
+  if (success != YES) {
+    EXLogError(@"[expo-marketingcloudsdk] Failed to initialize instance. (error: %@)", error);
+  } else {
+    [_notificationCenterDelegate addDelegate:self];
+  }
+  
   return YES;
 }
 
+//# pragma mark - EXNotificationsDelegate
+
+// MobilePush SDK: REQUIRED IMPLEMENTATION
+/** This delegate method offers an opportunity for applications with the "remote-notification" background mode to fetch appropriate new data in response to an incoming remote notification. You should call the fetchCompletionHandler as soon as you're finished performing that operation, so the system can accurately estimate its power and data cost.
+ This method will be invoked even if the application was launched or resumed because of the remote notification. The respective delegate methods will be invoked first. Note that this behavior is in contrast to application:didReceiveRemoteNotification:, which is not called in those cases, and which will not be invoked if this method is implemented. **/
 - (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler
 {
-  // This method is REQUIRED for correct functionality of the SDK.
-  // This method will be called on the delegate when the application receives a silent push
   [[MarketingCloudSDK sharedInstance] sfmc_setNotificationUserInfo:userInfo];
   completionHandler(UIBackgroundFetchResultNewData);
 }
 
-# pragma mark - UNUserNotificationCenterDelegate
-
-- (void)userNotificationCenter:(UNUserNotificationCenter *)center willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(UNNotificationPresentationOptions))completionHandler
-{
-  NSLog(@"User Info : %@", notification.request.content.userInfo);
-  completionHandler(UNAuthorizationOptionSound | UNAuthorizationOptionAlert | UNAuthorizationOptionBadge);
-}
-
-// The method will be called on the delegate when the user responded to the notification by opening
-// the application, dismissing the notification or choosing a UNNotificationAction. The delegate
-// must be set before the application returns from applicationDidFinishLaunching:.
-- (void)userNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void (^)(void))completionHandler
-{
-  // tell the MarketingCloudSDK about the notification
-  [[MarketingCloudSDK sharedInstance] sfmc_setNotificationRequest:response.notification.request];
-
-  if (completionHandler != nil) {
-      completionHandler();
-  }
-}
-
-- (void)userNotificationCenter:(UNUserNotificationCenter *)center openSettingsForNotification:(UNNotification *)notification
-{
-}
-
 @end

package/package.json

@@ -2,7 +2,7 @@
   "name": "@allboatsrise/expo-marketingcloudsdk",
   "author": "All Boats Rise Inc.",
   "license": "MIT",
-  "version": "46.0.1",
+  "version": "46.2.0",
   "description": "Expo module for Salesforce Marketing Cloud SDK",
   "homepage": "https://github.com/allboatsrise/expo-marketingcloudsdk",
   "keywords": [
@@ -53,6 +53,7 @@
   "peerDependencies": {
     "@expo/config-plugins": "^5.0.0",
     "expo": "*",
+    "expo-notifications": "^0.16.1",
     "react-native-marketingcloudsdk": "^7.5.1"
   }
 }

package/plugin/build/ios/index.js

@@ -3,24 +3,35 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.withIOSConfig = void 0;
 const config_plugins_1 = require("@expo/config-plugins");
 const withIOSConfig = (config, props) => {
-    config = withEntitlements(config, props);
     config = withInfo(config, props);
+    config = withRemoteNotificationsBackgroundMode(config, props);
     return config;
 };
 exports.withIOSConfig = withIOSConfig;
-const withEntitlements = (config, { mode = 'development' }) => {
-    return (0, config_plugins_1.withEntitlementsPlist)(config, async (config) => {
-        config.modResults['aps-environment'] = mode;
-        return config;
-    });
-};
 const withInfo = (config, props) => {
     return (0, config_plugins_1.withInfoPlist)(config, (config) => {
-        var _a;
-        config.modResults.SFMCApplicationId = props.appId;
+        var _a, _b, _c, _d, _e, _f;
         config.modResults.SFMCAccessToken = props.accessToken;
         config.modResults.SFMCAnalyticsEnabled = (_a = props.analyticsEnabled) !== null && _a !== void 0 ? _a : false;
+        config.modResults.SFMCApplicationId = props.appId;
+        config.modResults.SFMCApplicationControlsBadging = (_b = props.applicationControlsBadging) !== null && _b !== void 0 ? _b : false;
+        config.modResults.SFMCDelayRegistrationUntilContactKeyIsSet = (_c = props.delayRegistrationUntilContactKeyIsSet) !== null && _c !== void 0 ? _c : false;
+        config.modResults.SFMCInboxEnabled = (_d = props.inboxEnabled) !== null && _d !== void 0 ? _d : false;
+        config.modResults.SFMCLocationEnabled = (_e = props.locationEnabled) !== null && _e !== void 0 ? _e : false;
+        config.modResults.SFMCMid = (_f = props.mid) !== null && _f !== void 0 ? _f : '';
         config.modResults.SFMCServerUrl = props.serverUrl;
         return config;
     });
 };
+const withRemoteNotificationsBackgroundMode = (config, props) => {
+    config = (0, config_plugins_1.withInfoPlist)(config, (config) => {
+        if (!Array.isArray(config.modResults.UIBackgroundModes)) {
+            config.modResults.UIBackgroundModes = [];
+        }
+        if (!config.modResults.UIBackgroundModes.includes('remote-notification')) {
+            config.modResults.UIBackgroundModes.push('remote-notification');
+        }
+        return config;
+    });
+    return config;
+};

package/plugin/build/types.d.ts

@@ -16,10 +16,28 @@ export declare type MarketingCloudSdkPluginProps = {
      * defined in `android.googleServicesFile` (google-services.json) if defined.
      */
     senderId?: string;
+    /**
+     * Sets the configuration value to use for the Salesforce MarketingCloud Tenant Specific mid.
+     */
+    mid?: string;
+    /**
+     * Sets the configuration flag that enables or disables inbox services
+     */
+    inboxEnabled?: boolean;
+    /**
+     * Sets the configuration flag that enables or disables location services
+     */
+    locationEnabled?: boolean;
+    /**
+     * Sets the configuration flag that enables or disables Salesforce MarketingCloud Analytics services
+     */
     analyticsEnabled?: boolean;
     /**
-     * (iOS only) Environment of the app: either 'development' or 'production'. Defaults to 'development'.
-     * @default 'development'
+     * Sets the configuration value which enables or disables application control over badging
+     */
+    applicationControlsBadging?: boolean;
+    /**
+     * Sets the configuration value which enables or disables application control over delaying SDK registration until a contact key is set
      */
-    mode?: 'development' | 'production';
+    delayRegistrationUntilContactKeyIsSet?: boolean;
 };