feat: #11 Controller flow 구상

KCY-Fit-a-Pet · Dec 23, 2023 · 255bf66 · 255bf66
1 parent 1c1af45
commit 255bf66
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 7 deletions.
diff --git a/src/main/java/com/kcy/fitapet/domain/member/api/AuthApi.java b/src/main/java/com/kcy/fitapet/domain/member/api/AuthApi.java
@@ -194,8 +194,6 @@ public ResponseEntity<?> refresh(@CookieValue("refreshToken") @Valid String refr
      * @return ResponseEntity<?>
      */
     private ResponseEntity<?> getResponseEntity(Map<String, String> tokens) {
-        log.debug("access token: {}", tokens.get(ACCESS_TOKEN.getValue()));
-        log.debug("refresh token: {}", tokens.get(REFRESH_TOKEN.getValue()));
         ResponseCookie cookie = cookieUtil.createCookie(REFRESH_TOKEN.getValue(), tokens.get(REFRESH_TOKEN.getValue()), 60 * 60 * 24 * 7);
 
         return ResponseEntity.ok()

diff --git a/src/main/java/com/kcy/fitapet/domain/oauth/api/OauthApi.java b/src/main/java/com/kcy/fitapet/domain/oauth/api/OauthApi.java
@@ -4,45 +4,84 @@
 import com.kcy.fitapet.domain.oauth.dto.OauthSignUpReq;
 import com.kcy.fitapet.domain.oauth.service.component.OauthService;
 import com.kcy.fitapet.domain.oauth.type.ProviderType;
+import com.kcy.fitapet.global.common.response.SuccessResponse;
+import com.kcy.fitapet.global.common.security.jwt.dto.Jwt;
+import com.kcy.fitapet.global.common.util.cookie.CookieUtil;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.hc.core5.http.HttpStatus;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.ResponseCookie;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Map;
+
+import static com.kcy.fitapet.global.common.security.jwt.AuthConstants.*;
+import static com.kcy.fitapet.global.common.security.jwt.AuthConstants.ACCESS_TOKEN;
+
 @Tag(name = "OAuth API")
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/v1/auth/oauth")
 @Slf4j
 public class OauthApi {
     private final OauthService oAuthService;
+    private final CookieUtil cookieUtil;
 
+    @Operation(summary = "OAuth 로그인")
+    @Parameters({
+            @Parameter(name = "provider", description = "OAuth 제공자"),
+            @Parameter(name = "req", description = "OAuth 로그인 요청 정보")
+    })
     @PostMapping("")
     @PreAuthorize("isAnonymous()")
-    public void signIn(
+    public ResponseEntity<?> signIn(
             @RequestParam("provider") ProviderType provider,
             @RequestBody @Valid OauthSignInReq req
     ) {
+        Jwt jwt = null;
         if (ProviderType.NAVER.equals(provider)) {
-
+            return null;
         } else {
-
+            jwt = oAuthService.signInByOIDC(req.id(), req.id_token(), provider, req.nonce());
         }
+
+        return (jwt == null)
+                ? ResponseEntity.ok(SuccessResponse.from(Map.of("id", req.id())))
+                : getResponseEntity(jwt);
     }
 
     @PostMapping("/{id}")
     @PreAuthorize("isAnonymous()")
-    public void signUp(
+    public ResponseEntity<?> signUp(
             @PathVariable("id") Long id,
             @RequestParam("provider") ProviderType provider,
             @RequestBody @Valid OauthSignUpReq req
     ) {
+        Jwt jwt = null;
         if (ProviderType.NAVER.equals(provider)) {
-
+            return null;
         } else {
 
         }
+
+        ResponseCookie cookie = cookieUtil.createCookie(REFRESH_TOKEN.getValue(), jwt.refreshToken(), 60 * 60 * 24 * 7);
+        return getResponseEntity(jwt);
+    }
+
+    private ResponseEntity<?> getResponseEntity(Jwt jwt) {
+        ResponseCookie cookie = cookieUtil.createCookie(REFRESH_TOKEN.getValue(), jwt.refreshToken(), 60 * 60 * 24 * 7);
+
+        return ResponseEntity.ok()
+                .header(HttpHeaders.SET_COOKIE, cookie.toString())
+                .header(ACCESS_TOKEN.getValue(), jwt.accessToken())
+                .body(SuccessResponse.noContent());
     }
 }
diff --git a/src/main/java/com/kcy/fitapet/domain/oauth/dto/OauthSignInReq.java b/src/main/java/com/kcy/fitapet/domain/oauth/dto/OauthSignInReq.java
@@ -1,12 +1,17 @@
 package com.kcy.fitapet.domain.oauth.dto;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
 
+@Schema(description = "Oauth Sign In Request")
 public record OauthSignInReq(
+        @Schema(description = "Member Oauth Id")
         @NotEmpty
         Long id,
+        @Schema(description = "Member Oauth Id Token")
         @NotEmpty
         String id_token,
+        @Schema(description = "Member Oauth Nonce")
         @NotEmpty
         String nonce
 ) {

diff --git a/src/main/java/com/kcy/fitapet/domain/oauth/service/component/OauthService.java b/src/main/java/com/kcy/fitapet/domain/oauth/service/component/OauthService.java
@@ -32,6 +32,7 @@ public class OauthService {
     private final OauthClientHelper oauthClientHelper;
 
     private final JwtUtil jwtUtil;
+
     @Transactional
     public void signUpByOIDC() {
 
@@ -53,6 +54,8 @@ public Jwt signInByOIDC(Long id, String idToken, ProviderType provider, String n
             Member member = oauthSearchService.findMemberByOauthIdAndProvider(id, provider);
             return generateToken(JwtUserInfo.from(member));
         } else {
+            // 1. redis에 {id_token, id} 저장
+            // 2. null 반환 (회원가입 진행)
             return null;
         }
     }