From: Daniel Kutyła <daniel.kutyla@contractors.roche.com>
Date: Fri, 21 Aug 2020 15:44:01 +0000 (+0200)
Subject: 16735: Added array of possible login methods
X-Git-Tag: 2.1.0~15^2~1
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/a2a35bb1683304edd8d20e1a2b5df29e81669b46

16735: Added array of possible login methods

Arvados-DCO-1.1-Signed-off-by: Daniel Kutyła <daniel.kutyla@contractors.roche.com>
---

diff --git a/src/views/login-panel/login-panel.tsx b/src/views/login-panel/login-panel.tsx
index 1d7e6ad4..c857c0b2 100644
--- a/src/views/login-panel/login-panel.tsx
+++ b/src/views/login-panel/login-panel.tsx
@@ -70,9 +70,14 @@ type LoginPanelProps = DispatchProp<any> & WithStyles<CssRules> & {
     passwordLogin: boolean,
 };
 
+const loginOptions = ['LDAP', 'PAM'];
+
 export const requirePasswordLogin = (config: Config): boolean => {
-    if (config && config.clusterConfig && config.clusterConfig.Login && (config.clusterConfig.Login.LDAP || config.clusterConfig.Login.PAM)) {
-        return config.clusterConfig.Login.LDAP.Enable || config.clusterConfig.Login.PAM.Enable || false;
+    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;
 };