U-nify
diff --git a/‎src/main/java/com/ureca/unity/domain/auth/dto/OAuthAuthResult.java‎
Lines changed: 6 additions & 0 deletions b/‎src/main/java/com/ureca/unity/domain/auth/dto/OAuthAuthResult.java‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎src/main/java/com/ureca/unity/domain/auth/dto/OAuthTokenInfo.java‎
Lines changed: 7 additions & 0 deletions b/‎src/main/java/com/ureca/unity/domain/auth/dto/OAuthTokenInfo.java‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎src/main/java/com/ureca/unity/domain/auth/mapper/OAuthTokenMapper.java‎
Lines changed: 15 additions & 0 deletions b/‎src/main/java/com/ureca/unity/domain/auth/mapper/OAuthTokenMapper.java‎
Lines changed: 15 additions & 0 deletions
diff --git a/‎src/main/java/com/ureca/unity/domain/auth/model/OAuthToken.java‎
Lines changed: 17 additions & 0 deletions b/‎src/main/java/com/ureca/unity/domain/auth/model/OAuthToken.java‎
Lines changed: 17 additions & 0 deletions
diff --git a/‎src/main/java/com/ureca/unity/domain/auth/service/OAuthServiceImpl.java‎
Lines changed: 70 additions & 42 deletions b/‎src/main/java/com/ureca/unity/domain/auth/service/OAuthServiceImpl.java‎
Lines changed: 70 additions & 42 deletions
diff --git a/‎src/main/java/com/ureca/unity/domain/auth/service/OAuthTokenService.java‎
Lines changed: 11 additions & 0 deletions b/‎src/main/java/com/ureca/unity/domain/auth/service/OAuthTokenService.java‎
Lines changed: 11 additions & 0 deletions
diff --git a/‎src/main/java/com/ureca/unity/domain/auth/service/OAuthTokenServiceImpl.java‎
Lines changed: 34 additions & 0 deletions b/‎src/main/java/com/ureca/unity/domain/auth/service/OAuthTokenServiceImpl.java‎
Lines changed: 34 additions & 0 deletions
diff --git a/‎src/main/java/com/ureca/unity/domain/auth/service/oauth/GoogleOAuthClient.java‎
Lines changed: 31 additions & 8 deletions b/‎src/main/java/com/ureca/unity/domain/auth/service/oauth/GoogleOAuthClient.java‎
Lines changed: 31 additions & 8 deletions
@@ -0,0 +1,6 @@
+package com.ureca.unity.domain.auth.dto;
+
+public record OAuthAuthResult(
+        OAuthUserInfo userInfo,
+        OAuthTokenInfo tokenInfo
+) {}
@@ -0,0 +1,7 @@
+package com.ureca.unity.domain.auth.dto;
+
+public record OAuthTokenInfo(
+        String accessToken,
+        String refreshToken,      // nullable
+        Long expiresInSeconds     // nullable
+) {}
@@ -0,0 +1,15 @@
+package com.ureca.unity.domain.auth.mapper;
+
+import com.ureca.unity.domain.auth.model.OAuthToken;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Optional;
+
+@Mapper
+public interface OAuthTokenMapper {
+    void insert(OAuthToken token);
+    Optional<OAuthToken> findByUserIdAndProvider(@Param("userId") Long userId, @Param("provider") String provider);
+    void deleteByUserId(@Param("userId") Long userId);
+    void deleteByUserIdAndProvider(@Param("userId") Long userId, @Param("provider") String provider);
+}
@@ -0,0 +1,17 @@
+package com.ureca.unity.domain.auth.model;
+
+import lombok.*;
+import java.time.LocalDateTime;
+
+@Getter
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class OAuthToken {
+    private Long id;
+    private Long userId;
+    private String provider;      // google / naver / kakao
+    private String accessToken;
+    private String refreshToken;  // nullable
+    private LocalDateTime expiresAt;    // nullable
+}
@@ -1,18 +1,22 @@
 package com.ureca.unity.domain.auth.service;
 
 import com.ureca.unity.domain.auth.constant.OAuthProvider;
-import com.ureca.unity.domain.auth.dto.OAuthLoginResponse;
-import com.ureca.unity.domain.auth.dto.OAuthLoginResult;
-import com.ureca.unity.domain.auth.dto.OAuthUserInfo;
-import com.ureca.unity.domain.auth.dto.TokenResponse;
+import com.ureca.unity.domain.auth.dto.*;
+import com.ureca.unity.domain.auth.model.OAuthToken;
 import com.ureca.unity.domain.auth.service.oauth.OAuthClient;
 import com.ureca.unity.domain.user.mapper.UserMapper;
 import com.ureca.unity.domain.user.model.User;
 import com.ureca.unity.global.exception.CustomException;
 import com.ureca.unity.global.exception.ErrorCode;
 import com.ureca.unity.global.security.JwtIssuer;
 import lombok.RequiredArgsConstructor;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.util.Map;
 
 @Service
@@ -23,66 +27,90 @@ public class OAuthServiceImpl implements OAuthService {
     private final UserMapper userMapper;
     private final JwtIssuer jwtIssuer;
     private final RefreshTokenService refreshTokenService;
+    private final OAuthTokenService oAuthTokenService;
 
     @Override
     public OAuthLoginResult login(OAuthProvider provider, String authorizationCode) {
-        // 1. OAuthClient 선택
         OAuthClient oAuthClient = oauthClients.get(provider.value());
         if (oAuthClient == null) {
             throw new CustomException(ErrorCode.INVALID_OAUTH_PROVIDER);
         }
 
-        // 2. OAuth 사용자 정보 조회
-        OAuthUserInfo userInfo = oAuthClient.getUserInfo(authorizationCode);
+        OAuthAuthResult auth = oAuthClient.authenticate(authorizationCode);
+        OAuthUserInfo userInfo = auth.userInfo();
+        OAuthTokenInfo tokenInfo = auth.tokenInfo();
 
-        // 3. 사용자 조회
         return userMapper
-                .findByProviderAndProviderId(
-                        userInfo.getProvider(),
-                        userInfo.getProviderId()
-                )
-                .map(existingUser -> createLoginResult(existingUser.getId(), false)
-                )
+                .findByProviderAndProviderId(userInfo.getProvider(), userInfo.getProviderId())
+                .map(u -> createLoginResult(u.getId(), false, provider.value(), tokenInfo))
                 .orElseGet(() ->
-                        userMapper
-                                .findAnyByProviderAndProviderId(userInfo.getProvider(), userInfo.getProviderId())
+                        userMapper.findAnyByProviderAndProviderId(userInfo.getProvider(), userInfo.getProviderId())
                                 .map(anyUser -> {
-                                    // 4-1. 탈퇴 유저면 복구
-                                    if (anyUser.getDeletedAt() != null) {
+                                    boolean wasDeleted = anyUser.getDeletedAt() != null;
+
+                                    if (wasDeleted) {
                                         userMapper.restoreById(
                                                 anyUser.getId(),
                                                 userInfo.getEmail(),
                                                 userInfo.getName()
                                         );
                                     }
-                                    return createLoginResult(anyUser.getId(), false);
+
+                                    // 재가입이면 true, 기존이면 false
+                                    return createLoginResult(anyUser.getId(), wasDeleted, provider.value(), tokenInfo);
+                                })
+                                .orElseGet(() -> {
+                                    User newUser = User.builder()
+                                            .provider(userInfo.getProvider())
+                                            .providerId(userInfo.getProviderId())
+                                            .email(userInfo.getEmail())
+                                            .name(userInfo.getName())
+                                            .role("ROLE_USER")
+                                            .build();
+                                    userMapper.insert(newUser);
+                                    return createLoginResult(newUser.getId(), true, provider.value(), tokenInfo);
                                 })
-                .orElseGet(() -> {
-                    // 4-2. 신규 사용자 생성
-                    User newUser = User.builder()
-                            .provider(userInfo.getProvider())
-                            .providerId(userInfo.getProviderId())
-                            .email(userInfo.getEmail())
-                            .name(userInfo.getName())
-                            .role("ROLE_USER")
-                            .build();
-                    userMapper.insert(newUser);
-                    return createLoginResult(newUser.getId(), true);
-                    })
                 );
     }
-    private OAuthLoginResult createLoginResult(Long userId, boolean requiresOnboarding) {
-        String refreshToken = jwtIssuer.issueRefreshToken(userId);
-        refreshTokenService.saveRefreshToken(userId, refreshToken);
 
-        TokenResponse accessToken = jwtIssuer.issueAccessToken(userId);
+    private OAuthLoginResult createLoginResult(
+            Long userId,
+            boolean requiresOnboarding,
+            String provider,
+            OAuthTokenInfo tokenInfo
+    ) {
+        try {
+            oAuthTokenService.upsert(
+                    OAuthToken.builder()
+                            .userId(userId)
+                            .provider(provider)
+                            .accessToken(tokenInfo.accessToken())
+                            .refreshToken(tokenInfo.refreshToken())
+                            .expiresAt(
+                                    tokenInfo.expiresInSeconds() != null
+                                            ? LocalDateTime.ofInstant(
+                                            Instant.now().plusSeconds(tokenInfo.expiresInSeconds()),
+                                            ZoneId.of("Asia/Seoul")
+                                    )
+                                            : null
+                            )
+                            .build()
+            );
 
-        return new OAuthLoginResult(
-                OAuthLoginResponse.builder()
-                        .token(accessToken)
-                        .requiresOnboarding(requiresOnboarding)
-                        .build(),
-                refreshToken
-        );
+            String refreshToken = jwtIssuer.issueRefreshToken(userId);
+            refreshTokenService.saveRefreshToken(userId, refreshToken);
+
+            TokenResponse accessToken = jwtIssuer.issueAccessToken(userId);
+
+            return new OAuthLoginResult(
+                    OAuthLoginResponse.builder()
+                            .token(accessToken)
+                            .requiresOnboarding(requiresOnboarding)
+                            .build(),
+                    refreshToken
+            );
+        } catch (DataAccessException e) {
+            throw new CustomException(ErrorCode.AUTH_STORAGE_FAILED);
+        }
     }
 }
@@ -0,0 +1,11 @@
+package com.ureca.unity.domain.auth.service;
+
+import com.ureca.unity.domain.auth.model.OAuthToken;
+
+import java.util.Optional;
+
+public interface OAuthTokenService {
+    void upsert(OAuthToken token);
+    Optional<OAuthToken> find(Long userId, String provider);
+    void deleteByUserId(Long userId);
+}
@@ -0,0 +1,34 @@
+package com.ureca.unity.domain.auth.service;
+
+import com.ureca.unity.domain.auth.mapper.OAuthTokenMapper;
+import com.ureca.unity.domain.auth.model.OAuthToken;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Optional;
+
+@Service
+@RequiredArgsConstructor
+public class OAuthTokenServiceImpl implements OAuthTokenService {
+
+    private final OAuthTokenMapper oAuthTokenMapper;
+
+    @Transactional
+    @Override
+    public void upsert(OAuthToken token) {
+        oAuthTokenMapper.deleteByUserIdAndProvider(token.getUserId(), token.getProvider());
+        oAuthTokenMapper.insert(token);
+    }
+
+    @Override
+    public Optional<OAuthToken> find(Long userId, String provider) {
+        return oAuthTokenMapper.findByUserIdAndProvider(userId, provider);
+    }
+
+    @Transactional
+    @Override
+    public void deleteByUserId(Long userId) {
+        oAuthTokenMapper.deleteByUserId(userId);
+    }
+}
@@ -1,7 +1,10 @@
 package com.ureca.unity.domain.auth.service.oauth;
 
+import com.ureca.unity.domain.auth.dto.OAuthAuthResult;
+import com.ureca.unity.domain.auth.dto.OAuthTokenInfo;
 import com.ureca.unity.domain.auth.dto.OAuthUserInfo;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.*;
 import org.springframework.stereotype.Component;
@@ -11,6 +14,7 @@
 
 import java.util.Map;
 
+@Slf4j
 @Component("google")
 @RequiredArgsConstructor
 public class GoogleOAuthClient implements OAuthClient {
@@ -30,15 +34,34 @@ public class GoogleOAuthClient implements OAuthClient {
     @Value("${oauth.google.redirect-uri}")
     private String redirectUri;
 
-    private final RestTemplate restTemplate = new RestTemplate();
+    private final RestTemplate restTemplate;
 
     @Override
-    public OAuthUserInfo getUserInfo(String authorizationCode) {
-        String accessToken = getAccessToken(authorizationCode);
-        return fetchUserInfo(accessToken);
+    public OAuthAuthResult authenticate(String authorizationCode) {
+        Map<String, Object> token = getTokenResponse(authorizationCode); // access/refresh/expires_in
+
+        String accessToken = token.get("access_token").toString();
+        String refreshToken = token.get("refresh_token") != null ? String.valueOf(token.get("refresh_token")) : null;
+        Long expiresIn = null;
+        if (token.get("expires_in") != null) {
+            try {
+                expiresIn = Long.valueOf(String.valueOf(token.get("expires_in")));
+            } catch (NumberFormatException e) {
+                log.warn("Google token response has non-numeric expires_in: {}", token.get("expires_in"));
+                // expires_in 파싱 실패 시 null로 처리
+            }
+        }
+
+        OAuthUserInfo userInfo = fetchUserInfo(accessToken);
+
+        return new OAuthAuthResult(
+                userInfo,
+                new OAuthTokenInfo(accessToken, refreshToken, expiresIn)
+        );
     }
 
-    private String getAccessToken(String code) {
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    private Map<String, Object> getTokenResponse(String code) {
 
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
@@ -50,8 +73,7 @@ private String getAccessToken(String code) {
         body.add("redirect_uri", redirectUri);
         body.add("code", code);
 
-        HttpEntity<MultiValueMap<String, String>> request =
-                new HttpEntity<>(body, headers);
+        HttpEntity<MultiValueMap<String, String>> request = new HttpEntity<>(body, headers);
 
         ResponseEntity<Map> response = restTemplate.exchange(
                 tokenUri,
@@ -64,9 +86,10 @@ private String getAccessToken(String code) {
             throw new IllegalArgumentException("Failed to retrieve Google access token");
         }
 
-        return response.getBody().get("access_token").toString();
+        return (Map<String, Object>) response.getBody();
     }
 
+
     private OAuthUserInfo fetchUserInfo(String accessToken) {
 
         HttpHeaders headers = new HttpHeaders();