[ARVADOS-WORKBENCH2] created: 1.4.1-406-gf47e1caa
Git user
git at public.arvados.org
Thu Aug 20 14:44:30 UTC 2020
at f47e1caaa5781e6f6d8e022f92cae34adf49eaad (commit)
commit f47e1caaa5781e6f6d8e022f92cae34adf49eaad
Author: Tom Clegg <tom at tomclegg.ca>
Date: Thu Aug 20 10:43:53 2020 -0400
16314: Invoke user/pass prompt for Test authentication method.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>
diff --git a/src/common/config.ts b/src/common/config.ts
index cf539f3d..26f8dddb 100644
--- a/src/common/config.ts
+++ b/src/common/config.ts
@@ -76,6 +76,9 @@ export interface ClusterConfigJSON {
SSO: {
Enable: boolean;
}
+ Test: {
+ Enable: boolean;
+ }
};
Collections: {
ForwardSlashNameSubstitution: string;
@@ -231,6 +234,9 @@ export const mockClusterConfigJSON = (config: Partial<ClusterConfigJSON>): Clust
SSO: {
Enable: false,
},
+ Test: {
+ Enable: boolean;
+ }
},
Collections: {
ForwardSlashNameSubstitution: "",
diff --git a/src/views/login-panel/login-panel.tsx b/src/views/login-panel/login-panel.tsx
index f60f032a..f7cba4f8 100644
--- a/src/views/login-panel/login-panel.tsx
+++ b/src/views/login-panel/login-panel.tsx
@@ -72,7 +72,7 @@ type LoginPanelProps = DispatchProp<any> & WithStyles<CssRules> & {
const requirePasswordLogin = (config: Config): boolean => {
if (config && config.clusterConfig) {
- return config.clusterConfig.Login.LDAP.Enable || config.clusterConfig.Login.PAM.Enable || false;
+ return config.clusterConfig.Login.LDAP.Enable || config.clusterConfig.Login.PAM.Enable || config.clusterConfig.Login.Test.Enable || false;
}
return false;
};
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list