fix #39: CompanyName check

italia · Jun 2, 2021 · 889a40a · 889a40a
1 parent d51dda2
commit 889a40a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/setup.py b/setup.py
@@ -10,7 +10,7 @@ def readme():
 
 setup(
     name='spid_sp_test',
-    version='0.6.2',
+    version='0.6.3',
     description="SAML2 SPID Service Provider validation tool that can be run from the command line",
     long_description=readme(),
     long_description_content_type='text/markdown',

diff --git a/src/spid_sp_test/metadata_private.py b/src/spid_sp_test/metadata_private.py
@@ -27,17 +27,6 @@ def test_Contacts_Priv(self):
 
         if exts:
             ext = exts[0]
-            company = self.doc.xpath(
-                '//ContactPerson/Extensions/CessionarioCommittente/CompanyName'
-            )
-            if company:
-                company = company[0]
-                self._assertTrue(
-                    company.text,
-                    'If the Company element is present it MUST have a value',
-                    description = company,
-                )
-
             tise = self.doc.xpath(
                 '//ContactPerson/Extensions/CessionarioCommittente/TerzoIntermediarioSoggettoEmittente'
             )

diff --git a/src/spid_sp_test/metadata_public.py b/src/spid_sp_test/metadata_public.py
@@ -56,9 +56,16 @@ def test_Extensions_PubPriv(self):
         orgs = self.doc.xpath('//EntityDescriptor/Organization/OrganizationName')
         if len(orgs) >= 1:
             org = orgs[0]
-            company = self.doc.xpath('//ContactPerson/Extensions/CompanyName')
+            company = self.doc.xpath('//ContactPerson/CompanyName')
             if company:
                 company = company[0]
+
+                self._assertTrue(
+                    company.text,
+                    'If the Company element is present it MUST have a value',
+                    description = company,
+                )
+
                 self._assertTrue(
                     company.text == org.text,
                     'If the Company element if present it MUST be equal to OrganizationName',