From 7f53f56471d6f5aa8f4a0383a20666afb8af79a3 Mon Sep 17 00:00:00 2001 From: axolotle Date: Fri, 19 Jan 2024 13:33:24 +0100 Subject: [PATCH] portal: add app's description + logo from catalog in portal settings --- src/app.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/app.py b/src/app.py index 9f84bb2fd..8bd36bc83 100644 --- a/src/app.py +++ b/src/app.py @@ -1653,6 +1653,7 @@ def app_ssowatconf(): # Will organize apps by portal domain portal_domains_apps = {domain: {} for domain in portal_domains} + apps_catalog = _load_apps_catalog()["apps"] # New permission system for perm_name, perm_info in all_permissions.items(): @@ -1687,13 +1688,21 @@ def app_ssowatconf(): app_portal_domain = next( domain for domain in portal_domains if domain in app_domain ) - portal_domains_apps[app_portal_domain][app_id] = { + app_portal_info = { "label": perm_info["label"], "users": perm_info["corresponding_users"], "public": "visitors" in perm_info["allowed"], "url": uris[0], } + app_catalog_info = apps_catalog.get(app_id.split("__")[0]) + + if app_catalog_info: + app_portal_info["description"] = app_catalog_info["manifest"]["description"] + app_portal_info["logo"] = f"//{app_portal_domain}/yunohost/admin/applogos/{app_catalog_info['logo_hash']}.png" + + portal_domains_apps[app_portal_domain][app_id] = app_portal_info + conf_dict = { "cookie_secret_file": "/etc/yunohost/.ssowat_cookie_secret", "session_folder": "/var/cache/yunohost-portal/sessions",