Merge pull request #5274 from xuanduc987/push-c23315765c0e7ae94f164f369e5d0729

Handle error in resolve_type

Author: rmosolgo

lib/graphql/execution/interpreter/runtime.rb

@@ -587,7 +587,17 @@ def continue_field(value, owner_type, field, current_type, ast_node, next_select
             set_result(selection_result, result_name, r, false, is_non_null)
             r
           when "UNION", "INTERFACE"
-            resolved_type_or_lazy = resolve_type(current_type, value)
+            resolved_type_or_lazy = begin
+                                      resolve_type(current_type, value)
+                                    rescue GraphQL::ExecutionError, GraphQL::UnauthorizedError => ex_err
+                                      return continue_value(ex_err, field, is_non_null, ast_node, result_name, selection_result)
+                                    rescue StandardError => err
+                                      begin
+                                        query.handle_or_reraise(err)
+                                      rescue GraphQL::ExecutionError => ex_err
+                                        return continue_value(ex_err, field, is_non_null, ast_node, result_name, selection_result)
+                                      end
+                                    end
             after_lazy(resolved_type_or_lazy, ast_node: ast_node, field: field, owner_object: owner_object, arguments: arguments, trace: false, result_name: result_name, result: selection_result, runtime_state: runtime_state) do |resolved_type_result, runtime_state|
               if resolved_type_result.is_a?(Array) && resolved_type_result.length == 2
                 resolved_type, resolved_value = resolved_type_result

spec/graphql/execution_error_spec.rb

@@ -400,6 +400,101 @@
     assert_equal(expected_errors, result["errors"])
   end
 
+  describe "when ExecutionError is raised in resolve_type" do
+    let(:schema) do
+      test_type = Class.new(GraphQL::Schema::Object) do
+        graphql_name "Test"
+        field :dummy, GraphQL::Types::Boolean
+      end
+
+      test_union = Class.new(GraphQL::Schema::Union) do
+        graphql_name "TestUnion"
+        possible_types test_type
+      end
+
+      query_type = Class.new(GraphQL::Schema::Object) do
+        graphql_name "Query"
+
+        field :test, test_union
+        define_method(:test) do
+          1
+        end
+      end
+
+      Class.new(GraphQL::Schema) do
+        query query_type
+
+        define_singleton_method(:resolve_type) do |abstract_type, obj, ctx|
+          raise GraphQL::ExecutionError.new("resolve_type")
+        end
+      end
+    end
+
+    it "return execution error with location and path" do
+      query = "{ test { ...on Test { dummy }  } }"
+      result = schema.execute(query)
+      expected_result = {
+        "errors"=>[
+          {
+            "message"=>"resolve_type",
+            "locations"=>[{"line"=>1, "column"=>3}],
+            "path"=>["test"]
+          }
+        ],
+        "data"=>{"test"=>nil}
+      }
+      assert_equal(expected_result, result.to_h)
+    end
+
+    describe "when using DataLoaders" do
+      let(:schema) do
+        test_type = Class.new(GraphQL::Schema::Object) do
+          graphql_name "Test"
+          field :dummy, GraphQL::Types::Boolean
+        end
+
+        test_union = Class.new(GraphQL::Schema::Union) do
+          graphql_name "TestUnion"
+          possible_types test_type
+        end
+
+        query_type = Class.new(GraphQL::Schema::Object) do
+          graphql_name "Query"
+
+          field :test, test_union
+          define_method(:test) do
+            1
+          end
+        end
+
+        Class.new(GraphQL::Schema) do
+          query query_type
+          use GraphQL::Dataloader
+
+          define_singleton_method(:resolve_type) do |abstract_type, obj, ctx|
+            raise GraphQL::ExecutionError.new("resolve_type")
+          end
+        end
+      end
+
+      it "return execution error with location and path" do
+        query = "{ test { ...on Test { dummy }  } }"
+        result = schema.execute(query)
+        expected_result = {
+          "errors"=>[
+            {
+              "message"=>"resolve_type",
+              "locations"=>[{"line"=>1, "column"=>3}],
+              "path"=>["test"]
+            }
+          ],
+          "data"=>{"test"=>nil}
+        }
+        assert_equal(expected_result, result.to_h)
+      end
+    end
+  end
+
  describe "when using DataLoaders" do
     let(:schema) do
       item_error_loader = Class.new(GraphQL::Dataloader::Source) do