Delete restricted keys from the GCM payload

Author: vivangkumar

lib/pusher/native_notification/client.rb

@@ -66,14 +66,13 @@ def url(path = nil)
       # that there is an accompanying `title` and `icon`
       # field
       def validate_payload(payload)
-        # Restricted keys
-        RESTRICTED_GCM_PAYLOAD_KEYS.each { |k| payload.delete(k) }
-
         unless (payload.has_key?(:apns) || payload.has_key?(:gcm))
           raise Pusher::Error, "GCM or APNS data must be provided"
         end
 
         if (gcm_payload = payload[:gcm])
+          # Restricted keys
+          RESTRICTED_GCM_PAYLOAD_KEYS.each { |k| gcm_payload.delete(k) }
           if (ttl = gcm_payload[:time_to_live])
 
             if ttl.to_i < 0 || ttl.to_i > GCM_TTL

spec/client_spec.rb

@@ -656,7 +656,7 @@
         @client.notify(["test"], payload)
       end
 
-      it "should delete restricted keys before sending a notification" do
+      it "should delete restricted gcm keys before sending a notification" do
         notification_host_regexp = %r{hedwig-staging.herokuapp.com}
         payload = {
           interests: ["test"],
@@ -678,7 +678,8 @@
           :body => MultiJson.encode({ :foo => "bar" })
         })
 
-        @client.notify(["test"], payload.merge!(to: "blah", registration_ids: ["reg1", "reg2"]))
+        payload[:gcm].merge!(to: "blah", registration_ids: ["reg1", "reg2"])
+        @client.notify(["test"], payload)
       end
 
       it "should raise an error for an invalid webhook url field" do