jsonrpc-rails 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 017eda83610eb76324999392d1f824fbc274f5182a3a1412ac3aaef19e9beaa8
-  data.tar.gz: 22f7ee6229d94a2f1dce2f03c7205d6c855b37b359a31b3ff6402e6c2fb40e4f
+  metadata.gz: 16369528b9adcf6bc2b66b42365e475be375d330312694626d8244f2205e9df3
+  data.tar.gz: 4eeda34cff81e732d5aac37d684c81eba9c7a66de1729a7f1f2c1c8097de21fb
 SHA512:
-  metadata.gz: dac03145eeddd7906005c9ad1770b745b6f6e8a4fd5185b7146b9adc9787cc21fa18697922063ba94e2ae5b3ab64839da27f4fa88fdfbe47c6cd88cb86b93b8e
-  data.tar.gz: 298e2f0955364e3175332f0288cffea4646afc410f73393c97573d1f3054fac105563af655a78a768e6ca3f69a920454dd6c3e7a859232df30fe93b9827e4fbc
+  metadata.gz: ebefd2f90219d0dd655a9e7fc21023aa38b26de412e52102bdb6d2014a75f1975c284a417d2f353989e09360c34b56c07e42af89643e99bb3fe990db886a1039
+  data.tar.gz: 2c447976bc3b1dc7a8e9c2ffc695278bd7ec0e44bbad864f5810c16adefb901ec1212145a8d56865e4f7a59eba36b760db71e69addac2b70422f2b8276b53a7f

data/lib/jsonrpc_rails/middleware/validator.rb

@@ -35,7 +35,10 @@ module JSONRPC_Rails
 
         raw_payload = parse_json(body)
 
-        return jsonrpc_error_response(:invalid_request) unless raw_payload.is_a?(Hash) || raw_payload.is_a?(Array)
+        unless raw_payload.is_a?(Hash) || raw_payload.is_a?(Array)
+          id = extract_id_from_raw_payload(raw_payload)
+          return jsonrpc_error_response(:invalid_request, id: id)
+        end
 
         validity, = if raw_payload.is_a?(Array)
                       validate_batch(raw_payload)
@@ -89,9 +92,10 @@ module JSONRPC_Rails
 
       def validate_single(obj)
         if validate_single_structure(obj)
-          [ :valid, nil ]
+          [ :valid, obj["id"] ]
         else
-          [ jsonrpc_error_response(:invalid_request), nil ]
+          id = obj.is_a?(Hash) ? obj["id"] : nil
+          [ jsonrpc_error_response(:invalid_request, id: id), id ]
         end
       end
 
@@ -119,13 +123,22 @@ module JSONRPC_Rails
 
       # @param error_sym [Symbol]
       # @param status    [Integer]
+      # @param id       [String, Integer, nil]
       # @return [Array] Rack triplet
-      def jsonrpc_error_response(error_sym, status: 400)
+      def jsonrpc_error_response(error_sym, status: 400, id: nil)
         error_obj = JSON_RPC::JsonRpcError.build(error_sym)
-        payload   = JSON_RPC::Response.new(id: nil, error: error_obj).to_json
+        payload   = JSON_RPC::Response.new(id: id, error: error_obj).to_json
 
         [ status, { "Content-Type" => CONTENT_TYPE }, [ payload ] ]
       end
+
+      # Extract ID from raw payload if possible
+      def extract_id_from_raw_payload(raw)
+        return nil unless raw.is_a?(Hash)
+        raw["id"]
+      rescue
+        nil
+      end
     end
   end
 end

data/lib/jsonrpc_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JSONRPC_Rails
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonrpc-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Abdelkader Boudih