lino.jorzick
/
greenlight
forked from External/greenlight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed issue with ldap redirect throwing 404 (#2231)

This commit is contained in:
Ahmad Farhat 2020-10-26 11:50:43 -04:00 committed by GitHub
parent 0ff938a0fd
commit 49f7a7714a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/concerns/authenticator.rb
View File

@ -42,7 +42,7 @@ module Authenticator
redirect_to admins_path redirect_to admins_path
elsif user.activated? elsif user.activated?
# Dont redirect to any of these urls # Dont redirect to any of these urls
dont_redirect_to = [root_url, signin_url, ldap_signin_url, signup_url, unauthorized_url, dont_redirect_to = [root_url, signin_url, ldap_signin_url, ldap_callback_url, signup_url, unauthorized_url,
internal_error_url, not_found_url] internal_error_url, not_found_url]
url = if cookies[:return_to] && !dont_redirect_to.include?(cookies[:return_to]) url = if cookies[:return_to] && !dont_redirect_to.include?(cookies[:return_to])
cookies[:return_to] cookies[:return_to]
@ -62,7 +62,7 @@ module Authenticator
end end
def ensure_unauthenticated_except_twitter def ensure_unauthenticated_except_twitter
redirect_to current_user.main_room if current_user && params[:old_twitter_user_id].nil? redirect_to current_user.main_room || root_path if current_user && params[:old_twitter_user_id].nil?
end end
# Logs current user out of GreenLight. # Logs current user out of GreenLight.