diff --git a/src/main/java/github/benjamin/equipreservebackend/controller/UserController.java b/src/main/java/github/benjamin/equipreservebackend/controller/UserController.java index f188f0e..97b1ef2 100644 --- a/src/main/java/github/benjamin/equipreservebackend/controller/UserController.java +++ b/src/main/java/github/benjamin/equipreservebackend/controller/UserController.java @@ -1,6 +1,7 @@ package github.benjamin.equipreservebackend.controller; import github.benjamin.equipreservebackend.dto.LoginRequest; +import github.benjamin.equipreservebackend.entity.Role; import github.benjamin.equipreservebackend.vo.LoginResponse; import github.benjamin.equipreservebackend.response.ResponseResult; import github.benjamin.equipreservebackend.entity.User; @@ -12,6 +13,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @RestController @RequiredArgsConstructor public class UserController { @@ -25,6 +28,7 @@ public class UserController { User user = userService.login(request.getUsername(), request.getPassword()); SecurityUser securityUser = userService.loadSecurityUserById(user.getId()); String token = jwtUtil.generateToken(securityUser); - return ResponseResult.success(new LoginResponse(user.getId(), user.getName(), token)); + List roles = securityUser.getRoles().stream().map(Role::getCode).toList(); + return ResponseResult.success(new LoginResponse(user.getId(), user.getName(), roles, token)); } } diff --git a/src/main/java/github/benjamin/equipreservebackend/vo/LoginResponse.java b/src/main/java/github/benjamin/equipreservebackend/vo/LoginResponse.java index 2a10c4b..81aaccf 100644 --- a/src/main/java/github/benjamin/equipreservebackend/vo/LoginResponse.java +++ b/src/main/java/github/benjamin/equipreservebackend/vo/LoginResponse.java @@ -1,14 +1,18 @@ package github.benjamin.equipreservebackend.vo; +import github.benjamin.equipreservebackend.entity.Role; import lombok.AllArgsConstructor; import lombok.Data; +import java.util.List; + @Data @AllArgsConstructor public class LoginResponse { private Long userId; private String name; + private List roles; private String token; }