@react-native-firebase/messaging 19.2.1 → 19.3.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [19.3.0](https://github.com/invertase/react-native-firebase/compare/v19.2.2...v19.3.0) (2024-05-20)
+
+### Bug Fixes
+
+- **messaging, ios:** register for notifications on permission grant ([ccd78b9](https://github.com/invertase/react-native-firebase/commit/ccd78b9cf5d6961f5252e582ede785932599d25d)), closes [#7272](https://github.com/invertase/react-native-firebase/issues/7272)
+- **messaging, ios:** reject notification registration after 10 seconds ([1f86483](https://github.com/invertase/react-native-firebase/commit/1f8648329ce812644f4bbd0f0caadcfe6a0bbddf)), closes [#7272](https://github.com/invertase/react-native-firebase/issues/7272)
+
+## [19.2.2](https://github.com/invertase/react-native-firebase/compare/v19.2.1...v19.2.2) (2024-04-13)
+
+**Note:** Version bump only for package @react-native-firebase/messaging
+
 ## [19.2.1](https://github.com/invertase/react-native-firebase/compare/v19.2.0...v19.2.1) (2024-04-12)
 
 **Note:** Version bump only for package @react-native-firebase/messaging

package/ios/RNFBMessaging/RNFBMessagingModule.m

@@ -284,6 +284,15 @@ RCT_EXPORT_METHOD(requestPermission
                             if (error) {
                               [RNFBSharedUtils rejectPromiseWithNSError:reject error:error];
                             } else {
+                              // if we do not attempt to register immediately, registration fails
+                              // later unknown reason why, but this was the only difference between
+                              // using a react-native-permissions vs built-in permissions request in
+                              // a sequence of "request permissions" --> "register for messages" you
+                              // only want to request permission if you want to register for
+                              // messages, so we register directly now - see #7272
+                              dispatch_async(dispatch_get_main_queue(), ^{
+                                [[UIApplication sharedApplication] registerForRemoteNotifications];
+                              });
                               [self hasPermission:resolve:reject];
                             }
                           }];
@@ -303,8 +312,7 @@ RCT_EXPORT_METHOD(registerForRemoteNotifications
                   : (RCTPromiseRejectBlock)reject) {
 #if TARGET_IPHONE_SIMULATOR
 #if !TARGET_CPU_ARM64
-  // Do the registration on this unsupported simulator, but don't set up to wait for a token that
-  // won't arrive
+  // Register on this unsupported simulator, but no waiting for a token that won't arrive
   [[UIApplication sharedApplication] registerForRemoteNotifications];
   resolve(@([RCTConvert BOOL:@(YES)]));
   return;
@@ -317,6 +325,7 @@ RCT_EXPORT_METHOD(registerForRemoteNotifications
       if (@available(iOS 10.0, *)) {
 #pragma pop
     if ([UIApplication sharedApplication].isRegisteredForRemoteNotifications == YES) {
+      DLog(@"RNFBMessaging registerForRemoteNotifications - already registered.");
       resolve(@([RCTConvert BOOL:@(YES)]));
       return;
     } else {
@@ -326,6 +335,32 @@ RCT_EXPORT_METHOD(registerForRemoteNotifications
     // Apple docs recommend that registerForRemoteNotifications is always called on app start
     // regardless of current status
     dispatch_async(dispatch_get_main_queue(), ^{
+      // Sometimes the registration never completes, which deserves separate attention in other
+      // areas. This area should protect itself against hanging forever regardless. Just in case,
+      // check in after a delay and cleanup if required
+      dispatch_after(
+          dispatch_time(DISPATCH_TIME_NOW, 10.0 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
+            if ([RNFBMessagingAppDelegate sharedInstance].registerPromiseResolver != nil) {
+              // if we got here and resolve/reject are still set, unset, log failure, reject
+              DLog(@"RNFBMessaging dispatch_after block: we appear to have timed out. Rejecting");
+              [[RNFBMessagingAppDelegate sharedInstance] setPromiseResolve:nil
+                                                          andPromiseReject:nil];
+
+              [RNFBSharedUtils
+                  rejectPromiseWithUserInfo:reject
+                                   userInfo:[@{
+                                     @"code" : @"unknown-error",
+                                     @"message" :
+                                         @"registerDeviceForRemoteMessages requested but "
+                                         @"system did not respond. Possibly missing permission."
+                                   } mutableCopy]];
+              return;
+            } else {
+              DLog(@"RNFBMessaging dispatch_after: registerDeviceForRemoteMessages handled.");
+              return;
+            }
+          });
+
       [[UIApplication sharedApplication] registerForRemoteNotifications];
     });
   }

package/lib/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/messaging",
-  "version": "19.2.1",
+  "version": "19.3.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",
@@ -24,11 +24,11 @@
     "messaging"
   ],
   "peerDependencies": {
-    "@react-native-firebase/app": "19.2.1",
+    "@react-native-firebase/app": "19.3.0",
     "expo": ">=47.0.0"
   },
   "devDependencies": {
-    "expo": "^49.0.21"
+    "expo": "^50.0.15"
   },
   "peerDependenciesMeta": {
     "expo": {
@@ -38,5 +38,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f36a26abe71d9c3222a32683739117a977fb7896"
+  "gitHead": "edac62269c1b3088cadf74586d48f68214d6e8e4"
 }