Merge remote-tracking branch 'origin/master'

.gitignore

@@ -400,3 +400,9 @@ rdurable
 build-no-tests
 
 beacon/spring/out
+
+# Eclipse junk
+*.classpath
+*.settings
+*.project
+*bin

backend/build.gradle

@@ -215,7 +215,7 @@ dependencies {
 
 task copyUI(type: Copy) {
     from tasks.findByPath(':ui:npm_run_buildProd').outputs
-    into new File(buildDir, 'generated/ui/static')
+    into new File(buildDir, 'generated/ui/resources')
 }
 
 task integrationTest(type: Test) {

backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy

@@ -367,7 +367,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
 
     void constructXmlNodeForResolver(DynamicHttpMetadataResolver resolver, def markupBuilderDelegate, Closure childNodes) {
         markupBuilderDelegate.MetadataProvider(id: resolver.xmlId,
-                'xsi:type': 'DynamicHttpMetadataProvider',
+                'xsi:type': 'DynamicHTTPMetadataProvider',
                 requireValidMetadata: !resolver.requireValidMetadata ?: null,
                 failFastInitialization: !resolver.failFastInitialization ?: null,
                 sortKey: resolver.sortKey,
@@ -559,4 +559,4 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
 
     }
 
-}
+}

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/RootUiViewController.java

@@ -30,8 +30,8 @@ public String index() {
     public void indexHtml(HttpServletRequest request, HttpServletResponse response) throws IOException, URISyntaxException {
         //This method is necessary in order for Angular framework to honor dynamic ServletContext
         //under which shib ui application is deployed, both during initial index.html load and subsequest page refreshes
-        String content = new BufferedReader(new InputStreamReader(request.getServletContext()
-                .getResourceAsStream("/WEB-INF/classes/resources/index.html")))
+        String content = new BufferedReader(new InputStreamReader(this.getClass()
+                .getResourceAsStream("/resources/index.html")))
                 .lines()
                 .collect(Collectors.joining("\n"));
 

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/support/RestControllersSupport.java

@@ -13,6 +13,8 @@
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.client.HttpClientErrorException;
 
+import java.util.ArrayList;
+import java.util.List;
 import static org.springframework.http.HttpStatus.BAD_REQUEST;
 import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
 import static org.springframework.http.HttpStatus.NOT_FOUND;
@@ -60,6 +62,23 @@ public final ResponseEntity<ErrorResponse> metadataFileNotFoundHandler(MetadataF
 
     @ExceptionHandler(JsonSchemaValidationFailedException.class)
     public final ResponseEntity<?> handleJsonSchemaValidationFailedException(JsonSchemaValidationFailedException ex) {
-        return ResponseEntity.status(BAD_REQUEST).body(new ErrorResponse("400", String.join("\n", ex.getErrors())));
+        return ResponseEntity.status(BAD_REQUEST).body(new ErrorResponse("400", String.join("\n", flattenErrorsList(ex.getErrors()))));
+    }
+
+    private List<String> flattenErrorsList(List<Object> errors) {
+        List<String> theseErrors = new ArrayList<>();
+        processErrorsList(theseErrors, errors);
+        return theseErrors;
+    }
+
+    private static void processErrorsList(List<String> outputErrorList, Object errors){
+        if(errors instanceof String){
+            outputErrorList.add((String)errors);
+        }
+        else if(errors instanceof List){
+            for(Object error2:(List)errors){
+                processErrorsList(outputErrorList, error2);
+            }
+        }
     }
 }

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/DigestMethod.java

@@ -19,11 +19,11 @@ public DigestMethod(String algorithm) {
     @Nullable
     @Override
     public String getAlgorithm() {
-        return null;
+        return this.algorithm;
     }
 
     @Override
     public void setAlgorithm(@Nullable String value) {
-
+        this.algorithm = value;
     }
 }

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/RequestInitiator.java

@@ -12,10 +12,12 @@
 import javax.xml.namespace.QName;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 
 @Entity
-@EqualsAndHashCode(callSuper = true, exclude = {"storageAttributeMap"})
+@EqualsAndHashCode(callSuper = true, onlyExplicitlyIncluded = true)
 public class RequestInitiator extends AbstractElementExtensibleXMLObject implements org.opensaml.saml.ext.saml2mdreqinit.RequestInitiator {
+    @EqualsAndHashCode.Include
     private String binding;
     @Override
     public String getBinding() {
@@ -27,6 +29,7 @@ public void setBinding(String binding) {
         this.binding = binding;
     }
 
+    @EqualsAndHashCode.Include
     private String location;
 
     @Override
@@ -39,6 +42,7 @@ public void setLocation(String location) {
         this.location = location;
     }
 
+    @EqualsAndHashCode.Include
     private String responseLocation;
 
     @Override
@@ -57,6 +61,11 @@ public void setResponseLocation(String location) {
     @Transient
     private AttributeMap attributeMap = new AttributeMap(this);
 
+    @EqualsAndHashCode.Include
+    private Set<Map.Entry<QName, String>> attributeMapEntrySet() {
+        return this.attributeMap.entrySet();
+    }
+
     @PrePersist
     void prePersist() {
         this.storageAttributeMap = this.attributeMap;

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/frontend/EntityDescriptorRepresentation.java

@@ -1,5 +1,6 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain.frontend;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import javax.validation.constraints.NotNull;
@@ -38,10 +39,12 @@ public EntityDescriptorRepresentation(String id,
     @NotNull
     private String entityId;
 
-    private OrganizationRepresentation organization;
+    //TODO: review requirement
+    private OrganizationRepresentation organization = new OrganizationRepresentation();
 
     private List<ContactRepresentation> contacts;
 
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private MduiRepresentation mdui;
 
     private ServiceProviderSsoDescriptorRepresentation serviceProviderSsoDescriptor;
@@ -58,8 +61,10 @@ public EntityDescriptorRepresentation(String id,
 
     private LocalDateTime modifiedDate;
 
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private Map<String, Object> relyingPartyOverrides;
 
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<String> attributeRelease;
 
     private int version;

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/frontend/OrganizationRepresentation.java

@@ -1,15 +1,20 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain.frontend;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+
 import java.io.Serializable;
 
 public class OrganizationRepresentation implements Serializable {
 
     private static final long serialVersionUID = 802722455433573538L;
 
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private String name;
 
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private String displayName;
 
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private String url;
 
     public String getName() {

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/jsonschema/JsonSchemaValidationFailedException.java

@@ -13,9 +13,9 @@
 @Getter
 public class JsonSchemaValidationFailedException extends RuntimeException {
 
-    List<String> errors;
+    List errors;
 
     JsonSchemaValidationFailedException(List<?> errors) {
-        this.errors = (List<String>) errors;
+        this.errors = errors;
     }
 }

backend/src/main/resources/dynamic-http-metadata-provider.schema.json

@@ -86,6 +86,10 @@
                     "title": "label.match",
                     "description": "tooltip.match",
                     "type": "string",
+                    "widget": {
+                        "id": "string",
+                        "required": true
+                    },
                     "visibleIf": {
                         "@type": [
                             "Regex"

backend/src/main/resources/i18n/messages.properties

@@ -453,6 +453,7 @@ message.protocol-support-required=Protocol Support Enumeration is required if an
 message.conflict=Conflict
 message.data-version-contention=Data Version Contention
 message.contention-new-version=A newer version of this metadata source has been saved. Below are a list of changes. You can use your changes or their changes.
+message.contention-error=There was a problem saving due to a mismatched version.
 message.organization-feedback=These three fields must all be entered if any single field has a value.
 message.valid-email=Must be a valid Email Address
 message.valid-url=Must be a valid URL

backend/src/main/resources/metadata-sources-ui-schema.json

@@ -446,6 +446,12 @@
                                 "urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
                             ],
                             "description": "urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                        },
+                        {
+                            "enum": [
+                                "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
+                            ],
+                            "description": "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
                         }
                     ]
                 }

backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntitiesControllerIntegrationTests.groovy

@@ -41,6 +41,7 @@ class EntitiesControllerIntegrationTests extends Specification {
         this.webClient.webClient.uriBuilderFactory.encodingMode = DefaultUriBuilderFactory.EncodingMode.NONE
     }*/
 
+    //todo review
     def "GET /api/entities returns the proper json"() {
         given:
         def expectedBody = '''
@@ -54,7 +55,6 @@ class EntitiesControllerIntegrationTests extends Specification {
                     {"locationUrl":"https://test.scaldingspoon.org/test1/acs","binding":"urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST","makeDefault":false}
                 ],
                 "serviceEnabled":false,                
-                "relyingPartyOverrides":{},
                 "attributeRelease":["givenName","employeeNumber"]
             }
         '''

backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/EntitiesControllerTests.groovy

@@ -72,16 +72,16 @@ class EntitiesControllerTests extends Specification {
         result.andExpect(status().isNotFound())
     }
 
+    //todo  review
     def 'GET /api/entities/http%3A%2F%2Ftest.scaldingspoon.org%2Ftest1'() {
         given:
         def expectedBody = '''
             {
                 "id":null,
                 "serviceProviderName":null,
                 "entityId":"http://test.scaldingspoon.org/test1",
-                "organization":null,
+                "organization": {},
                 "contacts":null,
-                "mdui":null,
                 "serviceProviderSsoDescriptor": {
                     "protocolSupportEnum":"SAML 2",
                     "nameIdFormats":["urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified"]
@@ -94,8 +94,10 @@ class EntitiesControllerTests extends Specification {
                 "serviceEnabled":false,
                 "createdDate":null,
                 "modifiedDate":null,
-                "relyingPartyOverrides":{},
-                "attributeRelease":["givenName","employeeNumber"]
+                "attributeRelease":["givenName","employeeNumber"],
+                "version":-1891841119,
+                "createdBy":null,
+                "current":false
             }
         '''
         when: