summaryrefslogtreecommitdiff
path: root/users/app/controllers
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2013-09-03 10:43:34 -0700
committerjessib <jessib@riseup.net>2013-09-03 10:43:34 -0700
commitf3e17149116f6a3aeb87f8a6d0ecf29e8e33ad93 (patch)
tree2dfae950a25c5db22a456d96016898c5a9add5a6 /users/app/controllers
parentf97777ed0252abe94f8d94cb4565fb5a6c35ab23 (diff)
parent42cef3117cd97d9c37968a8cf63d33b27b4b8ed2 (diff)
Merge pull request #75 from azul/feature/token-expiry
Token expiry
Diffstat (limited to 'users/app/controllers')
-rw-r--r--users/app/controllers/controller_extension/token_authentication.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/users/app/controllers/controller_extension/token_authentication.rb b/users/app/controllers/controller_extension/token_authentication.rb
index 3e2816d..530294a 100644
--- a/users/app/controllers/controller_extension/token_authentication.rb
+++ b/users/app/controllers/controller_extension/token_authentication.rb
@@ -5,7 +5,7 @@ module ControllerExtension::TokenAuthentication
authenticate_with_http_token do |token_id, options|
@token = Token.find(token_id)
end
- @token.user if @token
+ @token.authenticate if @token
end
def logout