make send email on account merge

Author: bodintsov

framework/auth/views.py

@@ -832,7 +832,7 @@ def send_confirm_email(user, email, renew=False, external_id_provider=None, exte
         merge_target = OSFUser.objects.get(emails__address=email)
     except OSFUser.DoesNotExist:
         merge_target = None
-
+    merge_account_data = {}
     campaign = campaigns.campaign_for_user(user)
     # Choose the appropriate email template to use and add existing_user flag if a merge or adding an email.
     if external_id_provider and external_id:
@@ -845,6 +845,11 @@ def send_confirm_email(user, email, renew=False, external_id_provider=None, exte
             raise HTTPError(http_status.HTTP_400_BAD_REQUEST, data={})
     elif merge_target:
         # Merge account confirmation
+        merge_account_data = {
+            'merge_target_fullname': merge_target.fullname or merge_target.username,
+            'user_username': user.fullname,
+            'email': merge_target.email,
+        }
         notification_type = NotificationType.Type.USER_CONFIRM_MERGE
     elif user.is_active:
         # Add email confirmation
@@ -866,6 +871,7 @@ def send_confirm_email(user, email, renew=False, external_id_provider=None, exte
             'external_id_provider': external_id_provider,
             'osf_contact_email': settings.OSF_CONTACT_EMAIL,
             'osf_support_email': settings.OSF_SUPPORT_EMAIL,
+            **merge_account_data,
         },
     )
 

website/templates/confirm_merge.html.mako

@@ -5,7 +5,7 @@
   <td style="border-collapse: collapse;">
     Hello ${merge_target_fullname},<br>
     <br>
-    This email is to notify you that ${user_username} has initiated an account merge with your account on the Open Science Framework (OSF). This merge will move all of the projects and components associated with ${email} and with ${user_username} into one account. All projects and components will be displayed under ${user.username}.<br>
+    This email is to notify you that ${user_username} has initiated an account merge with your account on the Open Science Framework (OSF). This merge will move all of the projects and components associated with ${email} and with ${user_username} into one account. All projects and components will be displayed under ${user_username}.<br>
     <br>
     Both ${user_username} and ${email} can be used to log into the account. However, ${email} will no longer show up in user search.<br>
     <br>