IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5848 from OsamaSayegh/fix-social-login-groups

Browse Source 
FIX: apply automatic group rules when using social login providers
This commit is contained in:
Guo Xiang Tan
2018-05-23 08:17:42 +08:00
committed by GitHub
parent 41d37fd498 f6d412465b
commit ad9e0d6bea
4 changed files with 72 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/services/user_authenticator.rb
View File

@@ -21,7 +21,10 @@ class UserAuthenticator
end
def finish
authenticator.after_create_account(@user, @session) if authenticator
if authenticator
authenticator.after_create_account(@user, @session)
confirm_email
end
@session = nil
end
@@ -30,11 +33,18 @@ class UserAuthenticator
end
def authenticated?
@session && @session[:email] == @user.email && @session[:email_valid]
@session && @session[:email]&.downcase == @user.email.downcase && @session[:email_valid].to_s == "true"
end
private
def confirm_email
if authenticated?
EmailToken.confirm(@user.email_tokens.first.token)
@user.set_automatic_groups
end
end
def authenticator
if authenticator_name
@authenticator ||= @authenticator_finder.find_authenticator(authenticator_name)