sendgrid-ruby 6.3.5 → 6.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e029e78d950c6d118cf0444a43ea84aaaa93a7524fb35d22e0442e9a575ae18e
-  data.tar.gz: 136c50aab4d0f6561acccad706b2238eee7bc3d76d723055ce43f38fd4ef747a
+  metadata.gz: aa01e80d5c4628995eb1deeafc8dc22364917d5840e1906e3c6319c2b7a66224
+  data.tar.gz: 87a42bf375187c6a21fcc2432753ce96cb17c8b47f851c1d3800defc0ef9378f
 SHA512:
-  metadata.gz: ff63561ef8b7ea73bf7125c3cd62803e0ffe50a73914fbd3736d7d3aed8a98c23f6f8b6a1ab7c07d9eefc5b1fabed78586d8d27bafd548c87d4f79f422eb430f
-  data.tar.gz: 3d7eb06f425f60994db736113f45c9db3406b63f4bc1ff1a6e7eadd6761f8a67ba98eda05cf6830eef40fd9143046219ec3e7fa9d5b58da8bc270eddf0809a68
+  metadata.gz: 2689e50ffdd1914c0e0212cbfe3ac6faeb6d4c199edae135c13c5324d8d4d0c5ab39f0b5dbc33d9673c4de20540aa173262a3abfc58b000143430080d5dd68c9
+  data.tar.gz: b0e843dad160781bf98a01b507a7a5d7bb5a6c607a554cffede4871e7b00ce2e529de438189d33743901db48599a4fcc1b420c972de97b2df4ed54bae61813f3

data/.rubocop.yml

@@ -2,3 +2,7 @@ inherit_from: .rubocop_todo.yml
 
 Style/StringLiterals:
   Enabled: false
+
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*'

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+[2020-10-14] Version 6.3.6
+--------------------------
+**Library - Fix**
+- [PR #440](https://github.com/sendgrid/sendgrid-ruby/pull/440): reading position of a request body. Thanks to [@snaka](https://github.com/snaka)!
+
+
 [2020-09-28] Version 6.3.5
 --------------------------
 **Library - Fix**

data/lib/rack/sendgrid_webhook_verification.rb

@@ -39,6 +39,8 @@ module Rack
         request.env[SendGrid::EventWebhookHeader::TIMESTAMP]
       )
 
+      request.body.rewind
+
       if verified
         @app.call(env)
       else

data/lib/sendgrid/version.rb

@@ -1,3 +1,3 @@
 module SendGrid
-  VERSION = '6.3.5'.freeze
+  VERSION = '6.3.6'.freeze
 end

data/spec/rack/sendgrid_webhook_verification_spec.rb

@@ -112,5 +112,31 @@ unless RUBY_PLATFORM == 'java'
         expect(status).to eq(403)
       end
     end
+
+    describe 'request body which passed to an app' do
+      before do
+        @payload = nil
+        @spy_app = lambda do |env|
+          @payload = Rack::Request.new(env).body
+          [200, { 'Content-Type' => 'text/plain' }, ['Hello']]
+        end
+      end
+
+      let(:middleware) { Rack::SendGridWebhookVerification.new(@spy_app, public_key, %r{/email}) }
+
+      it 'keeps orignal reading position' do
+        options = {
+          :input => Fixtures::EventWebhook::PAYLOAD,
+          'Content-Type' => "application/json"
+        }
+        options[SendGrid::EventWebhookHeader::SIGNATURE] = Fixtures::EventWebhook::SIGNATURE
+        options[SendGrid::EventWebhookHeader::TIMESTAMP] = Fixtures::EventWebhook::TIMESTAMP
+        request = Rack::MockRequest.env_for('/email', options)
+        status, headers, body = middleware.call(request)
+        expect(status).to eq(200)
+        expect(@payload).not_to be_nil
+        expect(@payload.pos).to be_zero
+      end
+    end
   end
 end

data/test/sendgrid/test_sendgrid-ruby.rb

@@ -33,7 +33,7 @@ class TestAPI < MiniTest::Test
     assert_equal(test_headers, sg.request_headers)
     assert_equal('v3', sg.version)
     assert_equal(subuser, sg.impersonate_subuser)
-    assert_equal('6.3.5', SendGrid::VERSION)
+    assert_equal('6.3.6', SendGrid::VERSION)
     assert_instance_of(SendGrid::Client, sg.client)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sendgrid-ruby
 version: !ruby/object:Gem::Version
-  version: 6.3.5
+  version: 6.3.6
 platform: ruby
 authors:
 - Elmer Thomas
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-28 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_http_client