Merge remote-tracking branch 'upstream/pull/5398'

[rails.git] / app / controllers / confirmations_controller.rb

diff --git a/app/controllers/confirmations_controller.rb b/app/controllers/confirmations_controller.rb
index 48b8dabf2d9ec770b460d8c3f8ee025a4958c892..7bbb3a0937b538ef95abffd014c58bab7443418c 100644 (file)
--- a/app/controllers/confirmations_controller.rb
+++ b/app/controllers/confirmations_controller.rb
@@ -15,10 +15,7 @@ class ConfirmationsController < ApplicationController
 
   def confirm
     if request.post?
 
   def confirm
     if request.post?

-      token = params[:confirm_string]
-
-      user = User.find_by_token_for(:new_user, token) ||
-             UserToken.unexpired.find_by(:token => token)&.user
+      user = User.find_by_token_for(:new_user, params[:confirm_string])

 
       if !user
         flash[:error] = t(".unknown token")
 
       if !user
         flash[:error] = t(".unknown token")


@@ -34,7 +31,6 @@ class ConfirmationsController < ApplicationController
         flash[:notice] = gravatar_status_message(user) if gravatar_enable(user)
         user.save!
         referer = safe_referer(params[:referer]) if params[:referer]
         flash[:notice] = gravatar_status_message(user) if gravatar_enable(user)
         user.save!
         referer = safe_referer(params[:referer]) if params[:referer]

-        UserToken.delete_by(:token => token)

 
         pending_user = session.delete(:pending_user)
 
 
         pending_user = session.delete(:pending_user)
 


@@ -70,10 +66,7 @@ class ConfirmationsController < ApplicationController
 
   def confirm_email
     if request.post?
 
   def confirm_email
     if request.post?

-      token = params[:confirm_string]
-
-      self.current_user = User.find_by_token_for(:new_email, token) ||
-                          UserToken.unexpired.find_by(:token => params[:confirm_string])&.user
+      self.current_user = User.find_by_token_for(:new_email, params[:confirm_string])

 
       if current_user&.new_email?
         current_user.email = current_user.new_email
 
       if current_user&.new_email?
         current_user.email = current_user.new_email


@@ -89,7 +82,6 @@ class ConfirmationsController < ApplicationController
         else
           flash[:errors] = current_user.errors
         end
         else
           flash[:errors] = current_user.errors
         end

-        current_user.tokens.delete_all

         session[:user] = current_user.id
         session[:fingerprint] = current_user.fingerprint
       elsif current_user
         session[:user] = current_user.id
         session[:fingerprint] = current_user.fingerprint
       elsif current_user