github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-29 01:31:35 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #3227 from sigginet/patch-1

Browse Source 
FIX: Forward to SSO login automatically
This commit is contained in:
Sam
2015-02-24 10:42:30 +11:00
parent 34dc1f9e10 96e6fd3449
commit 0ccce7a59b
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/application_controller.rb
View File

@ -389,7 +389,15 @@ class ApplicationController < ActionController::Base
# save original URL in a cookie # save original URL in a cookie
cookies[:destination_url] = request.original_url unless request.original_url =~ /uploads/ cookies[:destination_url] = request.original_url unless request.original_url =~ /uploads/
redirect_to :login if SiteSetting.login_required?
# redirect user to the SSO page if we need to log in AND SSO is enabled
if SiteSetting.login_required?
if SiteSetting.enable_sso?
redirect_to '/session/sso'
else
redirect_to :login
end
end
end end
def block_if_readonly_mode def block_if_readonly_mode