#60 Add GCM key when calling FCM endpoint if VapidDetails are not provided.

Author: coryjthompson

WebPush.Test/WebPushClientTest.cs

@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
+using System.Net.Http;
 
 namespace WebPush.Test
 {
@@ -20,6 +21,9 @@ public class WebPushClientTest
         private const string TestFcmEndpoint =
             @"https://fcm.googleapis.com/fcm/send/efz_TLX_rLU:APA91bE6U0iybLYvv0F3mf6";
 
+        private const string TestFirefoxEndpoint =
+            @"https://updates.push.services.mozilla.com/wpush/v2/gBABAABgOe_sGrdrsT35ljtA4O9xCX";
+
         public const string TestSubject = "mailto:[email protected]";
 
         private MockHttpMessageHandler httpMessageHandlerMock;
@@ -76,10 +80,9 @@ public void TestSetGCMAPIKeyEmptyString()
         public void TestSetGcmApiKeyNonGcmPushService()
         {
             // Ensure that the API key doesn't get added on a service that doesn't accept it.
-
             var gcmAPIKey = @"teststring";
             client.SetGcmApiKey(gcmAPIKey);
-            var subscription = new PushSubscription(TestFcmEndpoint, TestPublicKey, TestPrivateKey);
+            var subscription = new PushSubscription(TestFirefoxEndpoint, TestPublicKey, TestPrivateKey);
             var message = client.GenerateRequestDetails(subscription, @"test payload");
 
             IEnumerable<string> values;
@@ -103,8 +106,8 @@ public void TestSetGcmApiKeyNull()
         public void TestSetVapidDetails()
         {
             client.SetVapidDetails(TestSubject, TestPublicKey, TestPrivateKey);
-
-            var subscription = new PushSubscription(TestFcmEndpoint, TestPublicKey, TestPrivateKey);
+            
+            var subscription = new PushSubscription(TestFirefoxEndpoint, TestPublicKey, TestPrivateKey);
             var message = client.GenerateRequestDetails(subscription, @"test payload");
             var authorizationHeader = message.Headers.GetValues(@"Authorization").First();
             var cryptoHeader = message.Headers.GetValues(@"Crypto-Key").First();
@@ -113,6 +116,17 @@ public void TestSetVapidDetails()
             Assert.IsTrue(cryptoHeader.Contains(@"p256ecdsa"));
         }
 
+        [TestMethod]
+        public void TestFcmAddsAuthorizationHeader()
+        {
+            client.SetGcmApiKey(@"somestring");
+            var subscription = new PushSubscription(TestFcmEndpoint, TestPublicKey, TestPrivateKey);
+            var message = client.GenerateRequestDetails(subscription, @"test payload");
+            var authorizationHeader = message.Headers.GetValues(@"Authorization").First();
+
+            Assert.IsTrue(authorizationHeader.StartsWith(@"key="));
+        }
+
         [TestMethod]
         [DataRow(HttpStatusCode.Created)]
         [DataRow(HttpStatusCode.Accepted)]

WebPush/WebPushClient.cs

@@ -218,6 +218,8 @@ public HttpRequestMessage GenerateRequestDetails(PushSubscription subscription,
             }
 
             var isGcm = subscription.Endpoint.StartsWith(@"https://android.googleapis.com/gcm/send");
+            var isFcm = subscription.Endpoint.StartsWith(@"https://fcm.googleapis.com/fcm/send/");
+
             if (isGcm)
             {
                 if (!string.IsNullOrEmpty(currentGcmApiKey))
@@ -241,6 +243,9 @@ public HttpRequestMessage GenerateRequestDetails(PushSubscription subscription,
                 {
                     cryptoKeyHeader += @";" + vapidHeaders["Crypto-Key"];
                 }
+            } else if (isFcm && !string.IsNullOrEmpty(currentGcmApiKey))
+            {
+                request.Headers.TryAddWithoutValidation("Authorization", "key=" + currentGcmApiKey);
             }
 
             request.Headers.Add("Crypto-Key", cryptoKeyHeader);