Merge pull request #87 from graphql-devise/explicit-require-schema-file

Add query and mutation type only once after app routes

Author: mcelicalderon

config/routes.rb

@@ -0,0 +1,11 @@
+GraphqlDevise::Engine.routes.draw do
+  if GraphqlDevise::Types::QueryType.fields.blank?
+    GraphqlDevise::Types::QueryType.field(:dummy, resolver: GraphqlDevise::Resolvers::Dummy)
+  end
+
+  if GraphqlDevise::Types::MutationType.fields.present?
+    GraphqlDevise::Schema.mutation(GraphqlDevise::Types::MutationType)
+  end
+
+  GraphqlDevise::Schema.query(GraphqlDevise::Types::QueryType)
+end

lib/graphql_devise.rb

@@ -9,6 +9,7 @@ class InvalidMountOptionsError < GraphqlDevise::Error; end
 end
 
 require 'graphql_devise/concerns/controller_methods'
+require 'graphql_devise/schema'
 require 'graphql_devise/types/authenticatable_type'
 require 'graphql_devise/types/credential_type'
 require 'graphql_devise/types/mutation_type'

lib/graphql_devise/rails/routes.rb

@@ -50,11 +50,6 @@ def mount_graphql_devise_for(resource, options = {})
         GraphqlDevise::Types::MutationType.field(action, mutation: mutation)
       end
 
-      if prepared_mutations.present? &&
-         (Gem::Version.new(GraphQL::VERSION) < Gem::Version.new('1.10.0') || GraphqlDevise::Schema.mutation.nil?)
-        GraphqlDevise::Schema.mutation(GraphqlDevise::Types::MutationType)
-      end
-
       prepared_queries = GraphqlDevise::MountMethod::OperationPreparer.new(
         resource:              resource,
         custom:                clean_options.operations,
@@ -69,10 +64,6 @@ def mount_graphql_devise_for(resource, options = {})
         GraphqlDevise::Types::QueryType.field(action, resolver: resolver)
       end
 
-      if prepared_queries.blank? && GraphqlDevise::Types::QueryType.fields.blank?
-        GraphqlDevise::Types::QueryType.field(:dummy, resolver: GraphqlDevise::Resolvers::Dummy)
-      end
-
       Devise.mailer.helper(GraphqlDevise::MailerHelper)
 
       devise_scope resource.underscore.tr('/', '_').to_sym do

app/graphql/graphql_devise/schema.rb lib/graphql_devise/schema.rbapp/graphql/graphql_devise/schema.rb renamed to lib/graphql_devise/schema.rb

@@ -1,5 +1,4 @@
 module GraphqlDevise
   class Schema < GraphQL::Schema
-    query(GraphqlDevise::Types::QueryType)
   end
 end