Fix inheriting visibility with preload: true

Author: rmosolgo

lib/graphql/schema/visibility.rb

@@ -18,9 +18,6 @@ def self.use(schema, dynamic: false, profiles: EmptyObjects::EMPTY_HASH, preload
           ctx.freeze
         }
         schema.visibility = self.new(schema, dynamic: dynamic, preload: preload, profiles: profiles, migration_errors: migration_errors)
-        if preload
-          schema.visibility.preload
-        end
       end
 
       def initialize(schema, dynamic:, preload:, profiles:, migration_errors:)
@@ -43,6 +40,9 @@ def initialize(schema, dynamic:, preload:, profiles:, migration_errors:)
         @types = nil
         @all_references = nil
         @loaded_all = false
+        if preload
+          self.preload
+        end
       end
 
       def all_directives
@@ -153,12 +153,12 @@ def profile_for(context)
           visibility_profile = context[:visibility_profile]
           if @profiles.include?(visibility_profile)
             profile_ctx = @profiles[visibility_profile]
-            @cached_profiles[visibility_profile] ||= @schema.visibility_profile_class.new(name: visibility_profile, context: profile_ctx, schema: @schema)
+            @cached_profiles[visibility_profile] ||= @schema.visibility_profile_class.new(name: visibility_profile, context: profile_ctx, schema: @schema, visibility: self)
           elsif @dynamic
             if context.is_a?(Query::NullContext)
               top_level_profile
             else
-              @schema.visibility_profile_class.new(context: context, schema: @schema)
+              @schema.visibility_profile_class.new(context: context, schema: @schema, visibility: self)
             end
           elsif !context.key?(:visibility_profile)
             raise ArgumentError, "#{@schema} expects a visibility profile, but `visibility_profile:` wasn't passed. Provide a `visibility_profile:` value or add `dynamic: true` to your visibility configuration."
@@ -168,7 +168,7 @@ def profile_for(context)
         elsif context.is_a?(Query::NullContext)
           top_level_profile
         else
-          @schema.visibility_profile_class.new(context: context, schema: @schema)
+          @schema.visibility_profile_class.new(context: context, schema: @schema, visibility: self)
         end
       end
 
@@ -181,7 +181,7 @@ def top_level_profile(refresh: false)
         if refresh
           @top_level_profile = nil
         end
-        @top_level_profile ||= @schema.visibility_profile_class.new(context: Query::NullContext.instance, schema: @schema)
+        @top_level_profile ||= @schema.visibility_profile_class.new(context: Query::NullContext.instance, schema: @schema, visibility: self)
       end
 
       private

lib/graphql/schema/visibility/migration.rb

@@ -76,10 +76,10 @@ def humanize(val)
           end
         end
 
-        def initialize(context:, schema:, name: nil)
+        def initialize(context:, schema:, name: nil, visibility:)
           @name = name
           @skip_error = context[:skip_visibility_migration_error] || context.is_a?(Query::NullContext) || context.is_a?(Hash)
-          @profile_types = GraphQL::Schema::Visibility::Profile.new(context: context, schema: schema)
+          @profile_types = GraphQL::Schema::Visibility::Profile.new(context: context, schema: schema, visibility: visibility)
           if !@skip_error
             context[:visibility_migration_running] = true
             warden_ctx_vals = context.to_h.dup

lib/graphql/schema/visibility/profile.rb

@@ -31,10 +31,11 @@ def self.null_profile(context:, schema:)
         # @return [Symbol, nil]
         attr_reader :name
 
-        def initialize(name: nil, context:, schema:)
+        def initialize(name: nil, context:, schema:, visibility:)
           @name = name
           @context = context
           @schema = schema
+          @visibility = visibility
           @all_types = {}
           @all_types_loaded = false
           @unvisited_types = []
@@ -122,7 +123,7 @@ def field_on_visible_interface?(field, owner)
         end
 
         def type(type_name)
-          t = @schema.visibility.get_type(type_name) # rubocop:disable Development/ContextIsPassedCop
+          t = @visibility.get_type(type_name) # rubocop:disable Development/ContextIsPassedCop
           if t
             if t.is_a?(Array)
               vis_t = nil
@@ -250,8 +251,8 @@ def directive_exists?(dir_name)
         end
 
         def directives
-          @all_directives ||= @schema.visibility.all_directives.select { |dir|
-            @cached_visible[dir] && @schema.visibility.all_references[dir].any? { |ref| ref == true || (@cached_visible[ref] && referenced?(ref)) }
+          @all_directives ||= @visibility.all_directives.select { |dir|
+            @cached_visible[dir] && @visibility.all_references[dir].any? { |ref| ref == true || (@cached_visible[ref] && referenced?(ref)) }
           }
         end
 
@@ -322,7 +323,7 @@ def load_all_types
         end
 
         def referenced?(type_defn)
-          @schema.visibility.all_references[type_defn].any? do |ref|
+          @visibility.all_references[type_defn].any? do |ref|
             case ref
             when GraphQL::Schema::Argument
               @cached_visible_arguments[ref.owner][ref]
@@ -340,7 +341,7 @@ def possible_types_for(type)
           case type.kind.name
           when "INTERFACE"
             pts = []
-            @schema.visibility.all_interface_type_memberships[type].each do |(itm, impl_type)|
+            @visibility.all_interface_type_memberships[type].each do |(itm, impl_type)|
               if @cached_visible[itm] && @cached_visible[impl_type] && referenced?(impl_type)
                 pts << impl_type
               end

spec/graphql/schema/visibility_spec.rb

@@ -121,6 +121,15 @@ def exec_query(...)
       res = exec_query("{ products { name costOfGoodsSold } }", visibility_profile: :admin)
       assert_equal [{ "name" => "Pool Noodle", "costOfGoodsSold" => 5}], res["data"]["products"]
     end
+
+    it "works with subclasses" do
+      child_schema = Class.new(VisSchema) do
+        query(VisSchema::Query)
+      end
+      res = child_schema.execute("{ products { name } }", visibility_profile: :public)
+      assert_equal ["Pool Noodle"], res["data"]["products"].map { |p| p["name"] }
+      assert_equal :public, res.context.types.name
+    end
   end
 
   describe "preloading profiles" do