Untangled the logic in Devise::Strategies::TokenAuthenticatable#param…

…s_auth_hash
iros · Jul 25, 2011 · 4d91fb4 · 4d91fb4
1 parent a2700bc
commit 4d91fb4
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/devise/strategies/token_authenticatable.rb b/lib/devise/strategies/token_authenticatable.rb
@@ -39,9 +39,11 @@ def remember_me?
 
       # Try both scoped and non scoped keys.
       def params_auth_hash
-        token_authentication_key = authentication_keys.first
-        return params if params[scope].kind_of?(Hash) && !params[scope].has_key?(token_authentication_key) && params.has_key?(token_authentication_key)
-        params[scope] || params
+        if params[scope].kind_of?(Hash) && params[scope].has_key?(authentication_keys.first)
+          params[scope]
+        else
+          params
+        end
       end
 
       # Overwrite authentication keys to use token_authentication_key.