From: Tom Clegg <tom@tomclegg.ca>
Date: Wed, 26 Aug 2020 20:22:08 +0000 (-0400)
Subject: Merge branch '16314-test-user-db'
X-Git-Tag: 2.1.0~14
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/49a14f5b5eacb5b8ad23d033c05597971cc42957

Merge branch '16314-test-user-db'

refs #16314

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>
---

49a14f5b5eacb5b8ad23d033c05597971cc42957
diff --cc src/views/login-panel/login-panel.tsx
index c857c0b2,f7cba4f8..4538802b
--- a/src/views/login-panel/login-panel.tsx
+++ b/src/views/login-panel/login-panel.tsx
@@@ -70,14 -70,9 +70,14 @@@ type LoginPanelProps = DispatchProp<any
      passwordLogin: boolean,
  };
  
- const loginOptions = ['LDAP', 'PAM'];
 -const requirePasswordLogin = (config: Config): boolean => {
 -    if (config && config.clusterConfig) {
 -        return config.clusterConfig.Login.LDAP.Enable || config.clusterConfig.Login.PAM.Enable || config.clusterConfig.Login.Test.Enable || false;
++const loginOptions = ['LDAP', 'PAM', 'Test'];
 +
 +export const requirePasswordLogin = (config: Config): boolean => {
 +    if (config && config.clusterConfig && config.clusterConfig.Login) {
 +        return loginOptions
 +            .filter(loginOption => !!config.clusterConfig.Login[loginOption])
 +            .map(loginOption => config.clusterConfig.Login[loginOption].Enable)
 +            .find(enabled => enabled === true) || false;
      }
      return false;
  };