[SHIBUI-1058]

check to see if the item is already enabled for the user
TIER · Feb 19, 2019 · 87ded49 · 87ded49
1 parent 2dd5be8
commit 87ded49
Showing 1 changed file with 5 additions and 3 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
@@ -122,9 +122,11 @@ public ResponseEntity<?> update(@RequestBody EntityDescriptorRepresentation edRe
             return ResponseEntity.notFound().build();
         } else {
             if (currentUser != null && (currentUser.getRole().equals("ROLE_ADMIN") || currentUser.getUsername().equals(existingEd.getCreatedBy()))) {
-                ResponseEntity<?> entityDescriptorEnablingDeniedResponse = entityDescriptorEnablePermissionsCheck(edRepresentation.isServiceEnabled());
-                if (entityDescriptorEnablingDeniedResponse != null) {
-                    return entityDescriptorEnablingDeniedResponse;
+                if (!existingEd.isServiceEnabled()) {
+                    ResponseEntity<?> entityDescriptorEnablingDeniedResponse = entityDescriptorEnablePermissionsCheck(edRepresentation.isServiceEnabled());
+                    if (entityDescriptorEnablingDeniedResponse != null) {
+                        return entityDescriptorEnablingDeniedResponse;
+                    }
                 }
 
                 // Verify we're the only one attempting to update the EntityDescriptor