From e579a922837fd898e3f49f5e05f98d5d1ae87dea Mon Sep 17 00:00:00 2001
From: ruzniaievdm <ruzniaievdm@gmail.com>
Date: Tue, 6 Feb 2024 18:43:55 +0200
Subject: [PATCH] fix: add condition to fetch draft xblock

---
 lms/djangoapps/courseware/block_render.py | 37 +++++++++++++++--------
 lms/envs/common.py                        |  2 ++
 lms/envs/devstack.py                      |  3 ++
 3 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/lms/djangoapps/courseware/block_render.py b/lms/djangoapps/courseware/block_render.py
index e5ba261c509a..72200eb44264 100644
--- a/lms/djangoapps/courseware/block_render.py
+++ b/lms/djangoapps/courseware/block_render.py
@@ -815,7 +815,7 @@ def _get_usage_key_for_course(course_key, usage_id) -> UsageKey:
         raise Http404("Invalid location") from exc
 
 
-def _get_block_by_usage_key(usage_key):
+def _get_block_by_usage_key(usage_key, request=None):
     """
     Gets a block instance based on a mapped-to-course usage_key
 
@@ -830,15 +830,28 @@ def _get_block_by_usage_key(usage_key):
             usage_key.course_key,
             usage_key
         )
-        try:
-            block = modulestore().get_item(usage_key, revision=ModuleStoreEnum.RevisionOption.draft_only)
-            block_orig_usage_key, block_orig_version = modulestore().get_block_original_usage(usage_key)
-        except ItemNotFoundError:
-            log.warning(
-                "Invalid draft location for course id %s: %s",
-                usage_key.course_key,
-                usage_key
-            )
+
+        if request is None:
+            # No request provided, cannot proceed
+            raise Http404 from exc
+
+        referer = request.META.get('HTTP_REFERER')
+        authoring_mfe_query_key = 'is_authoring_mfe'
+        authoring_mfe_matches = [settings.COURSE_AUTHORING_MICROFRONTEND_URL, authoring_mfe_query_key]
+        is_fetched_from_authoring_mfe = referer and any(match in referer for match in authoring_mfe_matches)
+
+        if is_fetched_from_authoring_mfe:
+            try:
+                block = modulestore().get_item(usage_key, revision=ModuleStoreEnum.RevisionOption.draft_only)
+                block_orig_usage_key, block_orig_version = modulestore().get_block_original_usage(usage_key)
+            except ItemNotFoundError:
+                log.warning(
+                    "Invalid draft location for course id %s: %s",
+                    usage_key.course_key,
+                    usage_key
+                )
+                raise Http404 from exc
+        else:
             raise Http404 from exc
 
     tracking_context = {
@@ -866,7 +879,7 @@ def get_block_by_usage_id(request, course_id, usage_id, disable_staff_debug_info
     """
     course_key = CourseKey.from_string(course_id)
     usage_key = _get_usage_key_for_course(course_key, usage_id)
-    block, tracking_context = _get_block_by_usage_key(usage_key)
+    block, tracking_context = _get_block_by_usage_key(usage_key, request)
 
     _, user = setup_masquerade(request, course_key, has_access(request.user, 'staff', block, course_key))
     field_data_cache = FieldDataCache.cache_for_block_descendents(
@@ -934,7 +947,7 @@ def _invoke_xblock_handler(request, course_id, usage_id, handler, suffix, course
         # At the time of writing, this is only used by one handler. If this usage grows, we may want to re-evaluate
         # how we do this to something more elegant. If you are the author of a third party block that decides it wants
         # to set this too, please let us know so we can consider making this easier / better-documented.
-        block, _ = _get_block_by_usage_key(block_usage_key)
+        block, _ = _get_block_by_usage_key(block_usage_key, request)
         handler_method = getattr(block, handler, False)
         will_recheck_access = handler_method and getattr(handler_method, 'will_recheck_access', False)
 
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 7ed5b76f62e0..69fc4b235360 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -5050,6 +5050,8 @@ def _make_locale_paths(settings):  # pylint: disable=missing-function-docstring
 # .. toggle_tickets: https://openedx.atlassian.net/browse/VAN-838
 ENABLE_DYNAMIC_REGISTRATION_FIELDS = False
 
+COURSE_AUTHORING_MICROFRONTEND_URL = None
+
 ############## Settings for EmailChangeMiddleware ###############
 
 # .. toggle_name: ENFORCE_SESSION_EMAIL_MATCH
diff --git a/lms/envs/devstack.py b/lms/envs/devstack.py
index e241852fddf0..a9a6d0562731 100644
--- a/lms/envs/devstack.py
+++ b/lms/envs/devstack.py
@@ -287,6 +287,9 @@ def should_show_debug_toolbar(request):  # lint-amnesty, pylint: disable=missing
 ########################## LEARNER HOME APP ##############################
 LEARNER_HOME_MICROFRONTEND_URL = 'http://localhost:1996'
 
+################### FRONTEND APPLICATION COURSE AUTHORING ###################
+COURSE_AUTHORING_MICROFRONTEND_URL = 'http://localhost:2001'
+
 ###################### Cross-domain requests ######################
 FEATURES['ENABLE_CORS_HEADERS'] = True
 CORS_ALLOW_CREDENTIALS = True