feat: saml name and logo collected as arrays

Author: kofzera

src/swamid_plugins/metainfo/collectors/oidc.py

@@ -1,11 +1,14 @@
 def collect_entity_metadata(mdstore, entity_id):
     metadata = {
         "display_name": get_display_name(mdstore, entity_id),
+        "display_names": get_display_names_lang(mdstore, entity_id),
         "logo": get_logo(mdstore, entity_id),
         "privacy_statement": get_privacy_statement(mdstore, entity_id),
         "contacts": get_contacts(mdstore, entity_id),
         "entity_categories": get_entity_categories(mdstore, entity_id),
-        "supported_entity_categories": get_supported_entity_categories(mdstore, entity_id),
+        "supported_entity_categories": get_supported_entity_categories(
+            mdstore, entity_id
+        ),
         "assurance_certifications": get_assurance_certifications(mdstore, entity_id),
         "registration_info": get_registration_info(mdstore, entity_id),
         "error_url": get_error_url(mdstore, entity_id),
@@ -19,9 +22,24 @@ def get_display_name(mdstore, entity_id):
     return display_name
 
 
+def get_display_names_lang(mdstore, entity_id):
+    langs = ["en", "cs"]
+    display_names = []
+    for lang in langs:
+        if mdstore.get("client_name#" + lang, None):
+            display_names.append(
+                {"text": mdstore.get("client_name#" + lang), "lang": lang}
+            )
+    return display_names
+
+
 def get_logo(mdstore, entity_id):
+    ret_logo = []
     logo = mdstore.get("logo_uri")
-    return logo
+    width = mdstore.get("logo_width")
+    height = mdstore.get("logo_height")
+    ret_logo.append({"text": logo, "height": height, "width": width})
+    return ret_logo
 
 
 def get_privacy_statement(mdstore, entity_id):
@@ -39,23 +57,23 @@ def get_contacts(mdstore, entity_id):
                     "mailto:{contact}".format(contact=email)
                     for email in (mdstore.get("contacts") or [])
                 ],
-                "given_name": ""
+                "given_name": "",
             },
             {
                 "contact_type": "technical",
                 "email_address": [
                     "mailto:{contact}".format(contact=email)
                     for email in (mdstore.get("technical_contacts") or [])
                 ],
-                "given_name": ""
+                "given_name": "",
             },
             {
                 "contact_type": "security",
                 "email_address": [
                     "mailto:{contact}".format(contact=email)
                     for email in (mdstore.get("security_contacts") or [])
                 ],
-                "given_name": ""
+                "given_name": "",
             },
         ]
         if contact["email_address"]
@@ -65,8 +83,8 @@ def get_contacts(mdstore, entity_id):
 
 def get_entity_categories(mdstore, entity_id):
     entity_categories_translation = {
-        'research_and_scholarship': 'http://refeds.org/category/research-and-scholarship',
-        'geant_coco': 'http://www.geant.net/uri/dataprotection-code-of-conduct/v1',
+        "research_and_scholarship": "http://refeds.org/category/research-and-scholarship",
+        "geant_coco": "http://www.geant.net/uri/dataprotection-code-of-conduct/v1",
     }
     entity_categories = [
         category
@@ -83,7 +101,7 @@ def get_supported_entity_categories(mdstore, entity_id):
 
 def get_assurance_certifications(mdstore, entity_id):
     assurance_certifications_translations = {
-        'sirtfi': 'https://refeds.org/sirtfi',
+        "sirtfi": "https://refeds.org/sirtfi",
     }
     assurance_certifications = [
         certification

src/swamid_plugins/metainfo/collectors/saml.py

@@ -1,6 +1,7 @@
 def collect_entity_metadata(mdstore, entity_id):
     metadata = {
         "display_name": get_display_name(mdstore, entity_id),
+        "display_names": get_display_names_lang(mdstore, entity_id),
         "logo": get_logo(mdstore, entity_id),
         "privacy_statement": get_privacy_statement(mdstore, entity_id),
         "contacts": get_contacts(mdstore, entity_id),
@@ -16,15 +17,31 @@ def collect_entity_metadata(mdstore, entity_id):
 
 def get_display_name(mdstore, entity_id):
     display_name = (
-        next(mdstore.mdui_uiinfo_display_name(entity_id, langpref="en"), None)
-        or mdstore.name(entity_id)
+            next(mdstore.mdui_uiinfo_display_name(entity_id, langpref="en"), None)
+            or mdstore.name(entity_id)
     )
     return display_name
 
 
+def get_display_names_lang(mdstore, entity_id):
+    uiinfos = mdstore.mdui_uiinfo(entity_id)
+    cls = "urn:oasis:names:tc:SAML:metadata:ui&DisplayName"
+    elements = list((
+        element
+        for uiinfo in uiinfos
+        for element_key, elements in uiinfo.items()
+        if element_key != "__class__"
+        for element in elements
+        if element.get("__class__") == cls
+    ))
+    list(map(lambda name: name.pop("__class__", None), elements))
+    return elements
+
+
 def get_logo(mdstore, entity_id):
-    logo = next(mdstore.mdui_uiinfo_logo(entity_id), None)
-    return logo
+    logos = list(mdstore.mdui_uiinfo_logo(entity_id))
+    list(map(lambda logo: logo.pop("__class__", None), logos))
+    return logos
 
 
 def get_privacy_statement(mdstore, entity_id):

src/swamid_plugins/metainfo/metainfo.py

@@ -18,17 +18,18 @@
 )
 
 
-def is_oidc_client(entity_id):
-    result = entity_id.startswith("APP-") or bool(UUID4HEX.match(entity_id))
-    return result
+def is_oidc_client(entity_id, mdstore):
+    return type(mdstore) == type(dict)
+    # result = entity_id.startswith("APP-") or bool(UUID4HEX.match(entity_id))
+    # return result
 
 
 def collect_entity_metadata(mdstore, metadata, entity_id):
     entity_metadata = (
         {}
         if not mdstore
         else collect_oidc_entity_metadata(mdstore, entity_id)
-        if is_oidc_client(entity_id)
+        if is_oidc_client(entity_id, mdstore)
         else collect_saml_entity_metadata(mdstore, entity_id)
     )
     return entity_metadata