SU2-33 | Фикс критических и серьёзных ошибок, удаление/перезагрузка организации, пагинация, favicon
This commit is contained in:
@@ -28,18 +28,13 @@ module Authorization
|
||||
session['cas'] && session['cas']['user']
|
||||
end
|
||||
|
||||
def set_current_user(options = {})
|
||||
return nil if current_login.blank?
|
||||
load_current_user
|
||||
end
|
||||
|
||||
def load_current_user
|
||||
@current_user ||= User.where('lower(login) = lower(?)', current_login).first
|
||||
end
|
||||
|
||||
def check_authentication
|
||||
if session.blank? || session['cas'].blank? || session['cas']['user'].blank? ||
|
||||
(request.get? && !request.xhr? && request.xhr? != 0 && (session['cas']['last_validated_at'].blank? || session['cas']['last_validated_at'] < 15.minutes.ago))
|
||||
(request.get? && !request.xhr? && (session['cas']['last_validated_at'].blank? || session['cas']['last_validated_at'] < 15.minutes.ago))
|
||||
render plain: 'Требуется авторизация', status: 401
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user