Skip to content

Commit

Permalink
Merged in task/SHIBUI-1190-defaults (pull request #472)
Browse files Browse the repository at this point in the history 
Updated UI to not use defaults in schema
  • Loading branch information
@rmathis
rmathis committed Apr 28, 2021
2 parents 5fa8666 + a80e501 commit 772de36
Show file tree
Hide file tree
Showing 10 changed files with 85 additions and 135 deletions.
58 changes: 15 additions & 43 deletions backend/src/main/resources/dynamic-http-metadata-provider.schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
"title": "label.xml-id",
"description": "tooltip.xml-id",
"type": "string",
"default": "",
"minLength": 1
},
"metadataRequestURLConstructionScheme": {
Expand Down Expand Up @@ -118,8 +117,7 @@
],
"description": "value.false"
}
],
"default": true
]
},
"failFastInitialization": {
"title": "label.fail-fast-init",
Expand All @@ -141,8 +139,7 @@
],
"description": "value.false"
}
],
"default": true
]
},
"dynamicMetadataResolverAttributes": {
"type": "object",
Expand Down Expand Up @@ -179,7 +176,6 @@
"PT24H"
]
},
"default": null,
"pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$"
},
"maxCacheDuration": {
Expand All @@ -201,7 +197,6 @@
"PT24H"
]
},
"default": null,
"pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$"
},
"maxIdleEntityData": {
Expand All @@ -223,7 +218,6 @@
"PT24H"
]
},
"default": null,
"pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$"
},
"removeIdleEntityData": {
Expand All @@ -246,8 +240,7 @@
],
"description": "value.false"
}
],
"default": true
]
},
"cleanupTaskInterval": {
"title": "label.cleanup-task-interval",
Expand All @@ -268,14 +261,12 @@
"PT24H"
]
},
"default": null,
"pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$"
},
"persistentCacheManagerDirectory": {
"title": "label.persistent-cache-manager-directory",
"description": "tooltip.persistent-cache-manager-directory",
"type": "string",
"default": "",
"minLength": 1
},
"initializeFromPersistentCacheInBackground": {
Expand All @@ -298,8 +289,7 @@
],
"description": "value.false"
}
],
"default": true
]
},
"backgroundInitializationFromCacheDelay": {
"title": "label.background-init-from-cache-delay",
Expand All @@ -325,7 +315,6 @@
true
]
},
"default": null,
"pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$"
}
}
Expand Down Expand Up @@ -405,16 +394,14 @@
],
"description": "False"
}
],
"default": false
]
},
"httpClientRef": {
"type": "string",
"title": "",
"description": "",
"placeholder": "",
"widget": "hidden",
"default": ""
"widget": "hidden"
},
"connectionRequestTimeout": {
"type": "string",
Expand All @@ -435,7 +422,6 @@
"PT24H"
]
},
"default": null,
"pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$"
},
"connectionTimeout": {
Expand All @@ -457,7 +443,6 @@
"PT24H"
]
},
"default": null,
"pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$"
},
"socketTimeout": {
Expand All @@ -479,52 +464,45 @@
"PT24H"
]
},
"default": null,
"pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$"
},
"tlsTrustEngineRef": {
"type": "string",
"title": "",
"description": "",
"placeholder": "",
"widget": "hidden",
"default": ""
"widget": "hidden"
},
"httpClientSecurityParametersRef": {
"type": "string",
"title": "",
"description": "",
"placeholder": "",
"widget": "hidden",
"default": ""
"widget": "hidden"
},
"proxyHost": {
"type": "string",
"title": "label.proxy-host",
"description": "tooltip.proxy-host",
"placeholder": "",
"default": ""
"placeholder": ""
},
"proxyPort": {
"type": "string",
"title": "label.proxy-port",
"description": "tooltip.proxy-port",
"placeholder": "",
"default": ""
"placeholder": ""
},
"proxyUser": {
"type": "string",
"title": "label.proxy-user",
"description": "tooltip.proxy-user",
"placeholder": "",
"default": ""
"placeholder": ""
},
"proxyPassword": {
"type": "string",
"title": "label.proxy-password",
"description": "tooltip.proxy-password",
"placeholder": "",
"default": ""
"placeholder": ""
},
"httpCaching": {
"type": "string",
Expand Down Expand Up @@ -566,15 +544,13 @@
"title": "label.http-max-cache-entries",
"description": "tooltip.http-max-cache-entries",
"placeholder": "",
"default": 0,
"minimum": 0
},
"httpMaxCacheEntrySize": {
"type": "integer",
"title": "label.max-cache-entry-size",
"description": "tooltip.max-cache-entry-size",
"placeholder": "",
"default": 0,
"minimum": 0
}
}
Expand Down Expand Up @@ -613,7 +589,6 @@
"PT24H"
]
},
"default": null,
"pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$"
}
}
Expand All @@ -629,8 +604,7 @@
"requireSignedRoot": {
"title": "label.require-signed-root",
"description": "tooltip.require-signed-root",
"type": "boolean",
"default": true
"type": "boolean"
},
"certificateFile": {
"title": "label.certificate-file",
Expand Down Expand Up @@ -698,14 +672,12 @@
"removeRolelessEntityDescriptors": {
"title": "label.remove-roleless-entity-descriptors",
"description": "tooltip.remove-roleless-entity-descriptors",
"type": "boolean",
"default": true
"type": "boolean"
},
"removeEmptyEntitiesDescriptors": {
"title": "label.remove-empty-entities-descriptors",
"description": "tooltip.remove-empty-entities-descriptors",
"type": "boolean",
"default": true
"type": "boolean"
}
}
}
Expand Down
27 changes: 9 additions & 18 deletions backend/src/main/resources/entity-attributes-filters-ui-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,44 +95,37 @@
"signAssertion": {
"title": "label.sign-the-assertion",
"description": "tooltip.sign-assertion",
"type": "boolean",
"default": false
"type": "boolean"
},
"dontSignResponse": {
"title": "label.dont-sign-the-response",
"description": "tooltip.dont-sign-response",
"type": "boolean",
"default": false
"type": "boolean"
},
"turnOffEncryption": {
"title": "label.turn-off-encryption-of-response",
"description": "tooltip.turn-off-encryption",
"type": "boolean",
"default": false
"type": "boolean"
},
"useSha": {
"title": "label.use-sha1-signing-algorithm",
"description": "tooltip.usa-sha-algorithm",
"type": "boolean",
"default": false
"type": "boolean"
},
"ignoreAuthenticationMethod": {
"title": "label.ignore-any-sp-requested-authentication-method",
"description": "tooltip.ignore-auth-method",
"type": "boolean",
"default": false
"type": "boolean"
},
"forceAuthn": {
"title": "label.force-authn",
"description": "tooltip.force-authn",
"type": "boolean",
"default": false
"type": "boolean"
},
"omitNotBefore": {
"title": "label.omit-not-before-condition",
"type": "boolean",
"description": "tooltip.omit-not-before-condition",
"default": false
"description": "tooltip.omit-not-before-condition"
},
"responderId": {
"title": "label.responder-id",
Expand All @@ -157,8 +150,7 @@
"urn:oasis:names:tc:SAML:2.0:nameid-format:transient"
]
}
},
"default": null
}
},
"authenticationMethods": {
"title": "label.authentication-methods-to-use",
Expand All @@ -177,8 +169,7 @@
"urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport"
]
}
},
"default": null
}
}
}
},
Expand Down
7 changes: 1 addition & 6 deletions backend/src/main/resources/file-system-metadata-provider.schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,12 @@
"title": "label.xml-id",
"description": "tooltip.xml-id",
"type": "string",
"default": "",
"minLength": 1
},
"metadataFile": {
"title": "label.metadata-file",
"description": "tooltip.metadata-file",
"type": "string",
"default": "",
"minLength": 1
},
"enabled": {
Expand Down Expand Up @@ -75,8 +73,7 @@
],
"description": "value.false"
}
],
"default": false
]
},
"reloadableMetadataResolverAttributes": {
"type": "object",
Expand All @@ -100,7 +97,6 @@
"PT24H"
]
},
"default": null,
"pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$"
},
"maxRefreshDelay": {
Expand All @@ -122,7 +118,6 @@
"PT24H"
]
},
"default": null,
"pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$"
},
"refreshDelayFactor": {
Expand Down
Loading

0 comments on commit 772de36

Please sign in to comment.