From 7dbe6221ace7087e4ae0c8579645f1dcb16602fa Mon Sep 17 00:00:00 2001 From: Katerina881 Date: Mon, 15 May 2023 16:04:49 +0400 Subject: [PATCH] fix --- data.mv.db | Bin 126976 -> 159744 bytes front/src/App.jsx | 6 +++--- .../MangaStore/controller/UserController.java | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/data.mv.db b/data.mv.db index 204d8dc3a84f3a7683e4bb48933be728cf57eb8b..2e6c88c4da9df02f0859f3cb33f13edee24dea6e 100644 GIT binary patch delta 18447 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 hX6gmG`N&lPqVX25q$a~}Jv(6OMaZ= @@ -37,7 +37,7 @@ export default function App() { }> } path="/readerAction" /> - }> + }> } path="/users" /> } path="/creatorAction" /> diff --git a/src/main/java/com/LabWork/app/MangaStore/controller/UserController.java b/src/main/java/com/LabWork/app/MangaStore/controller/UserController.java index f2040e4..c82efea 100644 --- a/src/main/java/com/LabWork/app/MangaStore/controller/UserController.java +++ b/src/main/java/com/LabWork/app/MangaStore/controller/UserController.java @@ -50,6 +50,7 @@ public class UserController { return new UserDto(user); } + @Secured(UserRole.AsString.ADMIN) @PostMapping(OpenAPI30Configuration.API_PREFIX + "/user") public String updateUser(@RequestBody @Valid UserDto userDto) { try { @@ -60,12 +61,14 @@ public class UserController { } } + @Secured(UserRole.AsString.ADMIN) @DeleteMapping(OpenAPI30Configuration.API_PREFIX + "/user/{id}") public UserDto removeUser(@PathVariable Long id) { User user = userService.deleteUser(id); return new UserDto(user); } + @Secured(UserRole.AsString.ADMIN) @GetMapping(OpenAPI30Configuration.API_PREFIX + "/users") public Pair, List> getUsers(@RequestParam(defaultValue = "1") int page, @RequestParam(defaultValue = "5") int size) {