X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/50286028b596616c33e2e6919f91c7292d5a6a72..d53a08ea0cc9a9af1a3071969d41165e8a6ff5d5:/src/views/login-panel/login-panel.tsx diff --git a/src/views/login-panel/login-panel.tsx b/src/views/login-panel/login-panel.tsx index 25fee7eb..110097be 100644 --- a/src/views/login-panel/login-panel.tsx +++ b/src/views/login-panel/login-panel.tsx @@ -2,15 +2,16 @@ // // SPDX-License-Identifier: AGPL-3.0 -import * as React from 'react'; +import React from 'react'; import { connect, DispatchProp } from 'react-redux'; import { Grid, Typography, Button, Select } from '@material-ui/core'; import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles'; -import { login, authActions } from '~/store/auth/auth-action'; -import { ArvadosTheme } from '~/common/custom-theme'; -import { RootState } from '~/store/store'; -import { LoginForm } from '~/views-components/login-form/login-form'; +import { login, authActions } from 'store/auth/auth-action'; +import { ArvadosTheme } from 'common/custom-theme'; +import { RootState } from 'store/store'; +import { LoginForm } from 'views-components/login-form/login-form'; import Axios from 'axios'; +import { Config } from 'common/config'; type CssRules = 'root' | 'container' | 'title' | 'content' | 'content__bolder' | 'button'; @@ -49,8 +50,8 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ } }); -const doPAMLogin = (url: string) => (username: string, password: string) => { - const formData = []; +const doPasswordLogin = (url: string) => (username: string, password: string) => { + const formData: string[] = []; formData.push('username='+encodeURIComponent(username)); formData.push('password='+encodeURIComponent(password)); return Axios.post(`${url}/arvados/v1/users/authenticate`, formData.join('&'), { @@ -66,7 +67,19 @@ type LoginPanelProps = DispatchProp & WithStyles & { localCluster: string, loginCluster: string, welcomePage: string, - pamLogin: boolean, + passwordLogin: boolean, +}; + +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; }; export const LoginPanel = withStyles(styles)( @@ -76,9 +89,8 @@ export const LoginPanel = withStyles(styles)( localCluster: state.auth.localCluster, loginCluster: state.auth.loginCluster, welcomePage: state.auth.config.clusterConfig.Workbench.WelcomePageHTML, - pamLogin: state.auth.remoteHostsConfig[state.auth.loginCluster || state.auth.homeCluster] && - state.auth.remoteHostsConfig[state.auth.loginCluster || state.auth.homeCluster].clusterConfig.Login.PAM || false, - }))(({ classes, dispatch, remoteHosts, homeCluster, localCluster, loginCluster, welcomePage, pamLogin }: LoginPanelProps) => { + passwordLogin: requirePasswordLogin(state.auth.remoteHostsConfig[state.auth.loginCluster || state.auth.homeCluster]), + }))(({ classes, dispatch, remoteHosts, homeCluster, localCluster, loginCluster, welcomePage, passwordLogin }: LoginPanelProps) => { const loginBtnLabel = `Log in${(localCluster !== homeCluster && loginCluster !== homeCluster) ? " to "+localCluster+" with user from "+homeCluster : ''}`; return ( } - {pamLogin + {passwordLogin ? + handleSubmit={doPasswordLogin(`https://${remoteHosts[loginCluster || homeCluster]}`)}/> :