From 1667ac40e899ebb234c95c9479eb3199d7f4c437 Mon Sep 17 00:00:00 2001 From: Louis VICAINNE Date: Wed, 10 Feb 2021 23:13:54 +0100 Subject: [PATCH] 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 --- app/controllers/concerns/authenticator.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/controllers/concerns/authenticator.rb b/app/controllers/concerns/authenticator.rb index 16c330cc..577bf571 100644 --- a/app/controllers/concerns/authenticator.rb +++ b/app/controllers/concerns/authenticator.rb @@ -45,6 +45,11 @@ module Authenticator # Dont redirect to any of these urls dont_redirect_to = [root_url, signin_url, ldap_signin_url, ldap_callback_url, signup_url, unauthorized_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]) cookies[:return_to] elsif user.role.get_permission("can_create_rooms")