From 87ded4989efa517e96348c0177ef956df8a4bc51 Mon Sep 17 00:00:00 2001 From: Jj! Date: Tue, 19 Feb 2019 14:29:39 -0600 Subject: [PATCH] [SHIBUI-1058] check to see if the item is already enabled for the user --- .../admin/ui/controller/EntityDescriptorController.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorController.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorController.java index ba3188daa..80213f5cd 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorController.java +++ b/backend/src/main/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