Commit 50f1b200 authored by Christophe Maudoux's avatar Christophe Maudoux 🐛

Arrange Manager tree (#1625)

parent 4825b477
...@@ -36,21 +36,7 @@ sub cTrees { ...@@ -36,21 +36,7 @@ sub cTrees {
samlIDPMetaDataNode => [ samlIDPMetaDataNode => [
'samlIDPMetaDataXML', 'samlIDPMetaDataXML',
'samlIDPMetaDataExportedAttributes', 'samlIDPMetaDataExportedAttributes',
{
title => 'samlIDPMetaDataOptions',
help => 'authsaml.html#options',
form => 'simpleInputContainer',
nodes => [
'samlIDPMetaDataOptionsResolutionRule',
'samlIDPMetaDataOptionsNameIDFormat',
'samlIDPMetaDataOptionsForceAuthn',
'samlIDPMetaDataOptionsIsPassive',
'samlIDPMetaDataOptionsAllowProxiedAuthn',
'samlIDPMetaDataOptionsAllowLoginFromIDP',
'samlIDPMetaDataOptionsRequestedAuthnContext',
'samlIDPMetaDataOptionsRelayStateURL',
],
},
{ {
title => "samlIDPMetaDataOptionsSession", title => "samlIDPMetaDataOptionsSession",
form => 'simpleInputContainer', form => 'simpleInputContainer',
...@@ -87,6 +73,21 @@ sub cTrees { ...@@ -87,6 +73,21 @@ sub cTrees {
"samlIDPMetaDataOptionsCheckTime", "samlIDPMetaDataOptionsCheckTime",
"samlIDPMetaDataOptionsCheckAudience" "samlIDPMetaDataOptionsCheckAudience"
] ]
},
{
title => 'samlIDPMetaDataOptions',
help => 'authsaml.html#options',
form => 'simpleInputContainer',
nodes => [
'samlIDPMetaDataOptionsResolutionRule',
'samlIDPMetaDataOptionsNameIDFormat',
'samlIDPMetaDataOptionsForceAuthn',
'samlIDPMetaDataOptionsIsPassive',
'samlIDPMetaDataOptionsAllowProxiedAuthn',
'samlIDPMetaDataOptionsAllowLoginFromIDP',
'samlIDPMetaDataOptionsRequestedAuthnContext',
'samlIDPMetaDataOptionsRelayStateURL',
],
}, },
{ {
title => "samlIDPMetaDataOptionsDisplay", title => "samlIDPMetaDataOptionsDisplay",
...@@ -170,6 +171,9 @@ sub cTrees { ...@@ -170,6 +171,9 @@ sub cTrees {
'oidcOPMetaDataOptionsUseNonce' 'oidcOPMetaDataOptionsUseNonce'
] ]
}, },
]
},
{ {
title => 'oidcOPMetaDataOptionsDisplayParams', title => 'oidcOPMetaDataOptionsDisplayParams',
form => 'simpleInputContainer', form => 'simpleInputContainer',
...@@ -178,11 +182,10 @@ sub cTrees { ...@@ -178,11 +182,10 @@ sub cTrees {
'oidcOPMetaDataOptionsIcon' 'oidcOPMetaDataOptionsIcon'
] ]
}, },
]
},
], ],
oidcRPMetaDataNode => [ oidcRPMetaDataNode => [
'oidcRPMetaDataExportedVars', 'oidcRPMetaDataExportedVars',
'oidcRPMetaDataOptionsExtraClaims',
{ {
title => 'oidcRPMetaDataOptions', title => 'oidcRPMetaDataOptions',
nodes => [ { nodes => [ {
...@@ -220,7 +223,7 @@ sub cTrees { ...@@ -220,7 +223,7 @@ sub cTrees {
'oidcRPMetaDataOptionsRule', 'oidcRPMetaDataOptionsRule',
] ]
}, },
'oidcRPMetaDataOptionsExtraClaims',
], ],
casSrvMetaDataNode => [ { casSrvMetaDataNode => [ {
title => 'casSrvMetaDataOptions', title => 'casSrvMetaDataOptions',
......
...@@ -313,27 +313,27 @@ function templates(tpl,key) { ...@@ -313,27 +313,27 @@ function templates(tpl,key) {
"id" : "oidcOPMetaDataOptionsProtocol", "id" : "oidcOPMetaDataOptionsProtocol",
"title" : "oidcOPMetaDataOptionsProtocol", "title" : "oidcOPMetaDataOptionsProtocol",
"type" : "simpleInputContainer" "type" : "simpleInputContainer"
},
{
"_nodes" : [
{
"get" : tpl+"s/"+key+"/"+"oidcOPMetaDataOptionsDisplayName",
"id" : tpl+"s/"+key+"/"+"oidcOPMetaDataOptionsDisplayName",
"title" : "oidcOPMetaDataOptionsDisplayName"
},
{
"get" : tpl+"s/"+key+"/"+"oidcOPMetaDataOptionsIcon",
"id" : tpl+"s/"+key+"/"+"oidcOPMetaDataOptionsIcon",
"title" : "oidcOPMetaDataOptionsIcon"
}
],
"id" : "oidcOPMetaDataOptionsDisplayParams",
"title" : "oidcOPMetaDataOptionsDisplayParams",
"type" : "simpleInputContainer"
} }
], ],
"id" : "oidcOPMetaDataOptions", "id" : "oidcOPMetaDataOptions",
"title" : "oidcOPMetaDataOptions" "title" : "oidcOPMetaDataOptions"
},
{
"_nodes" : [
{
"get" : tpl+"s/"+key+"/"+"oidcOPMetaDataOptionsDisplayName",
"id" : tpl+"s/"+key+"/"+"oidcOPMetaDataOptionsDisplayName",
"title" : "oidcOPMetaDataOptionsDisplayName"
},
{
"get" : tpl+"s/"+key+"/"+"oidcOPMetaDataOptionsIcon",
"id" : tpl+"s/"+key+"/"+"oidcOPMetaDataOptionsIcon",
"title" : "oidcOPMetaDataOptionsIcon"
}
],
"id" : "oidcOPMetaDataOptionsDisplayParams",
"title" : "oidcOPMetaDataOptionsDisplayParams",
"type" : "simpleInputContainer"
} }
] ]
; ;
...@@ -365,6 +365,13 @@ function templates(tpl,key) { ...@@ -365,6 +365,13 @@ function templates(tpl,key) {
"title" : "oidcRPMetaDataExportedVars", "title" : "oidcRPMetaDataExportedVars",
"type" : "keyTextContainer" "type" : "keyTextContainer"
}, },
{
"cnodes" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsExtraClaims",
"default" : [],
"id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsExtraClaims",
"title" : "oidcRPMetaDataOptionsExtraClaims",
"type" : "keyTextContainer"
},
{ {
"_nodes" : [ "_nodes" : [
{ {
...@@ -520,13 +527,6 @@ function templates(tpl,key) { ...@@ -520,13 +527,6 @@ function templates(tpl,key) {
], ],
"id" : "oidcRPMetaDataOptions", "id" : "oidcRPMetaDataOptions",
"title" : "oidcRPMetaDataOptions" "title" : "oidcRPMetaDataOptions"
},
{
"cnodes" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsExtraClaims",
"default" : [],
"id" : tpl+"s/"+key+"/"+"oidcRPMetaDataOptionsExtraClaims",
"title" : "oidcRPMetaDataOptionsExtraClaims",
"type" : "keyTextContainer"
} }
] ]
; ;
...@@ -546,134 +546,6 @@ function templates(tpl,key) { ...@@ -546,134 +546,6 @@ function templates(tpl,key) {
"title" : "samlIDPMetaDataExportedAttributes", "title" : "samlIDPMetaDataExportedAttributes",
"type" : "samlAttributeContainer" "type" : "samlAttributeContainer"
}, },
{
"_nodes" : [
{
"default" : "",
"get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsResolutionRule",
"id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsResolutionRule",
"title" : "samlIDPMetaDataOptionsResolutionRule",
"type" : "longtext"
},
{
"default" : "",
"get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsNameIDFormat",
"id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsNameIDFormat",
"select" : [
{
"k" : "",
"v" : ""
},
{
"k" : "unspecified",
"v" : "Unspecified"
},
{
"k" : "email",
"v" : "Email"
},
{
"k" : "x509",
"v" : "X509 certificate"
},
{
"k" : "windows",
"v" : "Windows"
},
{
"k" : "kerberos",
"v" : "Kerberos"
},
{
"k" : "entity",
"v" : "Entity"
},
{
"k" : "persistent",
"v" : "Persistent"
},
{
"k" : "transient",
"v" : "Transient"
},
{
"k" : "encrypted",
"v" : "Encrypted"
}
],
"title" : "samlIDPMetaDataOptionsNameIDFormat",
"type" : "select"
},
{
"default" : 0,
"get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsForceAuthn",
"id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsForceAuthn",
"title" : "samlIDPMetaDataOptionsForceAuthn",
"type" : "bool"
},
{
"default" : 0,
"get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsIsPassive",
"id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsIsPassive",
"title" : "samlIDPMetaDataOptionsIsPassive",
"type" : "bool"
},
{
"default" : 0,
"get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsAllowProxiedAuthn",
"id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsAllowProxiedAuthn",
"title" : "samlIDPMetaDataOptionsAllowProxiedAuthn",
"type" : "bool"
},
{
"default" : 0,
"get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsAllowLoginFromIDP",
"id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsAllowLoginFromIDP",
"title" : "samlIDPMetaDataOptionsAllowLoginFromIDP",
"type" : "bool"
},
{
"default" : "",
"get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsRequestedAuthnContext",
"id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsRequestedAuthnContext",
"select" : [
{
"k" : "",
"v" : ""
},
{
"k" : "kerberos",
"v" : "Kerberos"
},
{
"k" : "password-protected-transport",
"v" : "Password protected transport"
},
{
"k" : "password",
"v" : "Password"
},
{
"k" : "tls-client",
"v" : "TLS client certificate"
}
],
"title" : "samlIDPMetaDataOptionsRequestedAuthnContext",
"type" : "select"
},
{
"default" : 0,
"get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsRelayStateURL",
"id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsRelayStateURL",
"title" : "samlIDPMetaDataOptionsRelayStateURL",
"type" : "bool"
}
],
"help" : "authsaml.html#options",
"id" : "samlIDPMetaDataOptions",
"title" : "samlIDPMetaDataOptions",
"type" : "simpleInputContainer"
},
{ {
"_nodes" : [ "_nodes" : [
{ {
...@@ -841,6 +713,134 @@ function templates(tpl,key) { ...@@ -841,6 +713,134 @@ function templates(tpl,key) {
"title" : "samlIDPMetaDataOptionsSecurity", "title" : "samlIDPMetaDataOptionsSecurity",
"type" : "simpleInputContainer" "type" : "simpleInputContainer"
}, },
{
"_nodes" : [
{
"default" : "",
"get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsResolutionRule",
"id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsResolutionRule",
"title" : "samlIDPMetaDataOptionsResolutionRule",
"type" : "longtext"
},
{
"default" : "",
"get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsNameIDFormat",
"id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsNameIDFormat",
"select" : [
{
"k" : "",
"v" : ""
},
{
"k" : "unspecified",
"v" : "Unspecified"
},
{
"k" : "email",
"v" : "Email"
},
{
"k" : "x509",
"v" : "X509 certificate"
},
{
"k" : "windows",
"v" : "Windows"
},
{
"k" : "kerberos",
"v" : "Kerberos"
},
{
"k" : "entity",
"v" : "Entity"
},
{
"k" : "persistent",
"v" : "Persistent"
},
{
"k" : "transient",
"v" : "Transient"
},
{
"k" : "encrypted",
"v" : "Encrypted"
}
],
"title" : "samlIDPMetaDataOptionsNameIDFormat",
"type" : "select"
},
{
"default" : 0,
"get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsForceAuthn",
"id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsForceAuthn",
"title" : "samlIDPMetaDataOptionsForceAuthn",
"type" : "bool"
},
{
"default" : 0,
"get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsIsPassive",
"id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsIsPassive",
"title" : "samlIDPMetaDataOptionsIsPassive",
"type" : "bool"
},
{
"default" : 0,
"get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsAllowProxiedAuthn",
"id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsAllowProxiedAuthn",
"title" : "samlIDPMetaDataOptionsAllowProxiedAuthn",
"type" : "bool"
},
{
"default" : 0,
"get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsAllowLoginFromIDP",
"id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsAllowLoginFromIDP",
"title" : "samlIDPMetaDataOptionsAllowLoginFromIDP",
"type" : "bool"
},
{
"default" : "",
"get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsRequestedAuthnContext",
"id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsRequestedAuthnContext",
"select" : [
{
"k" : "",
"v" : ""
},
{
"k" : "kerberos",
"v" : "Kerberos"
},
{
"k" : "password-protected-transport",
"v" : "Password protected transport"
},
{
"k" : "password",
"v" : "Password"
},
{
"k" : "tls-client",
"v" : "TLS client certificate"
}
],
"title" : "samlIDPMetaDataOptionsRequestedAuthnContext",
"type" : "select"
},
{
"default" : 0,
"get" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsRelayStateURL",
"id" : tpl+"s/"+key+"/"+"samlIDPMetaDataOptionsRelayStateURL",
"title" : "samlIDPMetaDataOptionsRelayStateURL",
"type" : "bool"
}
],
"help" : "authsaml.html#options",
"id" : "samlIDPMetaDataOptions",
"title" : "samlIDPMetaDataOptions",
"type" : "simpleInputContainer"
},
{ {
"_nodes" : [ "_nodes" : [
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment