Fix context passed to GraphQL::Schema.federation_sdl

Author: jturkel

Appraisals

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 appraise 'graphql-1.9' do
-  gem 'graphql', '1.9.8'
+  gem 'graphql', '1.9.21'
 end
 
 appraise 'graphql-1.10' do
-  gem 'graphql', '1.10.10'
+  gem 'graphql', '1.10.14'
 end

gemfiles/graphql_1.10.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "graphql", "1.10.10"
+gem "graphql", "1.10.14"
 
 gemspec path: "../"

gemfiles/graphql_1.10.gemfile.lock

@@ -42,7 +42,7 @@ GEM
     diff-lcs (1.3)
     erubi (1.9.0)
     google-protobuf (3.12.2)
-    graphql (1.10.10)
+    graphql (1.10.14)
     i18n (1.8.3)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
@@ -112,7 +112,7 @@ DEPENDENCIES
   apollo-federation!
   appraisal
   debase
-  graphql (= 1.10.10)
+  graphql (= 1.10.14)
   pry-byebug
   rack
   rake

gemfiles/graphql_1.9.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "graphql", "1.9.8"
+gem "graphql", "1.9.21"
 
 gemspec path: "../"

gemfiles/graphql_1.9.gemfile.lock

@@ -42,7 +42,7 @@ GEM
     diff-lcs (1.3)
     erubi (1.9.0)
     google-protobuf (3.12.2)
-    graphql (1.9.8)
+    graphql (1.9.21)
     i18n (1.8.3)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
@@ -112,7 +112,7 @@ DEPENDENCIES
   apollo-federation!
   appraisal
   debase
-  graphql (= 1.9.8)
+  graphql (= 1.9.21)
   pry-byebug
   rack
   rake

lib/apollo-federation/service_field.rb

@@ -19,7 +19,7 @@ def define_service_field
 
     def _service
       schema_class = context.schema.is_a?(GraphQL::Schema) ? context.schema.class : context.schema
-      { sdl: schema_class.federation_sdl(context: context) }
+      { sdl: schema_class.federation_sdl(context: context.to_h) }
     end
   end
 end

spec/apollo-federation/service_field_spec.rb

@@ -382,6 +382,32 @@ def execute_sdl(schema)
       )
     end
 
+    it 'returns SDL that honors visibility checks' do
+      product = Class.new(base_object) do
+        graphql_name 'Product'
+        extend_type
+        key fields: 'upc'
+        field :upc, String, null: false, external: true
+        field :secret, String, null: false, external: true do
+          def self.visible?(context)
+            super && context.fetch(:show_secrets, false)
+          end
+        end
+      end
+
+      schema = Class.new(base_schema) do
+        orphan_types product
+      end
+
+      expect(execute_sdl(schema)).to match_sdl(
+        <<~GRAPHQL,
+          type Product @extends @key(fields: "upc") {
+            upc: String! @external
+          }
+        GRAPHQL
+      )
+    end
+
     context 'with a filter' do
       let(:schema) do
         product = Class.new(base_object) do