Merge pull request #133 from JanssenProject/issue#132

feat: admin ui plugin: changes in rest url #132
JanssenProject · Jan 3, 2022 · 87b9a44 · 87b9a44
2 parents 4056cf5 + a9128fe
commit 87b9a44
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 42 deletions.
diff --git a/docs/jans-config-api-swagger.yaml b/docs/jans-config-api-swagger.yaml
@@ -2879,20 +2879,12 @@ paths:
           $ref: '#/components/responses/Unauthorized'
         '500':
           $ref: '#/components/responses/InternalServerError'
-  /jans-config-api/admin-ui/user/roles/{role}:
     put:
       tags:
         - Admin UI - Role
       summary: Edit admin ui role.
       description: Edit admin ui role.
       operationId: edit-adminui-role
-      parameters:
-        - in: path
-          name: role
-          schema:
-            type: string
-          required: true
-          description: role name
       security:
         - oauth2: [https://jans.io/adminui/user/role.write]
       requestBody:
@@ -2923,15 +2915,20 @@ paths:
       summary: Delete admin ui role.
       description: Delete admin ui role.
       operationId: delete-adminui-role
-      parameters:
-        - in: path
-          name: role
-          schema:
-            type: string
-          required: true
-          description: role name
       security:
         - oauth2: [https://jans.io/adminui/user/role.write]
+      requestBody:
+        content:
+          application/json:
+            schema:
+              required:
+                - role
+              type: object
+              properties:
+                role:
+                  type: string
+                  description: Admin UI role name.
+                  example: api-admin
       responses:
         '200':
           description: OK
@@ -3007,20 +3004,12 @@ paths:
           $ref: '#/components/responses/Unauthorized'
         '500':
           $ref: '#/components/responses/InternalServerError'
-  /jans-config-api/admin-ui/user/permissions/{permission}:
     put:
       tags:
         - Admin UI - Permission
       summary: Edit admin ui permission.
       description: Edit admin ui permission.
       operationId: edit-adminui-permission
-      parameters:
-        - in: path
-          name: permission
-          schema:
-            type: string
-          required: true
-          description: permission name
       security:
         - oauth2: [https://jans.io/adminui/user/permission.write]
       requestBody:
@@ -3051,15 +3040,19 @@ paths:
       summary: Delete admin ui permission.
       description: Delete admin ui permission.
       operationId: delete-adminui-permission
-      parameters:
-        - in: path
-          name: permission
-          schema:
-            type: string
-          required: true
-          description: permission name
       security:
         - oauth2: [https://jans.io/adminui/user/permission.write]
+      requestBody:
+        content:
+          application/json:
+            schema:
+              required:
+                - permission
+              properties:
+                permission:
+                  type: string
+                  description: Admin UI permission name.
+                  example: https://jans.io/adminui/user/permission.write
       responses:
         '200':
           description: OK
@@ -6266,6 +6259,8 @@ components:
     AdminRole:
       type: object
       description: Admin role
+      required:
+        - role
       properties:
         role:
           type: string
@@ -6276,6 +6271,8 @@ components:
     AdminPermission:
       type: object
       description: Admin permission
+      required:
+        - permission
       properties:
         permission:
           type: string
@@ -6286,6 +6283,8 @@ components:
     RolePermissionMapping:
       type: object
       description: Admin role-permission mapping
+      required:
+        - role
       properties:
         role:
           type: string

diff --git a/...n-ui-plugin/src/main/java/io/jans/ca/plugin/adminui/rest/user/UserManagementResource.java b/...n-ui-plugin/src/main/java/io/jans/ca/plugin/adminui/rest/user/UserManagementResource.java
@@ -75,13 +75,12 @@ public Response addRole(@Valid @NotNull AdminRole roleArg) {
     }
 
     @PUT
-    @Path(ROLES + "/{role}")
+    @Path(ROLES)
     @Produces(MediaType.APPLICATION_JSON)
     @ProtectedApi(scopes = ADMINUI_ROLE_WRITE)
-    public Response editRole(@PathParam("role") String role, @Valid @NotNull AdminRole roleArg) {
+    public Response editRole(@Valid @NotNull AdminRole roleArg) {
         try {
             log.info("Editing Admin-UI role.");
-            roleArg.setRole(role);
             List<AdminRole> savedRoles = userManagementService.editRole(roleArg);
             log.info("Edited Admin-UI role..");
             return Response.ok(savedRoles).build();
@@ -95,13 +94,13 @@ public Response editRole(@PathParam("role") String role, @Valid @NotNull AdminRo
     }
 
     @DELETE
-    @Path(ROLES + "/{role}")
+    @Path(ROLES)
     @Produces(MediaType.APPLICATION_JSON)
     @ProtectedApi(scopes = ADMINUI_ROLE_WRITE)
-    public Response deleteRole(@PathParam("role") String role) {
+    public Response deleteRole(@Valid @NotNull AdminRole roleArg) {
         try {
             log.info("Deleting Admin-UI role.");
-            List<AdminRole> roles = userManagementService.deleteRole(role);
+            List<AdminRole> roles = userManagementService.deleteRole(roleArg.getRole());
             log.info("Deleted Admin-UI role..");
             return Response.ok(roles).build();
         } catch (ApplicationException e) {
@@ -152,13 +151,12 @@ public Response addPermission(@Valid @NotNull AdminPermission permissionArg) {
     }
 
     @PUT
-    @Path(PERMISSIONS + "/{permission}")
+    @Path(PERMISSIONS)
     @Produces(MediaType.APPLICATION_JSON)
     @ProtectedApi(scopes = ADMINUI_PERMISSION_WRITE)
-    public Response editPermission(@PathParam("permission") String permission, @Valid @NotNull AdminPermission permissionArg) {
+    public Response editPermission(@Valid @NotNull AdminPermission permissionArg) {
         try {
             log.info("Editing Admin-UI permissions.");
-            permissionArg.setPermission(permission);
             List<AdminPermission> savedPermissions = userManagementService.editPermission(permissionArg);
             log.info("Edited Admin-UI permissions..");
             return Response.ok(savedPermissions).build();
@@ -172,13 +170,13 @@ public Response editPermission(@PathParam("permission") String permission, @Vali
     }
 
     @DELETE
-    @Path(PERMISSIONS + "/{permission}")
+    @Path(PERMISSIONS)
     @Produces(MediaType.APPLICATION_JSON)
     @ProtectedApi(scopes = ADMINUI_PERMISSION_WRITE)
-    public Response deletePermission(@PathParam("permission") String permission) {
+    public Response deletePermission(@Valid @NotNull AdminPermission permissionArg) {
         try {
             log.info("Deleting Admin-UI permission.");
-            List<AdminPermission> permissions = userManagementService.deletePermission(permission);
+            List<AdminPermission> permissions = userManagementService.deletePermission(permissionArg.getPermission());
             log.info("Deleted Admin-UI permission..");
             return Response.ok(permissions).build();
         } catch (ApplicationException e) {