Revert renaming SetUserByToken concern

graphql-devise · Jun 10, 2020 · 03f2c3c · 03f2c3c
1 parent da575ba
commit 03f2c3c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -312,7 +312,7 @@ In our example our model is `User`, so it would look like this:
 # app/controllers/my_controller.rb
 
 class MyController < ApplicationController
-  include GraphqlDevise::Concerns::SetResourceByToken
+  include GraphqlDevise::Concerns::SetUserByToken
 
   before_action :authenticate_user!
 
@@ -336,7 +336,7 @@ in a `before_action` hook.
 # app/controllers/my_controller.rb
 
 class MyController < ApplicationController
-  include GraphqlDevise::Concerns::SetResourceByToken
+  include GraphqlDevise::Concerns::SetUserByToken
 
   before_action -> { set_resource_by_token(:user) }
 

diff --git a/..._devise/concerns/set_resource_by_token.rb → ...phql_devise/concerns/set_user_by_token.rb b/..._devise/concerns/set_resource_by_token.rb → ...phql_devise/concerns/set_user_by_token.rb
@@ -1,8 +1,8 @@
 module GraphqlDevise
   module Concerns
-    SetResourceByToken = DeviseTokenAuth::Concerns::SetUserByToken
+    SetUserByToken = DeviseTokenAuth::Concerns::SetUserByToken
 
-    DeviseTokenAuth::Concerns::SetUserByToken.module_eval do
+    SetUserByToken.module_eval do
       attr_accessor :client_id, :token, :resource
 
       alias_method :set_resource_by_token, :set_user_by_token

diff --git a/app/controllers/graphql_devise/graphql_controller.rb b/app/controllers/graphql_devise/graphql_controller.rb
@@ -2,7 +2,7 @@
 
 module GraphqlDevise
   class GraphqlController < ApplicationController
-    include GraphqlDevise::Concerns::SetResourceByToken
+    include GraphqlDevise::Concerns::SetUserByToken
 
     def auth
       result = if params[:_json]

diff --git a/lib/generators/graphql_devise/install_generator.rb b/lib/generators/graphql_devise/install_generator.rb
@@ -20,7 +20,7 @@ def execute_dta_installer
       end
       gsub_file(
         'app/controllers/application_controller.rb',
-        'GraphqlDevise::Concerns::SetResourceByToken',
+        'GraphqlDevise::Concerns::SetUserByToken',
         'DeviseTokenAuth::Concerns::SetUserByToken'
       )
 
@@ -53,7 +53,7 @@ def replace_controller_concern
       gsub_file(
         'app/controllers/application_controller.rb',
         /^\s+include DeviseTokenAuth::Concerns::SetUserByToken/,
-        '  include GraphqlDevise::Concerns::SetResourceByToken'
+        '  include GraphqlDevise::Concerns::SetUserByToken'
       )
     end
 

diff --git a/spec/dummy/app/controllers/api/v1/graphql_controller.rb b/spec/dummy/app/controllers/api/v1/graphql_controller.rb
@@ -1,7 +1,7 @@
 module Api
   module V1
     class GraphqlController < ApplicationController
-      include GraphqlDevise::Concerns::SetResourceByToken
+      include GraphqlDevise::Concerns::SetUserByToken
 
       before_action -> { set_resource_by_token(:user) }
 

diff --git a/spec/generators/graphql_devise/install_generator_spec.rb b/spec/generators/graphql_devise/install_generator_spec.rb
@@ -32,7 +32,7 @@
 
       assert_file 'app/models/user.rb', /^\s{2}devise :.+include GraphqlDevise::Concerns::Model/m
 
-      assert_file 'app/controllers/application_controller.rb', /^\s{2}include GraphqlDevise::Concerns::SetResourceByToken/
+      assert_file 'app/controllers/application_controller.rb', /^\s{2}include GraphqlDevise::Concerns::SetUserByToken/
     end
   end
 
@@ -51,7 +51,7 @@
 
       assert_file 'app/models/admin.rb', /^\s{2}devise :.+include GraphqlDevise::Concerns::Model/m
 
-      assert_file 'app/controllers/application_controller.rb', /^\s{2}include GraphqlDevise::Concerns::SetResourceByToken/
+      assert_file 'app/controllers/application_controller.rb', /^\s{2}include GraphqlDevise::Concerns::SetUserByToken/
     end
   end