SHIBUI-2394

Incremental commit
TIER · Sep 30, 2022 · 5722aa8 · 5722aa8
1 parent af200b1
commit 5722aa8
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/...d/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/ActivateController.java b/...d/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/ActivateController.java
@@ -39,8 +39,7 @@ public class ActivateController {
 
     @PatchMapping(path = "/entityDescriptor/{resourceId}/{mode}")
     @Transactional
-    public ResponseEntity<?> enableEntityDescriptor(@PathVariable String resourceId, @PathVariable String mode) throws
-                    PersistentEntityNotFound, ForbiddenException {
+    public ResponseEntity<?> enableEntityDescriptor(@PathVariable String resourceId, @PathVariable String mode) throws PersistentEntityNotFound, ForbiddenException {
         boolean status = "enable".equalsIgnoreCase(mode);
         EntityDescriptorRepresentation edr = entityDescriptorService.updateEntityDescriptorEnabledStatus(resourceId, status);
         return ResponseEntity.ok(edr);

diff --git a/...du/internet2/tier/shibboleth/admin/ui/domain/frontend/EntityDescriptorRepresentation.java b/...du/internet2/tier/shibboleth/admin/ui/domain/frontend/EntityDescriptorRepresentation.java
@@ -18,6 +18,11 @@
 
 public class EntityDescriptorRepresentation implements Serializable {
     private static final long serialVersionUID = 7753435553892353966L;
+
+    @Setter
+    @Getter
+    private boolean approved;
+
     private DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSSSS");
 
     private List<AssertionConsumerServiceRepresentation> assertionConsumerServices;
@@ -247,4 +252,4 @@ public void setServiceProviderSsoDescriptor(ServiceProviderSsoDescriptorRepresen
     public void setVersion(int version) {
         this.version = version;
     }
-}
+}
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
@@ -465,8 +465,7 @@ public void updateDescriptorFromRepresentation(org.opensaml.saml.saml2.metadata.
     }
 
     @Override
-    public EntityDescriptorRepresentation updateEntityDescriptorEnabledStatus(String resourceId, boolean status) throws
-                    PersistentEntityNotFound, ForbiddenException {
+    public EntityDescriptorRepresentation updateEntityDescriptorEnabledStatus(String resourceId, boolean status) throws PersistentEntityNotFound, ForbiddenException {
         EntityDescriptor ed = entityDescriptorRepository.findByResourceId(resourceId);
         if (ed == null) {
             throw new PersistentEntityNotFound("Entity with resourceid[" + resourceId + "] was not found for update");

diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
@@ -189,6 +189,7 @@ label.new-group=New Group
 label.new-attribute=New Custom Entity Attribute
 label.edit-group=Edit Group
 
+label.approved=Approved
 label.metadata-source=Metadata Source
 label.metadata-sources=Metadata Sources
 label.metadata-provider=Metadata Provider
@@ -629,6 +630,7 @@ message.session-timeout-heading=Session timed out
 message.session-timeout-body=Your session has timed out. Please login again.
 message.session-timeout=An error has occurred while saving. Your session may have timed out.
 
+tooltip.approved=Metadata Source is approved and can be enabled by authorized enabler
 tooltip.entity-id=An entityID is the SAML identifier that uniquely names a service provider.
 tooltip.service-provider-name=Service Provider Name (Dashboard Display Only)
 tooltip.force-authn=Disallows use (or reuse) of authentication results and login flows that don\u0027t provide a real-time proof of user presence in the login process
@@ -792,5 +794,4 @@ value.algorithm-cbc-192=CBC (192) - http://www.w3.org/2001/04/xmlenc#aes192-cbc
 value.algorithm-cbc-128=CBC (128) - http://www.w3.org/2001/04/xmlenc#aes128-cbc
 value.algorithm-cbc-tripledes=CBC (TRIPLEDES) - http://www.w3.org/2001/04/xmlenc#tripledes-cbc
 
-message.algorithms-unique=Each algorithm may only be used once.
-
+message.algorithms-unique=Each algorithm may only be used once.
diff --git a/backend/src/main/resources/metadata-sources-ui-schema.json b/backend/src/main/resources/metadata-sources-ui-schema.json
@@ -5,6 +5,11 @@
         "entityId"
     ],
     "properties": {
+        "approved": {
+            "title": "label.approved",
+            "description": "tooltip.approved",
+            "type": "boolean"
+        },
         "serviceProviderName": {
             "title": "label.service-provider-name",
             "description": "tooltip.service-provider-name",