Merge branch 'bugfix/SHIBUI-1392-QA' into feature/SHIBUI-1361-QA

TIER · Aug 8, 2019 · b8ea0ac · b8ea0ac
2 parents 6097672 + 0283c5f
commit b8ea0ac
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 1 deletion.
diff --git a/...eth/admin/ui/controller/MetadataResolverControllerVersionEndpointsIntegrationTests.groovy b/...eth/admin/ui/controller/MetadataResolverControllerVersionEndpointsIntegrationTests.groovy
@@ -1,5 +1,7 @@
 package edu.internet2.tier.shibboleth.admin.ui.controller
 
+import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilter
+import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilterTarget
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.DynamicHttpMetadataResolver
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.FileBackedHttpMetadataResolver
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.FilesystemMetadataResolver
@@ -103,6 +105,37 @@ class MetadataResolverControllerVersionEndpointsIntegrationTests extends Specifi
         mrv2.body.name == 'resolverUPDATED'
     }
 
+    def "SHIBUI-1386"() {
+        MetadataResolver mr = new FileBackedHttpMetadataResolver(name: 'testme')
+        mr = repository.save(mr)
+
+        when: 'add a filter'
+        // def filterValue = '''{"type":"EntityAttributes","@type":"EntityAttributes","filterEnabled":true,"entityAttributesFilterTarget":{"entityAttributesFilterTargetType":"ENTITY","value":["https://idp.unicon.net/idp/shibboleth"]},"relyingPartyOverrides":{"signAssertion":false,"dontSignResponse":false,"turnOffEncryption":false,"useSha":false,"ignoreAuthenticationMethod":false,"omitNotBefore":false,"nameIdFormats":[],"authenticationMethods":[],"forceAuthn":false},"attributeRelease":[],"name":"Test Filter 1"}'''
+        def filter = new EntityAttributesFilter(
+                name: 'testme',
+                filterEnabled: true
+        ).with {
+            it.relyingPartyOverrides = [
+                    'signAssertion': true
+            ]
+            it.setEntityAttributesFilterTarget(new EntityAttributesFilterTarget().with {
+                it.entityAttributesFilterTargetType = EntityAttributesFilterTarget.EntityAttributesFilterTargetType.ENTITY
+                it.value = ['https://testme/sp']
+                it
+            })
+            it
+        }
+        mr.metadataFilters.add(filter)
+        mr = repository.save(mr)
+
+        def allVersions = getAllMetadataResolverVersions(mr.resourceId, List)
+        def mrv1 = getMetadataResolverForVersion(mr.resourceId, allVersions.body[0].id, MetadataResolver)
+        def mrv2 = getMetadataResolverForVersion(mr.resourceId, allVersions.body[1].id, MetadataResolver)
+
+        then:
+        noExceptionThrown()
+    }
+
     private getAllMetadataResolverVersions(String resourceId, responseType) {
         this.restTemplate.getForEntity(resourceUriFor(ALL_VERSIONS_URI, resourceId), responseType)
     }

diff --git a/...a/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityAttributesFilterTarget.java b/...a/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityAttributesFilterTarget.java
@@ -1,5 +1,6 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain.filters;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import edu.internet2.tier.shibboleth.admin.ui.domain.AbstractAuditable;
 import lombok.EqualsAndHashCode;
 import org.hibernate.envers.AuditOverride;
@@ -9,6 +10,7 @@
 
 import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.OrderColumn;
 import java.util.ArrayList;
 import java.util.List;
@@ -17,6 +19,7 @@
 @EqualsAndHashCode(callSuper = true)
 @Audited
 @AuditOverride(forClass = AbstractAuditable.class)
+@JsonIgnoreProperties({"handler", "hibernateLazyInitializer"})
 public class EntityAttributesFilterTarget extends AbstractAuditable {
     public enum EntityAttributesFilterTargetType {
         ENTITY, CONDITION_SCRIPT, CONDITION_REF, REGEX

diff --git a/ui/src/app/metadata/configuration/component/metadata-header.component.html b/ui/src/app/metadata/configuration/component/metadata-header.component.html
@@ -2,7 +2,7 @@
     <div class="card-body">
         <h5 class="card-title version-title">
             <translate-i18n key="label.saved">Saved</translate-i18n>:&nbsp;
-            <span class="save-date">{{ version.date | date:'medium' }}</span>
+            <span class="save-date">{{ version.date | date:DATE_FORMAT }}</span>
             <br />
             <translate-i18n key="label.by">By</translate-i18n>:&nbsp;
             <span class="author">{{ version.creator }}</span>

diff --git a/ui/src/app/metadata/configuration/component/metadata-header.component.ts b/ui/src/app/metadata/configuration/component/metadata-header.component.ts
@@ -2,6 +2,8 @@ import { Component, Input } from '@angular/core';
 import { Metadata, MetadataTypes } from '../../domain/domain.type';
 import { MetadataVersion } from '../model/version';
 
+import { CONFIG_DATE_FORMAT } from '../configuration.values';
+
 @Component({
     selector: 'metadata-header',
     templateUrl: './metadata-header.component.html',
@@ -14,6 +16,8 @@ export class MetadataHeaderComponent {
     @Input() versionNumber: number;
     @Input() isCurrent: boolean;
 
+    DATE_FORMAT = CONFIG_DATE_FORMAT;
+
     constructor() {}
 }
 
diff --git a/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts b/ui/src/app/metadata/provider/model/file-backed-http.provider.form.ts
@@ -100,6 +100,8 @@ export const FileBackedHttpMetadataProviderEditor: Wizard<FileBackedHttpMetadata
             index: 1,
             initialValues: [],
             fields: [
+                'name',
+                '@type',
                 'enabled',
                 'xmlId',
                 'metadataURL',