Revert pull request #22042

Revert "Fix code quality test failures"

This reverts commit 8c55e11d1f.

Revert "Fix celery send_activation_email task failure"

This reverts commit 810eea0e51.

Revert "Convert Account Activation Emails to edx-ACE"

This reverts commit 7984c37a4f.

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

@@ -29,8 +29,8 @@ from openedx.core.djangoapps.user_authn.exceptions import AuthFailedError
 from openedx.core.djangoapps.util.user_messages import PageLevelMessages
 from openedx.core.djangolib.markup import HTML, Text
 from student.forms import send_password_reset_email_for_user
-from student.models import LoginFailures, UserProfile
-from student.views import compose_and_send_activation_email
+from student.models import LoginFailures
+from student.views import send_reactivation_email_for_user
 from third_party_auth import pipeline, provider
 from track import segment
 from util.json_request import JsonResponse
@@ -166,9 +166,7 @@ def _log_and_raise_inactive_user_auth_error(unauthenticated_user):
             unauthenticated_user.username)
         )
 
-    profile = UserProfile.objects.get(user=unauthenticated_user)
-    compose_and_send_activation_email(unauthenticated_user, profile)
-
+    send_reactivation_email_for_user(unauthenticated_user)
     raise AuthFailedError(_generate_not_activated_message(unauthenticated_user))
 
 

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

@@ -19,7 +19,6 @@ from django.test.utils import override_settings
 from django.urls import reverse
 
 from lms.djangoapps.discussion.notification_prefs import NOTIFICATION_PREF_KEY
-from openedx.core.djangoapps.ace_common.tests.mixins import EmailTemplateTagMixin
 from openedx.core.djangoapps.django_comment_common.models import ForumsConfig
 from openedx.core.djangoapps.lang_pref import LANGUAGE_KEY
 from openedx.core.djangoapps.site_configuration.tests.mixins import SiteMixin
@@ -92,7 +91,7 @@ def get_mock_pipeline_data(username=TEST_USERNAME, email=TEST_EMAIL):
         ]
     }
 )
-class TestCreateAccount(EmailTemplateTagMixin, SiteMixin, TestCase):
+class TestCreateAccount(SiteMixin, TestCase):
     """Tests for account creation"""
 
     def setUp(self):