Upgrade User Confirmation Registrations

Author: Ostap-Zherebetskyi

api/users/views.py

@@ -99,6 +99,7 @@
     OSFUser,
     Email,
     Tag,
+    NotificationType
 )
 from osf.utils.tokens import TokenHandler
 from osf.utils.tokens.handlers import sanction_handler
@@ -822,7 +823,7 @@ def get(self, request, *args, **kwargs):
             raise ValidationError('Request must include email in query params.')
 
         institutional = bool(request.query_params.get('institutional', None))
-        mail_template = mails.FORGOT_PASSWORD if not institutional else mails.FORGOT_PASSWORD_INSTITUTION
+        mail_template = 'forgot_password' if not institutional else 'forgot_password_institution'
 
         status_message = language.RESET_PASSWORD_SUCCESS_STATUS_MESSAGE.format(email=email)
         kind = 'success'
@@ -842,12 +843,15 @@ def get(self, request, *args, **kwargs):
                 user_obj.email_last_sent = timezone.now()
                 user_obj.save()
                 reset_link = f'{settings.RESET_PASSWORD_URL}{user_obj._id}/{user_obj.verification_key_v2['token']}/'
-                mails.send_mail(
-                    to_addr=email,
-                    mail=mail_template,
-                    reset_link=reset_link,
-                    can_change_preferences=False,
-                )
+
+                notification_type = NotificationType.objects.filter(name=mail_template)
+                if not notification_type.exists():
+                    raise NotificationType.DoesNotExist(
+                        f'NotificationType with name {mail_template} does not exist.'
+                    )
+                notification_type = notification_type.first()
+                notification_type.emit(user=user_obj, event_context={'can_change_preferences': False, 'reset_link': reset_link})
+
         return Response(status=status.HTTP_200_OK, data={'message': status_message, 'kind': kind, 'institutional': institutional})
 
     @method_decorator(csrf_protect)
@@ -1059,13 +1063,13 @@ def _process_external_identity(self, user, external_identity, service_url):
         if external_status == 'CREATE':
             service_url += '&' + urlencode({'new': 'true'})
         elif external_status == 'LINK':
-            mails.send_mail(
-                user=user,
-                to_addr=user.username,
-                mail=mails.EXTERNAL_LOGIN_LINK_SUCCESS,
-                external_id_provider=provider,
-                can_change_preferences=False,
-            )
+            notification_type = NotificationType.objects.filter(name='external_confirm_success')
+            if not notification_type.exists():
+                raise NotificationType.DoesNotExist(
+                    'NotificationType with name external_confirm_success does not exist.'
+                )
+            notification_type = notification_type.first()
+            notification_type.emit(user=user, event_context={'can_change_preferences': False, 'external_id_provider': provider})
 
         enqueue_task(update_affiliation_for_orcid_sso_users.s(user._id, provider_id))
 
@@ -1380,13 +1384,13 @@ def post(self, request, *args, **kwargs):
         if external_status == 'CREATE':
             service_url += '&{}'.format(urlencode({'new': 'true'}))
         elif external_status == 'LINK':
-            mails.send_mail(
-                user=user,
-                to_addr=user.username,
-                mail=mails.EXTERNAL_LOGIN_LINK_SUCCESS,
-                external_id_provider=provider,
-                can_change_preferences=False,
-            )
+            notification_type = NotificationType.objects.filter(name='external_confirm_success')
+            if not notification_type.exists():
+                raise NotificationType.DoesNotExist(
+                    'NotificationType with name external_confirm_success does not exist.'
+                )
+            notification_type = notification_type.first()
+            notification_type.emit(user=user, event_context={'can_change_preferences': False, 'external_id_provider': provider})
 
         enqueue_task(update_affiliation_for_orcid_sso_users.s(user._id, provider_id))
 

framework/auth/views.py

@@ -33,6 +33,7 @@
 from osf.exceptions import ValidationValueError, BlockedEmailError
 from osf.models.provider import PreprintProvider
 from osf.models.tag import Tag
+from osf.models.notification import NotificationType
 from osf.utils.requests import check_select_for_update
 from website.util.metrics import CampaignClaimedTags, CampaignSourceTags
 from website.ember_osf_web.decorators import ember_flag_is_active
@@ -207,14 +208,14 @@ def redirect_unsupported_institution(auth):
 def forgot_password_post():
     """Dispatches to ``_forgot_password_post`` passing non-institutional user mail template
     and reset action."""
-    return _forgot_password_post(mail_template=mails.FORGOT_PASSWORD,
+    return _forgot_password_post(mail_template='forgot_password',
                                  reset_route='reset_password_get')
 
 
 def forgot_password_institution_post():
     """Dispatches to `_forgot_password_post` passing institutional user mail template, reset
     action, and setting the ``institutional`` flag."""
-    return _forgot_password_post(mail_template=mails.FORGOT_PASSWORD_INSTITUTION,
+    return _forgot_password_post(mail_template='forgot_password_institution',
                                  reset_route='reset_password_institution_get',
                                  institutional=True)
 
@@ -272,12 +273,13 @@ def _forgot_password_post(mail_template, reset_route, institutional=False):
                         token=user_obj.verification_key_v2['token']
                     )
                 )
-                mails.send_mail(
-                    to_addr=email,
-                    mail=mail_template,
-                    reset_link=reset_link,
-                    can_change_preferences=False,
-                )
+                notification_type = NotificationType.objects.filter(name=mail_template)
+                if not notification_type.exists():
+                    raise NotificationType.DoesNotExist(
+                        f'NotificationType with name {mail_template} does not exist.'
+                    )
+                notification_type = notification_type.first()
+                notification_type.emit(user=user_obj, event_context={'can_change_preferences': False, 'reset_link': reset_link})
 
         # institutional forgot password page displays the message as main text, not as an alert
         if institutional: