Merge pull request #2331 from shaangill025/pr_2233_followup

Fix: Track endorser and author roles in per-tenant settings
openwallet-foundation · Jul 20, 2023 · 03b6376 · 03b6376
2 parents 5cf9fdc + 5f282ba
commit 03b6376
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/aries_cloudagent/multitenant/admin/routes.py b/aries_cloudagent/multitenant/admin/routes.py
@@ -88,7 +88,7 @@ def get_extra_settings_dict_per_tenant(tenant_settings: dict) -> dict:
 
     endorser_role_flag = tenant_settings.get(
         "ACAPY_ENDORSER_ROLE"
-    ) or tenant_settings.get("endorser_protocol_role")
+    ) or tenant_settings.get("endorser-protocol-role")
     extra_settings = {}
     if endorser_role_flag and endorser_role_flag == "author":
         extra_settings["endorser.author"] = True
@@ -102,7 +102,7 @@ def get_extra_settings_dict_per_tenant(tenant_settings: dict) -> dict:
             # These flags require endorser role as author, if not set as author then
             # this setting will be ignored.
             continue
-        if flag != "ACAPY_ENDORSER_ROLE":
+        if flag != "ACAPY_ENDORSER_ROLE" and flag != "endorser-protocol-role":
             map_flag = ACAPY_LIFECYCLE_CONFIG_FLAG_MAP.get(
                 flag
             ) or ACAPY_LIFECYCLE_CONFIG_FLAG_ARGS_MAP.get(flag)

diff --git a/aries_cloudagent/settings/routes.py b/aries_cloudagent/settings/routes.py
@@ -49,6 +49,8 @@ class ProfileSettingsSchema(OpenAPISchema):
 def _get_filtered_settings_dict(wallet_settings: dict):
     """Get filtered settings dict to display."""
     filter_param_list = list(ACAPY_LIFECYCLE_CONFIG_FLAG_ARGS_MAP.values())
+    filter_param_list.append("endorser.author")
+    filter_param_list.append("endorser.endorser")
     settings_dict = {}
     for param in filter_param_list:
         if param in wallet_settings: