CDD-3441 Use shared check page permissions

Author: MeganB-2

cms/dynamic_content/blocks.py

@@ -1,5 +1,6 @@
 from django.core.exceptions import ValidationError
 from django.db import models
+from common.auth.permissions import check_page_permissions
 from wagtail import blocks
 from wagtail.blocks import (
     CharBlock,
@@ -30,31 +31,6 @@
 METRIC_NUMBER_BLOCK_DATE_PREFIX_DEFAULT_TEXT = "Up to"
 
 
-def check_permissions(user_permissions, theme_id, sub_theme_id, topic_id) -> bool:
-    if not isinstance(user_permissions, list):
-        return False
-
-    for permission in user_permissions:
-        permission_theme_id = permission.get("theme", {}).get("id")
-        permission_sub_theme_id = permission.get("sub_theme", {}).get("id")
-        permission_topic_id = permission.get("topic", {}).get("id")
-
-        if permission_theme_id == "-1":
-            return True
-
-        if permission_theme_id == theme_id and permission_sub_theme_id == "-1":
-            return True
-
-        if (
-            permission_theme_id == theme_id
-            and permission_sub_theme_id == sub_theme_id
-            and (permission_topic_id in {"-1", topic_id})
-        ):
-            return True
-
-    return False
-
-
 class HeadlineNumberBlockTypes(StreamBlock):
     headline_number = HeadlineNumberComponent(help_text=help_texts.HEADLINE_BLOCK_FIELD)
     trend_number = TrendNumberComponent(help_text=help_texts.TREND_BLOCK_FIELD)
@@ -251,8 +227,8 @@ def get_api_representation(self, value, context=None):
             full_user_permissions = (
                 user_permissions.get("permission_sets") if user_permissions else None
             )
-            if not check_permissions(
-                user_permissions=full_user_permissions,
+            if not check_page_permissions(
+                permission_sets=full_user_permissions,
                 theme_id=getattr(page, "theme", None),
                 sub_theme_id=getattr(page, "sub_theme", None),
                 topic_id=getattr(page, "topic", None),

tests/unit/cms/dynamic_content/test_blocks.py

@@ -6,7 +6,7 @@
 import pytest
 from wagtail.blocks import StructBlock, StructValue
 
-from cms.dynamic_content.blocks import PageLink, SourceLinkBlock, check_permissions
+from cms.dynamic_content.blocks import PageLink, SourceLinkBlock
 
 
 class TestSourceLinkBlockClean:
@@ -182,14 +182,14 @@ def test_public_page_is_always_authorised(self):
         assert result["title"] == "Test title"
         assert result["sub_title"] == "Test subtitle"
 
-    @mock.patch("cms.dynamic_content.blocks.check_permissions")
-    def test_non_public_page_permission_denied(self, mock_check_permissions):
+    @mock.patch("cms.dynamic_content.blocks.check_page_permissions")
+    def test_non_public_page_permission_denied(self, mock_check_page_permissions):
         """
         Given a non-public page and permissions are denied
         When get_api_representation() is called
         Then the response is unauthorised and fields are blanked.
         """
-        mock_check_permissions.return_value = False
+        mock_check_page_permissions.return_value = False
 
         block = PageLink()
 
@@ -222,16 +222,16 @@ def test_non_public_page_permission_denied(self, mock_check_permissions):
         assert result["sub_title"] == ""
         assert result["page"] == ""
 
-        mock_check_permissions.assert_called_once()
+        mock_check_page_permissions.assert_called_once()
 
-    @mock.patch("cms.dynamic_content.blocks.check_permissions")
-    def test_non_public_page_permission_granted(self, mock_check_permissions):
+    @mock.patch("cms.dynamic_content.blocks.check_page_permissions")
+    def test_non_public_page_permission_granted(self, mock_check_page_permissions):
         """
         Given a non-public page and permissions are granted
         When get_api_representation() is called
         Then the response is authorised and fields are preserved.
         """
-        mock_check_permissions.return_value = True
+        mock_check_page_permissions.return_value = True
 
         block = PageLink()
 
@@ -265,16 +265,16 @@ def test_non_public_page_permission_granted(self, mock_check_permissions):
         assert result["sub_title"] == "Test subtitle"
         assert result["page"] == "https://test-page-url"
 
-        mock_check_permissions.assert_called_once()
+        mock_check_page_permissions.assert_called_once()
 
-    @mock.patch("cms.dynamic_content.blocks.check_permissions")
-    def test_non_public_page_missing_request(self, mock_check_permissions):
+    @mock.patch("cms.dynamic_content.blocks.check_page_permissions")
+    def test_non_public_page_missing_request(self, mock_check_page_permissions):
         """
         Given a non-public page and no request in context
         When get_api_representation() is called
         Then the response is unauthorised and fields are blanked.
         """
-        mock_check_permissions.return_value = False
+        mock_check_page_permissions.return_value = False
 
         block = PageLink()
 
@@ -298,4 +298,4 @@ def test_non_public_page_missing_request(self, mock_check_permissions):
         assert result["sub_title"] == ""
         assert result["page"] == ""
 
-        mock_check_permissions.assert_called_once()
+        mock_check_page_permissions.assert_called_once()