feat/OPS-328 : 확장 프로그램 로그인 메소드 추가 및 데이터 캐싱 메소드 추가.

Kimgooner · Kimgooner · commit 3ff7f94e992c · 2025-09-29T10:09:01.000+09:00
diff --git a/src/main/java/org/tuna/zoopzoop/backend/domain/auth/controller/ApiV1AuthController.java b/src/main/java/org/tuna/zoopzoop/backend/domain/auth/controller/ApiV1AuthController.java
@@ -10,6 +10,8 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.web.bind.annotation.*;
+import org.tuna.zoopzoop.backend.domain.auth.dto.AuthResultData;
+import org.tuna.zoopzoop.backend.domain.auth.entity.AuthResult;
 import org.tuna.zoopzoop.backend.domain.auth.entity.RefreshToken;
 import org.tuna.zoopzoop.backend.domain.auth.service.RefreshTokenService;
 import org.tuna.zoopzoop.backend.domain.member.entity.Member;
@@ -23,6 +25,7 @@
 public class ApiV1AuthController {
     private final JwtUtil jwtUtil;
     private final RefreshTokenService refreshTokenService;
+    private final AuthResult authResult;
 
     /**
      * 사용자 로그아웃 API
@@ -118,4 +121,29 @@ public ResponseEntity<RsData<Void>> refreshToken(
                 .status(HttpStatus.OK)
                 .body(new RsData<>("200", "액세스 토큰을 재발급 했습니다.", null));
     }
+
+    @GetMapping("/result")
+    @Operation(summary = "확장프로그램 백그라운드 풀링 대응 API")
+    public ResponseEntity<RsData<AuthResultData>> pullingResult(
+            @RequestParam String state
+    ) {
+        AuthResultData resultData = authResult.get(state);
+        if(resultData == null) {
+            return ResponseEntity
+                    .status(HttpStatus.NOT_FOUND)
+                    .body(new RsData<>(
+                            "404",
+                            "state에 해당하는 토큰이 준비되지 않았거나, 잘못된 state 입니다.",
+                            null
+                    )
+            );
+        }
+        return ResponseEntity
+                .status(HttpStatus.OK)
+                .body(new RsData<>(
+                        "200",
+                        "토큰이 정상적으로 발급되었습니다.",
+                        resultData
+                ));
+    }
 }
diff --git a/src/main/java/org/tuna/zoopzoop/backend/domain/auth/dto/AuthResultData.java b/src/main/java/org/tuna/zoopzoop/backend/domain/auth/dto/AuthResultData.java
@@ -0,0 +1,19 @@
+package org.tuna.zoopzoop.backend.domain.auth.dto;
+
+public class AuthResultData {
+    private final String accessToken;
+    private final String sessionId;
+
+    public AuthResultData(String accessToken, String sessionId) {
+        this.accessToken = accessToken;
+        this.sessionId = sessionId;
+    }
+
+    public String getAccessToken() {
+        return accessToken;
+    }
+
+    public String getSessionId() {
+        return sessionId;
+    }
+}
diff --git a/src/main/java/org/tuna/zoopzoop/backend/domain/auth/entity/AuthResult.java b/src/main/java/org/tuna/zoopzoop/backend/domain/auth/entity/AuthResult.java
@@ -0,0 +1,23 @@
+package org.tuna.zoopzoop.backend.domain.auth.entity;
+
+import org.springframework.stereotype.Component;
+import org.tuna.zoopzoop.backend.domain.auth.dto.AuthResultData;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+@Component
+public class AuthResult {
+    private final Map<String, AuthResultData> results = new ConcurrentHashMap<>();
+
+    public void put(String state, String accessToken, String sessionId) {
+        results.put(state, new AuthResultData(accessToken, sessionId));
+    }
+
+    public AuthResultData get(String state) {
+        return results.remove(state);
+    }
+
+    public void consume(String state) {
+        results.remove(state);
+    }
+}
diff --git a/src/main/java/org/tuna/zoopzoop/backend/domain/auth/global/CustomOAuth2AuthorizationRequestResolver.java b/src/main/java/org/tuna/zoopzoop/backend/domain/auth/global/CustomOAuth2AuthorizationRequestResolver.java
@@ -1,11 +1,16 @@
 package org.tuna.zoopzoop.backend.domain.auth.global;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
 import org.springframework.security.oauth2.client.web.DefaultOAuth2AuthorizationRequestResolver;
 import org.springframework.security.oauth2.client.web.OAuth2AuthorizationRequestResolver;
 import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest;
 
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+
 public class CustomOAuth2AuthorizationRequestResolver implements OAuth2AuthorizationRequestResolver {
 
     private final OAuth2AuthorizationRequestResolver defaultResolver;
@@ -28,13 +33,25 @@ private OAuth2AuthorizationRequest customize(OAuth2AuthorizationRequest req, Htt
         if (req == null) return null;
 
         String source = request.getParameter("source"); // 로그인 시작 시 전달된 source
-
         OAuth2AuthorizationRequest.Builder builder = OAuth2AuthorizationRequest.from(req);
 
         if ("extension".equals(source)) {
-            // state에 source 정보를 안전하게 포함
-            builder.state("source:extension;" + req.getState());
+            String state = request.getParameter("state");
+            Map<String, String> stateData = new HashMap<>();
+            stateData.put("source", "extension");
+            stateData.put("customState", state);
+            stateData.put("originalState", req.getState());
+
+            try {
+                String encodedState = Base64.getUrlEncoder()
+                        .encodeToString(new ObjectMapper().writeValueAsBytes(stateData));
+                builder.state(encodedState);
+            } catch (Exception e) {
+                e.printStackTrace();
+                return builder.build();
+            }
         }
+
         return builder.build();
     }
 }
diff --git a/src/main/java/org/tuna/zoopzoop/backend/domain/auth/handler/OAuth2SuccessHandler.java b/src/main/java/org/tuna/zoopzoop/backend/domain/auth/handler/OAuth2SuccessHandler.java
@@ -1,5 +1,7 @@
 package org.tuna.zoopzoop.backend.domain.auth.handler;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
@@ -12,6 +14,7 @@
 import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler;
 import org.springframework.stereotype.Component;
+import org.tuna.zoopzoop.backend.domain.auth.entity.AuthResult;
 import org.tuna.zoopzoop.backend.domain.auth.service.RefreshTokenService;
 import org.tuna.zoopzoop.backend.domain.member.entity.Member;
 import org.tuna.zoopzoop.backend.domain.member.repository.MemberRepository;
@@ -21,6 +24,8 @@
 
 import java.io.IOException;
 import java.net.URLEncoder;
+import java.util.Base64;
+import java.util.Map;
 
 @Component
 @RequiredArgsConstructor
@@ -31,6 +36,7 @@ public class OAuth2SuccessHandler extends SimpleUrlAuthenticationSuccessHandler
     private final MemberRepository memberRepository;
     private final MemberService memberService;
     private final RefreshTokenService refreshTokenService;
+    private final AuthResult authResult;
 
     @Value("${front.redirect_domain}")
     private String redirect_domain;
@@ -68,20 +74,26 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
 
         log.info("[OAuth2SuccessHandler] Member: {}, SessionId: {}", member.getId(), sessionId);
 
-        String source = request.getParameter("source");
         String state = request.getParameter("state");
-        log.info("[OAuth2SuccessHandler] Source: {}", source);
-        log.info("[OAuth2SuccessHandler] State: {}", state);
-        boolean isExtension = state != null && state.contains("source:extension");
-
-        // 확장 프로그램에서 로그인 했을 경우.
-        if(isExtension){
-            String redirectUrl = redirect_domain + "/extension/callback"
-                    + "?success=true"
-                    + "&accessToken=" + URLEncoder.encode(accessToken, "UTF-8")
-                    + "&sessionId=" + URLEncoder.encode(sessionId, "UTF-8");
-            response.sendRedirect(redirectUrl);
-            return;
+        if(state != null && state.startsWith("ey")) {
+            Map<String, String> stateData = new ObjectMapper().readValue(
+                    Base64.getUrlDecoder().decode(state),
+                    new TypeReference<Map<String, String>>() {
+                    }
+            );
+
+            String source = stateData.get("source");
+            String customState = stateData.get("customState");
+
+            log.info("[OAuth2SuccessHandler] Source: {}", source);
+            log.info("[OAuth2SuccessHandler] CustomState: {}", customState);
+
+            // 확장 프로그램에서 로그인 했을 경우.
+            if ("extension".equals(source)) {
+                authResult.put(customState, accessToken, sessionId);
+                response.sendRedirect(redirect_domain + "/extension/success");
+                return;
+            }
         }
 
         if ("http://localhost:3000".equals(redirect_domain)) {
diff --git a/src/main/java/org/tuna/zoopzoop/backend/domain/member/controller/ApiV1MemberController.java b/src/main/java/org/tuna/zoopzoop/backend/domain/member/controller/ApiV1MemberController.java
@@ -11,6 +11,7 @@
 import org.tuna.zoopzoop.backend.domain.member.dto.req.ReqBodyForEditMemberName;
 import org.tuna.zoopzoop.backend.domain.member.dto.res.ResBodyForEditMemberName;
 import org.tuna.zoopzoop.backend.domain.member.dto.res.ResBodyForGetMemberInfo;
+import org.tuna.zoopzoop.backend.domain.member.dto.res.ResBodyForGetMemberInfoV2;
 import org.tuna.zoopzoop.backend.domain.member.entity.Member;
 import org.tuna.zoopzoop.backend.domain.member.service.MemberService;
 import org.tuna.zoopzoop.backend.global.rsData.RsData;
@@ -40,7 +41,7 @@ public class ApiV1MemberController {
      */
     @GetMapping("/me")
     @Operation(summary = "사용자 정보 조회")
-    public ResponseEntity<RsData<ResBodyForGetMemberInfo>> getMemberInfo(
+    public ResponseEntity<RsData<ResBodyForGetMemberInfoV2>> getMemberInfo(
             @AuthenticationPrincipal CustomUserDetails userDetails
     ) {
         Member member = userDetails.getMember();
@@ -50,7 +51,7 @@ public ResponseEntity<RsData<ResBodyForGetMemberInfo>> getMemberInfo(
                         new RsData<>(
                                 "200",
                                 "사용자 정보를 조회했습니다.",
-                                new ResBodyForGetMemberInfo(member)
+                                new ResBodyForGetMemberInfoV2(member)
                         )
                 );
     }
diff --git a/src/main/java/org/tuna/zoopzoop/backend/domain/member/dto/res/ResBodyForGetMemberInfo.java b/src/main/java/org/tuna/zoopzoop/backend/domain/member/dto/res/ResBodyForGetMemberInfo.java
@@ -5,14 +5,12 @@
 public record ResBodyForGetMemberInfo(
         Integer id,
         String name,
-//        String email,
         String profileUrl
 ) {
     public ResBodyForGetMemberInfo(Member member){
         this(
                 member.getId(),
                 member.getName(),
-//                member.getEmail(),
                 member.getProfileImageUrl()
         );
     }
diff --git a/src/main/java/org/tuna/zoopzoop/backend/domain/member/dto/res/ResBodyForGetMemberInfoV2.java b/src/main/java/org/tuna/zoopzoop/backend/domain/member/dto/res/ResBodyForGetMemberInfoV2.java
@@ -0,0 +1,19 @@
+package org.tuna.zoopzoop.backend.domain.member.dto.res;
+
+import org.tuna.zoopzoop.backend.domain.member.entity.Member;
+
+public record ResBodyForGetMemberInfoV2(
+        Integer id,
+        String name,
+        String profileUrl,
+        String provider
+) {
+    public ResBodyForGetMemberInfoV2(Member member){
+        this(
+                member.getId(),
+                member.getName(),
+                member.getProfileImageUrl(),
+                member.getProvider().name()
+        );
+    }
+}
