Merge tag '26.1.1' into develop

Notifications refactor phase 2 hotfix part 1

Author: cslzchen

CHANGELOG

@@ -2,6 +2,15 @@
 
 We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.
 
+26.1.1 (2026-01-02)
+===================
+
+- Notifications Refactor Phase 2 - UAT Hotfix Part 1
+  * Fix reset password url
+  * Fix logout query for new user confirmation url
+  * Fix new user default notification subscription
+  * Clean-up / Sync settings
+
 26.1.0 (2026-01-01)
 ===================
 

api/users/views.py

@@ -853,7 +853,7 @@ def get(self, request, *args, **kwargs):
                 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.DOMAIN}passwordreset/{user_obj._id}/{user_obj.verification_key_v2['token']}/'
+                reset_link = f'{settings.DOMAIN}resetpassword/{user_obj._id}/{user_obj.verification_key_v2["token"]}/'
                 if institutional:
                     notification_type = NotificationType.Type.USER_FORGOT_PASSWORD_INSTITUTION
                 else:

framework/auth/views.py

@@ -828,6 +828,7 @@ def send_confirm_email(user, email, renew=False, external_id_provider=None, exte
         destination=destination
     )
 
+    logout_query = ''
     try:
         merge_target = OSFUser.objects.get(emails__address=email)
     except OSFUser.DoesNotExist:
@@ -851,9 +852,11 @@ def send_confirm_email(user, email, renew=False, external_id_provider=None, exte
             'email': merge_target.email,
         }
         notification_type = NotificationType.Type.USER_CONFIRM_MERGE
+        logout_query = '?logout=1'
     elif user.is_active:
         # Add email confirmation
         notification_type = NotificationType.Type.USER_CONFIRM_EMAIL
+        logout_query = '?logout=1'
     elif campaign:
         # Account creation confirmation: from campaign
         notification_type = campaigns.email_template_for_campaign(campaign)
@@ -865,7 +868,7 @@ def send_confirm_email(user, email, renew=False, external_id_provider=None, exte
         destination_address=email,
         event_context={
             'user_fullname': user.fullname,
-            'confirmation_url': f'{confirmation_url}?logout=1',
+            'confirmation_url': f'{confirmation_url}{logout_query}',
             'can_change_preferences': False,
             'external_id_provider': external_id_provider,
             'osf_contact_email': settings.OSF_CONTACT_EMAIL,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "OSF",
-  "version": "26.1.0",
+  "version": "26.1.1",
   "description": "Facilitating Open Science",
   "repository": "https://github.com/CenterForOpenScience/osf.io",
   "author": "Center for Open Science",

website/mailchimp_utils.py

@@ -2,13 +2,13 @@
 import hashlib
 import mailchimp3
 from mailchimp3.mailchimpclient import MailChimpError
-
+from django.contrib.contenttypes.models import ContentType
 from framework import sentry
 from framework.celery_tasks import app
 from framework.celery_tasks.handlers import queued_task
 from framework.auth.signals import user_confirmed
 from osf.exceptions import OSFError
-from osf.models import OSFUser
+from osf.models import OSFUser, NotificationSubscription, NotificationType
 from website import settings
 
 
@@ -119,3 +119,20 @@ def subscribe_on_confirm(user):
     # Subscribe user to general OSF mailing list upon account confirmation
     if settings.ENABLE_EMAIL_SUBSCRIPTIONS:
         subscribe_mailchimp_async(settings.MAILCHIMP_GENERAL_LIST, user._id)
+
+    # Subscribe user to default notification subscriptions
+    NotificationSubscription.objects.get_or_create(
+        user=user,
+        notification_type=NotificationType.Type.REVIEWS_SUBMISSION_STATUS.instance,
+        content_type=ContentType.objects.get_for_model(user),
+        object_id=user.id,
+        defaults={'message_frequency': 'instantly'},
+    )
+
+    NotificationSubscription.objects.get_or_create(
+        user=user,
+        notification_type=NotificationType.Type.USER_FILE_UPDATED.instance,
+        content_type=ContentType.objects.get_for_model(user),
+        object_id=user.id,
+        defaults={'message_frequency': 'instantly'},
+    )

website/settings/defaults.py

@@ -182,14 +182,10 @@ def parent_dir(path):
 
 # Triggered emails
 OSF_HELP_LIST = 'Open Science Framework Help'
-PREREG_AGE_LIMIT = timedelta(weeks=12)
-PREREG_WAIT_TIME = timedelta(weeks=2)
 WAIT_BETWEEN_MAILS = timedelta(days=7)
 NO_ADDON_WAIT_TIME = timedelta(weeks=8)
 NO_LOGIN_WAIT_TIME = timedelta(weeks=4)
-WELCOME_OSF4M_WAIT_TIME = timedelta(weeks=2)
 NO_LOGIN_OSF4M_WAIT_TIME = timedelta(weeks=6)
-WELCOME_OSF4M_WAIT_TIME_GRACE = timedelta(days=12)
 
 # Configuration for NO_LOGIN_EMAIL (NotificationType.Type.USER_NO_LOGIN)
 MAX_DAILY_NO_LOGIN_EMAILS = 1000