diff --git a/layer-api/src/main/java/org/layer/config/SecurityConfig.java b/layer-api/src/main/java/org/layer/config/SecurityConfig.java index 88e1f5cf..e9a6c31a 100644 --- a/layer-api/src/main/java/org/layer/config/SecurityConfig.java +++ b/layer-api/src/main/java/org/layer/config/SecurityConfig.java @@ -41,6 +41,7 @@ private void setHttp(HttpSecurity http) throws Exception { .requestMatchers(new AntPathRequestMatcher("/api/auth/oauth2/google")).permitAll() .requestMatchers(new AntPathRequestMatcher("/api/test")).permitAll() .requestMatchers(new AntPathRequestMatcher("/api/auth/oauth2/kakao")).permitAll() + .requestMatchers(new AntPathRequestMatcher("/api/auth/test")).permitAll() .anyRequest().authenticated() ); } diff --git a/layer-api/src/main/java/org/layer/domain/auth/controller/AuthController.java b/layer-api/src/main/java/org/layer/domain/auth/controller/AuthController.java index 30279580..15190373 100644 --- a/layer-api/src/main/java/org/layer/domain/auth/controller/AuthController.java +++ b/layer-api/src/main/java/org/layer/domain/auth/controller/AuthController.java @@ -3,8 +3,10 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.layer.domain.auth.controller.dto.*; +import org.layer.domain.auth.service.AuthService; import org.layer.domain.auth.service.dto.SignInServiceResponse; import org.layer.domain.auth.service.dto.SignUpServiceResponse; +import org.layer.domain.member.repository.MemberRepository; import org.layer.oauth.service.GoogleService; import org.layer.oauth.service.KakaoService; import org.springframework.http.HttpStatus; @@ -13,7 +15,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import org.layer.domain.auth.service.AuthService; + @Slf4j @RequiredArgsConstructor @RequestMapping("/api/auth") @@ -22,6 +24,7 @@ public class AuthController { private final AuthService authService; private final GoogleService googleService; private final KakaoService kakaoService; + private final MemberRepository memberRepository; // 로그인 @PostMapping("/sign-in") diff --git a/layer-domain/build.gradle b/layer-domain/build.gradle deleted file mode 100644 index e69de29b..00000000 diff --git a/layer-domain/src/main/java/org/layer/domain/member/entity/Member.java b/layer-domain/src/main/java/org/layer/domain/member/entity/Member.java index f19c135f..e4b21e06 100644 --- a/layer-domain/src/main/java/org/layer/domain/member/entity/Member.java +++ b/layer-domain/src/main/java/org/layer/domain/member/entity/Member.java @@ -6,6 +6,7 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; +import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import lombok.AccessLevel; import lombok.Builder; @@ -32,10 +33,12 @@ public class Member { @Enumerated(value = EnumType.STRING) private MemberRole memberRole; + @Valid @NotNull @Enumerated(value = EnumType.STRING) private SocialType socialType; + @Valid @NotNull private String socialId; diff --git a/layer-domain/src/main/java/org/layer/domain/member/repository/MemberRepository.java b/layer-domain/src/main/java/org/layer/domain/member/repository/MemberRepository.java index d3648db8..61034a45 100644 --- a/layer-domain/src/main/java/org/layer/domain/member/repository/MemberRepository.java +++ b/layer-domain/src/main/java/org/layer/domain/member/repository/MemberRepository.java @@ -9,5 +9,4 @@ public interface MemberRepository extends JpaRepository { Optional findBySocialIdAndSocialType(@NotNull String socialId, @NotNull SocialType socialType); - }