Do not deppend on devise mappings for resource_class

Author: mcelicalderon

app/controllers/graphql_devise/application_controller.rb

@@ -1,8 +1,7 @@
 module GraphqlDevise
-  class ApplicationController < DeviseTokenAuth::ApplicationController
-    private
-
-    def verify_authenticity_token
-    end
+  ApplicationController = if Rails::VERSION::MAJOR >= 5
+    Class.new(ActionController::API)
+  else
+    Class.new(ActionController::Base)
   end
 end

app/controllers/graphql_devise/concerns/set_user_by_token.rb

@@ -1,5 +1,17 @@
 module GraphqlDevise
   module Concerns
     SetUserByToken = DeviseTokenAuth::Concerns::SetUserByToken
+
+    SetUserByToken.module_eval do
+      def build_redirect_headers(access_token, client, redirect_header_options = {})
+        {
+          DeviseTokenAuth.headers_names[:"access-token"] => access_token,
+          DeviseTokenAuth.headers_names[:client] => client,
+          :config => params[:config],
+          :client_id => client,
+          :token => access_token
+        }.merge(redirect_header_options)
+      end
+    end
   end
 end

app/controllers/graphql_devise/graphql_controller.rb

@@ -2,6 +2,8 @@
 
 module GraphqlDevise
   class GraphqlController < ApplicationController
+    include GraphqlDevise::Concerns::SetUserByToken
+
     def auth
       result = if params[:_json]
         GraphqlDevise::Schema.multiplex(

app/helpers/graphql_devise/mailer_helper.rb

@@ -1,7 +1,7 @@
 module GraphqlDevise
   module MailerHelper
     def confirmation_query(resource_name:, token:, redirect_url:)
-      name = "#{resource_name.camelize(:lower)}ConfirmAccount"
+      name = "#{resource_name.underscore.tr('/', '_').camelize(:lower)}ConfirmAccount"
       raw = <<-GRAPHQL
         query($token:String!,$redirectUrl:String!){
           #{name}(confirmationToken:$token,redirectUrl:$redirectUrl){
@@ -17,7 +17,7 @@ def confirmation_query(resource_name:, token:, redirect_url:)
     end
 
     def password_reset_query(token:, redirect_url:, resource_name:)
-      name = "#{resource_name.camelize(:lower)}CheckPasswordToken"
+      name = "#{resource_name.underscore.tr('/', '_').camelize(:lower)}CheckPasswordToken"
       raw = <<-GRAPHQL
         query($token:String!,$redirectUrl:String!){
           #{name}(resetPasswordToken:$token,redirectUrl:$redirectUrl){

lib/graphql_devise.rb

@@ -7,8 +7,8 @@ class Error < StandardError; end
 
   class InvalidMountOptionsError < GraphqlDevise::Error; end
 
-  @schema_loaded     = false
-  @mounted_resources = []
+  @schema_loaded = false
+  @mappings      = {}
 
   def self.schema_loaded?
     @schema_loaded
@@ -18,12 +18,16 @@ def self.load_schema
     @schema_loaded = true
   end
 
-  def self.mount_resource(resource)
-    @mounted_resources << resource
+  def self.resource_mounted?(resource)
+    @mappings.key?(resource)
   end
 
-  def self.resource_mounted?(resource)
-    @mounted_resources.include?(resource)
+  def self.add_mapping(name, klass)
+    @mappings[name] = klass
+  end
+
+  def self.mapping_by_name(name)
+    @mappings.fetch(name)
   end
 end
 

lib/graphql_devise/concerns/controller_methods.rb

@@ -36,7 +36,7 @@ def resource_name
       end
 
       def resource_class
-        controller.send(:resource_class, resource_name)
+        GraphqlDevise.mapping_by_name(resource_name)
       end
 
       def recoverable_enabled?

lib/graphql_devise/mount_method/operation_preparer.rb

@@ -8,10 +8,10 @@
 module GraphqlDevise
   module MountMethod
     class OperationPreparer
-      def initialize(resource:, selected_operations:, preparer:, custom:, additional_operations:)
+      def initialize(mapping_name:, selected_operations:, preparer:, custom:, additional_operations:)
         @selected_operations   = selected_operations
         @preparer              = preparer
-        @mapping_name          = resource.underscore.tr('/', '_')
+        @mapping_name          = mapping_name
         @custom                = custom
         @additional_operations = additional_operations
       end

lib/graphql_devise/mount_method/operation_preparers/resource_name_setter.rb

@@ -7,7 +7,7 @@ def initialize(name)
         end
 
         def call(operation)
-          operation.instance_variable_set(:@resource_name, @name.to_sym)
+          operation.instance_variable_set(:@resource_name, @name)
 
           operation
         end

lib/graphql_devise/mutations/sign_up.rb

@@ -35,7 +35,7 @@ def resolve(confirm_success_url: nil, **attrs)
 
           { authenticatable: resource }
         else
-          clean_up_passwords(resource)
+          resource.clean_up_passwords if resource.respond_to?(:clean_up_passwords)
           raise_user_error_list(
             I18n.t('graphql_devise.registration_failed'),
             errors: resource.errors.full_messages
@@ -48,10 +48,6 @@ def resolve(confirm_success_url: nil, **attrs)
       def build_resource(attrs)
         resource_class.new(attrs)
       end
-
-      def clean_up_passwords(resource)
-        controller.send(:clean_up_passwords, resource)
-      end
     end
   end
 end

lib/graphql_devise/rails/routes.rb

@@ -12,6 +12,7 @@ class Mapper
 
     def mount_graphql_devise_for(resource, options = {})
       default_operations = GraphqlDevise::DefaultOperations::MUTATIONS.merge(GraphqlDevise::DefaultOperations::QUERIES)
+      mapping_name       = resource.underscore.tr('/', '_').to_sym
 
       # clean_options responds to all keys defined in GraphqlDevise::MountMethod::SUPPORTED_OPTIONS
       clean_options = GraphqlDevise::MountMethod::OptionSanitizer.new(options).call!
@@ -32,20 +33,18 @@ def mount_graphql_devise_for(resource, options = {})
         skip:       DEVISE_OPERATIONS
       )
 
-      devise_scope resource.underscore.tr('/', '_').to_sym do
-        post clean_options.at, to: 'graphql_devise/graphql#auth'
-        get  clean_options.at, to: 'graphql_devise/graphql#auth'
-      end
+      post clean_options.at, to: 'graphql_devise/graphql#auth'
+      get  clean_options.at, to: 'graphql_devise/graphql#auth'
 
       # Avoid routes reload done by Devise
-      return if GraphqlDevise.resource_mounted?(resource)
+      return if GraphqlDevise.resource_mounted?(mapping_name)
 
       authenticatable_type = clean_options.authenticatable_type.presence ||
                              "Types::#{resource}Type".safe_constantize ||
                              GraphqlDevise::Types::AuthenticatableType
 
       prepared_mutations = GraphqlDevise::MountMethod::OperationPreparer.new(
-        resource:              resource,
+        mapping_name:          mapping_name,
         custom:                clean_options.operations,
         additional_operations: clean_options.additional_mutations,
         preparer:              GraphqlDevise::MountMethod::OperationPreparers::MutationFieldSetter.new(authenticatable_type),
@@ -59,7 +58,7 @@ def mount_graphql_devise_for(resource, options = {})
       end
 
       prepared_queries = GraphqlDevise::MountMethod::OperationPreparer.new(
-        resource:              resource,
+        mapping_name:          mapping_name,
         custom:                clean_options.operations,
         additional_operations: clean_options.additional_queries,
         preparer:              GraphqlDevise::MountMethod::OperationPreparers::ResolverTypeSetter.new(authenticatable_type),
@@ -72,9 +71,9 @@ def mount_graphql_devise_for(resource, options = {})
         GraphqlDevise::Types::QueryType.field(action, resolver: resolver)
       end
 
-      Devise.mailer.helper(GraphqlDevise::MailerHelper)
+      GraphqlDevise.add_mapping(mapping_name, resource.constantize)
 
-      GraphqlDevise.mount_resource(resource)
+      Devise.mailer.helper(GraphqlDevise::MailerHelper)
     end
   end
 end