Merged in react (pull request #483)

React Conversion
TIER · Jun 14, 2021 · fc668d2 · fc668d2
2 parents 6fe87cb + 0c02bcb
commit fc668d2
Show file tree

Hide file tree

Showing 913 changed files with 37,452 additions and 52,431 deletions.
diff --git a/.../tier/shibboleth/admin/ui/controller/EntityAttributesFiltersUiDefinitionController.groovy b/.../tier/shibboleth/admin/ui/controller/EntityAttributesFiltersUiDefinitionController.groovy
@@ -41,7 +41,7 @@ class EntityAttributesFiltersUiDefinitionController {
     ResponseEntity<?> getUiDefinitionJsonSchema() {
         try {
             def parsedJson = jacksonObjectMapper.readValue(this.jsonSchemaLocation.url, Map)
-            jsonSchemaBuilderService.addReleaseAttributesToJson(parsedJson['properties']['attributeRelease']['widget'])
+            jsonSchemaBuilderService.addReleaseAttributesToJson(parsedJson['properties']['attributeRelease']['items'])
             jsonSchemaBuilderService.addRelyingPartyOverridesToJson(parsedJson['properties']['relyingPartyOverrides'])
             jsonSchemaBuilderService.addRelyingPartyOverridesCollectionDefinitionsToJson(parsedJson["definitions"])
             return ResponseEntity.ok(parsedJson)

diff --git a/...nternet2/tier/shibboleth/admin/ui/controller/MetadataSourcesUiDefinitionController.groovy b/...nternet2/tier/shibboleth/admin/ui/controller/MetadataSourcesUiDefinitionController.groovy
@@ -46,7 +46,7 @@ class MetadataSourcesUiDefinitionController {
         try {
             def parsedJson = jacksonObjectMapper.readValue(this.jsonSchemaLocation.url, Map)
             jsonSchemaBuilderService.hideServiceEnabledFromNonAdmins(parsedJson)
-            jsonSchemaBuilderService.addReleaseAttributesToJson(parsedJson['properties']['attributeRelease']['widget'])
+            jsonSchemaBuilderService.addReleaseAttributesToJson(parsedJson['properties']['attributeRelease']['items'])
             jsonSchemaBuilderService.addRelyingPartyOverridesToJson(parsedJson['properties']['relyingPartyOverrides'])
             jsonSchemaBuilderService.addRelyingPartyOverridesCollectionDefinitionsToJson(parsedJson["definitions"])
             return ResponseEntity.ok(parsedJson)

diff --git a/...ain/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy b/...ain/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy
@@ -20,8 +20,8 @@ class JsonSchemaBuilderService {
     }
 
     void addReleaseAttributesToJson(Object json) {
-        json['data'] = customPropertiesConfiguration.getAttributes().collect {
-            [key: it['name'], label: it['displayName']]
+        json['enum'] = customPropertiesConfiguration.getAttributes().collect {
+            it['name']
         }
     }
 
@@ -36,12 +36,8 @@ class JsonSchemaBuilderService {
                 property =
                         [title      : it['displayName'],
                          description: it['helpText'],
-                         type       : it['displayType']]
-                if (it['displayType'] == 'boolean') {
-                    property['default'] = Boolean.valueOf(it['defaultValue'])
-                } else {
-                    property['default'] = it['defaultValue']
-                }
+                         type       : it['displayType'],
+                         examples   : it['examples']]
             }
             properties[(String) it['name']] = property
         }
@@ -64,7 +60,7 @@ class JsonSchemaBuilderService {
             def items = [type     : 'string',
                          minLength: 1, // TODO: should this be configurable?
                          maxLength: 255] //TODO: or this?
-            items.widget = [id: 'datalist', data: it['defaultValues']]
+            items.examples = it['examples']
 
             definition['items'] = items
             json[(String) it['name']] = definition
@@ -76,7 +72,7 @@ class JsonSchemaBuilderService {
         if (currentUser != null && currentUser.role != 'ROLE_ADMIN') {
             // user isn't an admin, so hide 'ServiceEnabled'
             Map<String, String> serviceEnabled = (HashMap) json['properties']['serviceEnabled']
-            serviceEnabled['widget'] = 'hidden'
+            serviceEnabled['readOnly'] = true
             serviceEnabled.remove('title')
             serviceEnabled.remove('description')
         }

diff --git a/...src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/RootUiViewController.java b/...src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/RootUiViewController.java
@@ -35,7 +35,7 @@ public void indexHtml(HttpServletRequest request, HttpServletResponse response)
                 .lines()
                 .collect(Collectors.joining("\n"));
 
-        content = content.replaceFirst("<base.+>", "<base href=\"" + request.getContextPath() + "/\">");
+        content = content.replaceFirst("<base[^>]+>", "<base href=\"" + request.getContextPath() + "/\">");
         response.setContentType("text/html");
         try (OutputStream writer = response.getOutputStream()) {
             writer.write(content.getBytes());

diff --git a/...main/java/edu/internet2/tier/shibboleth/admin/ui/domain/RelyingPartyOverrideProperty.java b/...main/java/edu/internet2/tier/shibboleth/admin/ui/domain/RelyingPartyOverrideProperty.java
@@ -16,7 +16,7 @@ public class RelyingPartyOverrideProperty {
     private String displayType;
     private String defaultValue;
     private String helpText;
-    private List<String> defaultValues;
+    private List<String> examples;
     private String persistType;
     private String persistValue;
     private String attributeName;
@@ -33,7 +33,7 @@ public String toString() {
                 + ", \nhelpText='" + helpText + '\''
                 + ", \npersistType='" + persistType + '\''
                 + ", \npersistValue='" + persistValue + '\''
-                + ", \ndefaultValues=" + defaultValues
+                + ", \nexamples=" + examples
                 + ", \nattributeName='" + attributeName + '\''
                 + ", \nattributeFriendlyName='" + attributeFriendlyName + '\''
                 + "\n}";

diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml
@@ -68,30 +68,26 @@ custom:
     - name: signAssertion
       displayName: label.sign-the-assertion
       displayType: boolean
-      defaultValue: false
       helpText: tooltip.sign-assertion
       attributeName: http://shibboleth.net/ns/profiles/saml2/sso/browser/signAssertions
       attributeFriendlyName: signAssertions
     - name: dontSignResponse
       displayName: label.dont-sign-the-response
       displayType: boolean
-      defaultValue: false
       helpText: tooltip.dont-sign-response
       attributeName: http://shibboleth.net/ns/profiles/saml2/sso/browser/signResponses
       attributeFriendlyName: signResponses
       invert: true
     - name: turnOffEncryption
       displayName: label.turn-off-encryption-of-response
       displayType: boolean
-      defaultValue: false
       helpText: tooltip.turn-off-encryption
       attributeName: http://shibboleth.net/ns/profiles/encryptAssertions
       attributeFriendlyName: encryptAssertions
       invert: true
     - name: useSha
       displayName: label.use-sha1-signing-algorithm
       displayType: boolean
-      defaultValue: false
       helpText: tooltip.usa-sha-algorithm
       persistType: string
       persistValue: shibboleth.SecurityConfiguration.SHA1
@@ -100,7 +96,6 @@ custom:
     - name: ignoreAuthenticationMethod
       displayName: label.ignore-any-sp-requested-authentication-method
       displayType: boolean
-      defaultValue: false
       helpText: tooltip.ignore-auth-method
       persistType: string
       persistValue: 0x1
@@ -109,23 +104,21 @@ custom:
     - name: omitNotBefore
       displayName: label.omit-not-before-condition
       displayType: boolean
-      defaultValue: false
       helpText: tooltip.omit-not-before-condition
       attributeName: http://shibboleth.net/ns/profiles/includeConditionsNotBefore
       attributeFriendlyName: includeConditionsNotBefore
       invert: true
     - name: responderId
       displayName: label.responder-id
       displayType: string
-      defaultValue: null
       helpText: tooltip.responder-id
       attributeName: http://shibboleth.net/ns/profiles/responderId
       attributeFriendlyName: responderId
     - name: nameIdFormats
       displayName: label.nameid-format-to-send
       displayType: set
       helpText: tooltip.nameid-format
-      defaultValues:
+      examples:
         - urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified
         - urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress
         - urn:oasis:names:tc:SAML:2.0:nameid-format:persistent
@@ -136,7 +129,7 @@ custom:
       displayName: label.authentication-methods-to-use
       displayType: set
       helpText: tooltip.authentication-methods-to-use
-      defaultValues:
+      examples:
         - https://refeds.org/profile/mfa
         - urn:oasis:names:tc:SAML:2.0:ac:classes:TimeSyncToken
         - urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport
@@ -145,7 +138,6 @@ custom:
     - name: forceAuthn
       displayName: label.force-authn
       displayType: boolean
-      defaultValue: false
       helpText: tooltip.force-authn
       attributeName: http://shibboleth.net/ns/profiles/forceAuthn
       attributeFriendlyName: forceAuthn