[ARVADOS-WORKBENCH2] created: 1.4.1-406-gf0fb7571

[Git user]

        at  f0fb75714e54f5191a7026eedbec757ee22a682c (commit)


commit f0fb75714e54f5191a7026eedbec757ee22a682c
Author: Daniel Kutyła <daniel.kutyla at contractors.roche.com>
Date:   Fri Aug 21 14:56:45 2020 +0200

    16735: Added better checks for the PAM and LDAP login
    
    Arvados-DCO-1.1-Signed-off-by: Daniel Kutyła <daniel.kutyla at contractors.roche.com>

diff --git a/src/views-components/current-token-dialog/current-token-dialog.tsx b/src/views-components/current-token-dialog/current-token-dialog.tsx
index 0ea24690..9cb08f8b 100644
--- a/src/views-components/current-token-dialog/current-token-dialog.tsx
+++ b/src/views-components/current-token-dialog/current-token-dialog.tsx
@@ -57,6 +57,7 @@ unset ARVADOS_API_HOST_INSECURE`
 
     render() {
         const { classes, open, closeDialog, ...data } = this.props;
+
         return <Dialog
             open={open}
             onClose={closeDialog}
diff --git a/src/views/login-panel/login-panel.test.tsx b/src/views/login-panel/login-panel.test.tsx
new file mode 100644
index 00000000..c716433e
--- /dev/null
+++ b/src/views/login-panel/login-panel.test.tsx
@@ -0,0 +1,117 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import { requirePasswordLogin } from './login-panel';
+
+describe('<LoginPanel />', () => {
+    describe('requirePasswordLogin', () => {
+        it('should return false if no config specified', () => {
+            // given
+            const config = null;
+
+            // when
+            const result = requirePasswordLogin(config);
+
+            // then
+            expect(result).toBeFalsy();
+        });
+
+        it('should return false if no config.clusterConfig specified', () => {
+            // given
+            const config = {};
+
+            // when
+            const result = requirePasswordLogin(config);
+
+            // then
+            expect(result).toBeFalsy();
+        });
+
+        it('should return false if no config.clusterConfig.Login specified', () => {
+            // given
+            const config = {
+                clusterConfig: {},
+            };
+
+            // when
+            const result = requirePasswordLogin(config);
+
+            // then
+            expect(result).toBeFalsy();
+        });
+
+        it('should return false if no config.clusterConfig.Login.LDAP and config.clusterConfig.Login.PAM specified', () => {
+            // given
+            const config = {
+                clusterConfig: {
+                    Login: {}
+                },
+            };
+
+            // when
+            const result = requirePasswordLogin(config);
+
+            // then
+            expect(result).toBeFalsy();
+        });
+
+        it('should return false if config.clusterConfig.Login.LDAP.Enable and config.clusterConfig.Login.PAM.Enable not specified', () => {
+            // given
+            const config = {
+                clusterConfig: {
+                    Login: {
+                        PAM: {},
+                        LDAP: {},
+                    },
+                },
+            };
+
+            // when
+            const result = requirePasswordLogin(config);
+
+            // then
+            expect(result).toBeFalsy();
+        });
+
+        it('should return value from config.clusterConfig.Login.LDAP.Enable', () => {
+            // given
+            const config = {
+                clusterConfig: {
+                    Login: {
+                        PAM: {},
+                        LDAP: {
+                            Enable: true
+                        },
+                    },
+                },
+            };
+
+            // when
+            const result = requirePasswordLogin(config);
+
+            // then
+            expect(result).toBeTruthy();
+        });
+
+        it('should return value from config.clusterConfig.Login.PAM.Enable', () => {
+            // given
+            const config = {
+                clusterConfig: {
+                    Login: {
+                        LDAP: {},
+                        PAM: {
+                            Enable: true
+                        },
+                    },
+                },
+            };
+
+            // when
+            const result = requirePasswordLogin(config);
+
+            // then
+            expect(result).toBeTruthy();
+        });
+    });
+});
\ No newline at end of file
diff --git a/src/views/login-panel/login-panel.tsx b/src/views/login-panel/login-panel.tsx
index f60f032a..1d7e6ad4 100644
--- a/src/views/login-panel/login-panel.tsx
+++ b/src/views/login-panel/login-panel.tsx
@@ -70,8 +70,8 @@ type LoginPanelProps = DispatchProp<any> & WithStyles<CssRules> & {
     passwordLogin: boolean,
 };
 
-const requirePasswordLogin = (config: Config): boolean => {
-    if (config && config.clusterConfig) {
+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;
     }
     return false;

-----------------------------------------------------------------------


hooks/post-receive
--