Merge branch 'feature/shibui-1742' of bitbucket.org:unicon/shib-idp-u…

…i into feature/shibui-1742

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/ActivateController.java

@@ -0,0 +1,23 @@
+package edu.internet2.tier.shibboleth.admin.ui.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import edu.internet2.tier.shibboleth.admin.ui.repository.EntityDescriptorRepository;
+import edu.internet2.tier.shibboleth.admin.ui.security.service.UserService;
+
+@RestController
+@RequestMapping("/api/activate")
+public class ActivateController {
+    @Autowired
+    private UserService userService;
+
+    @Autowired
+    private EntityDescriptorRepository entityDescriptorRepo;
+
+
+
+
+// Enable/disable for : entity descriptor, provider, filter
+}

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/controller/RolesController.java

@@ -1,5 +1,7 @@
 package edu.internet2.tier.shibboleth.admin.ui.security.controller;
 
+import java.util.Optional;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -56,10 +58,17 @@ public ResponseEntity<?> getOne(@PathVariable String resourceId) throws EntityNo
     }
 
     @Secured("ROLE_ADMIN")
-    @PutMapping
+    @PutMapping(path = {"/", "/{resourceId}" })
     @Transactional
-    public ResponseEntity<?> update(@RequestBody Role role) throws EntityNotFoundException {
-        Role result = rolesService.updateRole(role);
+    public ResponseEntity<?> update(@RequestBody Role incomingRoleDetail, @PathVariable Optional<String> resourceId) throws EntityNotFoundException {
+        Role updateRole;
+        if (resourceId.isPresent()) {
+            updateRole = rolesService.findByResourceId(resourceId.get());
+        } else {
+            updateRole = rolesService.findByResourceId(incomingRoleDetail.getResourceId());
+        }
+        updateRole.setName(incomingRoleDetail.getName());
+        Role result = rolesService.updateRole(updateRole);
         return ResponseEntity.ok(result);
     }
 }