[ian.lee2] step2 과제 제출입니다.

build.gradle.kts

@@ -36,10 +36,14 @@ dependencies {
     runtimeOnly("io.jsonwebtoken:jjwt-jackson")
     runtimeOnly("com.h2database:h2")
     runtimeOnly("com.mysql:mysql-connector-j")
+    compileOnly("org.projectlombok:lombok")
+    annotationProcessor("org.projectlombok:lombok")
     testImplementation("org.springframework.boot:spring-boot-starter-test")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
     testImplementation("io.rest-assured:rest-assured")
+    testCompileOnly("org.projectlombok:lombok")
+    testAnnotationProcessor("org.projectlombok:lombok")
 }
 
 kotlin {

programming-log.md

@@ -156,10 +156,10 @@ private void validateName(String name) {
 `ProductNameValidator`에 `validateOrThrow(String name)` 메서드를 추가하고 Controller의 private `validateName()`을 제거했다. `OptionController`는 DTO가 검증을 담당하므로 `validateName()` 제거 후 별도 호출 없음.
 
 ```
-gift.product.ProductNameValidator
+gift.product.validation.ProductNameValidator
   └── validateOrThrow(name)  ← throw 로직 포함, Controller private 메서드 대체
 
-gift.option.OptionController
+gift.option.controller.OptionController
   └── validateName() 제거  ← OptionRequest @Valid가 대체
 ```
 

src/main/java/gift/auth/controller/OAuthController.java

@@ -0,0 +1,47 @@
+package gift.auth.controller;
+
+import gift.auth.exception.InvalidOAuthProviderException;
+import gift.auth.service.OAuthService;
+import gift.auth.dto.TokenResponse;
+import gift.external.ExternalProvider;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(path = "/api/auth")
+@RequiredArgsConstructor
+public class OAuthController {
+    private final OAuthService oAuthService;
+
+    @GetMapping(path = "/{provider}/login")
+    public ResponseEntity<Void> login(@PathVariable String provider) {
+        ExternalProvider externalProvider = parseProvider(provider);
+        return ResponseEntity.status(HttpStatus.FOUND)
+            .header(HttpHeaders.LOCATION, oAuthService.getLoginUri(externalProvider).toString())
+            .build();
+    }
+
+    @GetMapping(path = "/{provider}/callback")
+    public ResponseEntity<TokenResponse> callback(
+        @PathVariable String provider,
+        @RequestParam("code") String code
+    ) {
+        ExternalProvider externalProvider = parseProvider(provider);
+        return ResponseEntity.ok(oAuthService.handleCallback(externalProvider, code));
+    }
+
+    private ExternalProvider parseProvider(String provider) {
+        try {
+            return ExternalProvider.valueOf(provider.toUpperCase());
+        } catch (IllegalArgumentException e) {
+            throw new InvalidOAuthProviderException();
+        }
+    }
+}

src/main/java/gift/auth/TokenResponse.java → src/main/java/gift/auth/dto/TokenResponse.java

@@ -1,4 +1,4 @@
-package gift.auth;
+package gift.auth.dto;
 
 /**
  * Response containing a JWT access token.

src/main/java/gift/auth/exception/AuthErrorCode.java

@@ -0,0 +1,28 @@
+package gift.auth.exception;
+
+import gift.common.BaseErrorCode;
+import org.springframework.http.HttpStatus;
+
+public enum AuthErrorCode implements BaseErrorCode {
+    AUTHENTICATION_FAILED(HttpStatus.UNAUTHORIZED, "인증에 실패했습니다."),
+    ACCESS_DENIED(HttpStatus.FORBIDDEN, "접근 권한이 없습니다."),
+    INVALID_OAUTH_PROVIDER(HttpStatus.BAD_REQUEST, "지원하지 않는 OAuth Provider입니다.");
+
+    private final HttpStatus httpStatus;
+    private final String message;
+
+    AuthErrorCode(HttpStatus httpStatus, String message) {
+        this.httpStatus = httpStatus;
+        this.message = message;
+    }
+
+    @Override
+    public HttpStatus getHttpStatus() {
+        return httpStatus;
+    }
+
+    @Override
+    public String getMessage() {
+        return message;
+    }
+}

src/main/java/gift/auth/exception/AuthenticationException.java

@@ -0,0 +1,9 @@
+package gift.auth.exception;
+
+import gift.common.BaseException;
+
+public class AuthenticationException extends BaseException {
+    public AuthenticationException() {
+        super(AuthErrorCode.AUTHENTICATION_FAILED);
+    }
+}

src/main/java/gift/auth/exception/ForbiddenException.java

@@ -0,0 +1,9 @@
+package gift.auth.exception;
+
+import gift.common.BaseException;
+
+public class ForbiddenException extends BaseException {
+    public ForbiddenException() {
+        super(AuthErrorCode.ACCESS_DENIED);
+    }
+}

src/main/java/gift/auth/exception/InvalidOAuthProviderException.java

@@ -0,0 +1,9 @@
+package gift.auth.exception;
+
+import gift.common.BaseException;
+
+public class InvalidOAuthProviderException extends BaseException {
+    public InvalidOAuthProviderException() {
+        super(AuthErrorCode.INVALID_OAUTH_PROVIDER);
+    }
+}

src/main/java/gift/auth/AuthenticationResolver.java → src/main/java/gift/auth/jwt/AuthenticationResolver.java

@@ -1,7 +1,8 @@
-package gift.auth;
+package gift.auth.jwt;
 
-import gift.member.Member;
-import gift.member.MemberRepository;
+import gift.member.entity.Member;
+import gift.member.repository.MemberRepository;
+import lombok.RequiredArgsConstructor;
 
 import org.springframework.stereotype.Component;
 
@@ -12,15 +13,11 @@
  * @since 1.0
  */
 @Component
+@RequiredArgsConstructor
 public class AuthenticationResolver {
     private final JwtProvider jwtProvider;
     private final MemberRepository memberRepository;
 
-    public AuthenticationResolver(JwtProvider jwtProvider, MemberRepository memberRepository) {
-        this.jwtProvider = jwtProvider;
-        this.memberRepository = memberRepository;
-    }
-
     public Member extractMember(String authorization) {
         try {
             String token = authorization.replace("Bearer ", "");

src/main/java/gift/auth/JwtProperties.java → src/main/java/gift/auth/jwt/JwtProperties.java

@@ -1,4 +1,4 @@
-package gift.auth;
+package gift.auth.jwt;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 

src/main/java/gift/auth/JwtProvider.java → src/main/java/gift/auth/jwt/JwtProvider.java

@@ -1,4 +1,4 @@
-package gift.auth;
+package gift.auth.jwt;
 
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.security.Keys;

src/main/java/gift/auth/oauth/OAuthClient.java

@@ -0,0 +1,13 @@
+package gift.auth.oauth;
+
+import gift.external.ExternalProvider;
+
+import java.net.URI;
+
+public interface OAuthClient {
+    ExternalProvider provider();
+
+    URI getLoginUri();
+
+    OAuthUserInfo getUserInfo(String code);
+}

src/main/java/gift/auth/oauth/OAuthClientRegistry.java

@@ -0,0 +1,27 @@
+package gift.auth.oauth;
+
+import gift.external.ExternalProvider;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+@Component
+public class OAuthClientRegistry {
+    private final Map<ExternalProvider, OAuthClient> clients;
+
+    public OAuthClientRegistry(List<OAuthClient> clients) {
+        this.clients = clients.stream()
+            .collect(Collectors.toMap(OAuthClient::provider, Function.identity()));
+    }
+
+    public OAuthClient get(ExternalProvider provider) {
+        OAuthClient client = clients.get(provider);
+        if (client == null) {
+            throw new IllegalStateException("OAuth client not found. provider=" + provider);
+        }
+        return client;
+    }
+}

src/main/java/gift/auth/oauth/OAuthUserInfo.java

@@ -0,0 +1,4 @@
+package gift.auth.oauth;
+
+public record OAuthUserInfo(String email, String accessToken) {
+}

src/main/java/gift/auth/service/OAuthService.java

@@ -0,0 +1,46 @@
+package gift.auth.service;
+
+import gift.auth.dto.TokenResponse;
+import gift.auth.jwt.JwtProvider;
+import gift.auth.oauth.OAuthClient;
+import gift.auth.oauth.OAuthClientRegistry;
+import gift.auth.oauth.OAuthUserInfo;
+import gift.external.ExternalProvider;
+import gift.member.entity.Member;
+import gift.member.repository.MemberRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.net.URI;
+
+@Service
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+public class OAuthService {
+    private final OAuthClientRegistry oAuthClientRegistry;
+    private final MemberRepository memberRepository;
+    private final JwtProvider jwtProvider;
+
+    public URI getLoginUri(ExternalProvider provider) {
+        OAuthClient client = oAuthClientRegistry.get(provider);
+        return client.getLoginUri();
+    }
+
+    @Transactional
+    public TokenResponse handleCallback(ExternalProvider provider, String code) {
+        OAuthClient client = oAuthClientRegistry.get(provider);
+        OAuthUserInfo userInfo = client.getUserInfo(code);
+        String email = userInfo.email();
+
+        Member member = memberRepository.findByEmail(email)
+            .orElseGet(() -> new Member(email));
+        if (provider == ExternalProvider.KAKAO) {
+            member.updateKakaoAccessToken(userInfo.accessToken());
+        }
+        memberRepository.save(member);
+
+        String token = jwtProvider.createToken(member.getEmail());
+        return new TokenResponse(token);
+    }
+}