Nikolay-Raspaev/IP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Katerina881 2023-05-15 16:04:49 +04:00
parent 7762a31191
commit 7dbe6221ac
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data.mv.db
View File

Binary file not shown.

6
front/src/App.jsx
View File

@ -18,8 +18,8 @@ export default function App() {
const links = [ const links = [
{ path: 'catalog', label: "Catalog", userGroup: "AUTH" }, { path: 'catalog', label: "Catalog", userGroup: "AUTH" },
{ path: 'readerAction', label: "ReaderAction", userGroup: "USER" }, { path: 'readerAction', label: "ReaderAction", userGroup: "USER" },
{ path: 'creatorAction', label: "CreatorAction", userGroup: "ADMIN" }, { path: 'creatorAction', label: "CreatorAction", userGroup: "USER" },
{ path: 'users', label: "Users", userGroup: "ADMIN" } { path: 'users', label: "Users", userGroup: "USER" }
]; ];
return ( return (
<> <>
@ -37,7 +37,7 @@ export default function App() {
<Route element={<PrivateRoutes userGroup="USER" />}> <Route element={<PrivateRoutes userGroup="USER" />}>
<Route element={<ReaderAction />} path="/readerAction" /> <Route element={<ReaderAction />} path="/readerAction" />
</Route> </Route>
<Route element={<PrivateRoutes userGroup="ADMIN" />}> <Route element={<PrivateRoutes userGroup="USER" />}>
<Route element={<UsersPage />} path="/users" /> <Route element={<UsersPage />} path="/users" />
<Route element={<CreatorAction />} path="/creatorAction" /> <Route element={<CreatorAction />} path="/creatorAction" />
</Route> </Route>

3
src/main/java/com/LabWork/app/MangaStore/controller/UserController.java
View File

@ -50,6 +50,7 @@ public class UserController {
return new UserDto(user); return new UserDto(user);
} }
@Secured(UserRole.AsString.ADMIN)
@PostMapping(OpenAPI30Configuration.API_PREFIX + "/user") @PostMapping(OpenAPI30Configuration.API_PREFIX + "/user")
public String updateUser(@RequestBody @Valid UserDto userDto) { public String updateUser(@RequestBody @Valid UserDto userDto) {
try { try {
@ -60,12 +61,14 @@ public class UserController {
} }
} }
@Secured(UserRole.AsString.ADMIN)
@DeleteMapping(OpenAPI30Configuration.API_PREFIX + "/user/{id}") @DeleteMapping(OpenAPI30Configuration.API_PREFIX + "/user/{id}")
public UserDto removeUser(@PathVariable Long id) { public UserDto removeUser(@PathVariable Long id) {
User user = userService.deleteUser(id); User user = userService.deleteUser(id);
return new UserDto(user); return new UserDto(user);
} }
@Secured(UserRole.AsString.ADMIN)
@GetMapping(OpenAPI30Configuration.API_PREFIX + "/users") @GetMapping(OpenAPI30Configuration.API_PREFIX + "/users")
public Pair<Page<UserDto>, List<Integer>> getUsers(@RequestParam(defaultValue = "1") int page, public Pair<Page<UserDto>, List<Integer>> getUsers(@RequestParam(defaultValue = "1") int page,
@RequestParam(defaultValue = "5") int size) { @RequestParam(defaultValue = "5") int size) {