github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-30 02:38:16 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

invite only forums had very wonky logic, invited users were not being activated, invite_only forums were still registering users

Browse Source
This commit is contained in:
Sam
2013-08-28 17:18:31 +10:00
parent 28466eb5b2
commit 61281a3c81
9 changed files with 65 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/users/omniauth_callbacks_controller.rb
View File

@ -37,9 +37,13 @@ class Users::OmniauthCallbacksController < ApplicationController
@data = authenticator.after_authenticate(auth)
@data.authenticator_name = authenticator.name
user_found(@data.user) if @data.user
session[:authentication] = @data.session_data
if @data.user
user_found(@data.user)
elsif SiteSetting.invite_only?
@data.requires_invite = true
else
session[:authentication] = @data.session_data
end
respond_to do |format|
format.html
@ -87,7 +91,7 @@ class Users::OmniauthCallbacksController < ApplicationController
session[:authentication] = nil
@data.authenticated = true
else
if SiteSetting.invite_only?
if SiteSetting.must_approve_users? && !user.approved?
@data.awaiting_approval = true
else
@data.awaiting_activation = true