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

Return nil if no user is signed in

Browse Source
This commit is contained in:
Sebastian Serth
2020-10-28 14:52:04 +01:00
parent 10bbc68829
commit eedbf6a815
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/application_controller.rb
View File

@ -13,7 +13,7 @@ class ApplicationController < ActionController::Base
def current_user def current_user
::NewRelic::Agent.add_custom_attributes(external_user_id: session[:external_user_id], session_user_id: session[:user_id]) ::NewRelic::Agent.add_custom_attributes(external_user_id: session[:external_user_id], session_user_id: session[:user_id])
@current_user ||= ExternalUser.find_by(id: session[:external_user_id]) || login_from_session || login_from_other_sources @current_user ||= ExternalUser.find_by(id: session[:external_user_id]) || login_from_session || login_from_other_sources || nil
end end
def require_user! def require_user!

2
app/controllers/sessions_controller.rb
View File

@ -30,7 +30,7 @@ class SessionsController < ApplicationController
end end
def destroy def destroy
if current_user.external_user? if current_user&.external_user?
clear_lti_session_data clear_lti_session_data
else else
logout logout