m2m_keygen 0.4.3 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97b919ad7e666502842c42a4722d99e10237288033a561943798c317fd73cbf8
-  data.tar.gz: 0a70ea67255c9b67dad4a07141aa7d403104edfb2dc8db4b6c82613c7565e101
+  metadata.gz: 2e2806db77237a92193c897dd269a5f82bc7a8428c3abf0be500e44e971daad7
+  data.tar.gz: 2727209266923a5c77f8dc43b60fc74532dcf89d501f6f42fb2074d760dd95ec
 SHA512:
-  metadata.gz: 3a085c056d0c3ab39fef8c2d36f17b782aa5dbef6a2af6e7b7083198b72949730141e5fc20624bd757c2452aecaba5365a907b22cd88e274984605b5aaa3e46a
-  data.tar.gz: 7de0d94e000a63f99a0a3ee31446531fbf470b2edc769b4f320cd979c21b5b5953f573e89497658b817de9c820c34b621cdfaad20e12ab5dec22459645640557
+  metadata.gz: 2a38e8fc99501194f21fab88fa6035e60f77419628c57cf393ce22020265020c5d120842133a4a1f4d79d586ec1f39b4a67c2f5362d8f73708e79e9db8a0abd4
+  data.tar.gz: ff5e60ebb5591ef97725bd3992e1e9683c59790e53ad64558892b3d072962a321b32a227607cdce0717d393340c416f422d00becd2e6467bfab523e78cea8253

data/CHANGELOG.md

@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.4.5] - 2022-11-14
+
+### Fixed
+
+- Expiry can be part of JSON body
+
+## [0.4.4] - 2022-11-14
+
+### Changed
+
+- Body is parsed as JSON and added to the query string
+
 ## [0.4.3] - 2022-10-12
 
 ### Changed
@@ -55,7 +67,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Basic skeleton for gem
 
-[unreleased]: https://github.com/Billcorporate/m2m_keygen_ruby/compare/v0.4.3...HEAD
+[unreleased]: https://github.com/Billcorporate/m2m_keygen_ruby/compare/v0.4.5...HEAD
+[0.4.5]: https://github.com/Billcorporate/m2m_keygen_ruby/releases/tag/v0.4.5
+[0.4.4]: https://github.com/Billcorporate/m2m_keygen_ruby/releases/tag/v0.4.4
 [0.4.3]: https://github.com/Billcorporate/m2m_keygen_ruby/releases/tag/v0.4.3
 [0.4.2]: https://github.com/Billcorporate/m2m_keygen_ruby/releases/tag/v0.4.2
 [0.4.1]: https://github.com/Billcorporate/m2m_keygen_ruby/releases/tag/v0.4.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    m2m_keygen (0.4.3)
+    m2m_keygen (0.4.5)
       rack
       sorbet-runtime
       zeitwerk (~> 2.6)
@@ -28,7 +28,7 @@ GEM
     docile (1.4.0)
     dotenv (2.8.1)
     e2mmap (0.1.0)
-    faker (2.23.0)
+    faker (3.0.0)
       i18n (>= 1.8.11, < 2)
     ffi (1.15.5)
     formatador (1.1.0)
@@ -46,7 +46,7 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    haml (6.0.6)
+    haml (6.0.10)
       temple (>= 0.8.2)
       thor
       tilt
@@ -67,9 +67,9 @@ GEM
     minitest (5.16.3)
     nenv (0.3.0)
     netrc (0.11.0)
-    nokogiri (1.13.8-arm64-darwin)
+    nokogiri (1.13.9-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.8-x86_64-linux)
+    nokogiri (1.13.9-x86_64-linux)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -85,7 +85,7 @@ GEM
       syntax_tree (>= 2.7.1)
       syntax_tree-haml (>= 1.1.0)
       syntax_tree-rbs (>= 0.2.0)
-    prettier_print (0.1.0)
+    prettier_print (1.1.0)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -109,33 +109,33 @@ GEM
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.1)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
     rspec_in_context (1.1.0.3)
       activesupport (> 2.0)
       rspec (> 3.0)
-    rubocop (1.36.0)
+    rubocop (1.39.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
+      rubocop-ast (>= 1.23.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
+    rubocop-ast (1.23.0)
       parser (>= 3.1.1.0)
     rubocop-faker (1.1.0)
       faker (>= 2.12.0)
@@ -168,39 +168,38 @@ GEM
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
-    sorbet (0.5.10484)
-      sorbet-static (= 0.5.10484)
-    sorbet-runtime (0.5.10484)
-    sorbet-static (0.5.10484-universal-darwin-21)
-    sorbet-static (0.5.10484-x86_64-linux)
-    sorbet-static-and-runtime (0.5.10484)
-      sorbet (= 0.5.10484)
-      sorbet-runtime (= 0.5.10484)
+    sorbet (0.5.10554)
+      sorbet-static (= 0.5.10554)
+    sorbet-runtime (0.5.10554)
+    sorbet-static (0.5.10554-universal-darwin-21)
+    sorbet-static (0.5.10554-x86_64-linux)
+    sorbet-static-and-runtime (0.5.10554)
+      sorbet (= 0.5.10554)
+      sorbet-runtime (= 0.5.10554)
     spoom (1.1.12)
       sorbet (>= 0.5.9204)
       sorbet-runtime (>= 0.5.9204)
       thor (>= 0.19.2)
-    syntax_tree (3.6.3)
-      prettier_print
-    syntax_tree-haml (1.3.2)
-      haml (>= 5.2)
-      prettier_print
-      syntax_tree (>= 2.0.1)
+    syntax_tree (5.0.1)
+      prettier_print (>= 1.1.0)
+    syntax_tree-haml (2.0.0)
+      haml (>= 5.2, != 6.0.0)
+      prettier_print (>= 1.0.0)
+      syntax_tree (>= 4.0.0)
     syntax_tree-rbs (0.5.1)
       prettier_print
       rbs
       syntax_tree (>= 2.0.1)
-    tapioca (0.10.2)
+    tapioca (0.10.3)
       bundler (>= 1.17.3)
       netrc (>= 0.11.0)
       parallel (>= 1.21.0)
-      pry (>= 0.12.2)
-      rbi (~> 0.0.0, >= 0.0.14)
-      sorbet-static-and-runtime (>= 0.5.9204)
+      rbi (~> 0.0.0, >= 0.0.16)
+      sorbet-static-and-runtime (>= 0.5.9892)
       spoom (~> 1.1.0, >= 1.1.11)
       thor (>= 1.2.0)
       yard-sorbet
-    temple (0.8.2)
+    temple (0.9.1)
     thor (1.2.1)
     tilt (2.0.11)
     tzinfo (2.0.5)
@@ -215,7 +214,7 @@ GEM
     yard-sorbet (0.7.0)
       sorbet-runtime (>= 0.5)
       yard (>= 0.9)
-    zeitwerk (2.6.1)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   arm64-darwin-21

data/docs/M2mKeygen/Error.html

@@ -125,7 +125,7 @@
 </div>
 
       <div id="footer">
-  Generated on Wed Oct 12 11:55:54 2022 by
+  Generated on Mon Nov 14 18:18:15 2022 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.28 (ruby-3.1.2).
 </div>

data/docs/M2mKeygen/ParamsEncoder.html

@@ -311,7 +311,7 @@
 </div>
 
       <div id="footer">
-  Generated on Wed Oct 12 11:55:54 2022 by
+  Generated on Mon Nov 14 18:18:15 2022 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.28 (ruby-3.1.2).
 </div>

data/docs/M2mKeygen/RackValidator.html

@@ -495,7 +495,8 @@
 29
 30
 31
-32</pre>
+32
+33</pre>
     </td>
     <td>
       <pre class="code"><span class="info file"># File 'lib/m2m_keygen/rack_validator.rb', line 22</span>
@@ -503,8 +504,9 @@
 <span class='kw'>def</span> <span class='id identifier rubyid_validate'>validate</span><span class='lparen'>(</span><span class='id identifier rubyid_req'>req</span><span class='rparen'>)</span>
   <span class='comment'># This will cover the case when Rails is used.
 </span>  <span class='id identifier rubyid_req'>req</span> <span class='op'>=</span> <span class='const'>Rack</span><span class='op'>::</span><span class='const'>Request</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='id identifier rubyid_req'>req</span><span class='period'>.</span><span class='id identifier rubyid_env'>env</span><span class='rparen'>)</span>
+  <span class='id identifier rubyid_params'>params</span> <span class='op'>=</span> <span class='lparen'>(</span><span class='id identifier rubyid_req'>req</span><span class='period'>.</span><span class='id identifier rubyid_params'>params</span> <span class='op'>||</span> <span class='lbrace'>{</span><span class='rbrace'>}</span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_merge'>merge</span><span class='lparen'>(</span><span class='id identifier rubyid_parse_json_body'>parse_json_body</span><span class='lparen'>(</span><span class='id identifier rubyid_req'>req</span><span class='rparen'>)</span><span class='rparen'>)</span>
   <span class='ivar'>@signature</span><span class='period'>.</span><span class='id identifier rubyid_validate'>validate</span><span class='lparen'>(</span>
-    <span class='label'>params:</span> <span class='id identifier rubyid_req'>req</span><span class='period'>.</span><span class='id identifier rubyid_params'>params</span> <span class='op'>||</span> <span class='lbrace'>{</span><span class='rbrace'>}</span><span class='comma'>,</span>
+    <span class='label'>params:</span> <span class='id identifier rubyid_params'>params</span><span class='comma'>,</span>
     <span class='label'>verb:</span> <span class='id identifier rubyid_req'>req</span><span class='period'>.</span><span class='id identifier rubyid_request_method'>request_method</span> <span class='op'>||</span> <span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>get</span><span class='tstring_end'>&#39;</span></span><span class='comma'>,</span>
     <span class='label'>path:</span> <span class='id identifier rubyid_req'>req</span><span class='period'>.</span><span class='id identifier rubyid_path'>path</span> <span class='op'>||</span> <span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>/</span><span class='tstring_end'>&#39;</span></span><span class='comma'>,</span>
     <span class='label'>signature:</span> <span class='id identifier rubyid_req'>req</span><span class='period'>.</span><span class='id identifier rubyid_env'>env</span><span class='lbracket'>[</span><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>HTTP_X_SIGNATURE</span><span class='tstring_end'>&#39;</span></span><span class='rbracket'>]</span> <span class='op'>||</span> <span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_end'>&#39;</span></span><span class='comma'>,</span>
@@ -521,7 +523,7 @@
 </div>
 
       <div id="footer">
-  Generated on Wed Oct 12 11:55:54 2022 by
+  Generated on Mon Nov 14 18:18:15 2022 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.28 (ruby-3.1.2).
 </div>

data/docs/M2mKeygen/Signature.html

@@ -670,7 +670,7 @@
 </div>
 
       <div id="footer">
-  Generated on Wed Oct 12 11:55:54 2022 by
+  Generated on Mon Nov 14 18:18:15 2022 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.28 (ruby-3.1.2).
 </div>

data/docs/M2mKeygen/Types.html

@@ -137,7 +137,7 @@
 </div>
 
       <div id="footer">
-  Generated on Wed Oct 12 11:55:54 2022 by
+  Generated on Mon Nov 14 18:18:15 2022 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.28 (ruby-3.1.2).
 </div>

data/docs/M2mKeygen.html

@@ -131,7 +131,7 @@
 
 </div>
         </dt>
-        <dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>0.4.3</span><span class='tstring_end'>&#39;</span></span></pre></dd>
+        <dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>0.4.5</span><span class='tstring_end'>&#39;</span></span></pre></dd>
       
     </dl>
   
@@ -147,7 +147,7 @@
 </div>
 
       <div id="footer">
-  Generated on Wed Oct 12 11:55:54 2022 by
+  Generated on Mon Nov 14 18:18:15 2022 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.28 (ruby-3.1.2).
 </div>

data/docs/_index.html

@@ -172,7 +172,7 @@
 </div>
 
       <div id="footer">
-  Generated on Wed Oct 12 11:55:54 2022 by
+  Generated on Mon Nov 14 18:18:15 2022 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.28 (ruby-3.1.2).
 </div>

data/docs/file.README.html

@@ -220,7 +220,7 @@ The receiver will generate the same signature from the HTTP request it has recei
 </div></div>
 
       <div id="footer">
-  Generated on Wed Oct 12 11:55:54 2022 by
+  Generated on Mon Nov 14 18:18:15 2022 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.28 (ruby-3.1.2).
 </div>

data/docs/index.html

@@ -220,7 +220,7 @@ The receiver will generate the same signature from the HTTP request it has recei
 </div></div>
 
       <div id="footer">
-  Generated on Wed Oct 12 11:55:54 2022 by
+  Generated on Mon Nov 14 18:18:15 2022 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.28 (ruby-3.1.2).
 </div>

data/docs/top-level-namespace.html

@@ -100,7 +100,7 @@
 </div>
 
       <div id="footer">
-  Generated on Wed Oct 12 11:55:54 2022 by
+  Generated on Mon Nov 14 18:18:15 2022 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.28 (ruby-3.1.2).
 </div>

data/lib/m2m_keygen/rack_validator.rb

@@ -22,13 +22,24 @@ module M2mKeygen
     def validate(req)
       # This will cover the case when Rails is used.
       req = Rack::Request.new(req.env)
+      params = (req.params || {}).merge(parse_json_body(req))
       @signature.validate(
-        params: req.params || {},
+        params: params,
         verb: req.request_method || 'get',
         path: req.path || '/',
         signature: req.env['HTTP_X_SIGNATURE'] || '',
       ) && req.params['expiry'] && req.params['expiry'].to_i > Time.now.to_i &&
         req.params['expiry'].to_i < Time.now.to_i + 120
     end
+
+    private
+
+    sig { params(req: T.untyped).returns(T::Hash[T.untyped, T.untyped]) }
+    def parse_json_body(req)
+      body = req.body.read
+      JSON.parse(body || '{}')
+    rescue JSON::ParserError
+      {}
+    end
   end
 end

data/lib/m2m_keygen/version.rb

@@ -3,5 +3,5 @@
 
 module M2mKeygen
   # Gem version
-  VERSION = '0.4.3'
+  VERSION = '0.4.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: m2m_keygen
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.5
 platform: ruby
 authors:
 - Denis <Zaratan> Pasin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-12 00:00:00.000000000 Z
+date: 2022-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack