fix(oauth, unlock): 구글 oauth 로그인 취소 시, 리다이렉트 주소 수정 및 근처 공개 캡슐 응답 dto 필드 수정

fix(oauth, unlock): 구글 oauth 로그인 취소 시, 리다이렉트 주소 수정 및 근처 공개 캡슐 응답 dto 필드 수정

Author: Hyeseung-OH

src/main/java/back/fcz/domain/backup/controller/BackupController.java

@@ -58,10 +58,24 @@ public ResponseEntity<ApiResponse<GoogleDriveConnectionResponse>> capsuleBackup(
                     "백엔드 서버는 인가 코드를 이용해 연동 토큰을 DB에 저장한 뒤, 프론트엔드 대시보드 페이지로 리다이렉트 합니다.")
     @GetMapping("/connect/callback")
     public void callback(
-            @RequestParam String code,
+            @RequestParam(required = false) String code,
+            @RequestParam(required = false) String error,
             @AuthenticationPrincipal Long memberId,
             HttpServletResponse response
     ) throws IOException {
+
+        // 사용자가 권한 허용 취소한 경우
+        if ("access_denied".equals(error)) {
+            response.sendRedirect(frontendDomain + "/dashboard/receive");
+            return;
+        }
+
+        // 에러가 있는 경우
+        if (error != null) {
+            response.sendRedirect(frontendDomain + "/dashboard/receive");
+            return;
+        }
+
         backupService.saveGoogleToken(memberId, code);
         response.sendRedirect(frontendDomain + "/dashboard");
     }

src/main/java/back/fcz/domain/unlock/dto/response/NearbyOpenCapsuleResponse.java

@@ -14,6 +14,8 @@ public record NearbyOpenCapsuleResponse(
         String capsuleUnlockType,
         double capsuleLatitude,
         double capsuleLongitude,
+        LocalDateTime capsuleUnlockAt,
+        LocalDateTime capsuleUnlockUntil,
 
         int maxViewCount,         // 선착순 제한 인원(NULL이면 무제한)
         int currentViewCount,     // 현재 조회 인원
@@ -35,6 +37,8 @@ public NearbyOpenCapsuleResponse(Capsule capsule, double distanceToCapsule, bool
                 capsule.getUnlockType(),
                 capsule.getLocationLat(),
                 capsule.getLocationLng(),
+                capsule.getUnlockAt(),
+                capsule.getUnlockUntil(),
 
                 capsule.getMaxViewCount(),
                 capsule.getCurrentViewCount(),

src/main/java/back/fcz/global/security/SecurityConfig.java

@@ -6,6 +6,7 @@
 import back.fcz.global.security.filter.JwtAuthenticationFilter;
 import back.fcz.global.security.oauth.GoogleOAuth2SuccessHandler;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpMethod;
@@ -29,6 +30,9 @@ public class SecurityConfig {
     private final GoogleOAuth2SuccessHandler googleOAuth2SuccessHandler;
     private final CustomAuthenticationEntryPoint customAuthenticationEntryPoint;
 
+    @Value("${cors.allowed-origins}")
+    private String frontendDomain;
+
     private static final String[] SWAGGER_WHITELIST = {
             "/v3/api-docs/**",
             "/swagger-ui/**",
@@ -91,6 +95,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
                 .oauth2Login(oauth2 -> oauth2
                         .userInfoEndpoint(userInfo -> userInfo.userService(googleOAuth2Service))
                         .successHandler(googleOAuth2SuccessHandler)
+                        .failureUrl(frontendDomain + "/auth/login")
                 )
                 .exceptionHandling(exception -> exception
                         .authenticationEntryPoint(customAuthenticationEntryPoint)