From 841f36b0589d9e5aa0bbfcd328b0c3a2d7f795b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 4 Apr 2016 19:04:10 +0200 Subject: [PATCH] FIX: automatically unstage user when signing in using OAuth --- app/controllers/users/omniauth_callbacks_controller.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb index dd1a3cef8..0c151cf29 100644 --- a/app/controllers/users/omniauth_callbacks_controller.rb +++ b/app/controllers/users/omniauth_callbacks_controller.rb @@ -104,9 +104,11 @@ class Users::OmniauthCallbacksController < ApplicationController end def user_found(user) - # automatically activate any account if a provider marked the email valid - if !user.active && @auth_result.email_valid - user.toggle(:active).save + # automatically activate/unstage any account if a provider marked the email valid + if @auth_result.email_valid + user.staged = false + user.active = true + user.save end if ScreenedIpAddress.should_block?(request.remote_ip)