Added validation for identifiers token INameTokenTableRowSchema

CHANGES.rst

@@ -6,6 +6,8 @@ Changelog
 
 - Added `safe_utils.py` that will only include safe utils.
   [gbastien]
+- Added validation for identifiers token INameTokenTableRowSchema.
+  [odelaere]
 
 1.38 (2022-02-03)
 -----------------

src/collective/contact/core/content/directory.py

@@ -5,19 +5,27 @@
 from plone.autoform.directives import widget
 from plone.dexterity.content import Container
 from plone.dexterity.schema import DexteritySchemaPolicy
+from plone.i18n.normalizer.interfaces import IIDNormalizer
 from plone.supermodel import model
 from zope import schema
+from zope.component import getUtility
 from zope.interface import implements
 from zope.interface import Interface
 
 
+def is_valid_identifier(identifier):
+    idnormalizer = getUtility(IIDNormalizer)
+    return idnormalizer.normalize(identifier) == identifier
+
+
 class INameTokenTableRowSchema(Interface):
     """Schema for dict rows used in DataGridFields
     name is the 'real' name
     token is the token used in the vocabularies
     """
+
     name = schema.TextLine(title=_(u"Name"))
-    token = schema.TextLine(title=_(u"Token"))
+    token = schema.TextLine(title=_(u"Token"), constraint=is_valid_identifier)
 
 
 class IDirectory(model.Schema):

src/collective/contact/core/tests/test_content_types.py

@@ -1,5 +1,6 @@
 # -*- coding: utf8 -*-
 
+from collective.contact.core.content.directory import is_valid_identifier
 from collective.contact.core.interfaces import IContactCoreParameters
 from collective.contact.core.testing import INTEGRATION
 from ecreall.helpers.testing.base import BaseTest
@@ -51,6 +52,16 @@ def test_directory(self):
         self.assertIn({'name': 'Regiment', 'token': 'regiment'},
                       mydirectory.organization_levels)
 
+    def test_is_valid_identifier(self):
+        self.assertFalse(is_valid_identifier('Toto'))
+        self.assertTrue(is_valid_identifier('toto'))
+        self.assertTrue(is_valid_identifier('toto56'))
+        self.assertFalse(is_valid_identifier('toto 56'))
+        self.assertTrue(is_valid_identifier('toto-56'))
+        self.assertFalse(is_valid_identifier('toto-56@'))
+        self.assertFalse(is_valid_identifier('toto-56à'))
+        self.assertFalse(is_valid_identifier('toto-56É'))
+
 
 class TestPerson(TestContentTypes):