From 1be777b155cde4b738dcd8ef77edc852eeecadb5 Mon Sep 17 00:00:00 2001 From: Macartur Sousa Date: Tue, 2 Dec 2014 11:49:05 -0200 Subject: [PATCH] Fixed double redirect url --- lib/omniauth/strategies/remote_user.rb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/omniauth/strategies/remote_user.rb b/lib/omniauth/strategies/remote_user.rb index 1daba79..cb0526e 100644 --- a/lib/omniauth/strategies/remote_user.rb +++ b/lib/omniauth/strategies/remote_user.rb @@ -2,7 +2,7 @@ module OmniAuth module Strategies class RemoteUser include OmniAuth::Strategy - + option :cookie, '_gitlab_session' option :internal_cookie, '_remote_user' @@ -40,11 +40,10 @@ module OmniAuth def __logout(env) request = Rack::Request.new(env) - response = redirect_if_not_logging_in(request, request.path) + response = redirect_if_not_logging_in(request, sign_out_path ) if response response.delete_cookie(options.cookie) response.delete_cookie(options.internal_cookie) - response.redirect sign_out_path response end end @@ -65,8 +64,9 @@ module OmniAuth def redirect_if_not_logging_in(request, url) if ! [ - auth_path, - callback_path + sign_out_path, + auth_path, + callback_path ].include?(request.path_info) response = Rack::Response.new response.redirect url @@ -94,17 +94,17 @@ module OmniAuth end def callback_path - "#{auth_path}/callback" + "#{auth_path}/callback" end def auth_path - "#{path_prefix}/RemoteUser" + "#{path_prefix}/RemoteUser" end - + def sign_out_path - '/users/sign_out' + '/users/sign_out' end - + end end end -- libgit2 0.21.2