update

Author: zwu52

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

@@ -85,7 +85,7 @@ describe('externalizePayload', () => {
         baz: 'baz'
       },
       fcmOptions: {
-        link: 'link',
+        link: 'https://www.self_orgin.com',
         // eslint-disable-next-line camelcase
         analytics_label: 'label'
       },
@@ -108,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,22 +77,23 @@ 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 = {};
 
-  // fcmOptions.link value is written into notification.click_action. see more in b/232072111
   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;
   }