@react-native-firebase/messaging 15.1.1 → 15.2.0

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [15.2.0](https://github.com/invertase/react-native-firebase/compare/v15.1.1...v15.2.0) (2022-07-21)
+
+### Features
+
+- **ios, messaging:** Allow notifications in foreground on iOS, configure in firebase.json ([#6407](https://github.com/invertase/react-native-firebase/issues/6407)) ([71dee2b](https://github.com/invertase/react-native-firebase/commit/71dee2bac7a2ea58e51605a249cab7f1ac5fa7d7))
+
 ## [15.1.1](https://github.com/invertase/react-native-firebase/compare/v15.1.0...v15.1.1) (2022-06-28)
 
 **Note:** Version bump only for package @react-native-firebase/messaging

package/android/build.gradle

@@ -34,7 +34,6 @@ def firebaseBomVersion = appPackageJson['sdkVersions']['android']['firebase']
 def jsonMinSdk = appPackageJson['sdkVersions']['android']['minSdk']
 def jsonTargetSdk = appPackageJson['sdkVersions']['android']['targetSdk']
 def jsonCompileSdk = appPackageJson['sdkVersions']['android']['compileSdk']
-def jsonBuildTools = appPackageJson['sdkVersions']['android']['buildTools']
 def coreVersionDetected = appPackageJson['version']
 def coreVersionRequired = packageJson['peerDependencies'][appPackageJson['name']]
 // Only log after build completed so log warning appears at the end
@@ -51,9 +50,6 @@ project.ext {
         minSdk    : jsonMinSdk,
         targetSdk : jsonTargetSdk,
         compileSdk: jsonCompileSdk,
-        // optional as gradle.buildTools comes with one by default
-        // overriding here though to match the version RN uses
-        buildTools: jsonBuildTools
       ],
 
       firebase: [

package/ios/RNFBMessaging/RNFBMessaging+UNUserNotificationCenter.m

@@ -17,6 +17,7 @@
 
 #import <RNFBApp/RNFBRCTEventEmitter.h>
 
+#import "RNFBJSON.h"
 #import "RNFBMessaging+UNUserNotificationCenter.h"
 #import "RNFBMessagingSerializer.h"
 
@@ -82,6 +83,50 @@ struct {
        willPresentNotification:(UNNotification *)notification
          withCompletionHandler:
              (void (^)(UNNotificationPresentationOptions options))completionHandler {
+  NSArray *presentationOptionsConfig =
+      [[RNFBJSON shared] getArrayValue:@"messaging_ios_foreground_presentation_options"
+                          defaultValue:@[]];
+
+  UNNotificationPresentationOptions presentationOptions = UNNotificationPresentationOptionNone;
+
+  BOOL badge = [presentationOptionsConfig containsObject:@"badge"];
+  BOOL sound = [presentationOptionsConfig containsObject:@"sound"];
+  BOOL alert = [presentationOptionsConfig containsObject:@"alert"];
+  BOOL list = [presentationOptionsConfig containsObject:@"list"];
+  BOOL banner = [presentationOptionsConfig containsObject:@"banner"];
+
+  if (badge) {
+    presentationOptions |= UNNotificationPresentationOptionBadge;
+  }
+
+  if (sound) {
+    presentationOptions |= UNNotificationPresentationOptionSound;
+  }
+
+  // if list or banner is true, ignore `alert` property
+  if (banner || list) {
+    if (banner) {
+      if (@available(iOS 14, *)) {
+        presentationOptions |= UNNotificationPresentationOptionBanner;
+      } else {
+        // for iOS 13 we need to set `alert`
+        presentationOptions |= UNNotificationPresentationOptionAlert;
+      }
+    }
+
+    if (list) {
+      if (@available(iOS 14, *)) {
+        presentationOptions |= UNNotificationPresentationOptionList;
+      } else {
+        // for iOS 13 we need to set `alert`
+        presentationOptions |= UNNotificationPresentationOptionAlert;
+      }
+    }
+  } else if (alert) {
+    // TODO: Remove `alert` once iOS 14 becomes the minimum deployment target
+    presentationOptions |= UNNotificationPresentationOptionAlert;
+  }
+
   if (notification.request.content.userInfo[@"gcm.message_id"]) {
     NSDictionary *notificationDict = [RNFBMessagingSerializer notificationToDict:notification];
 
@@ -91,9 +136,7 @@ struct {
       [[RNFBRCTEventEmitter shared] sendEventWithName:@"messaging_message_received"
                                                  body:notificationDict];
     }
-
-    // TODO in a later version allow customising completion options in JS code
-    completionHandler(UNNotificationPresentationOptionNone);
+    completionHandler(presentationOptions);
   }
 
   if (_originalDelegate != nil && originalDelegateRespondsTo.willPresentNotification) {
@@ -101,7 +144,7 @@ struct {
                       willPresentNotification:notification
                         withCompletionHandler:completionHandler];
   } else {
-    completionHandler(UNNotificationPresentationOptionNone);
+    completionHandler(presentationOptions);
   }
 }
 

package/lib/version.js

@@ -1,2 +1,2 @@
 // Generated by genversion.
-module.exports = '15.1.1';
+module.exports = '15.2.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/messaging",
-  "version": "15.1.1",
+  "version": "15.2.0",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - React Native Firebase provides native integration of Firebase Cloud Messaging (FCM) for both Android & iOS. FCM is a cost free service, allowing for server-device and device-device communication. The React Native Firebase Messaging module provides a simple JavaScript API to interact with FCM.",
   "main": "lib/index.js",
@@ -22,10 +22,10 @@
     "messaging"
   ],
   "peerDependencies": {
-    "@react-native-firebase/app": "15.1.1"
+    "@react-native-firebase/app": "15.2.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8d469f19b9faec54c492f83c0a2dba6a52815da3"
+  "gitHead": "8fb859fb000d5c2c6bbb81dffc685e94ef1ba350"
 }