Fix errors when a non-null field fails auth check

Author: rmosolgo

lib/graphql.rb

@@ -21,6 +21,9 @@ def self.eager_load!
   class Error < StandardError
   end
 
+  class RuntimeError < Error
+  end
+
   # This error is raised when GraphQL-Ruby encounters a situation
   # that it *thought* would never happen. Please report this bug!
   class InvariantError < Error

lib/graphql/execution/batching/field_compatibility.rb

@@ -110,12 +110,8 @@ def resolve_batch(frs, objects, context, kwargs)
                   new_return_value
                 end
               end
-            rescue GraphQL::Error => err
-              if err.respond_to?(:path=) # TODO sort out error hierarchy so I can match these without a respond_to check
-                err
-              else
-                raise
-              end
+            rescue RuntimeError => err
+              err
             rescue StandardError => stderr
               begin
                 context.query.handle_or_reraise(stderr)

lib/graphql/execution/batching/prepare_object_step.rb

@@ -81,11 +81,17 @@ def create_result
               if new_obj
                 @authorized_value = true
                 @object = new_obj
+              elsif @is_non_null
+                @graphql_result[@key] = @field_resolve_step.add_non_null_error(@is_from_array)
               else
-                @graphql_result[@key] = @authorization_error
+                @graphql_result[@key] = @field_resolve_step.add_graphql_error(@authorization_error)
               end
             rescue GraphQL::Error => err
-              @graphql_result[@key] = @field_resolve_step.add_graphql_error(err)
+              if @is_non_null
+                @graphql_result[@key] = @field_resolve_step.add_non_null_error(@is_from_array)
+              else
+                @graphql_result[@key] = @field_resolve_step.add_graphql_error(err)
+              end
             end
           end
 

lib/graphql/execution_error.rb

@@ -3,7 +3,7 @@ module GraphQL
   # If a field's resolve function returns a {ExecutionError},
   # the error will be inserted into the response's `"errors"` key
   # and the field will resolve to `nil`.
-  class ExecutionError < GraphQL::Error
+  class ExecutionError < GraphQL::RuntimeError
     # @return [GraphQL::Language::Nodes::Field] the field where the error occurred
     def ast_node
       ast_nodes.first

lib/graphql/invalid_null_error.rb

@@ -2,7 +2,7 @@
 module GraphQL
   # Raised automatically when a field's resolve function returns `nil`
   # for a non-null field.
-  class InvalidNullError < GraphQL::Error
+  class InvalidNullError < GraphQL::RuntimeError
     # @return [GraphQL::BaseType] The owner of {#field}
     attr_reader :parent_type
 

lib/graphql/query/context.rb

@@ -119,8 +119,8 @@ def skip
       # @param error [GraphQL::ExecutionError] an execution error
       # @return [void]
       def add_error(error)
-        if !error.is_a?(ExecutionError)
-          raise TypeError, "expected error to be a ExecutionError, but was #{error.class}"
+        if !error.is_a?(GraphQL::RuntimeError)
+          raise TypeError, "expected error to be a GraphQL::RuntimeError, but was #{error.class}"
         end
         errors << error
         nil

lib/graphql/unauthorized_error.rb

@@ -4,7 +4,7 @@ module GraphQL
   # It's passed to {Schema.unauthorized_object}.
   #
   # Alternatively, custom code in `authorized?` may raise this error. It will be routed the same way.
-  class UnauthorizedError < GraphQL::Error
+  class UnauthorizedError < GraphQL::RuntimeError
     # @return [Object] the application object that failed the authorization check
     attr_reader :object