more clean-up from self-CR

Author: Johnetordoff

api/nodes/serializers.py

@@ -1256,15 +1256,11 @@ def create(self, validated_data):
 
         try:
             contributor_dict = {
-                'auth': auth,
-                'user_id': id,
-                'email': email,
-                'full_name': full_name,
-                'send_email': send_email,
-                'bibliographic': bibliographic,
-                'index': index,
-                'permissions': permissions,
+                'auth': auth, 'user_id': id, 'email': email, 'full_name': full_name, 'send_email': send_email,
+                'bibliographic': bibliographic, 'index': index,
             }
+
+            contributor_dict['permissions'] = permissions
             contributor_obj = node.add_contributor_registered_or_not(**contributor_dict)
         except ValidationError as e:
             raise exceptions.ValidationError(detail=e.messages[0])

api/nodes/views.py

@@ -1051,7 +1051,7 @@ def perform_create(self, serializer):
                 user=user,
                 event_context={
                     'guid': node._id,
-                    'title': node._id,
+                    'title': node.title,
                     'can_change_preferences': False,
                 },
             )
@@ -1063,7 +1063,7 @@ def perform_create(self, serializer):
                 user=user,
                 event_context={
                     'guid': fork._id,
-                    'title': node._id,
+                    'title': node.title,
                     'can_change_preferences': False,
                 },
             )

api/providers/serializers.py

@@ -347,10 +347,6 @@ def create(self, validated_data):
 
         if bool(get_perms(user, provider)):
             raise ValidationError('Specified user is already a moderator.')
-        if 'claim_url' in context:
-            template = NotificationType.Type.PROVIDER_CONFIRM_EMAIL_MODERATION
-        else:
-            template = NotificationType.Type.PROVIDER_MODERATOR_ADDED
 
         perm_group = validated_data.pop('permission_group', '')
         if perm_group not in REVIEW_GROUPS:
@@ -362,9 +358,12 @@ def create(self, validated_data):
 
         provider.add_to_group(user, perm_group)
         setattr(user, 'permission_group', perm_group)  # Allows reserialization
-        print(template, context)
+        if 'claim_url' in context:
+            notification_type = NotificationType.Type.PROVIDER_CONFIRM_EMAIL_MODERATION
+        else:
+            notification_type = NotificationType.Type.PROVIDER_MODERATOR_ADDED
         NotificationType.objects.get(
-            name=template,
+            name=notification_type,
         ).emit(
             user=user,
             event_context=context,

api/providers/tasks.py

@@ -639,18 +639,6 @@ def bulk_upload_finish_job(upload, row_count, success_count, draft_errors, appro
     approval_errors.sort()
     if not dry_run:
         upload.save()
-        notification_type = None
-        event_context = {
-            'initiator_fullname': initiator.fullname,
-            'auto_approval': auto_approval,
-            'count': row_count,
-            'pending_submissions_url': get_registration_provider_submissions_url(provider),
-            'draft_errors': draft_errors,
-            'approval_errors': approval_errors,
-            'successes': success_count,
-            'failures': len(draft_errors),
-            'osf_support_email': settings.OSF_SUPPORT_EMAIL,
-        }
 
         if upload.state == JobState.DONE_FULL:
             notification_type = NotificationType.Type.USER_REGISTRATION_BULK_UPLOAD_SUCCESS_ALL
@@ -666,12 +654,22 @@ def bulk_upload_finish_job(upload, row_count, success_count, draft_errors, appro
             name=notification_type,
         ).emit(
             user=initiator,
-            event_context=event_context,
+            event_context={
+                'initiator_fullname': initiator.fullname,
+                'auto_approval': auto_approval,
+                'count': row_count,
+                'pending_submissions_url': get_registration_provider_submissions_url(provider),
+                'draft_errors': draft_errors,
+                'approval_errors': approval_errors,
+                'successes': success_count,
+                'failures': len(draft_errors),
+                'osf_support_email': settings.OSF_SUPPORT_EMAIL,
+            },
         )
 
         upload.email_sent = timezone.now()
         upload.save()
-        logger.info(f'Notification sent to bulk upload initiator [{initiator._id}]')
+        logger.info(f'Email sent to bulk upload initiator [{initiator._id}]')
 
 
 def handle_internal_error(initiator=None, provider=None, message=None, dry_run=True):

api/users/views.py

@@ -825,29 +825,33 @@ def get(self, request, *args, **kwargs):
         if not email:
             raise ValidationError('Request must include email in query params.')
 
-        institutional = bool(request.query_params.get('institutional', None))
-        mail_template = 'forgot_password' if not institutional else 'forgot_password_institution'
-
         status_message = language.RESET_PASSWORD_SUCCESS_STATUS_MESSAGE.format(email=email)
-        kind = 'success'
         # check if the user exists
         user_obj = get_user(email=email)
+        institutional = bool(request.query_params.get('institutional', None))
 
         if user_obj:
             # rate limit forgot_password_post
             if not throttle_period_expired(user_obj.email_last_sent, settings.SEND_EMAIL_THROTTLE):
-                status_message = 'You have recently requested to change your password. Please wait a few minutes ' \
-                                 'before trying again.'
-                kind = 'error'
-                return Response({'message': status_message, 'kind': kind}, status=status.HTTP_429_TOO_MANY_REQUESTS)
+                return Response(
+                    {
+                        'message': language.THROTTLE_PASSWORD_CHANGE_ERROR_MESSAGE,
+                        'kind': 'error',
+                    },
+                    status=status.HTTP_429_TOO_MANY_REQUESTS,
+                )
             elif user_obj.is_active:
                 # new random verification key (v2)
                 user_obj.verification_key_v2 = generate_verification_key(verification_type='password')
                 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']}/'
+                if institutional:
+                    notification_type = NotificationType.Type.USER_FORGOT_PASSWORD_INSTITUTION
+                else:
+                    notification_type = NotificationType.Type.USER_FORGOT_PASSWORD
 
-                NotificationType.objects.get(name=mail_template).emit(
+                NotificationType.objects.get(name=notification_type).emit(
                     user=user_obj,
                     message_frequency='instantly',
                     event_context={
@@ -856,7 +860,14 @@ def get(self, request, *args, **kwargs):
                     },
                 )
 
-        return Response(status=status.HTTP_200_OK, data={'message': status_message, 'kind': kind, 'institutional': institutional})
+        return Response(
+            status=status.HTTP_200_OK,
+            data={
+                'message': status_message,
+                'kind': 'success',
+                'institutional': institutional,
+            },
+        )
 
     @method_decorator(csrf_protect)
     def post(self, request, *args, **kwargs):

website/language.py

@@ -222,6 +222,9 @@
     'you should have, please contact OSF Support. '
 )
 
+THROTTLE_PASSWORD_CHANGE_ERROR_MESSAGE = \
+    'You have recently requested to change your password. Please wait a few minutes before trying again.'
+
 SANCTION_STATUS_MESSAGES = {
     'registration': {
         'approve': 'Your registration approval has been accepted.',