add analytics_label in FcmOptions + fix FcmOptions for WebpushFcmOptions (#256)

* add analytics_label in FcmOptions + fix FcmOptions for WebpushFcmOptions

* fix comment

* refactor fcm to FCM

Author: C Hemidy

messaging/messaging.go

@@ -148,6 +148,7 @@ type Message struct {
 	Android      *AndroidConfig    `json:"android,omitempty"`
 	Webpush      *WebpushConfig    `json:"webpush,omitempty"`
 	APNS         *APNSConfig       `json:"apns,omitempty"`
+	FCMOptions   *FCMOptions       `json:"fcm_options,omitempty"`
 	Token        string            `json:"token,omitempty"`
 	Topic        string            `json:"-"`
 	Condition    string            `json:"condition,omitempty"`
@@ -198,6 +199,7 @@ type AndroidConfig struct {
 	RestrictedPackageName string               `json:"restricted_package_name,omitempty"`
 	Data                  map[string]string    `json:"data,omitempty"` // if specified, overrides the Data field on Message type
 	Notification          *AndroidNotification `json:"notification,omitempty"`
+	FCMOptions            *AndroidFCMOptions   `json:"fcm_options,omitempty"`
 }
 
 // MarshalJSON marshals an AndroidConfig into JSON (for internal use only).
@@ -274,6 +276,11 @@ type AndroidNotification struct {
 	ChannelID    string   `json:"channel_id,omitempty"`
 }
 
+// AndroidFCMOptions contains additional options for features provided by the FCM Android SDK.
+type AndroidFCMOptions struct {
+	AnalyticsLabel string `json:"analytics_label,omitempty"`
+}
+
 // WebpushConfig contains messaging options specific to the WebPush protocol.
 //
 // See https://tools.ietf.org/html/rfc8030#section-5 for additional details, and supported
@@ -282,7 +289,7 @@ type WebpushConfig struct {
 	Headers      map[string]string    `json:"headers,omitempty"`
 	Data         map[string]string    `json:"data,omitempty"`
 	Notification *WebpushNotification `json:"notification,omitempty"`
-	FcmOptions   *WebpushFcmOptions   `json:"fcmOptions,omitempty"`
+	FcmOptions   *WebpushFcmOptions   `json:"fcm_options,omitempty"`
 }
 
 // WebpushNotificationAction represents an action that can be performed upon receiving a WebPush notification.
@@ -398,8 +405,9 @@ type WebpushFcmOptions struct {
 // See https://developer.apple.com/library/content/documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/CommunicatingwithAPNs.html
 // for more details on supported headers and payload keys.
 type APNSConfig struct {
-	Headers map[string]string `json:"headers,omitempty"`
-	Payload *APNSPayload      `json:"payload,omitempty"`
+	Headers    map[string]string `json:"headers,omitempty"`
+	Payload    *APNSPayload      `json:"payload,omitempty"`
+	FCMOptions *APNSFCMOptions   `json:"fcm_options,omitempty"`
 }
 
 // APNSPayload is the payload that can be included in an APNS message.
@@ -608,6 +616,16 @@ type ApsAlert struct {
 	LaunchImage     string   `json:"launch-image,omitempty"`
 }
 
+// APNSFCMOptions contains additional options for features provided by the FCM Aps SDK.
+type APNSFCMOptions struct {
+	AnalyticsLabel string `json:"analytics_label,omitempty"`
+}
+
+// FCMOptions contains additional options to use across all platforms.
+type FCMOptions struct {
+	AnalyticsLabel string `json:"analytics_label,omitempty"`
+}
+
 // ErrorInfo is a topic management error.
 type ErrorInfo struct {
 	Index  int

messaging/messaging_test.go

@@ -82,13 +82,19 @@ var validMessages = []struct {
 				"k1": "v1",
 				"k2": "v2",
 			},
+			FCMOptions: &FCMOptions{
+				AnalyticsLabel: "Analytics",
+			},
 			Topic: "test-topic",
 		},
 		want: map[string]interface{}{
 			"data": map[string]interface{}{
 				"k1": "v1",
 				"k2": "v2",
 			},
+			"fcm_options": map[string]interface{}{
+				"analytics_label": "Analytics",
+			},
 			"topic": "test-topic",
 		},
 	},
@@ -153,6 +159,9 @@ var validMessages = []struct {
 					ChannelID:    "channel",
 				},
 				TTL: &ttlWithNanos,
+				FCMOptions: &AndroidFCMOptions{
+					AnalyticsLabel: "Analytics",
+				},
 			},
 			Topic: "test-topic",
 		},
@@ -171,6 +180,9 @@ var validMessages = []struct {
 					"channel_id":     "channel",
 				},
 				"ttl": "1.500000000s",
+				"fcm_options": map[string]interface{}{
+					"analytics_label": "Analytics",
+				},
 			},
 			"topic": "test-topic",
 		},
@@ -260,7 +272,7 @@ var validMessages = []struct {
 					"k1":                 "v1",
 					"k2":                 "v2",
 				},
-				"fcmOptions": map[string]interface{}{
+				"fcm_options": map[string]interface{}{
 					"link": "https://link.com",
 				},
 			},
@@ -308,6 +320,9 @@ var validMessages = []struct {
 						"k2": true,
 					},
 				},
+				FCMOptions: &APNSFCMOptions{
+					AnalyticsLabel: "Analytics",
+				},
 			},
 			Topic: "test-topic",
 		},
@@ -327,6 +342,9 @@ var validMessages = []struct {
 					"k1": "v1",
 					"k2": true,
 				},
+				"fcm_options": map[string]interface{}{
+					"analytics_label": "Analytics",
+				},
 			},
 			"topic": "test-topic",
 		},