Fix mails import due to merge and fix tests

Author: cslzchen

admin_tests/users/test_views.py

@@ -26,7 +26,7 @@
 from admin.users import views
 from admin.users.forms import UserSearchForm, MergeUserForm
 from osf.models.admin_log_entry import AdminLogEntry
-from tests.utils import assert_notification
+from tests.utils import assert_notification, capture_notifications
 from osf.models.notification_type import NotificationType
 
 pytestmark = pytest.mark.django_db
@@ -101,7 +101,11 @@ def test_correct_view_permissions(self):
         request.POST = {'emails': ', '.join(user.emails.all().values_list('address', flat=True))}
         request.user = user
 
-        response = views.ResetPasswordView.as_view()(request, guid=guid)
+        with capture_notifications() as notifications:
+            response = views.ResetPasswordView.as_view()(request, guid=guid)
+
+        assert len(notifications['emits']) == 1
+        assert notifications['emits'][0]['type'] == NotificationType.Type.USER_FORGOT_PASSWORD
         self.assertEqual(response.status_code, 302)
 
 

api/users/services.py

@@ -2,7 +2,8 @@
 from django.utils import timezone
 
 from framework.auth.core import generate_verification_key
-from website import settings, mails
+from osf.models import NotificationType
+from website import settings
 
 
 def send_password_reset_email(user, email, verification_type='password', institutional=False, **mail_kwargs):
@@ -14,14 +15,16 @@ def send_password_reset_email(user, email, verification_type='password', institu
     user.save()
 
     reset_link = furl(settings.DOMAIN).add(path=f'resetpassword/{user._id}/{user.verification_key_v2["token"]}').url
-    mail_template = mails.FORGOT_PASSWORD if not institutional else mails.FORGOT_PASSWORD_INSTITUTION
+    notification_type = NotificationType.Type.USER_FORGOT_PASSWORD_INSTITUTION if institutional \
+        else NotificationType.Type.USER_FORGOT_PASSWORD
 
-    mails.send_mail(
-        to_addr=email,
-        mail=mail_template,
-        reset_link=reset_link,
-        can_change_preferences=False,
-        **mail_kwargs,
+    notification_type.instance.emit(
+        destination_address=email,
+        event_context={
+            'reset_link': reset_link,
+            'can_change_preferences': False,
+            **mail_kwargs,
+        },
     )
 
     return reset_link