diff options
| author | Azul <azul@leap.se> | 2014-06-09 11:00:28 +0200 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2014-06-09 11:00:28 +0200 |
| commit | 728d6d3985126c2890638bb2ee24020fa0e36a80 (patch) | |
| tree | 1fcbb560b0103123d49fb953e86fdb960ee5dd13 /app/controllers/controller_extension/token_authentication.rb | |
| parent | b9174fdc9d9bd403d9a16650bafc4715e3dbf2d4 (diff) | |
| parent | 9fa52ed80d71ec56ed5acf18dfd63bd03b201cc5 (diff) | |
Merge tag '0.5.2'
Diffstat (limited to 'app/controllers/controller_extension/token_authentication.rb')
| -rw-r--r-- | app/controllers/controller_extension/token_authentication.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/controller_extension/token_authentication.rb b/app/controllers/controller_extension/token_authentication.rb index 6e0a6ce..b0ed624 100644 --- a/app/controllers/controller_extension/token_authentication.rb +++ b/app/controllers/controller_extension/token_authentication.rb @@ -2,8 +2,8 @@ module ControllerExtension::TokenAuthentication extend ActiveSupport::Concern def token - @token ||= authenticate_with_http_token do |token_id, options| - Token.find(token_id) + @token ||= authenticate_with_http_token do |token, options| + Token.find_by_token(token) end end |