diff --git a/src/main/java/com/displaynone/acss/components/auth/models/user/UserDTO.java b/src/main/java/com/displaynone/acss/components/auth/models/user/UserDTO.java index 7a05402..bc85417 100644 --- a/src/main/java/com/displaynone/acss/components/auth/models/user/UserDTO.java +++ b/src/main/java/com/displaynone/acss/components/auth/models/user/UserDTO.java @@ -13,7 +13,6 @@ public class UserDTO { private String name; private String photo; private String position; - private LocalDateTime lastVisit; private Set roles; private boolean isActive; private boolean isACSBlocked; diff --git a/src/main/java/com/displaynone/acss/controllers/auth/AuthController.java b/src/main/java/com/displaynone/acss/controllers/auth/AuthController.java index 41f565b..ede0af2 100644 --- a/src/main/java/com/displaynone/acss/controllers/auth/AuthController.java +++ b/src/main/java/com/displaynone/acss/controllers/auth/AuthController.java @@ -2,6 +2,7 @@ package com.displaynone.acss.controllers.auth; import com.displaynone.acss.components.auth.AuthComponent; import com.displaynone.acss.components.auth.models.AuthTokenPair; +import com.displaynone.acss.components.auth.models.user.UserMapper; import com.displaynone.acss.components.auth.models.user.UserModel; import com.displaynone.acss.exception.generics.BadRequestHTTPException; import com.displaynone.acss.exception.generics.NotFoundHTTPException; @@ -21,7 +22,7 @@ public class AuthController { private final AuthComponent authComponent; @PostMapping("/login") - public ResponseEntity login(@RequestBody LoginRQB body) { + public ResponseEntity login(@RequestBody LoginRQB body) { String login = body.getLogin(); String password = body.getPassword(); @@ -35,7 +36,7 @@ public class AuthController { throw new UnauthorizedHTTPException(e.getMessage()); } - return ResponseEntity.ok(authInfo.getSecond()); + return ResponseEntity.ok(new LoginRSB(UserMapper.convertToDTO(authInfo.getFirst()), authInfo.getSecond())); } @PostMapping("/refresh") diff --git a/src/main/java/com/displaynone/acss/controllers/auth/LoginRSB.java b/src/main/java/com/displaynone/acss/controllers/auth/LoginRSB.java new file mode 100644 index 0000000..e6d00a6 --- /dev/null +++ b/src/main/java/com/displaynone/acss/controllers/auth/LoginRSB.java @@ -0,0 +1,13 @@ +package com.displaynone.acss.controllers.auth; + +import com.displaynone.acss.components.auth.models.AuthTokenPair; +import com.displaynone.acss.components.auth.models.user.UserDTO; +import lombok.AllArgsConstructor; +import lombok.Data; + +@Data +@AllArgsConstructor +public class LoginRSB { + private UserDTO user; + private AuthTokenPair tokens; +}