refactory: auth 로직 리팩토링

Author: ImGdevel

ProjectVG.Api/Controllers/OAuthController.cs

@@ -1,9 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using ProjectVG.Application.Services.Auth;
-using ProjectVG.Application.Models.Auth;
 using ProjectVG.Infrastructure.Auth;
-using System.Security.Cryptography;
-using System.Text;
 using Microsoft.Extensions.Options;
 using ProjectVG.Common.Configuration;
 
@@ -14,24 +11,16 @@ namespace ProjectVG.Api.Controllers
     public class OAuthController : ControllerBase
     {
         private readonly IOAuth2Service _oauth2Service;
-        private readonly IAuthService _authService;
-        private readonly OAuth2ProviderSettings _oauth2Settings;
 
         public OAuthController(
-            IHttpClientFactory httpClientFactory, 
-            JwtService jwtService,
             IOAuth2Service oauth2Service,
-            IAuthService authService,
             IOptions<OAuth2ProviderSettings> oauth2Settings)
         {
             _oauth2Service = oauth2Service;
-            _authService = authService;
-            _oauth2Settings = oauth2Settings.Value;
         }
 
         [HttpGet("oauth2/authorize")]
         public async Task<IActionResult> OAuth2Authorize(
-            [FromQuery] string scope,
             [FromQuery] string state,
             [FromQuery] string code_challenge,
             [FromQuery] string code_challenge_method,
@@ -45,14 +34,12 @@ public async Task<IActionResult> OAuth2Authorize(
                     return BadRequest("Invalid PKCE parameters");
                 }
 
-                var googleAuthUrl = await _oauth2Service.BuildAuthorizationUrlAsync(scope, state, code_challenge, code_challenge_method, code_verifier, client_redirect_uri);
+                var googleAuthUrl = await _oauth2Service.BuildAuthorizationUrlAsync(state, code_challenge, code_challenge_method, code_verifier, client_redirect_uri);
 
                 return Ok(new
                 {
                     success = true,
-                    auth_url = googleAuthUrl,
-                    state = state,
-                    message = "Redirect to this URL to start OAuth2 login"
+                    auth_url = googleAuthUrl
                 });
             }
             catch (InvalidOperationException ex)

ProjectVG.Api/Filters/JwtAuthenticationFilter.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.Logging;
-using ProjectVG.Application.Services.Auth;
+using ProjectVG.Infrastructure.Auth;
 using System.Security.Claims;
 
 namespace ProjectVG.Api.Filters
@@ -12,7 +12,7 @@ public class JwtAuthenticationAttribute : Attribute, IAsyncAuthorizationFilter
         public async Task OnAuthorizationAsync(AuthorizationFilterContext context)
         {
             var logger = context.HttpContext.RequestServices.GetRequiredService<ILogger<JwtAuthenticationAttribute>>();
-            var authService = context.HttpContext.RequestServices.GetRequiredService<IAuthService>();
+            var tokenService = context.HttpContext.RequestServices.GetRequiredService<ITokenService>();
 
             // 디버그: 모든 헤더 로깅
             logger.LogInformation("=== JWT 인증 디버그 시작 ===");
@@ -47,7 +47,7 @@ public async Task OnAuthorizationAsync(AuthorizationFilterContext context)
             logger.LogInformation("토큰 추출 성공. 토큰 길이: {TokenLength}", token.Length);
             logger.LogInformation("토큰 미리보기: {TokenPreview}", token.Length > 20 ? token.Substring(0, 20) + "..." : token);
 
-            var isValid = await authService.ValidateAccessTokenAsync(token);
+            var isValid = await tokenService.ValidateAccessTokenAsync(token);
             logger.LogInformation("토큰 검증 결과: {IsValid}", isValid);
 
             if (!isValid)
@@ -66,7 +66,7 @@ public async Task OnAuthorizationAsync(AuthorizationFilterContext context)
                 return;
             }
 
-            var userId = await authService.GetCurrentUserIdAsync(token);
+            var userId = await tokenService.GetUserIdFromTokenAsync(token);
             logger.LogInformation("추출된 사용자 ID: {UserId}", userId);
 
             if (!userId.HasValue)

ProjectVG.Application/Services/Auth/AuthService.cs

@@ -182,45 +182,5 @@ public async Task<bool> LogoutAsync(string refreshToken)
                 return false;
             }
         }
-
-        public async Task<bool> ValidateAccessTokenAsync(string accessToken)
-        {
-            try
-            {
-                _logger.LogInformation("=== ValidateAccessTokenAsync 디버그 ===");
-                
-                var userId = await _tokenService.GetUserIdFromTokenAsync(accessToken);
-                _logger.LogInformation("추출된 UserId: {UserId}", userId);
-                
-                if (!userId.HasValue)
-                {
-                    _logger.LogWarning("UserId가 null이므로 검증 실패");
-                    return false;
-                }
-
-                _logger.LogInformation("JWT 토큰 검증 성공 - UserId: {UserId}", userId.Value);
-                return true;
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Access token validation failed");
-                return false;
-            }
-        }
-
-        public async Task<Guid?> GetCurrentUserIdAsync(string accessToken)
-        {
-            try
-            {
-                return await _tokenService.GetUserIdFromTokenAsync(accessToken);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Failed to get user ID from access token");
-                return null;
-            }
-        }
-
-
     }
 }

ProjectVG.Application/Services/Auth/IAuthService.cs

@@ -3,24 +3,50 @@
 
 namespace ProjectVG.Application.Services.Auth
 {
+    /// <summary>
+    /// 인증 및 토큰 관리 서비스
+    /// JWT 토큰 생성, 검증, 갱신 및 OAuth 로그인 처리를 담당
+    /// </summary>
     public interface IAuthService
     {
-        // 로그인을 실행 (provider Id와 )
-
-
-
+        /// <summary>
+        /// OAuth 제공자를 통한 로그인 처리 (Google, GitHub, Microsoft, 게스트 등)
+        /// </summary>
+        /// <param name="provider">인증 제공자 (google, github, microsoft, guest, test)</param>
+        /// <param name="providerUserId">제공자별 사용자 ID</param>
+        /// <returns>로그인 결과 (토큰, 사용자 정보 포함)</returns>
         Task<AuthResult> LoginWithOAuthAsync(string provider, string providerUserId);
+
+        /// <summary>
+        /// 리프레시 토큰을 사용하여 새로운 액세스 토큰 발급
+        /// </summary>
+        /// <param name="refreshToken">유효한 리프레시 토큰</param>
+        /// <returns>새로운 토큰 쌍과 사용자 정보</returns>
         Task<AuthResult> RefreshTokenAsync(string refreshToken);
+
+        /// <summary>
+        /// 사용자 로그아웃 처리 (리프레시 토큰 무효화)
+        /// </summary>
+        /// <param name="refreshToken">무효화할 리프레시 토큰</param>
+        /// <returns>로그아웃 성공 여부</returns>
         Task<bool> LogoutAsync(string refreshToken);
-        Task<bool> ValidateAccessTokenAsync(string accessToken);
-        Task<Guid?> GetCurrentUserIdAsync(string accessToken);
     }
 
+    /// <summary>
+    /// 인증 처리 결과를 담는 클래스
+    /// </summary>
     public class AuthResult
     {
+        /// <summary>인증 성공 여부</summary>
         public bool IsSuccess { get; set; }
+        
+        /// <summary>실패시 오류 메시지</summary>
         public string? ErrorMessage { get; set; }
+        
+        /// <summary>성공시 JWT 토큰 정보</summary>
         public TokenResponse? Tokens { get; set; }
+        
+        /// <summary>성공시 사용자 정보</summary>
         public UserDto? User { get; set; }
     }
 }

ProjectVG.Application/Services/Auth/ILoginService.cs

@@ -2,26 +2,98 @@
 
 namespace ProjectVG.Application.Services.Auth
 {
+    /// <summary>
+    /// OAuth2 인증 플로우 관리 서비스
+    /// Google, GitHub, Microsoft 등의 외부 OAuth2 제공자와의 인증 처리를 담당
+    /// </summary>
     public interface IOAuth2Service
     {
-        Task<string> BuildAuthorizationUrlAsync(string scope, string state, string codeChallenge, string codeChallengeMethod, string codeVerifier, string clientRedirectUri);
+        /// <summary>
+        /// OAuth2 인증 URL 생성 (PKCE 플로우 지원)
+        /// </summary>
+        /// <param name="state">CSRF 보호를 위한 상태값</param>
+        /// <param name="codeChallenge">PKCE code challenge</param>
+        /// <param name="codeChallengeMethod">PKCE challenge 방법 (S256)</param>
+        /// <param name="codeVerifier">PKCE code verifier</param>
+        /// <param name="clientRedirectUri">클라이언트 리다이렉트 URI</param>
+        /// <returns>OAuth2 인증 URL</returns>
+        Task<string> BuildAuthorizationUrlAsync(string state, string codeChallenge, string codeChallengeMethod, string codeVerifier, string clientRedirectUri);
+        
+        /// <summary>
+        /// OAuth2 콜백 처리 (인증 코드를 토큰으로 교환하고 사용자 로그인 처리)
+        /// </summary>
+        /// <param name="code">인증 코드</param>
+        /// <param name="state">상태값</param>
+        /// <returns>콜백 처리 결과</returns>
         Task<OAuth2CallbackResult> HandleOAuth2CallbackAsync(string code, string state);
+
+        /// <summary>
+        /// 상태값으로 저장된 OAuth2 토큰 데이터 조회
+        /// </summary>
+        /// <param name="state">상태값</param>
+        /// <returns>토큰 데이터 (없으면 null)</returns>
         Task<OAuth2TokenData?> GetTokenDataAsync(string state);
+
+        /// <summary>
+        /// OAuth2 토큰 데이터 삭제 (사용 후 정리)
+        /// </summary>
+        /// <param name="state">삭제할 토큰 데이터의 상태값</param>
         Task DeleteTokenDataAsync(string state);
+
+        /// <summary>
+        /// OAuth2 인증 코드를 액세스 토큰으로 교환
+        /// </summary>
+        /// <param name="code">인증 코드</param>
+        /// <param name="clientId">클라이언트 ID</param>
+        /// <param name="redirectUri">리다이렉트 URI</param>
+        /// <param name="codeVerifier">PKCE code verifier (선택적)</param>
+        /// <returns>토큰 교환 결과</returns>
         Task<TokenResponse> ExchangeAuthorizationCodeAsync(string code, string clientId, string redirectUri, string codeVerifier = "");
+        
+        /// <summary>
+        /// OAuth2 제공자에서 사용자 정보 조회
+        /// </summary>
+        /// <param name="accessToken">OAuth2 액세스 토큰</param>
+        /// <param name="provider">제공자명 (google, github, microsoft)</param>
+        /// <returns>사용자 정보</returns>
         Task<OAuth2UserInfo> GetUserInfoAsync(string accessToken, string provider);
+        
+        /// <summary>
+        /// OAuth2 요청 정보 저장 (임시 저장소)
+        /// </summary>
+        /// <param name="state">상태값</param>
+        /// <param name="request">OAuth2 요청 정보</param>
+        /// <returns>저장된 요청 정보</returns>
         Task<OAuth2AuthRequest> StoreOAuth2RequestAsync(string state, OAuth2AuthRequest request);
+        
+        /// <summary>
+        /// 저장된 OAuth2 요청 정보 조회
+        /// </summary>
+        /// <param name="state">상태값</param>
+        /// <returns>요청 정보 (없으면 null)</returns>
         Task<OAuth2AuthRequest?> GetOAuth2RequestAsync(string state);
+        
+        /// <summary>
+        /// OAuth2 요청 정보 삭제 (사용 후 정리)
+        /// </summary>
+        /// <param name="state">삭제할 요청의 상태값</param>
         Task DeleteOAuth2RequestAsync(string state);
+        
+        /// <summary>
+        /// 토큰 데이터를 상태값과 함께 임시 저장
+        /// </summary>
+        /// <param name="state">상태값</param>
+        /// <param name="tokenData">저장할 토큰 데이터</param>
         Task StoreTokenDataAsync(string state, object tokenData);
     }
 
+    /// <summary>
+    /// OAuth2 제공자에서 가져온 사용자 정보
+    /// </summary>
     public class OAuth2UserInfo
     {
         public string Id { get; set; } = string.Empty;
         public string Email { get; set; } = string.Empty;
-        public string Name { get; set; } = string.Empty;
-        public string? Picture { get; set; }
         public string Provider { get; set; } = string.Empty;
     }
 }