htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

slight changes to application controller to be more readable

Browse Source
This commit is contained in:
Janis4411
2022-08-02 13:46:39 +02:00
committed by Sebastian Serth
parent c638df12e7
commit cc3fc72cf9
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/controllers/application_controller.rb
View File

@ -15,7 +15,11 @@ class ApplicationController < ActionController::Base
rescue_from ActionController::InvalidAuthenticityToken, with: :render_csrf_error rescue_from ActionController::InvalidAuthenticityToken, with: :render_csrf_error
def current_user def current_user
@current_user ||= ExternalUser.find_by(id: session[:external_user_id]) || login_from_session || login_from_other_sources || nil @current_user ||= ExternalUser.find_by(id: session[:external_user_id]) ||
login_from_session ||
login_from_other_sources ||
login_from_authentication_token ||
nil
end end
def require_user! def require_user!
@ -32,6 +36,13 @@ class ApplicationController < ActionController::Base
end end
end end
def login_from_authentication_token
token = AuthenticationToken.find_by(shared_secret: params[:token])
return unless token
auto_login(token.user) if token.expire_at.future?
end
def set_sentry_context def set_sentry_context
return if current_user.blank? return if current_user.blank?