From 366e40d9ec1e9068d80a5c3a42c7d0ad31de4a08 Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Thu, 14 May 2020 18:37:29 -0300 Subject: [PATCH] 15881: Simplifies code that decides if it need to show a login form. Also, remove any trailing slashes on service's ExternalURLs coming from the exported cluster config. Refs #16392 Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- src/common/config.ts | 13 ++++++++++++- src/views/login-panel/login-panel.tsx | 14 ++++++++++---- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/common/config.ts b/src/common/config.ts index 5c63fd69..361ca24e 100644 --- a/src/common/config.ts +++ b/src/common/config.ts @@ -120,6 +120,17 @@ const getApiRevision = async (apiUrl: string) => { } }; +const removeTrailingSlashes = (config: ClusterConfigJSON): ClusterConfigJSON => { + const svcs: any = {}; + Object.keys(config.Services).map((s) => { + svcs[s] = config.Services[s]; + if (svcs[s].hasOwnProperty('ExternalURL')) { + svcs[s].ExternalURL = svcs[s].ExternalURL.replace(/\/+$/, ''); + } + }); + return {...config, Services: svcs}; +}; + export const fetchConfig = () => { return Axios .get(WORKBENCH_CONFIG_URL + "?nocache=" + (new Date()).getTime()) @@ -133,7 +144,7 @@ export const fetchConfig = () => { throw new Error(`Unable to start Workbench. API_HOST is undefined in ${WORKBENCH_CONFIG_URL} or the environment.`); } return Axios.get(getClusterConfigURL(workbenchConfig.API_HOST)).then(async response => { - const clusterConfigJSON = response.data; + const clusterConfigJSON = removeTrailingSlashes(response.data); const apiRevision = await getApiRevision(clusterConfigJSON.Services.Controller.ExternalURL); const config = { ...buildConfig(clusterConfigJSON), apiRevision }; const warnLocalConfig = (varName: string) => console.warn( diff --git a/src/views/login-panel/login-panel.tsx b/src/views/login-panel/login-panel.tsx index ba0f584f..f60f032a 100644 --- a/src/views/login-panel/login-panel.tsx +++ b/src/views/login-panel/login-panel.tsx @@ -11,6 +11,7 @@ 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'; @@ -69,6 +70,13 @@ type LoginPanelProps = DispatchProp & WithStyles & { passwordLogin: boolean, }; +const requirePasswordLogin = (config: Config): boolean => { + if (config && config.clusterConfig) { + return config.clusterConfig.Login.LDAP.Enable || config.clusterConfig.Login.PAM.Enable || false; + } + return false; +}; + export const LoginPanel = withStyles(styles)( connect((state: RootState) => ({ remoteHosts: state.auth.remoteHosts, @@ -76,10 +84,8 @@ export const LoginPanel = withStyles(styles)( localCluster: state.auth.localCluster, loginCluster: state.auth.loginCluster, welcomePage: state.auth.config.clusterConfig.Workbench.WelcomePageHTML, - passwordLogin: state.auth.remoteHostsConfig[state.auth.loginCluster || state.auth.homeCluster] && - state.auth.remoteHostsConfig[state.auth.loginCluster || state.auth.homeCluster].clusterConfig.Login.LDAP.Enable || - state.auth.remoteHostsConfig[state.auth.loginCluster || state.auth.homeCluster].clusterConfig.Login.PAM.Enable || false, - }))(({ classes, dispatch, remoteHosts, homeCluster, localCluster, loginCluster, welcomePage, passwordLogin }: 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 (