Merge pull request #26413 from edx/reset-password-success-email

reset-password-success-email

openedx/core/djangoapps/user_authn/views/password_reset.py

@@ -715,10 +715,10 @@ class LogistrationPasswordResetView(APIView):  # lint-amnesty, pylint: disable=m
                             }
                         )
                         user.save()
-                        send_password_reset_success_email(user, request)
                     except ObjectDoesNotExist:
                         err = 'Account recovery process initiated without AccountRecovery instance for user {username}'
                         log.error(err.format(username=user.username))
+                send_password_reset_success_email(user, request)
         except ValidationError as err:
             AUDIT_LOG.exception("Password validation failed")
             error_status = {

openedx/core/djangoapps/user_authn/views/tests/test_reset_password.py

@@ -824,12 +824,13 @@ class ResetPasswordAPITests(EventTestMixin, CacheIsolationTestCase):
             new=updated_user.email
         )
 
-    def test_password_reset_email_sent_on_account_recovery_email(self):
+    @ddt.data(True, False)
+    def test_password_reset_email_successfully_sent(self, is_account_recovery):
         """
         Test that with is_account_recovery query param available, password
         reset email is sent to newly updated email address.
         """
-        post_request = self.create_reset_request(self.uidb36, self.token, True)
+        post_request = self.create_reset_request(self.uidb36, self.token, is_account_recovery)
         post_request.user = AnonymousUser()
         post_request.site = Mock(domain='example.com')
         reset_view = LogistrationPasswordResetView.as_view()