graphql_devise 0.18.1 → 1.0.1

data/lib/graphql_devise/concerns/controller_methods.rb

@@ -1,122 +1,110 @@
 # frozen_string_literal: true
 
 module GraphqlDevise
-  module Concerns
-    module ControllerMethods
-      extend ActiveSupport::Concern
+  module ControllerMethods
+    extend ActiveSupport::Concern
 
-      private
+    private
 
-      def check_redirect_url_whitelist!(redirect_url)
-        if blacklisted_redirect_url?(redirect_url)
-          raise_user_error(I18n.t('graphql_devise.redirect_url_not_allowed', redirect_url: redirect_url))
-        end
-      end
-
-      def raise_user_error(message)
-        raise GraphqlDevise::UserError, message
+    def check_redirect_url_whitelist!(redirect_url)
+      if blacklisted_redirect_url?(redirect_url)
+        raise_user_error(I18n.t('graphql_devise.redirect_url_not_allowed', redirect_url: redirect_url))
       end
+    end
 
-      def raise_user_error_list(message, errors:)
-        raise GraphqlDevise::DetailedUserError.new(message, errors: errors)
-      end
+    def raise_user_error(message)
+      raise UserError, message
+    end
 
-      def remove_resource
-        controller.resource = nil
-        controller.client_id = nil
-        controller.token = nil
-      end
+    def raise_user_error_list(message, errors:)
+      raise DetailedUserError.new(message, errors: errors)
+    end
 
-      def request
-        controller.request
-      end
+    def remove_resource
+      controller.resource = nil
+      controller.client_id = nil
+      controller.token = nil
+    end
 
-      def response
-        controller.response
-      end
+    def response
+      controller.response
+    end
 
-      def controller
-        context[:controller]
-      end
+    def controller
+      context[:controller]
+    end
 
-      def resource_name
-        GraphqlDevise.to_mapping_name(resource_class)
-      end
+    def resource_name
+      ::GraphqlDevise.to_mapping_name(resource_class)
+    end
 
-      def resource_class
-        self.class.instance_variable_get(:@resource_klass)
-      end
+    def resource_class
+      self.class.instance_variable_get(:@resource_klass)
+    end
 
-      def recoverable_enabled?
-        resource_class.devise_modules.include?(:recoverable)
-      end
+    def recoverable_enabled?
+      resource_class.devise_modules.include?(:recoverable)
+    end
 
-      def confirmable_enabled?
-        resource_class.devise_modules.include?(:confirmable)
-      end
+    def confirmable_enabled?
+      resource_class.devise_modules.include?(:confirmable)
+    end
 
-      def blacklisted_redirect_url?(redirect_url)
-        DeviseTokenAuth.redirect_whitelist && !DeviseTokenAuth::Url.whitelisted?(redirect_url)
-      end
+    def blacklisted_redirect_url?(redirect_url)
+      DeviseTokenAuth.redirect_whitelist && !DeviseTokenAuth::Url.whitelisted?(redirect_url)
+    end
 
-      def current_resource
-        @current_resource ||= controller.send(:set_resource_by_token, resource_class)
-      end
+    def current_resource
+      @current_resource ||= controller.send(:set_resource_by_token, resource_class)
+    end
 
-      def client
-        if Gem::Version.new(DeviseTokenAuth::VERSION) <= Gem::Version.new('1.1.0')
-          controller.client_id
-        else
-          controller.token.client if controller.token.present?
-        end
+    def client
+      if Gem::Version.new(DeviseTokenAuth::VERSION) <= Gem::Version.new('1.1.0')
+        controller.client_id
+      else
+        controller.token.client if controller.token.present?
       end
+    end
 
-      def set_auth_headers(resource)
-        auth_headers = resource.create_new_auth_token
-        response.headers.merge!(auth_headers)
-
-        auth_headers
-      end
+    def generate_auth_headers(resource)
+      auth_headers = resource.create_new_auth_token
+      controller.resource = resource
+      access_token_name = DeviseTokenAuth.headers_names[:'access-token']
+      client_name = DeviseTokenAuth.headers_names[:'client']
 
-      def client_and_token(token)
-        if Gem::Version.new(DeviseTokenAuth::VERSION) <= Gem::Version.new('1.1.0')
-          { client_id: token.first, token: token.last }
-        else
-          { client_id: token.client, token: token.token }
-        end
+      # NOTE: Depending on the DTA version, the token will be an object or nil
+      if controller.token
+        controller.token.client = auth_headers[client_name]
+        controller.token.token = auth_headers[access_token_name]
+      else
+        controller.client_id = auth_headers[client_name]
+        controller.token = auth_headers[access_token_name]
       end
 
-      def redirect_headers(token_info, redirect_header_options)
-        controller.send(
-          :build_redirect_headers,
-          token_info.fetch(:token),
-          token_info.fetch(:client_id),
-          redirect_header_options
-        )
-      end
+      auth_headers
+    end
 
-      def find_resource(field, value)
-        if resource_class.connection.adapter_name.downcase.include?('mysql')
-          # fix for mysql default case insensitivity
-          resource_class.where("BINARY #{field} = ? AND provider= ?", value, provider).first
-        elsif Gem::Version.new(DeviseTokenAuth::VERSION) < Gem::Version.new('1.1.0')
-          resource_class.find_by(field => value, :provider => provider)
-        else
-          resource_class.dta_find_by(field => value, :provider => provider)
-        end
+    def find_resource(field, value)
+      if resource_class.connection.adapter_name.downcase.include?('mysql')
+        # fix for mysql default case insensitivity
+        resource_class.where("BINARY #{field} = ? AND provider= ?", value, provider).first
+      elsif Gem::Version.new(DeviseTokenAuth::VERSION) < Gem::Version.new('1.1.0')
+        resource_class.find_by(field => value, :provider => provider)
+      else
+        resource_class.dta_find_by(field => value, :provider => provider)
       end
+    end
 
-      def get_case_insensitive_field(field, value)
-        if resource_class.case_insensitive_keys.include?(field)
-          value.downcase
-        else
-          value
-        end
+    def get_case_insensitive_field(field, value)
+      if resource_class.case_insensitive_keys.include?(field)
+        value.downcase
+      else
+        value
       end
+    end
 
-      def provider
-        :email
-      end
+    def provider
+      :email
     end
   end
 end

data/lib/graphql_devise/concerns/field_authentication.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module GraphqlDevise
+  module FieldAuthentication
+    extend ActiveSupport::Concern
+
+    def initialize(*args, authenticate: nil, **kwargs, &block)
+      @authenticate = authenticate
+      super(*args, **kwargs, &block)
+    end
+
+    attr_reader :authenticate
+  end
+end

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.'
 
@@ -18,7 +18,7 @@ module GraphqlDevise
 
           response_payload = { authenticatable: resource }
 
-          response_payload[:credentials] = set_auth_headers(resource) if resource.active_for_authentication?
+          response_payload[:credentials] = generate_auth_headers(resource) if resource.active_for_authentication?
 
           response_payload
         else

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(
@@ -19,7 +19,7 @@ module GraphqlDevise
             raise_user_error(I18n.t('graphql_devise.sessions.bad_credentials'))
           end
 
-          new_headers = set_auth_headers(resource)
+          new_headers = generate_auth_headers(resource)
           controller.sign_in(:user, resource, store: false, bypass: false)
 
           yield resource if block_given?

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).'
 
@@ -38,7 +38,7 @@ module GraphqlDevise
 
           response_payload = { authenticatable: resource }
 
-          response_payload[:credentials] = set_auth_headers(resource) if resource.active_for_authentication?
+          response_payload[:credentials] = generate_auth_headers(resource) if resource.active_for_authentication?
 
           response_payload
         else

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.'
 
@@ -23,7 +23,7 @@ module GraphqlDevise
           yield resource if block_given?
 
           response_payload               = { authenticatable: resource }
-          response_payload[:credentials] = set_auth_headers(resource) if controller.signed_in?(resource_name)
+          response_payload[:credentials] = generate_auth_headers(resource) if controller.signed_in?(resource_name)
 
           response_payload
         else

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