FIX: don't activate un-confirmed email on omniauth authentication (#5176)

2025-05-23 18:51:07 +08:00 · 2017-09-12 16:36:17 +01:00
parent c097fbbdff
commit 104d97695d
3 changed files with 60 additions and 2 deletions
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@ -115,7 +115,7 @@ class Users::OmniauthCallbacksController < ApplicationController
    if @auth_result.email_valid && @auth_result.email == user.email
      user.update!(staged: false)
      # ensure there is an active email token
-      user.email_tokens.create(email: user.email) unless user.email_tokens.active.exists?
+      user.email_tokens.create(email: user.email) unless user.email_tokens.active.where(email: user.email).exists?
      user.activate
    end