Merge pull request #5071 from rmosolgo/handle-execution-error-from-object-from-id

Handle GraphQL::ExecutionError from loading objects during analysis

Author: rmosolgo

lib/graphql/analysis.rb

@@ -81,7 +81,7 @@ def analyze_query(query, analyzers, multiplex_analyzers: [])
       end
     rescue Timeout::Error
       [GraphQL::AnalysisError.new("Timeout on validation of query")]
-    rescue GraphQL::UnauthorizedError
+    rescue GraphQL::UnauthorizedError, GraphQL::ExecutionError
       # This error was raised during analysis and will be returned the client before execution
       []
     end

lib/graphql/schema/field.rb

@@ -490,7 +490,7 @@ def calculate_complexity(query:, nodes:, child_complexity:)
             if arguments[:last] && (max_possible_page_size.nil? || arguments[:last] > max_possible_page_size)
               max_possible_page_size = arguments[:last]
             end
-          elsif arguments.is_a?(GraphQL::UnauthorizedError)
+          elsif arguments.is_a?(GraphQL::ExecutionError) || arguments.is_a?(GraphQL::UnauthorizedError)
             raise arguments
           end
 

spec/graphql/analysis/max_query_complexity_spec.rb

@@ -190,7 +190,11 @@ def self.resolve_type(abs_type, object, ctx)
       end
 
       def self.object_from_id(id, ctx)
-        { name: "Loaded thing #{id}" }
+        if id == "13"
+          raise GraphQL::ExecutionError, "No Thing ##{id}"
+        else
+          { name: "Loaded thing #{id}" }
+        end
       end
 
       def self.unauthorized_object(err)
@@ -209,5 +213,11 @@ def self.unauthorized_object(err)
       res2 = AuthorizedTypeSchema.execute(query_str)
       assert_equal ["Unauthorized Object: \"Loaded thing 123\""], res2["errors"].map { |e| e["message"] }
     end
+
+    it "returns the right error when the loaded object raises an error" do
+      query_str = "{ things(thingId: \"13\", first: 1) { nodes { name } } }"
+      res = AuthorizedTypeSchema.execute(query_str, context: { authorized: true })
+      assert_equal ["No Thing #13"], res["errors"].map { |e| e["message"] }
+    end
   end
 end

spec/graphql/analysis/query_complexity_spec.rb

@@ -668,8 +668,7 @@ def resolve
       it "handles the error" do
         res = GraphQL::Query.new(complexity_schema, query_string).result
         assert_equal ["count must be less than 50"], res["errors"].map { |e| e["message"] }
-        complexity = reduce_result.first
-        assert_equal 102, complexity, "It uses max page size"
+        assert_equal [], reduce_result, "It doesn't finish calculation"
       end
     end