fix(firebase_messaging): Retrieve messageId from MessagePayload r…

…eceived on message event for Web platform. (#7846)
firebase · Nov 30, 2022 · d796d33 · d796d33
1 parent cba4344
commit d796d33
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/packages/firebase_messaging/firebase_messaging_web/lib/src/interop/messaging.dart b/packages/firebase_messaging/firebase_messaging_web/lib/src/interop/messaging.dart
@@ -91,6 +91,7 @@ class MessagePayload
   MessagePayload._fromJsObject(messaging_interop.MessagePayloadJsImpl jsObject)
       : super.fromJsObject(jsObject);
 
+  String get messageId => jsObject.messageId;
   String? get collapseKey => jsObject.collapseKey;
   FcmOptions? get fcmOptions => jsObject.fcmOptions == null
       ? null

diff --git a/packages/firebase_messaging/firebase_messaging_web/lib/src/interop/messaging_interop.dart b/packages/firebase_messaging/firebase_messaging_web/lib/src/interop/messaging_interop.dart
@@ -64,6 +64,7 @@ abstract class NotificationPayloadJsImpl {
 @JS()
 @anonymous
 abstract class MessagePayloadJsImpl {
+  external String get messageId;
   external String? get collapseKey;
   external FcmOptionsJsImpl? get fcmOptions;
   external NotificationPayloadJsImpl? get notification;

diff --git a/packages/firebase_messaging/firebase_messaging_web/lib/src/utils.dart b/packages/firebase_messaging/firebase_messaging_web/lib/src/utils.dart
@@ -74,7 +74,7 @@ Map<String, dynamic> messagePayloadToMap(MessagePayload messagePayload) {
     'contentAvailable': null,
     'data': data,
     'from': messagePayload.from,
-    'messageId': null,
+    'messageId': messagePayload.messageId,
     'mutableContent': null,
     'notification': messagePayload.notification == null
         ? null