From 066318b0a1f3540cd41948034436184c1196fb59 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Wed, 28 Jul 2021 15:28:03 -0700
Subject: [PATCH] SHIBUI-1844

correcting API for role
---
 .../ui/controller/ActivateController.java     | 23 +++++++++++++++++++
 .../security/controller/RolesController.java  | 15 +++++++++---
 2 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/ActivateController.java

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/ActivateController.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/ActivateController.java
new file mode 100644
index 000000000..10b0a742b
--- /dev/null
+++ b/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
+}
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/controller/RolesController.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/controller/RolesController.java
index 12cfe7025..d576e0630 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/controller/RolesController.java
+++ b/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);
     }
 }