[SHIBUI-1058]

Updated unit tests to make use of createdBy.
TIER · Jan 21, 2019 · 2795f70 · 2795f70
1 parent a8bb750
commit 2795f70
Show file tree

Hide file tree

Showing 4 changed files with 243 additions and 19 deletions.
diff --git a/...in/java/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorController.java b/...in/java/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorController.java
@@ -176,8 +176,7 @@ public ResponseEntity<?> getOneXml(@PathVariable String resourceId) throws Marsh
                 final String xml = this.openSamlObjects.marshalToXmlString(ed);
                 return ResponseEntity.ok(xml);
             } else {
-                return ResponseEntity.status(HttpStatus.FORBIDDEN).body(new ErrorResponse(HttpStatus.FORBIDDEN,
-                        "You are not authorized to perform the requested operation."));
+                return ResponseEntity.status(HttpStatus.FORBIDDEN).build();
             }
         }
     }

diff --git a/...du/internet2/tier/shibboleth/admin/ui/domain/frontend/EntityDescriptorRepresentation.java b/...du/internet2/tier/shibboleth/admin/ui/domain/frontend/EntityDescriptorRepresentation.java
@@ -9,9 +9,6 @@
 
 public class EntityDescriptorRepresentation implements Serializable {
 
-
-    private int version;
-
     public EntityDescriptorRepresentation() {
     }
 
@@ -63,6 +60,10 @@ public EntityDescriptorRepresentation(String id,
 
     private List<String> attributeRelease;
 
+    private int version;
+
+    private String createdBy;
+
     public String getId() {
         return id;
     }
@@ -204,4 +205,12 @@ public int getVersion() {
     public void setVersion(int version) {
         this.version = version;
     }
+
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+    }
 }
diff --git a/...n/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java b/...n/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java
@@ -357,6 +357,7 @@ public EntityDescriptorRepresentation createRepresentationFromDescriptor(org.ope
         representation.setCreatedDate(ed.getCreatedDate());
         representation.setModifiedDate(ed.getModifiedDate());
         representation.setVersion(ed.hashCode());
+        representation.setCreatedBy(ed.getCreatedBy());
 
         if (ed.getSPSSODescriptor("") != null && ed.getSPSSODescriptor("").getSupportedProtocols().size() > 0) {
             ServiceProviderSsoDescriptorRepresentation serviceProviderSsoDescriptorRepresentation = representation.getServiceProviderSsoDescriptor(true);