From 3ca8ac68fbd96ee5804fe5c984e8580227cf93a5 Mon Sep 17 00:00:00 2001 From: auslin-aot <99173163+auslin-aot@users.noreply.github.com> Date: Wed, 11 Dec 2024 11:01:59 +0530 Subject: [PATCH] FWF-4084: Update group_or_roles return groups in multitenant --- .../src/formsflow_api_utils/utils/user_context.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/forms-flow-api-utils/src/formsflow_api_utils/utils/user_context.py b/forms-flow-api-utils/src/formsflow_api_utils/utils/user_context.py index ff2a16d6df..062f2b81d7 100644 --- a/forms-flow-api-utils/src/formsflow_api_utils/utils/user_context.py +++ b/forms-flow-api-utils/src/formsflow_api_utils/utils/user_context.py @@ -60,11 +60,12 @@ def groups(self) -> List[str]: @property def group_or_roles(self) -> List[str]: """Return groups is env is using groups, else roles.""" - return ( - self._roles - if current_app.config.get("KEYCLOAK_ENABLE_CLIENT_AUTH") - else self._groups - ) + if current_app.config.get( + "KEYCLOAK_ENABLE_CLIENT_AUTH" + ) and not current_app.config.get("MULTI_TENANCY_ENABLED"): + return self._roles + else: + return self._groups def user_context(function):