Configure warden when gem is included in the model

Author: mcelicalderon

app/controllers/graphql_devise/concerns/additional_controller_methods.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module GraphqlDevise
+  module Concerns
+    module AdditionalControllerMethods
+      extend ActiveSupport::Concern
+
+      included do
+        attr_accessor :client_id, :token, :resource
+      end
+
+      def gql_devise_context(models)
+        {
+          current_resource: authenticate_model(models),
+          controller:       self
+        }
+      end
+
+      def authenticate_model(models)
+        Array(models).each do |model|
+          set_resource_by_token(model)
+          return @resource if @resource.present?
+        end
+
+        nil
+      end
+
+      def resource_class(resource = nil)
+        return resource if resource.respond_to?(:find_by)
+
+        super
+      end
+
+      def full_url_without_params
+        request.base_url + request.path
+      end
+
+      def set_resource_by_token(resource)
+        set_user_by_token(resource)
+      end
+
+      def graphql_context(resource_name)
+        {
+          resource_name: resource_name,
+          controller:    self
+        }
+      end
+
+      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/concerns/set_user_by_token.rb

@@ -2,64 +2,12 @@
 
 module GraphqlDevise
   module Concerns
-    SetUserByToken = DeviseTokenAuth::Concerns::SetUserByToken
+    module SetUserByToken
+      extend ActiveSupport::Concern
 
-    SetUserByToken.module_eval do
-      attr_accessor :client_id, :token, :resource
-
-      class_methods do
-        def set_resource_by_model(models, **kwargs)
-          Array(models).each do |model|
-            GraphqlDevise.configure_warden_serializer_for_model(model)
-          end
-
-          before_action(**kwargs) do
-            authenticate_model(models)
-          end
-        end
-      end
-
-      def authenticate_model(models)
-        Array(models).each do |model|
-          set_resource_by_token(model)
-          return @resource if @resource.present?
-        end
-
-        nil
-      end
-
-      def resource_class(resource = nil)
-        return resource if resource.respond_to?(:find_by)
-
-        super
-      end
-
-      def full_url_without_params
-        request.base_url + request.path
-      end
-
-      def set_resource_by_token(resource)
-        set_user_by_token(resource)
-      end
-
-      def graphql_context(resource_name)
-        context = {
-          resource_name: resource_name,
-          controller:    self
-        }
-        context[:current_resource] = @resource if @resource.present?
-
-        context
-      end
-
-      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)
+      included do
+        include DeviseTokenAuth::Concerns::SetUserByToken
+        include GraphqlDevise::Concerns::AdditionalControllerMethods
       end
     end
   end

app/models/graphql_devise/concerns/additional_model_methods.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'graphql_devise/model/with_email_updater'
+
+module GraphqlDevise
+  module Concerns
+    module AdditionalModelMethods
+      extend ActiveSupport::Concern
+
+      class_methods do
+        def reconfirmable
+          devise_modules.include?(:confirmable) && column_names.include?('unconfirmed_email')
+        end
+      end
+
+      def update_with_email(attributes = {})
+        GraphqlDevise::Model::WithEmailUpdater.new(self, attributes).call
+      end
+    end
+  end
+end

app/models/graphql_devise/concerns/model.rb

@@ -4,17 +4,14 @@
 
 module GraphqlDevise
   module Concerns
-    Model = DeviseTokenAuth::Concerns::User
+    module Model
+      extend ActiveSupport::Concern
 
-    Model.module_eval do
-      class_methods do
-        def reconfirmable
-          devise_modules.include?(:confirmable) && column_names.include?('unconfirmed_email')
-        end
-      end
+      included do
+        include DeviseTokenAuth::Concerns::User
+        include GraphqlDevise::Concerns::AdditionalModelMethods
 
-      def update_with_email(attributes = {})
-        GraphqlDevise::Model::WithEmailUpdater.new(self, attributes).call
+        GraphqlDevise.configure_warden_serializer_for_model(self)
       end
     end
   end

lib/graphql_devise/concerns/controller_methods.rb

@@ -60,7 +60,7 @@ def blacklisted_redirect_url?(redirect_url)
       end
 
       def current_resource
-        @current_resource ||= controller.send(:set_user_by_token, resource_class)
+        @current_resource ||= controller.send(:set_resource_by_token, resource_class)
       end
 
       def client

lib/graphql_devise/resource_loader.rb

@@ -43,7 +43,6 @@ def call(query, mutation)
         query.field(action, resolver: resolver, authenticate: false)
       end
 
-      GraphqlDevise.configure_warden_serializer_for_model(model)
       GraphqlDevise.add_mapping(GraphqlDevise.to_mapping_name(@resource).to_sym, @resource)
       GraphqlDevise.mount_resource(model) if @routing
 

spec/dummy/app/controllers/api/v1/graphql_controller.rb

@@ -5,8 +5,6 @@ module V1
     class GraphqlController < ApplicationController
       include GraphqlDevise::Concerns::SetUserByToken
 
-      set_resource_by_model SchemaUser, only: [:controller_auth]
-
       def graphql
         result = DummySchema.execute(params[:query], **execute_params(params))
 
@@ -22,7 +20,12 @@ def failing_resource_name
       end
 
       def controller_auth
-        result = DummySchema.execute(params[:query], **execute_params(params))
+        result = DummySchema.execute(
+          params[:query],
+          operation_name: params[:operationName],
+          variables:      ensure_hash(params[:variables]),
+          context:        gql_devise_context(SchemaUser)
+        )
 
         render json: result unless performed?
       end