github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-22 15:48:39 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

BUGFIX: sso to respect must_approve_users

Browse Source
This commit is contained in:
Sam 2014-02-26 10:27:39 +11:00
parent 440435f023
commit 74a1145a0b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/session_controller.rb
View File

@ -31,7 +31,11 @@ class SessionController < ApplicationController
sso.expire_nonce! sso.expire_nonce!
if user = sso.lookup_or_create_user if user = sso.lookup_or_create_user
log_on_user user if SiteSetting.must_approve_users? && !user.approved?
# TODO: need an awaiting approval message here
else
log_on_user user
end
redirect_to return_path redirect_to return_path
else else
render text: "unable to log on user", status: 500 render text: "unable to log on user", status: 500