diff options
| author | Azul <azul@riseup.net> | 2016-03-31 11:40:44 +0200 |
|---|---|---|
| committer | Azul <azul@riseup.net> | 2016-03-31 11:40:44 +0200 |
| commit | be5efb57dc9b282a31cf29c9eac27cb5a7e7ac2f (patch) | |
| tree | ce8bee7d2fa4007a1db9815e1af001fe44e329c1 /app/controllers/controller_extension/token_authentication.rb | |
| parent | 14c9f2ab7cbf410bcd7fdd75b4a1c11417b30bd7 (diff) | |
| parent | 48acca107b9bd7a59bacb1449b042eb753e63917 (diff) | |
Merge remote-tracking branch 'github/211' into develop
Diffstat (limited to 'app/controllers/controller_extension/token_authentication.rb')
| -rw-r--r-- | app/controllers/controller_extension/token_authentication.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/controller_extension/token_authentication.rb b/app/controllers/controller_extension/token_authentication.rb index 4ad1977..c41d61b 100644 --- a/app/controllers/controller_extension/token_authentication.rb +++ b/app/controllers/controller_extension/token_authentication.rb @@ -5,7 +5,7 @@ module ControllerExtension::TokenAuthentication def token @token ||= authenticate_with_http_token do |token, options| - Token.find_by_token(token) + Token.find_by_token(token) || ApiToken.find_by_token(token, request.headers['REMOTE_ADDR']) end end |