From 7988553abeaf1949509c3a42d2befa7759e2199d Mon Sep 17 00:00:00 2001 From: russellwheatley Date: Tue, 11 Jan 2022 16:48:22 +0000 Subject: [PATCH] fix(messaging): plumb through messageId for web --- .../firebase_messaging_web/lib/src/interop/messaging.dart | 1 + .../lib/src/interop/messaging_interop.dart | 1 + .../firebase_messaging_web/lib/src/utils.dart | 2 +- 3 files changed, 3 insertions(+), 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 index 6036dab14412..7be5bf735a12 100644 --- 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 index 6bfd743dc918..e0c3893d5f37 100644 --- 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 @@ -35,6 +35,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 index 674a0adaacd6..4fae3e2bbae1 100644 --- a/packages/firebase_messaging/firebase_messaging_web/lib/src/utils.dart +++ b/packages/firebase_messaging/firebase_messaging_web/lib/src/utils.dart @@ -72,7 +72,7 @@ Map messagePayloadToMap(MessagePayload messagePayload) { 'contentAvailable': null, 'data': data, 'from': messagePayload.from, - 'messageId': null, + 'messageId': messagePayload.messageId, 'mutableContent': null, 'notification': messagePayload.notification == null ? null