Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/main/java/umc/codeplay/controller/AuthController.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import java.util.Collection;
import java.util.stream.Collectors;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;

import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
Expand Down Expand Up @@ -36,7 +38,7 @@ public class AuthController {

@PostMapping("/login")
public ApiResponse<MemberResponseDTO.LoginResultDTO> login(
@RequestBody MemberRequestDTO.LoginDto request) {
@Validated @RequestBody MemberRequestDTO.LoginDto request) {
if (memberService.getSocialStatus(request.getEmail()) != SocialStatus.NONE) {
throw new GeneralHandler(ErrorStatus.AUTHORIZATION_METHOD_ERROR);
}
Expand Down Expand Up @@ -66,7 +68,7 @@ public ApiResponse<MemberResponseDTO.LoginResultDTO> login(

@PostMapping("/signup")
public ApiResponse<MemberResponseDTO.JoinResultDTO> join(
@RequestBody MemberRequestDTO.JoinDto request) {
@Validated @RequestBody MemberRequestDTO.JoinDto request) {
Member member = memberService.joinMember(request);
MemberResponseDTO.JoinResultDTO newJoinResult = MemberConverter.toJoinResultDTO(member);

Expand All @@ -75,8 +77,8 @@ public ApiResponse<MemberResponseDTO.JoinResultDTO> join(

@PostMapping("/refresh")
public ApiResponse<MemberResponseDTO.LoginResultDTO> refresh(
@RequestHeader("Refresh-Token") String refreshToken,
@RequestParam("email") String email) {
@RequestHeader("Refresh-Token") @NotNull(message = "리프레시 토큰은 필수 헤더입니다.") String refreshToken,
@Validated @RequestParam("email") @NotBlank(message = "이메일은 필수 입력값입니다.") String email) {
// 리프레시 토큰 유효성 검사
if (jwtUtil.validateToken(refreshToken)
&& (jwtUtil.getTypeFromToken(refreshToken).equals("refresh"))) {
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/umc/codeplay/controller/OAuthController.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.servlet.view.RedirectView;
Expand All @@ -28,6 +29,7 @@
@RestController
@RequestMapping("/oauth")
@RequiredArgsConstructor
@Validated
public class OAuthController {

private final JwtUtil jwtUtil;
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/umc/codeplay/domain/Member.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@
import lombok.*;

import umc.codeplay.domain.enums.Role;
import umc.codeplay.domain.mapping.MusicLike;
import umc.codeplay.domain.enums.SocialStatus;

import umc.codeplay.domain.mapping.MusicLike;

@Entity
@Getter
Expand Down
13 changes: 13 additions & 0 deletions src/main/java/umc/codeplay/dto/MemberRequestDTO.java
Original file line number Diff line number Diff line change
@@ -1,19 +1,32 @@
package umc.codeplay.dto;

import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotBlank;

import lombok.Getter;

public class MemberRequestDTO {

@Getter
public static class JoinDto {
@NotBlank(message = "이름은 필수 입력값입니다.")
String name;

@NotBlank(message = "이메일은 필수 입력값입니다.")
@Email(message = "이메일 형식이 아닙니다.")
String email;

@NotBlank(message = "비밀번호는 필수 입력값입니다.")
String password;
}

@Getter
public static class LoginDto {
@NotBlank(message = "이메일은 필수 입력값입니다.")
@Email(message = "이메일 형식이 아닙니다.")
String email;

@NotBlank(message = "비밀번호는 필수 입력값입니다.")
String password;
}
}
2 changes: 1 addition & 1 deletion src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spring:

jpa:
hibernate:
ddl-auto: update # Hibernate 엔티티 스키마 자동 업데이트
ddl-auto: create # Hibernate 엔티티 스키마 자동 업데이트
properties:
jakarta.persistence.sharedCache.mode: ALL
hibernate:
Expand Down
Loading