Merge pull request #11546 from bodintsov/fix/unify-keys-in-email-templates

cslzchen · web-flow · commit 6ec559977b2c · 2026-02-12T09:29:52.000-05:00
[ENG-9887] Fix naming and unify keys in templates
diff --git a/addons/base/views.py b/addons/base/views.py
@@ -582,7 +582,6 @@ def create_waterbutler_log(payload, **kwargs):
                     user=user,
                     subscribed_object=node,
                     event_context={
-                        'user_fullname': user.fullname,
                         'action': payload['action'],
                         'source_node': source_node._id,
                         'source_node_title': source_node.title,
diff --git a/addons/boa/tasks.py b/addons/boa/tasks.py
@@ -187,14 +187,11 @@ async def submit_to_boa_async(host, username, password, user_guid, project_guid,
         user=user,
         event_context={
             'user_fullname': user.fullname,
-            'query_file_name': query_file_name,
             'query_file_full_path': file_full_path,
             'output_file_name': output_file_name,
             'job_id': boa_job.id,
             'project_url': project_url,
             'boa_job_list_url': boa_settings.BOA_JOB_LIST_URL,
-            'boa_support_email': boa_settings.BOA_SUPPORT_EMAIL,
-            'osf_support_email': osf_settings.OSF_SUPPORT_EMAIL,
         }
     )
     return BoaErrorCode.NO_ERROR
@@ -214,7 +211,6 @@ def handle_boa_error(message, code, username, fullname, project_url, query_file_
         event_context={
             'user_fullname': fullname,
             'code': code,
-            'query_file_name': query_file_name,
             'file_size': file_size,
             'message': message,
             'max_file_size': boa_settings.MAX_SUBMISSION_SIZE,
diff --git a/admin/users/views.py b/admin/users/views.py
@@ -189,7 +189,6 @@ def post(self, request, *args, **kwargs):
                 event_context={
                     'user_fullname': user.fullname,
                     'contact_email': OSF_SUPPORT_EMAIL,
-                    'can_change_preferences': False,
                 }
             )
         else:
diff --git a/api/institutions/authentication.py b/api/institutions/authentication.py
@@ -352,7 +352,6 @@ def authenticate(self, request):
                 user=user,
                 event_context={
                     'domain': DOMAIN,
-                    'osf_support_email': OSF_SUPPORT_EMAIL,
                     'user_fullname': user.fullname,
                     'storage_flag_is_active': flag_is_active(request, features.STORAGE_I18N),
                 },
@@ -368,9 +367,7 @@ def authenticate(self, request):
                 event_context={
                     'user_fullname': user.fullname,
                     'email_to_add': email_to_add,
-                    'domain': DOMAIN,
                     'osf_support_email': OSF_SUPPORT_EMAIL,
-                    'storage_flag_is_active': flag_is_active(request, features.STORAGE_I18N),
                 },
                 save=False,
             )
@@ -390,10 +387,8 @@ def authenticate(self, request):
                     'user_fullname': user.fullname,
                     'user_username': user.username,
                     'user__id': user._id,
-                    'duplicate_user_fullname': duplicate_user.fullname,
                     'duplicate_user_username': duplicate_user.username,
                     'duplicate_user__id': duplicate_user._id,
-                    'domain': DOMAIN,
                     'osf_support_email': OSF_SUPPORT_EMAIL,
                 },
             )
diff --git a/api/nodes/views.py b/api/nodes/views.py
@@ -1073,9 +1073,7 @@ def perform_create(self, serializer):
                 user=user,
                 subscribed_object=node,
                 event_context={
-                    'domain': settings.DOMAIN,
                     'node_title': node.title,
-                    'can_change_preferences': False,
                 },
             )
             raise exc
@@ -1086,9 +1084,7 @@ def perform_create(self, serializer):
             event_context={
                 'domain': settings.DOMAIN,
                 'node_title': node.title,
-                'fork_title': fork.title,
                 'fork__id': fork._id,
-                'can_change_preferences': False,
             },
         )
 
diff --git a/api/providers/tasks.py b/api/providers/tasks.py
@@ -653,13 +653,11 @@ def bulk_upload_finish_job(upload, row_count, success_count, draft_errors, appro
             user=initiator,
             event_context={
                 'user_fullname': initiator.fullname,
-                'initiator_fullname': initiator.fullname,
                 'auto_approval': auto_approval,
                 'count': row_count,
                 'total': row_count,
                 'pending_submissions_url': f'{get_registration_provider_submissions_url(provider)}?status=pending',
                 'draft_errors': draft_errors,
-                'approval_errors': approval_errors,
                 'successes': success_count,
                 'failures': len(draft_errors),
                 'osf_support_email': settings.OSF_SUPPORT_EMAIL,
diff --git a/api/requests/serializers.py b/api/requests/serializers.py
@@ -196,10 +196,9 @@ def make_node_institutional_access_request(self, node, validated_data) -> NodeRe
                     'sender_absolute_url': sender.absolute_url,
                     'node_absolute_url': node_request.target.absolute_url,
                     'node_title': node_request.target.title,
-                    'recipient_fullname': recipient.username if recipient else None,
+                    'recipient_username': recipient.username if recipient else None,
                     'comment': comment,
                     'domain': settings.DOMAIN,
-                    'institution_name': institution.name if institution else None,
                 },
                 email_context={
                     'bcc_addr': [sender.username] if validated_data['bcc_sender'] else None,
diff --git a/api/users/serializers.py b/api/users/serializers.py
@@ -744,7 +744,6 @@ def update(self, instance, validated_data):
                 event_context={
                     'user_fullname': user.fullname,
                     'new_address': user.username,
-                    'can_change_preferences': False,
                     'osf_contact_email': settings.OSF_CONTACT_EMAIL,
                 },
             )
diff --git a/api/users/services.py b/api/users/services.py
@@ -22,7 +22,6 @@ def send_password_reset_email(user, email, verification_type='password', institu
         destination_address=email,
         event_context={
             'reset_link': reset_link,
-            'can_change_preferences': False,
             **mail_kwargs,
         },
     )
diff --git a/api/users/views.py b/api/users/views.py
@@ -652,7 +652,6 @@ def create(self, request, *args, **kwargs):
                 'user_username': user.username,
                 'user_absolute_url': user.absolute_url,
                 'user__id': user._id,
-                'can_change_preferences': False,
             },
         )
         user.email_last_sent = timezone.now()
@@ -865,7 +864,6 @@ def get(self, request, *args, **kwargs):
                     user=user_obj,
                     message_frequency='instantly',
                     event_context={
-                        'can_change_preferences': False,
                         'reset_link': reset_link,
                     },
                 )
@@ -1173,7 +1171,6 @@ def _process_external_identity(self, user, external_identity, service_url):
                 message_frequency='instantly',
                 event_context={
                     'user_fullname': user.fullname,
-                    'can_change_preferences': False,
                     'external_id_provider': provider,
                 },
             )
@@ -1494,7 +1491,6 @@ def post(self, request, *args, **kwargs):
                 user=user,
                 message_frequency='instantly',
                 event_context={
-                    'can_change_preferences': False,
                     'external_id_provider': provider.name,
                 },
             )
diff --git a/framework/auth/views.py b/framework/auth/views.py
@@ -280,8 +280,6 @@ def _forgot_password_post(notificaton_type, reset_route, institutional=False):
                     user=user_obj,
                     event_context={
                         'reset_link': reset_link,
-                        'can_change_preferences': False,
-                        'osf_contact_email': settings.OSF_CONTACT_EMAIL,
                     },
                 )
 
@@ -664,7 +662,6 @@ def external_login_confirm_email_get(auth, uid, token):
             event_context={
                 'user_fullname': user.fullname,
                 'external_id_provider': provider,
-                'can_change_preferences': False,
                 'osf_contact_email': settings.OSF_CONTACT_EMAIL,
             },
         )
@@ -869,7 +866,6 @@ def send_confirm_email(user, email, renew=False, external_id_provider=None, exte
         event_context={
             'user_fullname': user.fullname,
             'confirmation_url': f'{confirmation_url}{logout_query}',
-            'can_change_preferences': False,
             'external_id_provider': external_id_provider,
             'osf_contact_email': settings.OSF_CONTACT_EMAIL,
             'osf_support_email': settings.OSF_SUPPORT_EMAIL,
diff --git a/notifications/tasks.py b/notifications/tasks.py
@@ -108,8 +108,6 @@ def send_user_email_task(self, user_id, notification_ids, **kwargs):
 
         event_context = {
             'notifications': rendered_notifications,
-            'user_fullname': user.fullname,
-            'can_change_preferences': False
         }
 
         NotificationType.Type.USER_DIGEST.instance.emit(
@@ -252,7 +250,6 @@ def send_moderator_email_task(self, user_id, notification_ids, provider_content_
         event_context = {
             'notifications': rendered_notifications,
             'user_fullname': user.fullname,
-            'can_change_preferences': False,
             'notification_settings_url': notification_settings_url,
             'reviews_withdrawal_url': withdrawals_url,
             'reviews_submissions_url': submissions_url,
diff --git a/osf/management/commands/check_crossref_dois.py b/osf/management/commands/check_crossref_dois.py
@@ -126,7 +126,6 @@ def report_stuck_dois(dry_run=True):
             NotificationType.Type.USER_CROSSREF_DOI_PENDING.instance.emit(
                 destination_address=settings.OSF_SUPPORT_EMAIL,
                 event_context={
-                    'pending_doi_count': preprints_with_pending_dois.count(),
                     'time_since_published': time_since_published.days,
                     'guids': guids,
                 }
diff --git a/osf/management/commands/deactivate_requested_accounts.py b/osf/management/commands/deactivate_requested_accounts.py
@@ -27,7 +27,6 @@ def deactivate_requested_accounts(dry_run=True):
                         'user__id': user._id,
                         'user_absolute_url': user.absolute_url,
                         'user_username': user.username,
-                        'can_change_preferences': False,
                     }
                 )
         else:
@@ -40,7 +39,6 @@ def deactivate_requested_accounts(dry_run=True):
                     event_context={
                         'user_fullname': user.fullname,
                         'contact_email': OSF_SUPPORT_EMAIL,
-                        'can_change_preferences': False,
                     }
                 )
 
diff --git a/osf/management/commands/send_storage_exceeded_announcement.py b/osf/management/commands/send_storage_exceeded_announcement.py
@@ -46,7 +46,6 @@ def main(json_file, dry=False):
                         event_context={
                             'public_nodes': public_nodes,
                             'private_nodes': private_nodes,
-                            'can_change_preferences': False,
                         }
                     )
                 except Exception:
diff --git a/osf/models/collection_submission.py b/osf/models/collection_submission.py
@@ -139,15 +139,12 @@ def _notify_moderators_pending(self, event_data):
             user=user,
             subscribed_object=self.collection.provider,
             event_context={
-                'provider_id': self.collection.provider.id,
-                'submitter_fullname': self.creator.fullname,
                 'requester_fullname': event_data.kwargs.get('user').fullname,
                 'requester_contributor_names': ''.join(self.guid.referent.contributors.values_list('fullname', flat=True)),
                 'localized_timestamp': str(timezone.now()),
                 'message': f'submitted "{self.guid.referent.title}".',
                 'reviews_submission_url': f'{DOMAIN}reviews/registries/{self.guid.referent._id}/{self.guid.referent._id}',
                 'is_request_email': False,
-                'is_initiator': self.creator == user,
                 'profile_image_url': user.profile_image_url(),
                 'logo': self.collection.provider._id if
                 self.collection.provider and not self.collection.provider.is_default else settings.OSF_PREPRINTS_LOGO,
@@ -309,21 +306,14 @@ def _notify_removed(self, event_data):
                         **event_context_base,
                         'requester_contributor_names': ''.join(
                             self.guid.referent.contributors.values_list('fullname', flat=True)),
-
                         'is_admin': node.has_permission(contributor, ADMIN),
                         'rejection_justification': event_data.kwargs.get('comment'),
-                        'collections_title': self.collection.title,
                         'collection_provider_name': self.collection.provider.name,
                         'collection_provider__id': self.collection.provider._id,
-                        'remover_absolute_url': user.get_absolute_url() if user is not None else None,
                         'node_absolute_url': node.absolute_url,
                         'collection_provider': self.collection.provider.name,
                         'collections_link': DOMAIN + 'collections/' + self.collection.provider._id,
                         'user_fullname': contributor.fullname,
-                        'is_request_email': False,
-                        'message': '',
-                        'localized_timestamp': str(timezone.now()),
-                        'reviews_submission_url': f'{DOMAIN}reviews/registries/{self.guid.referent._id}/{self.guid.referent._id}',
                     },
                 )
         elif is_admin and self.collection.provider:
@@ -332,21 +322,12 @@ def _notify_removed(self, event_data):
                     user=contributor,
                     event_context={
                         **event_context_base,
-                        'requester_contributor_names': ''.join(
-                            self.guid.referent.contributors.values_list('fullname', flat=True)),
-                        'localized_timestamp': str(timezone.now()),
                         'user_fullname': contributor.fullname,
-                        'collections_title': self.collection.title,
                         'collection_provider_name': self.collection.provider.name,
-                        'collection_provider__id': self.collection.provider._id,
                         'collection_provider': self.collection.provider.name,
                         'collections_link': DOMAIN + 'collections/' + self.collection.provider._id,
                         'node_absolute_url': node.get_absolute_url(),
-                        'is_request_email': False,
-                        'message': '',
                         'is_admin': node.has_permission(contributor, ADMIN),
-                        'reviews_submission_url': f'{DOMAIN}reviews/registries/{self.guid.referent._id}/{self.guid.referent._id}',
-
                     },
                 )
 
@@ -392,29 +373,18 @@ def _notify_cancel(self, event_data):
                 user=contributor,
                 subscribed_object=self.collection,
                 event_context={
-                    'requester_contributor_names': ''.join(
-                        node.contributors.values_list('fullname', flat=True)),
-                    'profile_image_url': user.profile_image_url(),
                     'user_fullname': contributor.fullname,
-                    'requester_fullname': self.creator.fullname,
                     'is_admin': node.has_permission(contributor, ADMIN),
                     'node_title': node.title,
                     'node_absolute_url': node.get_absolute_url(),
                     'remover_fullname': user.fullname if user else '',
                     'remover_absolute_url': user.get_absolute_url() if user else '',
-                    'localized_timestamp': str(timezone.now()),
                     'collections_link': collections_link,
-                    'collection_title': self.collection.title,
                     'collection_provider_name': collection_provider_name,
                     'node_absolute_url"': node.get_absolute_url(),
                     'collection_provider': collection_provider_name,
                     'domain': settings.DOMAIN,
-                    'is_request_email': False,
-                    'message': '',
                     'osf_contact_email': settings.OSF_CONTACT_EMAIL,
-                    'reviews_submission_url': f'{DOMAIN}reviews/registries/{self.guid.referent._id}/{self.guid.referent._id}',
-                    'logo': self.collection.provider._id if
-                    self.collection.provider and not self.collection.provider.is_default else settings.OSF_PREPRINTS_LOGO,
                 },
             )
 
diff --git a/osf/models/mixins.py b/osf/models/mixins.py
@@ -2327,7 +2327,6 @@ def suspend_spam_user(self, user):
                 event_context={
                     'user_fullname': user.fullname,
                     'osf_support_email': settings.OSF_SUPPORT_EMAIL,
-                    'can_change_preferences': False
                 }
             )
         user.save()
diff --git a/osf/models/preprint.py b/osf/models/preprint.py
@@ -1075,24 +1075,18 @@ def _send_preprint_confirmation(self, auth):
             subscribed_object=self.provider,
             user=recipient,
             event_context={
-                'domain': settings.DOMAIN,
                 'user_fullname': recipient.fullname,
                 'referrer_fullname': recipient.fullname,
                 'reviewable_title': self.title,
                 'no_future_emails': self.provider.allow_submissions,
                 'reviewable_absolute_url': self.absolute_url,
                 'reviewable_provider_name': self.provider.name,
-                'reviewable_provider__id': self.provider._id,
                 'workflow': self.provider.reviews_workflow,
                 'provider_url': f'{self.provider.domain or settings.DOMAIN}preprints/'
                                 f'{(self.provider._id if not self.provider.domain else '').strip('/')}',
-                'provider_contact_email': self.provider.email_contact or settings.OSF_CONTACT_EMAIL,
-                'provider_support_email': self.provider.email_support or settings.OSF_SUPPORT_EMAIL,
                 'is_creator': True,
                 'provider_name': 'OSF Preprints' if self.provider.name == 'Open Science Framework' else self.provider.name,
-                'logo': settings.OSF_PREPRINTS_LOGO if self.provider._id == 'osf' else self.provider._id,
                 'document_type': self.provider.preprint_word,
-                'notify_comment': not self.provider.reviews_comments_private
             },
         )
 
diff --git a/osf/models/user.py b/osf/models/user.py
@@ -1104,7 +1104,6 @@ def set_password(self, raw_password, notify=True):
                 event_context={
                     'domain': website_settings.DOMAIN,
                     'user_fullname': self.fullname,
-                    'can_change_preferences': False,
                     'osf_contact_email': website_settings.OSF_CONTACT_EMAIL
                 }
             )
diff --git a/osf/utils/notifications.py b/osf/utils/notifications.py
@@ -118,21 +118,14 @@ def notify_edit_comment(resource, user, action, states, *args, **kwargs):
 def notify_reject_withdraw_request(resource, action, *args, **kwargs):
     context = get_email_template_context(resource)
     context['requester_fullname'] = action.creator.fullname
-    context['referrer_fullname'] = action.creator.fullname
-    context['force_withdrawal'] = False
     context['notify_comment'] = not resource.provider.reviews_comments_private
-    context['reviewable_withdrawal_justification'] = resource.withdrawal_justification
 
     for contributor in resource.contributors.all():
-        context['user_fullname'] = contributor.fullname
         context['contributor_fullname'] = contributor.fullname
-        context['is_requester'] = action.creator == contributor
         context['comment'] = action.comment
         NotificationType.Type.NODE_WITHDRAWAl_REQUEST_REJECTED.instance.emit(
             user=contributor,
             event_context={
-                'is_requester': contributor == action.creator,
-                'ever_public': getattr(resource, 'ever_public', resource.is_public),
                 **context
             },
         )
diff --git a/scripts/stuck_registration_audit.py b/scripts/stuck_registration_audit.py
@@ -101,7 +101,6 @@ def main():
                 'broken_registrations_count': len(broken_registrations),
                 'attachment_name': filename,
                 'attachement_content': output.getvalue(),
-                'can_change_preferences': False
             }
         )
 
diff --git a/website/archiver/utils.py b/website/archiver/utils.py
diff --git a/website/profile/views.py b/website/profile/views.py
diff --git a/website/project/views/contributor.py b/website/project/views/contributor.py
diff --git a/website/templates/invite_default.html.mako b/website/templates/invite_default.html.mako
diff --git a/website/templates/node_request_institutional_access_request.html.mako b/website/templates/node_request_institutional_access_request.html.mako

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,6 @@ def post(self, request, args, *kwargs):`
`189`	`189`	`event_context={`
`190`	`190`	`'user_fullname': user.fullname,`
`191`	`191`	`'contact_email': OSF_SUPPORT_EMAIL,`
`192`		`- 'can_change_preferences': False,`
`193`	`192`	`}`
`194`	`193`	`)`
`195`	`194`	`else:`
Original file line number	Diff line number	Diff line change
`@@ -744,7 +744,6 @@ def update(self, instance, validated_data):`
`744`	`744`	`event_context={`
`745`	`745`	`'user_fullname': user.fullname,`
`746`	`746`	`'new_address': user.username,`
`747`		`- 'can_change_preferences': False,`
`748`	`747`	`'osf_contact_email': settings.OSF_CONTACT_EMAIL,`
`749`	`748`	`},`
`750`	`749`	`)`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ def send_password_reset_email(user, email, verification_type='password', institu`
`22`	`22`	`destination_address=email,`
`23`	`23`	`event_context={`
`24`	`24`	`'reset_link': reset_link,`
`25`		`- 'can_change_preferences': False,`
`26`	`25`	`**mail_kwargs,`
`27`	`26`	`},`
`28`	`27`	`)`