Merge pull request #11302 from bodintsov/fix/no-notification-send-when-primary-email-changed

[ENG-8872] Fix/no notification send when primary email changed

Author: Johnetordoff

api/users/serializers.py

@@ -34,7 +34,7 @@
 from api.nodes.serializers import NodeSerializer, RegionRelationshipField
 from framework.auth.views import send_confirm_email_async
 from osf.exceptions import ValidationValueError, ValidationError, BlockedEmailError
-from osf.models import Email, Node, OSFUser, Preprint, Registration, UserMessage, Institution
+from osf.models import Email, Node, OSFUser, Preprint, Registration, UserMessage, Institution, NotificationType
 from osf.models.user_message import MessageTypes
 from osf.models.provider import AbstractProviderGroupObjectPermission
 from osf.utils.requests import string_type_request_headers
@@ -711,6 +711,17 @@ def update(self, instance, validated_data):
         if primary and instance.confirmed:
             user.username = instance.address
             user.save()
+            notification_type = NotificationType.Type.USER_PRIMARY_EMAIL_CHANGED
+            notification_type.instance.emit(
+                subscribed_object=user,
+                user=user,
+                event_context={
+                    'user_fullname': user.fullname,
+                    'new_address': user.username,
+                    'can_change_preferences': False,
+                    'osf_contact_email': settings.OSF_CONTACT_EMAIL,
+                },
+            )
         elif primary and not instance.confirmed:
             raise exceptions.ValidationError('You cannot set an unconfirmed email address as your primary email address.')
 

api_tests/users/views/test_user_settings.py

@@ -453,25 +453,25 @@ def test_adding_new_token_for_unconfirmed_email(self, app, user_one, unconfirmed
 
     def test_set_primary_email(self, app, confirmed_url, payload, confirmed_email, user_one, user_two, unconfirmed_url):
         payload['data']['attributes'] = {'primary': True}
+        with capture_notifications():
+            # test_set_email_primary_not_logged_in
+            res = app.patch_json_api(confirmed_url, payload, expect_errors=True)
+            assert res.status_code == 401
 
-        # test_set_email_primary_not_logged_in
-        res = app.patch_json_api(confirmed_url, payload, expect_errors=True)
-        assert res.status_code == 401
-
-        # test_set_primary_email_current_user
-        res = app.patch_json_api(confirmed_url, payload, auth=user_one.auth)
-        assert res.status_code == 200
-        user_one.reload()
-        assert user_one.username == confirmed_email.address
+            # test_set_primary_email_current_user
+            res = app.patch_json_api(confirmed_url, payload, auth=user_one.auth)
+            assert res.status_code == 200
+            user_one.reload()
+            assert user_one.username == confirmed_email.address
 
-        # test set primary not current user
-        res = app.patch_json_api(confirmed_url, payload, auth=user_two.auth, expect_errors=True)
-        assert res.status_code == 403
+            # test set primary not current user
+            res = app.patch_json_api(confirmed_url, payload, auth=user_two.auth, expect_errors=True)
+            assert res.status_code == 403
 
-        # test set primary not confirmed fails
-        res = app.patch_json_api(unconfirmed_url, payload, auth=user_one.auth, expect_errors=True)
-        assert res.status_code == 400
-        assert res.json['errors'][0]['detail'] == 'You cannot set an unconfirmed email address as your primary email address.'
+            # test set primary not confirmed fails
+            res = app.patch_json_api(unconfirmed_url, payload, auth=user_one.auth, expect_errors=True)
+            assert res.status_code == 400
+            assert res.json['errors'][0]['detail'] == 'You cannot set an unconfirmed email address as your primary email address.'
 
     def test_delete_email(self, app, payload, user_one, user_two, confirmed_email, confirmed_url, unconfirmed_url, unconfirmed_address):
         # test delete email logged in as another user fails