github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-28 13:51:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

REVERT: External auth when redeeming invites

Browse Source 
Reverting this commit:

87a0a6664e4bcde2ec3ac012308d9c7fb8e0d370

because I'm extracting all of this logic into a plugin instead.
This commit is contained in:
Blake Erickson
2019-08-15 17:19:12 -06:00
parent ab7038bfc2
commit 893d30fb92
8 changed files with 53 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,7 +108,7 @@ class Users::OmniauthCallbacksController < ApplicationController
def complete_response_data
if @auth_result.user
user_found(@auth_result.user)
elsif invite_required?
elsif SiteSetting.invite_only?
@auth_result.requires_invite = true
else
session[:authentication] = @auth_result.session_data
@ -156,10 +156,4 @@ class Users::OmniauthCallbacksController < ApplicationController
end
end
# If invite_only and enable_invite_only_oauth allow the user to authenticate if coming from the invite page
def invite_required?
(SiteSetting.invite_only? && !SiteSetting.enable_invite_only_oauth) ||
(SiteSetting.invite_only? && (!@origin.include?('invites') && SiteSetting.enable_invite_only_oauth))
end
end