[REFACTOR] 유저 도메인 추가

src/main/java/com/somemore/domains/volunteer/domain/Volunteer.java

@@ -1,6 +1,6 @@
 package com.somemore.domains.volunteer.domain;
 
-import com.somemore.global.auth.oauth.OAuthProvider;
+import com.somemore.global.auth.oauth.domain.OAuthProvider;
 import com.somemore.global.common.entity.BaseEntity;
 import com.somemore.domains.volunteer.dto.request.VolunteerProfileUpdateRequestDto;
 import jakarta.persistence.*;

src/main/java/com/somemore/domains/volunteer/dto/request/VolunteerRegisterRequestDto.java

@@ -1,6 +1,6 @@
 package com.somemore.domains.volunteer.dto.request;
 
-import com.somemore.global.auth.oauth.OAuthProvider;
+import com.somemore.global.auth.oauth.domain.OAuthProvider;
 
 public record VolunteerRegisterRequestDto(
         OAuthProvider oAuthProvider,

src/main/java/com/somemore/global/auth/cookie/CookieService.java

@@ -27,7 +27,7 @@ public void deleteAccessToken(HttpServletResponse response) {
     }
 
     private static ResponseCookie generateCookie(TokenType tokenType, String value) {
-        return ResponseCookie.from(TokenType.ACCESS.name(), value) // 덮어쓰기 위해서 고정 값
+        return ResponseCookie.from(TokenType.ACCESS.name(), value)
                 .domain(".somemore.site")
                 .httpOnly(true)
                 .secure(true)

src/main/java/com/somemore/global/auth/idpw/filter/IdPwAuthFilter.java

@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.somemore.global.auth.cookie.CookieUseCase;
 import com.somemore.global.auth.jwt.domain.EncodedToken;
-import com.somemore.global.auth.jwt.domain.UserRole;
+import com.somemore.user.domain.UserRole;
 import com.somemore.global.auth.jwt.usecase.GenerateTokensOnLoginUseCase;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.http.HttpServletRequest;

src/main/java/com/somemore/global/auth/idpw/provider/CustomAuthenticationProvider.java

@@ -3,7 +3,7 @@
 import com.somemore.global.auth.authentication.JwtAuthenticationToken;
 import com.somemore.global.auth.jwt.domain.EncodedToken;
 import com.somemore.global.auth.jwt.domain.TokenType;
-import com.somemore.global.auth.jwt.domain.UserRole;
+import com.somemore.user.domain.UserRole;
 import com.somemore.global.auth.jwt.usecase.JwtUseCase;
 import com.somemore.domains.center.usecase.query.CenterSignUseCase;
 import lombok.RequiredArgsConstructor;

src/main/java/com/somemore/global/auth/jwt/domain/EncodedToken.java

@@ -3,6 +3,11 @@
 public record EncodedToken(String value) {
 
     private static final String UNINITIALIZED = "UNINITIALIZED";
+    private static final String PREFIX = "Bearer ";
+
+    public String getValueWithPrefix() {
+        return PREFIX + this.value;
+    }
 
     public boolean isUninitialized() {
         return value == null

src/main/java/com/somemore/global/auth/jwt/service/GenerateTokensOnLoginService.java

@@ -1,6 +1,6 @@
 package com.somemore.global.auth.jwt.service;
 
-import com.somemore.global.auth.jwt.domain.UserRole;
+import com.somemore.user.domain.UserRole;
 import com.somemore.global.auth.jwt.domain.EncodedToken;
 import com.somemore.global.auth.jwt.domain.TokenType;
 import com.somemore.global.auth.jwt.generator.JwtGenerator;

src/main/java/com/somemore/global/auth/jwt/usecase/GenerateTokensOnLoginUseCase.java

@@ -1,7 +1,7 @@
 package com.somemore.global.auth.jwt.usecase;
 
 import com.somemore.global.auth.jwt.domain.EncodedToken;
-import com.somemore.global.auth.jwt.domain.UserRole;
+import com.somemore.user.domain.UserRole;
 
 import java.util.UUID;
 

src/main/java/com/somemore/global/auth/oauth/checker/OAuthInfoChecker.java

@@ -0,0 +1,7 @@
+package com.somemore.global.auth.oauth.checker;
+
+import com.somemore.global.auth.oauth.domain.OAuthProvider;
+
+public interface OAuthInfoChecker {
+    boolean doesUserExist(OAuthProvider provider, String id);
+}

src/main/java/com/somemore/global/auth/oauth/checker/OAuthInfoCheckerImpl.java

@@ -0,0 +1,22 @@
+package com.somemore.global.auth.oauth.checker;
+
+import com.somemore.global.auth.oauth.domain.OAuthProvider;
+import com.somemore.global.auth.oauth.repository.OAuthInfoRepository;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+public class OAuthInfoCheckerImpl implements OAuthInfoChecker {
+
+    private final OAuthInfoRepository oAuthInfoRepository;
+
+    @Override
+    public boolean doesUserExist(OAuthProvider provider, String id) {
+        return oAuthInfoRepository.existsByOAuthProviderAndOauthId(provider, id);
+    }
+}

src/main/java/com/somemore/global/auth/oauth/converter/NaverOAuthResponseConverter.java

@@ -0,0 +1,21 @@
+package com.somemore.global.auth.oauth.converter;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.somemore.global.auth.oauth.domain.CommonOAuthInfo;
+import com.somemore.global.auth.oauth.domain.OAuthProvider;
+import com.somemore.global.auth.oauth.naver.dto.NaverUserProfileResponseDto;
+import org.springframework.security.oauth2.core.user.OAuth2User;
+import org.springframework.stereotype.Component;
+
+@Component
+public class NaverOAuthResponseConverter implements OAuthResponseConverter {
+
+    @Override
+    public CommonOAuthInfo convert(OAuth2User oAuth2User) {
+        NaverUserProfileResponseDto naverUserProfileResponseDto = new ObjectMapper().convertValue(oAuth2User.getAttributes(), NaverUserProfileResponseDto.class);
+
+        return new CommonOAuthInfo(
+                OAuthProvider.NAVER,
+                naverUserProfileResponseDto.response().id());
+    }
+}

src/main/java/com/somemore/global/auth/oauth/converter/OAuthResponseConverter.java

@@ -0,0 +1,8 @@
+package com.somemore.global.auth.oauth.converter;
+
+import com.somemore.global.auth.oauth.domain.CommonOAuthInfo;
+import org.springframework.security.oauth2.core.user.OAuth2User;
+
+public interface OAuthResponseConverter {
+    CommonOAuthInfo convert(OAuth2User oAuth2User);
+}

src/main/java/com/somemore/global/auth/oauth/domain/CommonOAuthInfo.java

@@ -0,0 +1,6 @@
+package com.somemore.global.auth.oauth.domain;
+
+public record CommonOAuthInfo(
+        OAuthProvider provider,
+        String oauthId) {
+}

src/main/java/com/somemore/global/auth/oauth/domain/OAuthInfo.java

@@ -0,0 +1,55 @@
+package com.somemore.global.auth.oauth.domain;
+
+import com.somemore.global.common.entity.BaseEntity;
+import com.somemore.user.domain.User;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.util.UUID;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Entity
+@Table(name = "oauth_info")
+public class OAuthInfo extends BaseEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Long id;
+
+    @Column(name = "user_id", nullable = false)
+    private UUID userId;
+
+    @Column(name = "oauth_id", nullable = false)
+    private String oauthId;
+
+    @Enumerated(EnumType.STRING)
+    @Column(name = "oauth_provider", nullable = false)
+    private OAuthProvider oAuthProvider;
+
+    public static OAuthInfo create(User user, CommonOAuthInfo commonOAuthInfo) {
+        return OAuthInfo.builder()
+                .userId(user.getId())
+                .oauthId(commonOAuthInfo.oauthId())
+                .oAuthProvider(commonOAuthInfo.provider())
+                .build();
+    }
+
+    @Builder
+    private OAuthInfo(UUID userId, String oauthId, OAuthProvider oAuthProvider) {
+        this.userId = userId;
+        this.oauthId = oauthId;
+        this.oAuthProvider = oAuthProvider;
+    }
+}

src/main/java/com/somemore/global/auth/oauth/OAuthProvider.java → src/main/java/com/somemore/global/auth/oauth/domain/OAuthProvider.java

@@ -1,4 +1,4 @@
-package com.somemore.global.auth.oauth;
+package com.somemore.global.auth.oauth.domain;
 
 import lombok.Getter;
 

src/main/java/com/somemore/global/auth/oauth/handler/CustomOAuthSuccessHandler.java

@@ -1,65 +1,63 @@
 package com.somemore.global.auth.oauth.handler;
 
-import com.somemore.global.auth.cookie.CookieUseCase;
 import com.somemore.global.auth.jwt.domain.EncodedToken;
-import com.somemore.global.auth.jwt.domain.UserRole;
 import com.somemore.global.auth.jwt.usecase.GenerateTokensOnLoginUseCase;
-import com.somemore.global.auth.oauth.OAuthProvider;
-import com.somemore.global.auth.oauth.naver.service.query.ProcessNaverOAuthUserService;
+import com.somemore.global.auth.oauth.processor.OAuthUserProcessor;
 import com.somemore.global.auth.redirect.RedirectUseCase;
-import com.somemore.domains.volunteer.usecase.VolunteerQueryUseCase;
+import com.somemore.user.domain.UserRole;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
+import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler;
 import org.springframework.stereotype.Component;
 
-import java.io.IOException;
 import java.util.UUID;
 
 @Component
 @RequiredArgsConstructor
 @Slf4j
 public class CustomOAuthSuccessHandler extends SimpleUrlAuthenticationSuccessHandler {
 
-    private final ProcessNaverOAuthUserService processNaverOAuthService;
-    private final VolunteerQueryUseCase volunteerQueryUseCase;
+    private final OAuthUserProcessor oauthUserProcessor;
     private final GenerateTokensOnLoginUseCase generateTokensOnLoginUseCase;
-    private final CookieUseCase cookieUseCase;
     private final RedirectUseCase redirectUseCase;
 
-    @Value("${app.front-url}")
-    private String frontendRootUrl;
+    public static final String AUTHORIZATION = "Authorization";
+    public static final String MAIN_PATH = "/main";
 
     @Override
-    public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException {
-        String oAuthId;
-        switch (getOAuthProvider(authentication)) {
-            case NAVER -> oAuthId = processNaverOAuthService.processOAuthUser(authentication);
-            default -> {
-                log.error("지원하지 않는 OAuth 제공자입니다.");
-                throw new IllegalArgumentException();
-            }
-        }
+    public void onAuthenticationSuccess(HttpServletRequest request,
+                                        HttpServletResponse response,
+                                        Authentication authentication) {
+        OAuth2User oauthUser = extractOAuthUser(authentication);
+        UUID userId = oauthUserProcessor.fetchUserIdByOAuthUser(oauthUser);
+
+        processAccessToken(response, userId);
+        redirect(request, response);
+    }
+
+    private void redirect(HttpServletRequest request, HttpServletResponse response) {
+        // TODO 유저 정보 커스텀 확인 분기
+        redirectUseCase.redirect(request, response, MAIN_PATH);
+    }
 
-        UUID volunteerId = volunteerQueryUseCase.getVolunteerIdByOAuthId(oAuthId);
+    private void processAccessToken(HttpServletResponse response, UUID userId) {
         EncodedToken accessToken =
                 generateTokensOnLoginUseCase.saveRefreshTokenAndReturnAccessToken(
-                        volunteerId, UserRole.VOLUNTEER
-                );
+                        userId, UserRole.getOAuthUserDefaultRole());
 
-        cookieUseCase.setAccessToken(response, accessToken.value());
-        redirectUseCase.redirect(request, response, frontendRootUrl);
+        response.addHeader(AUTHORIZATION, accessToken.getValueWithPrefix());
     }
 
-    private static OAuthProvider getOAuthProvider(Authentication authentication) {
+    private OAuth2User extractOAuthUser(Authentication authentication) {
         if (authentication instanceof OAuth2AuthenticationToken token) {
-            return OAuthProvider.from(token.getAuthorizedClientRegistrationId());
+            return token.getPrincipal();
         }
-        throw new IllegalArgumentException();
+        log.error("Authentication 객체가 OAuth2AuthenticationToken 타입이 아닙니다: {}", authentication.getClass().getName());
+        throw new IllegalArgumentException("잘못된 인증 객체입니다.");
     }
 }

src/main/java/com/somemore/global/auth/oauth/naver/dto/NaverUserProfileResponseDto.java

@@ -0,0 +1,18 @@
+package com.somemore.global.auth.oauth.naver.dto;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+public record NaverUserProfileResponseDto(
+        String resultcode, // 결과 코드
+        String message,    // 결과 메시지
+        Response response  // 응답 데이터
+) {
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public record Response(
+            String id // 일련 번호
+    ) {
+    }
+}