Merge b7ec7bb into 0197076

Author: zwu52

.changeset/sour-hornets-care.md

@@ -0,0 +1,5 @@
+---
+'@firebase/messaging': patch
+---
+
+Fix missing FcmOptions.link

packages/messaging/src/helpers/externalizePayload.test.ts

@@ -26,7 +26,9 @@ describe('externalizePayload', () => {
       notification: {
         title: 'title',
         body: 'body',
-        image: 'image'
+        image: 'image',
+        // eslint-disable-next-line camelcase
+        click_action: 'https://www.self_orgin.com'
       },
       from: 'from',
       // eslint-disable-next-line camelcase
@@ -39,7 +41,10 @@ describe('externalizePayload', () => {
       notification: { title: 'title', body: 'body', image: 'image' },
       from: 'from',
       collapseKey: 'collapse',
-      messageId: 'mid'
+      messageId: 'mid',
+      fcmOptions: {
+        link: 'https://www.self_orgin.com'
+      }
     };
     expect(externalizePayload(internalPayload)).to.deep.equal(payload);
   });
@@ -80,7 +85,7 @@ describe('externalizePayload', () => {
         baz: 'baz'
       },
       fcmOptions: {
-        link: 'link',
+        link: 'https://www.self_orgin.com',
         // eslint-disable-next-line camelcase
         analytics_label: 'label'
       },
@@ -103,7 +108,7 @@ describe('externalizePayload', () => {
         baz: 'baz'
       },
       fcmOptions: {
-        link: 'link',
+        link: 'https://www.self_orgin.com',
         analyticsLabel: 'label'
       },
       from: 'from',

packages/messaging/src/helpers/externalizePayload.ts

@@ -77,19 +77,26 @@ function propagateFcmOptions(
   payload: MessagePayload,
   messagePayloadInternal: MessagePayloadInternal
 ): void {
-  if (!messagePayloadInternal.fcmOptions) {
+  // fcmOptions.link value is written into notification.click_action. see more in b/232072111
+  if (
+    !messagePayloadInternal.fcmOptions &&
+    !messagePayloadInternal.notification?.click_action
+  ) {
     return;
   }
 
   payload.fcmOptions = {};
 
-  const link = messagePayloadInternal.fcmOptions!.link;
+  const link =
+    messagePayloadInternal.fcmOptions?.link ??
+    messagePayloadInternal.notification?.click_action;
+
   if (!!link) {
     payload.fcmOptions!.link = link;
   }
 
   // eslint-disable-next-line camelcase
-  const analyticsLabel = messagePayloadInternal.fcmOptions!.analytics_label;
+  const analyticsLabel = messagePayloadInternal.fcmOptions?.analytics_label;
   if (!!analyticsLabel) {
     payload.fcmOptions!.analyticsLabel = analyticsLabel;
   }