graphql_devise 0.18.2 → 1.0.0

data/lib/graphql_devise/concerns/set_user_by_token.rb

@@ -6,7 +6,7 @@ module GraphqlDevise
 
     included do
       include DeviseTokenAuth::Concerns::SetUserByToken
-      include GraphqlDevise::Concerns::AdditionalControllerMethods
+      include AdditionalControllerMethods
     end
   end
 end

data/lib/graphql_devise/default_operations.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module GraphqlDevise
+  module DefaultOperations
+    QUERIES = {}.freeze
+    MUTATIONS = {
+      login:                           { klass: Mutations::Login, authenticatable: true },
+      logout:                          { klass: Mutations::Logout, authenticatable: true },
+      register:                        { klass: Mutations::Register, authenticatable: true },
+      update_password_with_token:      { klass: Mutations::UpdatePasswordWithToken, authenticatable: true },
+      send_password_reset_with_token:  { klass: Mutations::SendPasswordResetWithToken, authenticatable: false },
+      resend_confirmation_with_token:  { klass: Mutations::ResendConfirmationWithToken, authenticatable: false },
+      confirm_registration_with_token: { klass: Mutations::ConfirmRegistrationWithToken, authenticatable: true }
+    }.freeze
+  end
+end

data/lib/graphql_devise/engine.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'graphql_devise/rails/routes'
-
 module GraphqlDevise
   class Engine < ::Rails::Engine
     isolate_namespace GraphqlDevise

data/lib/graphql_devise/model/with_email_updater.rb

@@ -9,15 +9,13 @@ module GraphqlDevise
       end
 
       def call
-        check_deprecated_attributes
-
-        resource_attributes = @attributes.except(:schema_url, :confirmation_success_url, :confirmation_url)
+        resource_attributes = @attributes.except(:confirmation_url)
         return @resource.update(resource_attributes) unless requires_reconfirmation?(resource_attributes)
 
         @resource.assign_attributes(resource_attributes)
 
         if @resource.email == email_in_database
-          return @resource.save
+          @resource.save
         elsif required_reconfirm_attributes?
           return false unless @resource.valid?
 
@@ -28,7 +26,7 @@ module GraphqlDevise
           saved
         else
           raise(
-            GraphqlDevise::Error,
+            ::GraphqlDevise::Error,
             'Method `update_with_email` requires attribute `confirmation_url` for email reconfirmation to work'
           )
         end
@@ -36,24 +34,8 @@ module GraphqlDevise
 
       private
 
-      def check_deprecated_attributes
-        if [@attributes[:schema_url], @attributes[:confirmation_success_url]].any?(&:present?)
-          ActiveSupport::Deprecation.warn(<<-DEPRECATION.strip_heredoc, caller)
-            Providing `schema_url` and `confirmation_success_url` to `update_with_email` is deprecated and will be
-            removed in a future version of this gem.
-
-            Now you must only provide `confirmation_url` and the email will contain the new format of the confirmation
-            url that needs to be used with the new `confirmRegistrationWithToken` on the client application.
-          DEPRECATION
-        end
-      end
-
       def required_reconfirm_attributes?
-        if @attributes[:schema_url].present?
-          [@attributes[:confirmation_success_url], DeviseTokenAuth.default_confirm_success_url].any?(&:present?)
-        else
-          [@attributes[:confirmation_url], DeviseTokenAuth.default_confirm_success_url].any?(&:present?)
-        end
+        [@attributes[:confirmation_url], DeviseTokenAuth.default_confirm_success_url].any?(&:present?)
       end
 
       def requires_reconfirmation?(resource_attributes)
@@ -78,14 +60,7 @@ module GraphqlDevise
       end
 
       def confirmation_method_params
-        if @attributes[:schema_url].present?
-          {
-            redirect_url: @attributes[:confirmation_success_url] || DeviseTokenAuth.default_confirm_success_url,
-            schema_url:   @attributes[:schema_url]
-          }
-        else
-          { redirect_url: @attributes[:confirmation_url] || DeviseTokenAuth.default_confirm_success_url }
-        end
+        { redirect_url: @attributes[:confirmation_url] || DeviseTokenAuth.default_confirm_success_url }
       end
 
       def send_confirmation_instructions(saved)

data/lib/graphql_devise/mount_method/operation_preparer.rb

@@ -1,12 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'operation_preparers/gql_name_setter'
-require_relative 'operation_preparers/mutation_field_setter'
-require_relative 'operation_preparers/resolver_type_setter'
-require_relative 'operation_preparers/resource_klass_setter'
-require_relative 'operation_preparers/default_operation_preparer'
-require_relative 'operation_preparers/custom_operation_preparer'
-
 module GraphqlDevise
   module MountMethod
     class OperationPreparer

data/lib/graphql_devise/mount_method/operation_preparers/custom_operation_preparer.rb

@@ -11,7 +11,7 @@ module GraphqlDevise
         end
 
         def call
-          mapping_name = GraphqlDevise.to_mapping_name(@model)
+          mapping_name = ::GraphqlDevise.to_mapping_name(@model)
 
           @custom_operations.slice(*@selected_keys).each_with_object({}) do |(action, operation), result|
             mapped_action = "#{mapping_name}_#{action}"

data/lib/graphql_devise/mount_method/operation_preparers/default_operation_preparer.rb

@@ -12,7 +12,7 @@ module GraphqlDevise
         end
 
         def call
-          mapping_name = GraphqlDevise.to_mapping_name(@model)
+          mapping_name = ::GraphqlDevise.to_mapping_name(@model)
 
           @selected_operations.except(*@custom_keys).each_with_object({}) do |(action, operation_info), result|
             mapped_action = "#{mapping_name}_#{action}"

data/lib/graphql_devise/mount_method/operation_sanitizer.rb

@@ -25,18 +25,6 @@ module GraphqlDevise
         else
           @default
         end
-
-        operations.each do |operation, values|
-          next if values[:deprecation_reason].blank?
-
-          ActiveSupport::Deprecation.warn(<<-DEPRECATION.strip_heredoc, caller)
-              `#{operation}` is deprecated and will be removed in a future version of this gem.
-              #{values[:deprecation_reason]}
-
-              You can supress this message by skipping `#{operation}` on your ResourceLoader or the
-              mount_graphql_devise_for method on your routes file.
-          DEPRECATION
-        end
       end
     end
   end

data/lib/graphql_devise/mount_method/option_sanitizer.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'supported_options'
-
 module GraphqlDevise
   module MountMethod
     class OptionSanitizer

data/lib/graphql_devise/mount_method/option_sanitizers/array_checker.rb

@@ -13,11 +13,11 @@ module GraphqlDevise
           return @default_value if value.blank?
 
           unless value.instance_of?(Array)
-            raise GraphqlDevise::InvalidMountOptionsError, "`#{key}` option has an invalid value. Array expected."
+            raise InvalidMountOptionsError, "`#{key}` option has an invalid value. Array expected."
           end
 
           unless value.all? { |element| element.instance_of?(@element_type) }
-            raise GraphqlDevise::InvalidMountOptionsError, "`#{key}` option has invalid elements. #{@element_type} expected."
+            raise InvalidMountOptionsError, "`#{key}` option has invalid elements. #{@element_type} expected."
           end
 
           value

data/lib/graphql_devise/mount_method/option_sanitizers/class_checker.rb

@@ -12,11 +12,11 @@ module GraphqlDevise
           return if value.nil?
 
           unless value.instance_of?(Class)
-            raise GraphqlDevise::InvalidMountOptionsError, "`#{key}` option has an invalid value. Class expected."
+            raise InvalidMountOptionsError, "`#{key}` option has an invalid value. Class expected."
           end
 
           unless @klass_array.any? { |klass| value.ancestors.include?(klass) }
-            raise GraphqlDevise::InvalidMountOptionsError,
+            raise InvalidMountOptionsError,
                   "`#{key}` option has an invalid value. #{@klass_array.join(', ')} or descendants expected. Got #{value}."
           end
 

data/lib/graphql_devise/mount_method/option_sanitizers/hash_checker.rb

@@ -13,7 +13,7 @@ module GraphqlDevise
           return @default_value if value.blank?
 
           unless value.instance_of?(Hash)
-            raise GraphqlDevise::InvalidMountOptionsError, "`#{key}` option has an invalid value. Hash expected. Got #{value.class}."
+            raise InvalidMountOptionsError, "`#{key}` option has an invalid value. Hash expected. Got #{value.class}."
           end
 
           value.each { |internal_key, klass| ClassChecker.new(@element_type_array).call!(klass, "#{key} -> #{internal_key}") }

data/lib/graphql_devise/mount_method/option_sanitizers/string_checker.rb

@@ -12,7 +12,7 @@ module GraphqlDevise
           return @default_string if value.blank?
 
           unless value.instance_of?(String)
-            raise GraphqlDevise::InvalidMountOptionsError, "`#{key}` option has an invalid value. String expected."
+            raise InvalidMountOptionsError, "`#{key}` option has an invalid value. String expected."
           end
 
           value

data/lib/graphql_devise/mount_method/option_validators/provided_operations_validator.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'supported_operations_validator'
-
 module GraphqlDevise
   module MountMethod
     module OptionValidators

data/lib/graphql_devise/mount_method/option_validators/skip_only_validator.rb

@@ -11,7 +11,7 @@ module GraphqlDevise
         def validate!
           if [@options.skip, @options.only].all?(&:present?)
             raise(
-              GraphqlDevise::InvalidMountOptionsError,
+              InvalidMountOptionsError,
               "Can't specify both `skip` and `only` options when mounting the route."
             )
           end

data/lib/graphql_devise/mount_method/option_validators/supported_operations_validator.rb

@@ -15,7 +15,7 @@ module GraphqlDevise
 
           if unsupported_operations.present?
             raise(
-              GraphqlDevise::InvalidMountOptionsError,
+              InvalidMountOptionsError,
               "#{@key} option contains unsupported operations: \"#{unsupported_operations.join(', ')}\". Check for typos."
             )
           end

data/lib/graphql_devise/mount_method/options_validator.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'option_validators/skip_only_validator'
-require_relative 'option_validators/provided_operations_validator'
-
 module GraphqlDevise
   module MountMethod
     class OptionsValidator

data/lib/graphql_devise/mount_method/supported_options.rb

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'option_sanitizers/array_checker'
-require_relative 'option_sanitizers/hash_checker'
-require_relative 'option_sanitizers/string_checker'
-require_relative 'option_sanitizers/class_checker'
-
 module GraphqlDevise
   module MountMethod
     SUPPORTED_OPTIONS = {

data/lib/graphql_devise/mutations/base.rb

@@ -5,7 +5,7 @@ require 'devise_token_auth/version'
 module GraphqlDevise
   module Mutations
     class Base < GraphQL::Schema::Mutation
-      include Concerns::ControllerMethods
+      include ControllerMethods
     end
   end
 end

data/lib/graphql_devise/mutations/confirm_registration_with_token.rb

@@ -6,7 +6,7 @@ module GraphqlDevise
       argument :confirmation_token, String, required: true
 
       field :credentials,
-            GraphqlDevise::Types::CredentialType,
+            Types::CredentialType,
             null:        true,
             description: 'Authentication credentials. Null unless user is signed in after confirmation.'
 

data/lib/graphql_devise/mutations/login.rb

@@ -6,7 +6,7 @@ module GraphqlDevise
       argument :email,    String, required: true
       argument :password, String, required: true
 
-      field :credentials, GraphqlDevise::Types::CredentialType, null: false
+      field :credentials, Types::CredentialType, null: false
 
       def resolve(email:, password:)
         resource = find_resource(

data/lib/graphql_devise/mutations/register.rb

@@ -9,7 +9,7 @@ module GraphqlDevise
       argument :confirm_url,           String, required: false
 
       field :credentials,
-            GraphqlDevise::Types::CredentialType,
+            Types::CredentialType,
             null:        true,
             description: 'Authentication credentials. Null if after signUp resource is not active for authentication (e.g. Email confirmation required).'
 

data/lib/graphql_devise/mutations/update_password_with_token.rb

@@ -8,7 +8,7 @@ module GraphqlDevise
       argument :reset_password_token,  String, required: true
 
       field :credentials,
-            GraphqlDevise::Types::CredentialType,
+            Types::CredentialType,
             null:        true,
             description: 'Authentication credentials. Resource must be signed_in for credentials to be returned.'
 

data/lib/graphql_devise/resolvers/base.rb

@@ -5,7 +5,7 @@ require 'devise_token_auth/version'
 module GraphqlDevise
   module Resolvers
     class Base < GraphQL::Schema::Resolver
-      include Concerns::ControllerMethods
+      include ControllerMethods
     end
   end
 end

data/lib/graphql_devise/resource_loader.rb

@@ -6,95 +6,127 @@ module GraphqlDevise
       @resource           = resource
       @options            = options
       @routing            = routing
-      @default_operations = GraphqlDevise::DefaultOperations::MUTATIONS.merge(GraphqlDevise::DefaultOperations::QUERIES)
+      @default_operations = DefaultOperations::MUTATIONS.merge(DefaultOperations::QUERIES)
     end
 
     def call(query, mutation)
       # clean_options responds to all keys defined in GraphqlDevise::MountMethod::SUPPORTED_OPTIONS
-      clean_options = GraphqlDevise::MountMethod::OptionSanitizer.new(@options).call!
+      clean_options = MountMethod::OptionSanitizer.new(@options).call!
 
-      model = if @resource.is_a?(String)
-        ActiveSupport::Deprecation.warn(<<-DEPRECATION.strip_heredoc, caller)
-          Providing a String as the model you want to mount is deprecated and will be removed in a future version of
-          this gem. Please use the actual model constant instead.
-
-          EXAMPLE
-
-          GraphqlDevise::ResourceLoader.new(User) # instead of GraphqlDevise::ResourceLoader.new('User')
-
-          mount_graphql_devise_for User # instead of mount_graphql_devise_for 'User'
-        DEPRECATION
-        @resource.constantize
-      else
-        @resource
+      unless @resource.is_a?(Class)
+        raise(
+          InvalidMountOptionsError,
+          'A class must be provided when mounting a model. String values are no longer supported.'
+        )
       end
 
       # Necesary when mounting a resource via route file as Devise forces the reloading of routes
-      return clean_options if GraphqlDevise.resource_mounted?(model) && @routing
+      return clean_options if ::GraphqlDevise.resource_mounted?(@resource) && @routing
 
       validate_options!(clean_options)
 
       authenticatable_type = clean_options.authenticatable_type.presence ||
                              "Types::#{@resource}Type".safe_constantize ||
-                             GraphqlDevise::Types::AuthenticatableType
+                             Types::AuthenticatableType
 
-      prepared_mutations = prepare_mutations(model, clean_options, authenticatable_type)
+      prepared_mutations = prepare_mutations(@resource, clean_options, authenticatable_type)
 
       if prepared_mutations.any? && mutation.blank?
-        raise GraphqlDevise::Error, 'You need to provide a mutation type unless all mutations are skipped'
+        raise ::GraphqlDevise::Error, 'You need to provide a mutation type unless all mutations are skipped'
       end
 
-      prepared_mutations.each do |action, prepared_mutation|
-        mutation.field(action, mutation: prepared_mutation, authenticate: false)
+      begin
+        prepared_mutations.each do |action, prepared_mutation|
+          mutation.field(action, mutation: prepared_mutation, authenticate: false)
+        end
+      rescue ArgumentError
+        raise unless Gem::Version.new(GraphQL::VERSION) >= Gem::Version.new('2.0')
+
+        raise_undefined_field_class_error('MutationType')
       end
 
-      prepared_resolvers = prepare_resolvers(model, clean_options, authenticatable_type)
+      prepared_resolvers = prepare_resolvers(@resource, clean_options, authenticatable_type)
 
       if prepared_resolvers.any? && query.blank?
-        raise GraphqlDevise::Error, 'You need to provide a query type unless all queries are skipped'
+        raise ::GraphqlDevise::Error, 'You need to provide a query type unless all queries are skipped'
       end
 
-      prepared_resolvers.each do |action, resolver|
-        query.field(action, resolver: resolver, authenticate: false)
+      begin
+        prepared_resolvers.each do |action, resolver|
+          query.field(action, resolver: resolver, authenticate: false)
+        end
+      rescue ArgumentError
+        raise unless Gem::Version.new(GraphQL::VERSION) >= Gem::Version.new('2.0')
+
+        raise_undefined_field_class_error('QueryType')
       end
 
-      GraphqlDevise.add_mapping(GraphqlDevise.to_mapping_name(@resource).to_sym, @resource)
-      GraphqlDevise.mount_resource(model) if @routing
+      ::GraphqlDevise.add_mapping(::GraphqlDevise.to_mapping_name(@resource).to_sym, @resource)
+      ::GraphqlDevise.mount_resource(@resource) if @routing
 
       clean_options
     end
 
     private
 
+    def raise_undefined_field_class_error(type_class)
+      raise(
+        GraphqlDevise::Error,
+        <<~MESSAGE
+          To use this gem with graphql >= 2.0 you need to use a custom `field_class`
+          on your #{type_class}. You can use the `field_class` defined in this gem like this:
+
+          module Types
+            class #{type_class} < GraphQL::Schema::Object
+              field_class GraphqlDevise::Types::BaseField
+            end
+          end
+
+          If you already have a `field_class` set on your #{type_class}, you can include our concern
+          to make this work
+
+          module Types
+            class BaseField < GraphQL::Schema::Field
+              include GraphqlDevise::FieldAuthentication
+            end
+          end
+
+          The concern will define an initializer, if your custom field logic is not standard, you can look
+          at the `GraphqlDevise::FieldAuthentication` implementation to add what is required to your own
+          field class
+        MESSAGE
+      )
+    end
+
     def prepare_resolvers(model, clean_options, authenticatable_type)
-      GraphqlDevise::MountMethod::OperationPreparer.new(
+      MountMethod::OperationPreparer.new(
         model:                 model,
         custom:                clean_options.operations,
         additional_operations: clean_options.additional_queries,
-        preparer:              GraphqlDevise::MountMethod::OperationPreparers::ResolverTypeSetter.new(authenticatable_type),
-        selected_operations:   GraphqlDevise::MountMethod::OperationSanitizer.call(
-          default: GraphqlDevise::DefaultOperations::QUERIES, only: clean_options.only, skipped: clean_options.skip
+        preparer:              MountMethod::OperationPreparers::ResolverTypeSetter.new(authenticatable_type),
+        selected_operations:   MountMethod::OperationSanitizer.call(
+          default: DefaultOperations::QUERIES, only: clean_options.only, skipped: clean_options.skip
         )
       ).call
     end
 
     def prepare_mutations(model, clean_options, authenticatable_type)
-      GraphqlDevise::MountMethod::OperationPreparer.new(
+      MountMethod::OperationPreparer.new(
         model:                 model,
         custom:                clean_options.operations,
         additional_operations: clean_options.additional_mutations,
-        preparer:              GraphqlDevise::MountMethod::OperationPreparers::MutationFieldSetter.new(authenticatable_type),
-        selected_operations:   GraphqlDevise::MountMethod::OperationSanitizer.call(
-          default: GraphqlDevise::DefaultOperations::MUTATIONS, only: clean_options.only, skipped: clean_options.skip
+        preparer:              MountMethod::OperationPreparers::MutationFieldSetter.new(authenticatable_type),
+        selected_operations:   MountMethod::OperationSanitizer.call(
+          default: DefaultOperations::MUTATIONS, only: clean_options.only, skipped: clean_options.skip
         )
       ).call
     end
 
     def validate_options!(clean_options)
-      GraphqlDevise::MountMethod::OptionsValidator.new(
+      MountMethod::OptionsValidator.new(
         [
-          GraphqlDevise::MountMethod::OptionValidators::SkipOnlyValidator.new(options: clean_options),
-          GraphqlDevise::MountMethod::OptionValidators::ProvidedOperationsValidator.new(
+          MountMethod::OptionValidators::SkipOnlyValidator.new(options: clean_options),
+          MountMethod::OptionValidators::ProvidedOperationsValidator.new(
             options: clean_options, supported_operations: @default_operations
           )
         ]

data/lib/graphql_devise/route_mounter.rb

@@ -0,0 +1,13 @@
+module GraphqlDevise
+  module RouteMounter
+    def mount_graphql_devise_for(resource, options = {})
+      clean_options = ResourceLoader.new(resource, options, true).call(
+        Types::QueryType,
+        Types::MutationType
+      )
+
+      post clean_options.at, to: 'graphql_devise/graphql#auth'
+      get  clean_options.at, to: 'graphql_devise/graphql#auth'
+    end
+  end
+end

data/lib/graphql_devise/schema_plugin.rb

@@ -4,7 +4,7 @@ module GraphqlDevise
   class SchemaPlugin
     # NOTE: Based on GQL-Ruby docs  https://graphql-ruby.org/schema/introspection.html
     INTROSPECTION_FIELDS = ['__schema', '__type', '__typename']
-    DEFAULT_NOT_AUTHENTICATED = ->(field) { raise GraphqlDevise::AuthenticationError, "#{field} field requires authentication" }
+    DEFAULT_NOT_AUTHENTICATED = ->(field) { raise AuthenticationError, "#{field} field requires authentication" }
 
     def initialize(query: nil, mutation: nil, authenticate_default: true, public_introspection: !Rails.env.production?, resource_loaders: [], unauthenticated_proc: DEFAULT_NOT_AUTHENTICATED)
       @query                = query
@@ -30,22 +30,7 @@ module GraphqlDevise
       auth_required = authenticate_option(field, trace_data)
       context       = context_from_data(trace_data)
 
-      if context.key?(:resource_name)
-        ActiveSupport::Deprecation.warn(<<-DEPRECATION.strip_heredoc, caller)
-          Providing `resource_name` as part of the GQL context, or doing so by using the `graphql_context(resource_name)`
-          method on your controller is deprecated and will be removed in a future version of this gem.
-          Please use `gql_devise_context` in you controller instead.
-
-          EXAMPLE
-          include GraphqlDevise::SetUserByToken
-
-          DummySchema.execute(params[:query], context: gql_devise_context(User))
-          DummySchema.execute(params[:query], context: gql_devise_context(User, Admin))
-        DEPRECATION
-      end
-
       if auth_required && !(public_introspection && introspection_field?(field))
-        context = set_current_resource(context)
         raise_on_missing_resource(context, field, auth_required)
       end
 
@@ -56,25 +41,6 @@ module GraphqlDevise
 
     attr_reader :public_introspection
 
-    def set_current_resource(context)
-      controller     = context[:controller]
-      resource_names = Array(context[:resource_name])
-
-      context[:current_resource] ||= resource_names.find do |resource_name|
-        unless Devise.mappings.key?(resource_name)
-          raise(
-            GraphqlDevise::Error,
-            "Invalid resource_name `#{resource_name}` provided to `graphql_context`. Possible values are: #{Devise.mappings.keys}."
-          )
-        end
-
-        found = controller.set_resource_by_token(resource_name)
-        break found if found
-      end
-
-      context
-    end
-
     def raise_on_missing_resource(context, field, auth_required)
       @unauthenticated_proc.call(field.name) if context[:current_resource].blank?
 
@@ -113,7 +79,11 @@ module GraphqlDevise
       auth_required = if trace_data[:context]
         field.metadata[:authenticate]
       else
-        if Gem::Version.new(GraphQL::VERSION) >= Gem::Version.new('1.13.1')
+        if Gem::Version.new(GraphQL::VERSION) >= Gem::Version.new('2.0')
+          # authenticate will only be defined if "field_class GraphqlDevise::Types::BaseField" is added to the type
+          # returning nil here will use the default value used when mounting the plugin
+          field.try(:authenticate)
+        elsif Gem::Version.new(GraphQL::VERSION) >= Gem::Version.new('1.13.1')
           field.graphql_definition(silence_deprecation_warning: true).metadata[:authenticate]
         else
           field.graphql_definition.metadata[:authenticate]
@@ -125,7 +95,7 @@ module GraphqlDevise
 
     def load_fields
       @resource_loaders.each do |resource_loader|
-        raise Error, 'Invalid resource loader instance' unless resource_loader.instance_of?(GraphqlDevise::ResourceLoader)
+        raise ::GraphqlDevise::Error, 'Invalid resource loader instance' unless resource_loader.instance_of?(ResourceLoader)
 
         resource_loader.call(@query, @mutation)
       end
@@ -136,6 +106,3 @@ module GraphqlDevise
     end
   end
 end
-
-GraphQL::Field.accepts_definitions(authenticate: GraphQL::Define.assign_metadata_key(:authenticate))
-GraphQL::Schema::Field.accepts_definition(:authenticate)

data/lib/graphql_devise/types/authenticatable_type.rb

@@ -2,7 +2,7 @@
 
 module GraphqlDevise
   module Types
-    class AuthenticatableType < GraphQL::Schema::Object
+    class AuthenticatableType < BaseType
       field :email, String, null: false
     end
   end

data/lib/graphql_devise/types/base_field.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module GraphqlDevise
+  module Types
+    class BaseField < GraphQL::Schema::Field
+      include FieldAuthentication
+    end
+  end
+end

data/lib/graphql_devise/types/base_type.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module GraphqlDevise
+  module Types
+    class BaseType < GraphQL::Schema::Object
+    end
+  end
+end

data/lib/graphql_devise/types/credential_type.rb

@@ -2,7 +2,7 @@
 
 module GraphqlDevise
   module Types
-    class CredentialType < GraphQL::Schema::Object
+    class CredentialType < BaseType
       field :access_token, String, null: false
       field :uid,          String, null: false
       field :token_type,   String, null: false

data/lib/graphql_devise/types/mutation_type.rb

@@ -3,6 +3,7 @@
 module GraphqlDevise
   module Types
     class MutationType < GraphQL::Schema::Object
+      field_class GraphqlDevise::Types::BaseField if Gem::Version.new(GraphQL::VERSION) >= Gem::Version.new('2.0')
     end
   end
 end