From 19eeccceb5ad66054bd57ebb54491a340ff7ecdb Mon Sep 17 00:00:00 2001 From: Emil-Carlsson <77834509+Emil-Carlsson@users.noreply.github.com> Date: Fri, 3 Nov 2023 12:22:22 +0100 Subject: [PATCH] Wont show password if only LDAP/AD enabled (#23860) (#24735) Automatic Merge --- webapp/channels/src/components/login/login.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webapp/channels/src/components/login/login.tsx b/webapp/channels/src/components/login/login.tsx index de57dde41f..339e7db500 100644 --- a/webapp/channels/src/components/login/login.tsx +++ b/webapp/channels/src/components/login/login.tsx @@ -146,6 +146,7 @@ const Login = ({onCustomizeHeader}: LoginProps) => { const enableBaseLogin = enableSignInWithEmail || enableSignInWithUsername || ldapEnabled; const enableExternalSignup = enableSignUpWithGitLab || enableSignUpWithOffice365 || enableSignUpWithGoogle || enableSignUpWithOpenId || enableSignUpWithSaml; const showSignup = enableOpenServer && (enableExternalSignup || enableSignUpWithEmail || enableLdap); + const onlyLdapEnabled = enableLdap && !(enableSaml || enableSignInWithEmail || enableSignInWithUsername || enableSignUpWithEmail || enableSignUpWithGitLab || enableSignUpWithGoogle || enableSignUpWithOffice365 || enableSignUpWithOpenId); const query = new URLSearchParams(search); const redirectTo = query.get('redirect_to'); @@ -740,7 +741,7 @@ const Login = ({onCustomizeHeader}: LoginProps) => { }; const getResetPasswordLink = () => { - if (!PasswordEnableForgotLink || PasswordEnableForgotLink === 'false') { + if (!PasswordEnableForgotLink || PasswordEnableForgotLink === 'false' || onlyLdapEnabled) { return null; }