Merge pull request #24 from mohamedhafez/fcm_url

api key only needed for old google apis

lib/webpush/request.rb

@@ -62,7 +62,7 @@ def api_key
     end
 
     def api_key?
-      !(api_key.nil? || api_key.empty?) && @endpoint =~ /\Ahttps:\/\/.+\.googleapis\.com/
+      !(api_key.nil? || api_key.empty?) && @endpoint =~ /\Ahttps:\/\/(android|gcm-http)\.googleapis\.com/
     end
 
     def encrypted_payload?

spec/webpush/request_spec.rb

@@ -24,12 +24,18 @@
     end
 
     describe 'from :api_key' do
-      it 'inserts Authorization header when api_key present, and endpoint is for Chrome' do
+      it 'inserts Authorization header when api_key present, and endpoint is for Chrome\'s non-standards-compliant GCM endpoints' do
         request = Webpush::Request.new('https://gcm-http.googleapis.com/gcm/xyz', api_key: "api_key")
 
         expect(request.headers['Authorization']).to eq("key=api_key")
       end
 
+      it 'does not insert Authorization header for Chrome\'s new standards-compliant endpoints, even if api_key is present' do
+        request = Webpush::Request.new('https://fcm.googleapis.com/fcm/send/ABCD1234', api_key: "api_key")
+
+        expect(request.headers['Authorization']).to be_nil
+      end
+
       it 'does not insert Authorization header when endpoint is not for Chrome, even if api_key is present' do
         request = Webpush::Request.new('https://some.random.endpoint.com/xyz', api_key: "api_key")