fix(profil_controller#update_email): ensure we are not merging same account

fix(profil_controller#update_email): changing email from current_user.email to current_user.email destroy current user. whoops ☠️'

Update config/locales/en.yml

Co-authored-by: Pierre de La Morinerie <pierre.de_la_morinerie@beta.gouv.fr>

Update config/locales/fr.yml

Co-authored-by: Pierre de La Morinerie <pierre.de_la_morinerie@beta.gouv.fr>

Update spec/controllers/users/profil_controller_spec.rb

Update config/locales/fr.yml

Co-authored-by: Pierre de La Morinerie <pierre.de_la_morinerie@beta.gouv.fr>

Update spec/controllers/users/profil_controller_spec.rb

fix(spec): broken due to typo

app/controllers/users/profil_controller.rb

@@ -14,9 +14,7 @@ module Users
 
     def update_email
       requested_user = User.find_by(email: requested_email)
-
-      if requested_user.present?
-        current_user.ask_for_merge(requested_user)
+      if requested_user.present? && current_user.ask_for_merge(requested_user)
         current_user.update(unconfirmed_email: nil)
 
         flash.notice = t('devise.registrations.update_needs_confirmation')

app/models/user.rb

@@ -63,6 +63,8 @@ class User < ApplicationRecord
 
   before_validation -> { sanitize_email(:email) }
 
+  validate :does_not_merge_on_self, if: :requested_merge_into_id_changed?
+
   def validate_password_complexity?
     administrateur?
   end
@@ -223,12 +225,21 @@ class User < ApplicationRecord
   end
 
   def ask_for_merge(requested_user)
-    update(requested_merge_into: requested_user)
-    UserMailer.ask_for_merge(self, requested_user.email).deliver_later
+    if update(requested_merge_into: requested_user)
+      UserMailer.ask_for_merge(self, requested_user.email).deliver_later
+      return true
+    else
+      return false
+    end
   end
 
   private
 
+  def does_not_merge_on_self
+    return if requested_merge_into_id != self.id
+    errors.add(:requested_merge_into, :same)
+  end
+
   def link_invites!
     Invite.where(email: email).update_all(user_id: id)
   end