Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4807 from techAPJ/email-token-social 

FIX: confirm email token for user created via social login
This commit is contained in:
Arpit Jalan 2017-04-13 16:18:15 +05:30 committed by GitHub
parent 3d76fb9c2c 7fb17b83c4
commit ef093b1610
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,7 +112,8 @@ class Users::OmniauthCallbacksController < ApplicationController
def user_found(user) def user_found(user)
# automatically activate/unstage any account if a provider marked the email valid # automatically activate/unstage any account if a provider marked the email valid
if @auth_result.email_valid && @auth_result.email == user.email if @auth_result.email_valid && @auth_result.email == user.email
user.update!(staged: false, active: true) user.update!(staged: false)
user.activate
end end
if ScreenedIpAddress.should_block?(request.remote_ip) if ScreenedIpAddress.should_block?(request.remote_ip)