Revert "refactor: remove save_xblock helper"

This reverts commit 8e5b926.

Author: navinkarkera

lti_consumer/api.py

@@ -76,12 +76,16 @@ def _ensure_lti_passport(block, lti_config):
     )
 
     if key_mismatch:
+        from lti_consumer.plugin.compat import save_xblock  # pylint: disable=import-outside-toplevel
         passport = Lti1p3Passport.objects.create(
             lti_1p3_tool_public_key=block_public_key,
             lti_1p3_tool_keyset_url=block_keyset_url,
             name=f"Passport of {block.display_name}",
             context_key=block.context_id,
         )
+        # Persist new passport link on block so future loads use split passport.
+        block.lti_1p3_passport_id = str(passport.passport_id)
+        save_xblock(block)
         log.info("Created new LTI passport for %s", block.scope_ids.usage_id)
 
     return passport

lti_consumer/models.py

@@ -429,6 +429,9 @@ def get_or_create_lti_1p3_passport(self):
                     passport.name = f"Passport of {block.display_name}"
                     passport.context_key = block.context_id
                     passport.save()
+                    block.lti_1p3_passport_id = str(passport.passport_id)
+                    block.save()
+                    compat.save_xblock(block)
             # We use update to avoid triggering post save signal as this function is itself
             # called from the post_save signal handler, this avoids double call to same function.
             LtiConfiguration.objects.filter(pk=self.pk).update(lti_1p3_passport=passport)

lti_consumer/plugin/compat.py

@@ -117,6 +117,23 @@ def load_enough_xblock(location: UsageKey):  # pragma: nocover
         return xblock_api.load_block(location, None)
 
 
+def save_xblock(block):  # pragma: nocover
+    """
+    Save xblock in modulestore or contentstore.
+    """
+    # pylint: disable=import-error,import-outside-toplevel
+    from openedx.core.djangoapps.xblock import api as xblock_api
+    from xmodule.modulestore.django import modulestore
+
+    # Save course block using modulestore
+    if isinstance(block.scope_ids.usage_id.context_key, CourseKey):
+        return modulestore().update_item(block, None)
+    # Save library block using the XBlock API
+    else:
+        runtime = xblock_api.get_runtime(None)
+        return runtime.save_block(block)
+
+
 def load_block_as_user(location):  # pragma: nocover
     """
     Load a block as the current user, or load as the anonymous user if no user is available.

lti_consumer/plugin/views.py

@@ -138,7 +138,7 @@ def public_keyset_endpoint(
             lti_passport = Lti1p3Passport.objects.get(passport_id=passport_id)
             public_jwk = lti_passport.lti_1p3_public_jwk
             # TODO: move version inside passport from config
-            # We just need any lti_config that is using this passport to check version
+            # We just need any any lti_config that is using this passport to check version
             lti_config = LtiConfiguration.objects.filter(lti_1p3_passport=lti_passport).first()
             version = lti_config.version
         elif external_app and external_slug:
@@ -457,7 +457,7 @@ def access_token_endpoint(
         elif passport_id:
             lti_passport = Lti1p3Passport.objects.get(passport_id=passport_id)
             # TODO: move version inside passport from config
-            # We just need any lti_config that is using this passport to check version
+            # We just need any any lti_config that is using this passport to check version
             lti_config = LtiConfiguration.objects.filter(lti_1p3_passport=lti_passport).first()
             version = lti_config.version
             lti_consumer = LtiConsumer1p3(