diff --git a/src/main/java/co/jp/app/controller/UserController.java b/src/main/java/co/jp/app/controller/UserController.java index ce8ed90..fa8e107 100644 --- a/src/main/java/co/jp/app/controller/UserController.java +++ b/src/main/java/co/jp/app/controller/UserController.java @@ -4,6 +4,7 @@ import co.jp.app.common.ApiResponse; import co.jp.app.common.ResultCode; import co.jp.app.dto.LoginDto; import co.jp.app.dto.RegistrationDto; +import co.jp.app.dto.UserDto; import co.jp.app.service.JwtService; import jakarta.validation.Valid; import org.springframework.http.HttpStatus; @@ -37,15 +38,20 @@ public class UserController { } @PostMapping("/register") - public ResponseEntity registerUser(@Valid @RequestBody RegistrationDto registrationDto) { + public ResponseEntity> registerUser(@Valid @RequestBody RegistrationDto registrationDto) { UserEntity registeredUser = userService.registerNewUser(registrationDto); - return ResponseEntity.status(HttpStatus.CREATED).body(ApiResponse.success(registeredUser.getEmail())); + UserDto userDto = new UserDto(); + + userDto.setEmail(registeredUser.getEmail()); + userDto.setName(registeredUser.getName()); + + return ResponseEntity.status(HttpStatus.CREATED).body(ApiResponse.success(userDto)); } @PostMapping("/login") - public ResponseEntity authenticateUser(@Valid @RequestBody LoginDto loginDto) { + public ResponseEntity>> authenticateUser(@Valid @RequestBody LoginDto loginDto) { Authentication authentication = authenticationManager.authenticate( new UsernamePasswordAuthenticationToken(loginDto.getEmail(), loginDto.getPassword()) diff --git a/src/main/java/co/jp/app/dto/UserDto.java b/src/main/java/co/jp/app/dto/UserDto.java new file mode 100644 index 0000000..42b21ba --- /dev/null +++ b/src/main/java/co/jp/app/dto/UserDto.java @@ -0,0 +1,24 @@ +package co.jp.app.dto; + +public class UserDto { + + private String email; + + private String name; + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +}