Improve RESOLVEUID_RE regexp to catch also paths generated by Link co…

…ntent-types (#1700) * Improve regexp to catch also paths generated by Link content-types * add changelog
plone · Sep 3, 2023 · 36e67bd · 36e67bd
1 parent b58560e
commit 36e67bd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/news/1699.bugfix b/news/1699.bugfix
@@ -0,0 +1 @@
+Improve RESOLVEUID_RE regexp to catch also paths generated by Link content-types. @cekk
diff --git a/src/plone/restapi/serializer/utils.py b/src/plone/restapi/serializer/utils.py
@@ -8,7 +8,7 @@
 import re
 
 
-RESOLVEUID_RE = re.compile("^[./]*resolve[Uu]id/([^/]*)/?(.*)$")
+RESOLVEUID_RE = re.compile("^(?:|.*/)resolve[Uu]id/([^/]*)/?(.*)$")
 
 
 def resolve_uid(path):

diff --git a/src/plone/restapi/tests/test_resolveuid.py b/src/plone/restapi/tests/test_resolveuid.py
@@ -24,7 +24,6 @@
 
 
 class TestBlocksResolveUIDFunctional(TestCase):
-
     layer = PLONE_RESTAPI_BLOCKS_FUNCTIONAL_TESTING
 
     def setUp(self):
@@ -698,3 +697,9 @@ def test_resolveuid_with_primary_field_url_keeps_suffix(self):
             ]["url"],
             self.doc2.absolute_url() + "/view",
         )
+
+    def test_resolveuid_handle_link_style_formats(self):
+        uid = IUUID(self.doc2)
+        blocks = {"aaa": {"@type": "foo", "url": f"/plone/resolveuid/{uid}"}}
+        value = self.serialize("blocks", blocks)
+        self.assertEqual(value["aaa"]["url"], self.doc2.absolute_url())