From 72ccd90cc4b6e6cd1e8e67778768c31c22b754b2 Mon Sep 17 00:00:00 2001 From: Hu Hailin Date: Wed, 9 Dec 2020 04:57:39 +0900 Subject: [PATCH] rc causes issue for namespaced class, use mapping directly to keep behavior consistency with devise (#1440) --- app/controllers/devise_token_auth/concerns/set_user_by_token.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/devise_token_auth/concerns/set_user_by_token.rb b/app/controllers/devise_token_auth/concerns/set_user_by_token.rb index e28ef153c..c03bca6ba 100644 --- a/app/controllers/devise_token_auth/concerns/set_user_by_token.rb +++ b/app/controllers/devise_token_auth/concerns/set_user_by_token.rb @@ -46,7 +46,7 @@ def set_user_by_token(mapping = nil) # check for an existing user, authenticated via warden/devise, if enabled if DeviseTokenAuth.enable_standard_devise_support - devise_warden_user = warden.user(rc.to_s.underscore.to_sym) + devise_warden_user = warden.user(mapping) if devise_warden_user && devise_warden_user.tokens[@token.client].nil? @used_auth_by_token = false @resource = devise_warden_user