From 5366a814f9a13d80bcb3b53cf2a07170f9d972df Mon Sep 17 00:00:00 2001 From: GareArc Date: Fri, 14 Mar 2025 16:35:05 -0400 Subject: [PATCH 1/2] fix: update json keys --- api/services/feature_service.py | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/api/services/feature_service.py b/api/services/feature_service.py index 1a3a4026ad..7bcb1fdfcf 100644 --- a/api/services/feature_service.py +++ b/api/services/feature_service.py @@ -156,38 +156,42 @@ class FeatureService: def _fulfill_params_from_enterprise(cls, features): enterprise_info = EnterpriseService.get_info() - if "sso_enforced_for_signin" in enterprise_info: + if "SSOEnforcedForSignin" in enterprise_info: features.sso_enforced_for_signin = enterprise_info["sso_enforced_for_signin"] - if "sso_enforced_for_signin_protocol" in enterprise_info: + if "SSOEnforcedForSigninProtocol" in enterprise_info: features.sso_enforced_for_signin_protocol = enterprise_info["sso_enforced_for_signin_protocol"] - if "sso_enforced_for_web" in enterprise_info: + if "SSOEnforcedForWeb" in enterprise_info: features.sso_enforced_for_web = enterprise_info["sso_enforced_for_web"] - if "sso_enforced_for_web_protocol" in enterprise_info: + if "SSOEnforcedForWebProtocol" in enterprise_info: features.sso_enforced_for_web_protocol = enterprise_info["sso_enforced_for_web_protocol"] - if "enable_email_code_login" in enterprise_info: + if "EnableEmailCodeLogin" in enterprise_info: features.enable_email_code_login = enterprise_info["enable_email_code_login"] - if "enable_email_password_login" in enterprise_info: + if "EnableEmailPasswordLogin" in enterprise_info: features.enable_email_password_login = enterprise_info["enable_email_password_login"] - if "is_allow_register" in enterprise_info: + if "IsAllowRegister" in enterprise_info: features.is_allow_register = enterprise_info["is_allow_register"] - if "is_allow_create_workspace" in enterprise_info: + if "IsAllowCreateWorkspace" in enterprise_info: features.is_allow_create_workspace = enterprise_info["is_allow_create_workspace"] - if "branding" in enterprise_info: - features.branding = enterprise_info["branding"] + if "Branding" in enterprise_info: + features.branding.enabled = enterprise_info["branding"].get("enabled", False) + features.branding.application_title = enterprise_info["branding"].get("applicationTitle", "") + features.branding.login_page_logo = enterprise_info["branding"].get("loginPageLogo", "") + features.branding.workspace_logo = enterprise_info["branding"].get("workspaceLogo", "") + features.branding.favicon = enterprise_info["branding"].get("favicon", "") - if "license" in enterprise_info: - license_info = enterprise_info["license"] + if "License" in enterprise_info: + license_info = enterprise_info["License"] if "status" in license_info: features.license.status = LicenseStatus(license_info.get("status", LicenseStatus.INACTIVE)) if "expired_at" in license_info: - features.license.expired_at = license_info["expired_at"] + features.license.expired_at = license_info["expiredAt"] From 0e0bada1f3e6a8be1694aff02936d5fe1c0015e1 Mon Sep 17 00:00:00 2001 From: GareArc Date: Fri, 14 Mar 2025 16:36:49 -0400 Subject: [PATCH 2/2] fix: missing json keys --- api/services/feature_service.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/api/services/feature_service.py b/api/services/feature_service.py index 7bcb1fdfcf..404dbc46ac 100644 --- a/api/services/feature_service.py +++ b/api/services/feature_service.py @@ -157,35 +157,35 @@ class FeatureService: enterprise_info = EnterpriseService.get_info() if "SSOEnforcedForSignin" in enterprise_info: - features.sso_enforced_for_signin = enterprise_info["sso_enforced_for_signin"] + features.sso_enforced_for_signin = enterprise_info["SSOEnforcedForSignin"] if "SSOEnforcedForSigninProtocol" in enterprise_info: - features.sso_enforced_for_signin_protocol = enterprise_info["sso_enforced_for_signin_protocol"] + features.sso_enforced_for_signin_protocol = enterprise_info["SSOEnforcedForSigninProtocol"] if "SSOEnforcedForWeb" in enterprise_info: - features.sso_enforced_for_web = enterprise_info["sso_enforced_for_web"] + features.sso_enforced_for_web = enterprise_info["SSOEnforcedForWeb"] if "SSOEnforcedForWebProtocol" in enterprise_info: - features.sso_enforced_for_web_protocol = enterprise_info["sso_enforced_for_web_protocol"] + features.sso_enforced_for_web_protocol = enterprise_info["SSOEnforcedForWebProtocol"] if "EnableEmailCodeLogin" in enterprise_info: - features.enable_email_code_login = enterprise_info["enable_email_code_login"] + features.enable_email_code_login = enterprise_info["EnableEmailCodeLogin"] if "EnableEmailPasswordLogin" in enterprise_info: - features.enable_email_password_login = enterprise_info["enable_email_password_login"] + features.enable_email_password_login = enterprise_info["EnableEmailPasswordLogin"] if "IsAllowRegister" in enterprise_info: - features.is_allow_register = enterprise_info["is_allow_register"] + features.is_allow_register = enterprise_info["IsAllowRegister"] if "IsAllowCreateWorkspace" in enterprise_info: - features.is_allow_create_workspace = enterprise_info["is_allow_create_workspace"] + features.is_allow_create_workspace = enterprise_info["IsAllowCreateWorkspace"] if "Branding" in enterprise_info: - features.branding.enabled = enterprise_info["branding"].get("enabled", False) - features.branding.application_title = enterprise_info["branding"].get("applicationTitle", "") - features.branding.login_page_logo = enterprise_info["branding"].get("loginPageLogo", "") - features.branding.workspace_logo = enterprise_info["branding"].get("workspaceLogo", "") - features.branding.favicon = enterprise_info["branding"].get("favicon", "") + features.branding.enabled = enterprise_info["Branding"].get("enabled", False) + features.branding.application_title = enterprise_info["Branding"].get("applicationTitle", "") + features.branding.login_page_logo = enterprise_info["Branding"].get("loginPageLogo", "") + features.branding.workspace_logo = enterprise_info["Branding"].get("workspaceLogo", "") + features.branding.favicon = enterprise_info["Branding"].get("favicon", "") if "License" in enterprise_info: license_info = enterprise_info["License"]