From: Tom Hughes <tom@compton.nu>
Date: Tue, 27 Feb 2024 20:53:51 +0000 (+0000)
Subject: Generate email change token before changing the address
X-Git-Tag: live~691
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/c3a14b195b9be06e653d4c362be862dd53edd704?hp=-c

Generate email change token before changing the address
---

c3a14b195b9be06e653d4c362be862dd53edd704
diff --git a/app/controllers/concerns/user_methods.rb b/app/controllers/concerns/user_methods.rb
index 8cba09827..28305b5c3 100644
--- a/app/controllers/concerns/user_methods.rb
+++ b/app/controllers/concerns/user_methods.rb
@@ -45,13 +45,15 @@ module UserMethods
       if user.new_email.blank? || user.new_email == user.email
         flash[:notice] = t "accounts.update.success"
       else
+        token = user.generate_token_for(:new_email)
+
         user.email = user.new_email
 
         if user.valid?
           flash[:notice] = t "accounts.update.success_confirm_needed"
 
           begin
-            UserMailer.email_confirm(user, user.generate_token_for(:new_email)).deliver_later
+            UserMailer.email_confirm(user, token).deliver_later
           rescue StandardError
             # Ignore errors sending email
           end