[issue-4351] move UserInfoChangedMailer call outside super to prevent…

… race condition
zooniverse · Aug 16, 2024 · aae5b02 · aae5b02
1 parent 883d2e5
commit aae5b02
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/app/controllers/api/v1/users_controller.rb b/app/controllers/api/v1/users_controller.rb
@@ -48,12 +48,16 @@ def me
 
   def update
     prev_email = user.email
+    email_changed = false
     super do |user|
-      if user.email_changed?
-        user.update(valid_email: true)
-        UserInfoChangedMailerWorker.perform_async(user.id, 'email', prev_email)
-      end
+      email_changed = user.email_changed?
+    end
+
+    if email_changed
+      user.update(valid_email: true)
+      UserInfoChangedMailerWorker.perform_async(user.id, 'email', prev_email)
     end
+
   end
 
   def destroy

diff --git a/app/mailers/user_info_changed_mailer.rb b/app/mailers/user_info_changed_mailer.rb
@@ -4,12 +4,12 @@ class UserInfoChangedMailer < ApplicationMailer
   def user_info_changed(user, info, previous_email=nil)
     @user = user
     @recipient_emails = [user.email]
-    @recipient_emails << previous_email if previous_email.present? && info == 'email'
 
     case info
     when "email"
       subject = "Your Zooniverse email address has been changed"
       template = "email_changed"
+      @recipient_emails << previous_email if previous_email
     when "password"
       subject = "Your Zooniverse password has been changed"
       template = "password_changed"