fix: PR requests, narrowing scope

Author: kiram15

common/djangoapps/student/views/dashboard.py

@@ -58,7 +58,7 @@
 from openedx.core.djangolib.markup import HTML, Text
 from openedx.features.content_type_gating.models import ContentTypeGatingConfig
 from openedx.features.course_duration_limits.access import get_user_course_duration, get_user_course_expiration_date
-from xmodule.modulestore.django import modulestore  # lint-amnesty, pylint: disable=wrong-import-order
+from xmodule.modulestore.django import modulestore  # pylint: disable=wrong-import-order
 
 log = logging.getLogger("edx.student")
 

common/djangoapps/student/views/management.py

@@ -31,6 +31,7 @@
 )
 from django.views.decorators.http import (  # pylint: disable=unused-import
     require_GET,
+    require_http_methods,  # noqa: F401
     require_POST,
 )
 from edx_ace import ace
@@ -112,7 +113,8 @@
 from openedx.core.lib.api.authentication import BearerAuthenticationAllowInactiveUser
 from openedx.features.course_experience.url_helpers import make_learning_mfe_courseware_url
 from openedx.features.discounts.applicability import FIRST_PURCHASE_DISCOUNT_OVERRIDE_FLAG
-from xmodule.modulestore.django import modulestore  # lint-amnesty, pylint: disable=wrong-import-order
+from openedx.features.enterprise_support.utils import is_enterprise_learner
+from xmodule.modulestore.django import modulestore  # pylint: disable=wrong-import-order
 
 log = logging.getLogger("edx.student")
 
@@ -233,6 +235,7 @@ def compose_activation_email(
     message_context = generate_activation_email_context(user, user_registration)
     message_context.update({
         'confirm_activation_link': _get_activation_confirmation_link(message_context['key'], redirect_url),
+        'is_enterprise_learner': is_enterprise_learner(user),
         'is_first_purchase_discount_overridden': FIRST_PURCHASE_DISCOUNT_OVERRIDE_FLAG.is_enabled(),
         'route_enabled': route_enabled,
         'routed_user': user.username,
@@ -705,7 +708,7 @@ def activate_account(request, key):
         url_path = '/login?{}'.format(urllib.parse.urlencode(params))  # noqa: UP032
         return redirect(settings.AUTHN_MICROFRONTEND_URL + url_path)
 
-    response = redirect(redirect_url) if redirect_url else redirect('dashboard')
+    response = redirect(redirect_url) if redirect_url and is_enterprise_learner(request.user) else redirect('dashboard')
     if show_account_activation_popup:
         response.delete_cookie(
             settings.SHOW_ACTIVATE_CTA_POPUP_COOKIE_NAME,

common/djangoapps/third_party_auth/pipeline.py

@@ -1009,7 +1009,8 @@ def get_username(strategy, details, backend, user=None, *args, **kwargs):  # pyl
             slug_func = lambda val: val
 
         if is_auto_generated_username_enabled() and details.get('username') is None:
-            from openedx.core.djangoapps.user_authn.views.utils import get_auto_generated_username  # pylint: disable=import-outside-toplevel  # noqa: I001
+            # Lazy import to avoid circular dependency
+            from openedx.core.djangoapps.user_authn.views.utils import get_auto_generated_username
             username = get_auto_generated_username(details)
         else:
             if email_as_username and details.get('email'):

lms/envs/common.py

@@ -3294,7 +3294,7 @@ def _should_send_certificate_events(settings):
         "pipeline": ["enterprise.filters.accounts.AccountSettingsReadOnlyFieldsStep"],
     },
     "org.openedx.learning.dashboard.render.started.v1": {
-        "fail_silently": True,
+        "fail_silently": False,
         "pipeline": ["enterprise.filters.dashboard.DashboardContextEnricher"],
     },
 }

openedx/core/djangoapps/user_authn/tests/test_tasks.py

@@ -45,6 +45,7 @@ def test_ComposeEmail(self):
         assert self.msg.context['routed_user_email'] == self.student.email
         assert self.msg.context['routed_profile_name'] == ''
         assert self.msg.context['registration_flow'] is False
+        assert self.msg.context['is_enterprise_learner'] is False
         assert self.msg.context['is_first_purchase_discount_overridden'] is False
 
     @mock.patch('time.sleep', mock.Mock(return_value=None))

requirements/constraints.txt

@@ -44,7 +44,7 @@ django-stubs<6
 # The team that owns this package will manually bump this package rather than having it pulled in automatically.
 # This is to allow them to better control its deployment and to do it in a process that works better
 # for them.
-edx-enterprise==8.0.3
+edx-enterprise==8.0.2
 
 # Date: 2023-07-26
 # Our legacy Sass code is incompatible with anything except this ancient libsass version.

requirements/edx/base.txt

@@ -483,7 +483,7 @@ edx-drf-extensions==10.6.0
     #   enterprise-integrated-channels
     #   openedx-authz
     #   openedx-core
-edx-enterprise==8.0.3
+edx-enterprise==8.0.2
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/edx/kernel.in

requirements/edx/development.txt

@@ -756,7 +756,7 @@ edx-drf-extensions==10.6.0
     #   enterprise-integrated-channels
     #   openedx-authz
     #   openedx-core
-edx-enterprise==8.0.3
+edx-enterprise==8.0.2
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/edx/doc.txt

requirements/edx/doc.txt

@@ -573,7 +573,7 @@ edx-drf-extensions==10.6.0
     #   enterprise-integrated-channels
     #   openedx-authz
     #   openedx-core
-edx-enterprise==8.0.3
+edx-enterprise==8.0.2
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/edx/base.txt

requirements/edx/testing.txt

@@ -589,7 +589,7 @@ edx-drf-extensions==10.6.0
     #   enterprise-integrated-channels
     #   openedx-authz
     #   openedx-core
-edx-enterprise==8.0.3
+edx-enterprise==8.0.2
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/edx/base.txt