Merge pull request #5285 from rmosolgo/one-of-prepare-fix

InputObject: validate even when prepare is overridden

Author: rmosolgo

lib/graphql/schema/argument.rb

@@ -217,7 +217,7 @@ def statically_coercible?
       # @api private
       def prepare_value(obj, value, context: nil)
         if type.unwrap.kind.input_object?
-          value = recursively_prepare_input_object(value, type)
+          value = recursively_prepare_input_object(value, type, context)
         end
 
         Schema::Validator.validate!(validators, obj, context, value)
@@ -398,15 +398,16 @@ def initialize(argument)
 
       private
 
-      def recursively_prepare_input_object(value, type)
+      def recursively_prepare_input_object(value, type, context)
         if type.non_null?
           type = type.of_type
         end
 
         if type.list? && !value.nil?
           inner_type = type.of_type
-          value.map { |v| recursively_prepare_input_object(v, inner_type) }
+          value.map { |v| recursively_prepare_input_object(v, inner_type, context) }
         elsif value.is_a?(GraphQL::Schema::InputObject)
+          value.validate_for(context)
           value.prepare
         else
           value

lib/graphql/schema/input_object.rb

@@ -64,14 +64,7 @@ def deconstruct_keys(keys = nil)
       end
 
       def prepare
-        if @context
-          object = @context[:current_object]
-          # Pass this object's class with `as` so that messages are rendered correctly from inherited validators
-          Schema::Validator.validate!(self.class.validators, object, @context, @ruby_style_hash, as: self.class)
-          self
-        else
-          self
-        end
+        self
       end
 
       def unwrap_value(value)
@@ -111,6 +104,14 @@ def to_kwargs
         @ruby_style_hash.dup
       end
 
+      # @api private
+      def validate_for(context)
+        object = context[:current_object]
+        # Pass this object's class with `as` so that messages are rendered correctly from inherited validators
+        Schema::Validator.validate!(self.class.validators, object, context, @ruby_style_hash, as: self.class)
+        nil
+      end
+
       class << self
         def authorized?(obj, value, ctx)
           # Authorize each argument (but this doesn't apply if `prepare` is implemented):

spec/graphql/schema/input_object_spec.rb

@@ -765,7 +765,7 @@ class TestInput2 < GraphQL::Schema::InputObject
     input_object = InputObjectDigTest::TestInput2.new(
       nil,
       ruby_kwargs: arg_values,
-      context: nil,
+      context: GraphQL::Query::NullContext.instance,
       defaults_used: Set.new
     )
     it "returns the value at that key" do
@@ -808,7 +808,7 @@ class TestInput2 < GraphQL::Schema::InputObject
     input_object = InputObjectPatternTest::TestInput2.new(
       nil,
       ruby_kwargs: arg_values,
-      context: nil,
+      context: GraphQL::Query::NullContext.instance,
       defaults_used: Set.new
     )
     it "matches the value at that key" do

spec/graphql/schema/validator/validator_helpers.rb

@@ -26,6 +26,10 @@ def build_schema(arg_type, validates_config)
       argument :b, arg_type, required: false
       argument :c, arg_type, required: false
       validates(validates_config)
+
+      def prepare
+        self
+      end
     end
 
     validated_resolver = Class.new(GraphQL::Schema::Resolver) do