Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improved comments.

Browse source
This commit is contained in:
Martin Edenhofer 2015-08-23 22:15:10 +02:00
parent 492a38ad35
commit 882d1cd5aa
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/controllers/application_controller.rb
View file

@ -169,7 +169,7 @@ class ApplicationController < ActionController::Base
error_message = 'authentication failed' error_message = 'authentication failed'
# check sso # check sso based authentication
sso_userdata = User.sso(params) sso_userdata = User.sso(params)
if sso_userdata if sso_userdata
session[:persistent] = true session[:persistent] = true
@ -179,7 +179,7 @@ class ApplicationController < ActionController::Base
} }
end end
# check http basic auth # check http basic based authentication
authenticate_with_http_basic do |username, password| authenticate_with_http_basic do |username, password|
logger.debug "http basic auth check '#{username}'" logger.debug "http basic auth check '#{username}'"
@ -195,10 +195,10 @@ class ApplicationController < ActionController::Base
} }
end end
# check token # check http token based authentication
if auth_param[:token_action] if auth_param[:token_action]
authenticate_with_http_token do |token, _options| authenticate_with_http_token do |token, _options|
logger.debug "token auth check #{token}" logger.debug "token auth check '#{token}'"
userdata = Token.check( userdata = Token.check(
action: auth_param[:token_action], action: auth_param[:token_action],