From f3e5322a6ac60959cc0943b3ba75e7000a34e967 Mon Sep 17 00:00:00 2001 From: RAHEEL Date: Mon, 6 Nov 2023 14:44:48 +0500 Subject: [PATCH] fix: enable oauth for community --- .../lowcoder/src/pages/setting/idSource/list.tsx | 4 ++-- .../packages/lowcoder/src/pages/setting/settingHome.tsx | 9 ++------- client/packages/lowcoder/src/pages/userAuth/login.tsx | 4 ++-- client/packages/lowcoder/src/pages/userAuth/register.tsx | 4 ++-- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/client/packages/lowcoder/src/pages/setting/idSource/list.tsx b/client/packages/lowcoder/src/pages/setting/idSource/list.tsx index dedca4d34..62f121ac0 100644 --- a/client/packages/lowcoder/src/pages/setting/idSource/list.tsx +++ b/client/packages/lowcoder/src/pages/setting/idSource/list.tsx @@ -45,13 +45,13 @@ export const IdSourceList = (props: any) => { const enableEnterpriseLogin = useSelector(selectSystemConfig)?.featureFlag?.enableEnterpriseLogin; useEffect(() => { - if (!currentOrgId || (!isSelfDomain(config) && !isEnterpriseMode(config))) { + if (!currentOrgId) { return; } getConfigs(); }, [currentOrgId]); - if (!currentOrgId || (!isSelfDomain(config) && !isEnterpriseMode(config))) { + if (!currentOrgId) { return null; } diff --git a/client/packages/lowcoder/src/pages/setting/settingHome.tsx b/client/packages/lowcoder/src/pages/setting/settingHome.tsx index 242895338..f54815278 100644 --- a/client/packages/lowcoder/src/pages/setting/settingHome.tsx +++ b/client/packages/lowcoder/src/pages/setting/settingHome.tsx @@ -52,14 +52,9 @@ export function SettingHome() { { key: SettingPageEnum.OAuthProvider, label: ( - - {trans("settings.oauthProviders")} - {(!currentOrgAdmin(user) || (!isSelfDomain(config) && !isEnterpriseMode(config))) && ( - - )} - + {trans("settings.oauthProviders")} ), - disabled: !currentOrgAdmin(user) || (!isSelfDomain(config) && !isEnterpriseMode(config)), + disabled: !currentOrgAdmin(user), }, { key: SettingPageEnum.Environments, diff --git a/client/packages/lowcoder/src/pages/userAuth/login.tsx b/client/packages/lowcoder/src/pages/userAuth/login.tsx index 6478c1c31..4062dda50 100644 --- a/client/packages/lowcoder/src/pages/userAuth/login.tsx +++ b/client/packages/lowcoder/src/pages/userAuth/login.tsx @@ -131,11 +131,11 @@ function Login() { loginCardView = thirdPartyLoginView; } - const loginHeading = organizationId && LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== "" + const loginHeading = LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== "" ? LOWCODER_CUSTOM_AUTH_WELCOME_TEXT : getLoginTitle(inviteInfo?.createUserName, systemConfig?.branding?.brandName) - const loginSubHeading = organizationId && LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== "" + const loginSubHeading = LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== "" ? trans("userAuth.poweredByLowcoder") : '' diff --git a/client/packages/lowcoder/src/pages/userAuth/register.tsx b/client/packages/lowcoder/src/pages/userAuth/register.tsx index 151d00a20..251154b58 100644 --- a/client/packages/lowcoder/src/pages/userAuth/register.tsx +++ b/client/packages/lowcoder/src/pages/userAuth/register.tsx @@ -71,11 +71,11 @@ function UserRegister() { return null; } - const registerHeading = organizationId && LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== "" + const registerHeading = LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== "" ? LOWCODER_CUSTOM_AUTH_WELCOME_TEXT : trans("userAuth.register") - const registerSubHeading = organizationId && LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== "" + const registerSubHeading = LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== "" ? trans("userAuth.poweredByLowcoder") : ''