inigorb 0.27.5 → 0.27.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26c3e3abbc50481d5f7cc16aaebebf3021057277cadc8338bbc2497dff00574e
-  data.tar.gz: 30523a5fd3ba87a2201aa1e30fdedb3c72c000b9c9f8aa56e4ed88c51a14df69
+  metadata.gz: 788d97815fbd001b6eebffed2c9f7c9ef5ea8eddb4228c060ce8dfc155b71aa0
+  data.tar.gz: b21a0572e9fabb0c6c55fe1a112c2e09f0fc5891e9a9353a05599e43a843a1ed
 SHA512:
-  metadata.gz: 5635418c67f39131177f34e6831440004ab89a0ade0ec73a052c9c1c2d6cc7f396b3ddaf0a759495dee5df473debb8e35c751407b1d1b3ecc18b76313f7b2e71
-  data.tar.gz: 506d88a0918b5117f9424a56baef74aaab1bb065447cab2bdc48b9710a4db2649d0ae7fae27dec2c12e5c4939022ce06fcf8451bdd2f7e8167f6240617121625
+  metadata.gz: 4120ce3939645d632e5f72e17bf5342e2e7c869368e64cb05f6d9fb411f6eaf73afb3088828c081db4a6d3ea15341403c25396d021303b8387a2fc49a1214669
+  data.tar.gz: 9a97a310ced373289fccb74631452212da345acb5e7d2ea1c45ec46b1e7f95ec016fccf7d0d15ec6994758416d1301ddc7eee0cbd111a63989a1e6582c4c7364

data/lib/inigorb.rb

@@ -63,13 +63,15 @@ module Inigo
 
       request = Rack::Request.new(env)
 
-      # 'path' guard -> /graphql
-      if request.path != self.class.path
+      path = self.class.path
+      path += "/" unless path.end_with?("/")
+      # 'path' guard -> /graphql, /graphql/whatever
+      if request.path != self.class.path && !request.path.start_with?(path)
         return @app.call(env)
       end
 
       # GraphiQL request
-      if request.get? && request.accept.include?('text/html')
+      if request.get? && env['HTTP_ACCEPT'].include?('text/html')
         return @app.call(env)
       end
 
@@ -84,9 +86,16 @@ module Inigo
         # Read request from body
         request.body.each { |chunk| gReq += chunk }
 
-        if self.class.operation_store.present? && gReq.include?("operationId")
+        if self.class.operation_store.present? && has_operation_id?(gReq)
           parsed = JSON.parse(gReq)
-          parts = parsed['operationId'].split('/')
+          operationId = get_operation_id(parsed)
+
+          if !operationId
+            request.body.rewind
+            return @app.call(env)
+          end
+
+          parts = operationId.split('/')
           # Query can't be resolved
           if parts.length != 2
             request.body.rewind
@@ -114,24 +123,9 @@ module Inigo
         end
         request.body.rewind
       elsif request.get?
-        req = {}
-
-        if request.params['query']
-          req.merge!('query' => request.params['query'])
-        end
-
-        if request.params['operationName']
-          req.merge!('operationName' => request.params['operationName'])
-        end
-
-        if request.params['variables']
-          req.merge!('variables' => request.params['variables'])
-        end
-
-        if request.params['operationId']
-          req.merge!('operationId' => request.params['operationId'])
-          if self.class.operation_store
-            parts = request.params['operationId'].split('/')
+        operation_id = get_operation_id(request.params)
+        if operation_id && self.class.operation_store
+            parts = operation_id.split('/')
             # Query can't be resolved
             if parts.length != 2
               return @app.call(env)
@@ -143,17 +137,19 @@ module Inigo
             end
 
             if data.name
-              req.merge!('operationName' => data.name)
+              request.params['operationName'] = data.name
             end
     
             if data.body
-              req.merge!('query' => data.body)
+              request.params['query'] = data.body
             end
-          end
+
+            # Update the env with the modified query string
+            env['QUERY_STRING'] = Rack::Utils.build_nested_query(request.params)
         end
 
         # Read request from query param
-        gReq = JSON.dump(req)
+        gReq = JSON.dump(request.params)
       end
 
       q = Query.new(self.class.instance, gReq)
@@ -280,5 +276,24 @@ module Inigo
       [status, headers, [JSON.dump(response_hash)]]
     end
 
+    # operates with string data not to parse the request body unnecessary
+    def has_operation_id?(str_data)
+      # Relay / Apollo 1.x and Apollo Link have the same field just in different places.
+      str_data.include?('operationId')
+    end
+
+    # extracts operation id from parsed body hash
+    def get_operation_id(json_data)
+      # Relay / Apollo 1.x
+      if json_data.include?('operationId')
+        json_data['operationId']
+      # Apollo Link
+      elsif json_data.include?('extensions') && json_data['extensions'].include?('operationId')
+        json_data['extensions']['operationId']
+      else
+        nil
+      end
+    end
+
   end  
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inigorb
 version: !ruby/object:Gem::Version
-  version: 0.27.5
+  version: 0.27.6
 platform: ruby
 authors:
 - Inigo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-10 00:00:00.000000000 Z
+date: 2023-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt