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

fix(omniauth): Correct too many redrect error with OpenID provider (#2462) 

* fix(omniauth): Correct too many redrect error with OpenID provider

This fix avoids "Too Many redirects" error with login with OpenID and without terms

* Correct code for travis rules checks

Replace if not by unless to fulfill requirements by travis

* Update authenticator.rb

* Remove trailing space

Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
This commit is contained in:
Louis VICAINNE 2021-02-10 23:13:54 +01:00 committed by GitHub
parent 377aa7bdb9
commit 1667ac40e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,6 +45,11 @@ module Authenticator
# Dont redirect to any of these urls # Dont redirect to any of these urls
dont_redirect_to = [root_url, signin_url, ldap_signin_url, ldap_callback_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]
unless ENV['OAUTH2_REDIRECT'].nil?
dont_redirect_to.push(File.join(ENV['OAUTH2_REDIRECT'], "auth", "openid_connect", "callback"))
end
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]
elsif user.role.get_permission("can_create_rooms") elsif user.role.get_permission("can_create_rooms")