#4 Inconsistent casing of gcmAPIKey in GenerateRequestDetails

Author: Cory Thompson

README.md

@@ -40,13 +40,13 @@ var privateKey = @"mryM-krWj_6IsIMGsd8wNFXGBxnx...............";
 
 var subscription = new PushSubscription(pushEndpoint, p256dh, auth);
 var vapidDetails = new VapidDetails(subject, publicKey, privateKey);
-//var gcmApiKey = @"[your key here]";
+//var gcmAPIKey = @"[your key here]";
 
 var webPushClient = new WebPushClient();
 try
 {
 	webPushClient.SendNotification(subscription, "payload", vapidDetails);
-    //webPushClient.SendNotification(subscription, "payload", gcmApiKey);
+    //webPushClient.SendNotification(subscription, "payload", gcmAPIKey);
 }
 catch (WebPushException exception)
 {
@@ -56,7 +56,7 @@ catch (WebPushException exception)
 
 # API Reference
 
-## SendNotification(pushSubscription, payload, vapidDetails|gcmApiKey|options)
+## SendNotification(pushSubscription, payload, vapidDetails|gcmAPIKey|options)
 
 ```csharp
 var subscription = new PushSubscription(pushEndpoint, p256dh, auth);

src/WebPushClient.cs

@@ -122,15 +122,15 @@ public HttpRequestMessage GenerateRequestDetails(PushSubscription subscription,
                     extraHeaders = headers;
                 }
 
-                if (options.ContainsKey("gcmApiKey"))
+                if (options.ContainsKey("gcmAPIKey"))
                 {
-                    string gcmApiKey = options["gcmApiKey"] as string;
-                    if (gcmApiKey == null)
+                    string gcmAPIKey = options["gcmAPIKey"] as string;
+                    if (gcmAPIKey == null)
                     {
-                        throw new ArgumentException("options.gcmApiKey must be of type string");
+                        throw new ArgumentException("options.gcmAPIKey must be of type string");
                     }
 
-                    currentGCMAPiKey = gcmApiKey;
+                    currentGCMAPiKey = gcmAPIKey;
                 }
 
                 if (options.ContainsKey("vapidDetails"))
@@ -259,11 +259,11 @@ public void SendNotification(PushSubscription subscription, string payload, Vapi
         /// </summary>
         /// <param name="subscription">The PushSubscription you wish to send the notification to.</param>
         /// <param name="payload">The payload you wish to send to the user</param>
-        /// <param name="gcmApiKey">The GCM API key</param>
-        public void SendNotification(PushSubscription subscription, string payload, string gcmApiKey)
+        /// <param name="gcmAPIKey">The GCM API key</param>
+        public void SendNotification(PushSubscription subscription, string payload, string gcmAPIKey)
         {
             Dictionary<string, object> options = new Dictionary<string, object>();
-            options["gcmApiKey"] = gcmApiKey;
+            options["gcmAPIKey"] = gcmAPIKey;
             SendNotification(subscription, payload, options);
         }
     }

test/WebPushClientTest.cs

@@ -28,13 +28,37 @@ public void TestSetGCMAPIKey()
         {
             WebPushClient client = new WebPushClient();
 
-            string gcmApiKey = @"teststring";
-            client.SetGCMAPIKey(gcmApiKey);
+            string gcmAPIKey = @"teststring";
+            client.SetGCMAPIKey(gcmAPIKey);
             PushSubscription subscription = new PushSubscription(TEST_GCM_ENDPOINT, TEST_PUBLIC_KEY, TEST_PRIVATE_KEY);
             HttpRequestMessage message = client.GenerateRequestDetails(subscription, "test payload");
             string authorizationHeader = message.Headers.GetValues("Authorization").First();
 
-            Assert.AreEqual("key=" + gcmApiKey, authorizationHeader);
+            Assert.AreEqual("key=" + gcmAPIKey, authorizationHeader);
+        }
+
+        [Test]
+        public void TestGCMAPIKeyInOptions()
+        {
+            WebPushClient client = new WebPushClient();
+
+            string gcmAPIKey = @"teststring";
+            PushSubscription subscription = new PushSubscription(TEST_GCM_ENDPOINT, TEST_PUBLIC_KEY, TEST_PRIVATE_KEY);
+
+            Dictionary<string, object> options = new Dictionary<string, object>();
+            options["gcmAPIKey"] = gcmAPIKey;
+            HttpRequestMessage message = client.GenerateRequestDetails(subscription, "test payload", options);
+            string authorizationHeader = message.Headers.GetValues("Authorization").First();
+
+            Assert.AreEqual("key=" + gcmAPIKey, authorizationHeader);
+
+            // Test previous incorrect casing of gcmAPIKey
+            Dictionary<string, object> options2 = new Dictionary<string, object>();
+            options2["gcmApiKey"] = gcmAPIKey;
+            Assert.Throws<ArgumentException>(delegate
+            {
+                client.GenerateRequestDetails(subscription, "test payload", options2);
+            });
         }
 
         [Test]
@@ -69,8 +93,8 @@ public void TestSetGCMAPiKeyNonGCMPushService()
             // Ensure that the API key doesn't get added on a service that doesn't accept it.
             WebPushClient client = new WebPushClient();
 
-            string gcmApiKey = @"teststring";
-            client.SetGCMAPIKey(gcmApiKey);
+            string gcmAPIKey = @"teststring";
+            client.SetGCMAPIKey(gcmAPIKey);
             PushSubscription subscription = new PushSubscription(TEST_FCM_ENDPOINT, TEST_PUBLIC_KEY, TEST_PRIVATE_KEY);
             HttpRequestMessage message = client.GenerateRequestDetails(subscription, "test payload");