Skip to content

Commit 03f2c3c

Browse files
committed
Revert renaming SetUserByToken concern
1 parent da575ba commit 03f2c3c

6 files changed

Lines changed: 10 additions & 10 deletions

File tree

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ In our example our model is `User`, so it would look like this:
312312
# app/controllers/my_controller.rb
313313

314314
class MyController < ApplicationController
315-
include GraphqlDevise::Concerns::SetResourceByToken
315+
include GraphqlDevise::Concerns::SetUserByToken
316316

317317
before_action :authenticate_user!
318318

@@ -336,7 +336,7 @@ in a `before_action` hook.
336336
# app/controllers/my_controller.rb
337337

338338
class MyController < ApplicationController
339-
include GraphqlDevise::Concerns::SetResourceByToken
339+
include GraphqlDevise::Concerns::SetUserByToken
340340

341341
before_action -> { set_resource_by_token(:user) }
342342

app/controllers/graphql_devise/concerns/set_resource_by_token.rb renamed to app/controllers/graphql_devise/concerns/set_user_by_token.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module GraphqlDevise
22
module Concerns
3-
SetResourceByToken = DeviseTokenAuth::Concerns::SetUserByToken
3+
SetUserByToken = DeviseTokenAuth::Concerns::SetUserByToken
44

5-
DeviseTokenAuth::Concerns::SetUserByToken.module_eval do
5+
SetUserByToken.module_eval do
66
attr_accessor :client_id, :token, :resource
77

88
alias_method :set_resource_by_token, :set_user_by_token

app/controllers/graphql_devise/graphql_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
module GraphqlDevise
44
class GraphqlController < ApplicationController
5-
include GraphqlDevise::Concerns::SetResourceByToken
5+
include GraphqlDevise::Concerns::SetUserByToken
66

77
def auth
88
result = if params[:_json]

lib/generators/graphql_devise/install_generator.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def execute_dta_installer
2020
end
2121
gsub_file(
2222
'app/controllers/application_controller.rb',
23-
'GraphqlDevise::Concerns::SetResourceByToken',
23+
'GraphqlDevise::Concerns::SetUserByToken',
2424
'DeviseTokenAuth::Concerns::SetUserByToken'
2525
)
2626

@@ -53,7 +53,7 @@ def replace_controller_concern
5353
gsub_file(
5454
'app/controllers/application_controller.rb',
5555
/^\s+include DeviseTokenAuth::Concerns::SetUserByToken/,
56-
' include GraphqlDevise::Concerns::SetResourceByToken'
56+
' include GraphqlDevise::Concerns::SetUserByToken'
5757
)
5858
end
5959

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module Api
22
module V1
33
class GraphqlController < ApplicationController
4-
include GraphqlDevise::Concerns::SetResourceByToken
4+
include GraphqlDevise::Concerns::SetUserByToken
55

66
before_action -> { set_resource_by_token(:user) }
77

spec/generators/graphql_devise/install_generator_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
assert_file 'app/models/user.rb', /^\s{2}devise :.+include GraphqlDevise::Concerns::Model/m
3434

35-
assert_file 'app/controllers/application_controller.rb', /^\s{2}include GraphqlDevise::Concerns::SetResourceByToken/
35+
assert_file 'app/controllers/application_controller.rb', /^\s{2}include GraphqlDevise::Concerns::SetUserByToken/
3636
end
3737
end
3838

@@ -51,7 +51,7 @@
5151

5252
assert_file 'app/models/admin.rb', /^\s{2}devise :.+include GraphqlDevise::Concerns::Model/m
5353

54-
assert_file 'app/controllers/application_controller.rb', /^\s{2}include GraphqlDevise::Concerns::SetResourceByToken/
54+
assert_file 'app/controllers/application_controller.rb', /^\s{2}include GraphqlDevise::Concerns::SetUserByToken/
5555
end
5656
end
5757

0 commit comments

Comments
 (0)