github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-22 12:42:16 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
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
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)
# automatically activate/unstage any account if a provider marked the email valid
if @auth_result.email_valid && @auth_result.email == user.email
user.update!(staged: false, active: true)
user.update!(staged: false)
user.activate
end
if ScreenedIpAddress.should_block?(request.remote_ip)