🚀 :: Api-v0.0.2-3

Gosrock · Jan 11, 2023 · f01ef86 · f01ef86
2 parents f47338f + 5ca479e
commit f01ef86
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 13 deletions.
diff --git a/DuDoong-Api/src/main/java/band/gosrock/api/auth/controller/AuthController.java b/DuDoong-Api/src/main/java/band/gosrock/api/auth/controller/AuthController.java
@@ -4,6 +4,7 @@
 import band.gosrock.api.auth.model.dto.request.RegisterRequest;
 import band.gosrock.api.auth.model.dto.response.AvailableRegisterResponse;
 import band.gosrock.api.auth.model.dto.response.OauthLoginLinkResponse;
+import band.gosrock.api.auth.model.dto.response.OauthTokenResponse;
 import band.gosrock.api.auth.model.dto.response.OauthUserInfoResponse;
 import band.gosrock.api.auth.model.dto.response.TokenAndUserResponse;
 import band.gosrock.api.auth.service.LoginUseCase;
@@ -13,7 +14,6 @@
 import band.gosrock.api.auth.service.RegisterUseCase;
 import band.gosrock.api.auth.service.WithDrawUseCase;
 import band.gosrock.common.annotation.DevelopOnlyApi;
-import band.gosrock.infrastructure.outer.api.oauth.dto.OauthTokenResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -64,8 +64,10 @@ public OauthLoginLinkResponse getKakaoOauthLink(
     @Operation(summary = "code 요청받는 핸들러 클라이언트가 몰라도됩니다.", deprecated = true)
     @Tag(name = "카카오 oauth")
     @GetMapping("/oauth/kakao")
-    public OauthTokenResponse getCredentialFromKaKao(@RequestParam("code") String code) {
-        return registerUseCase.getCredentialFromKaKao(code);
+    public OauthTokenResponse getCredentialFromKaKao(
+            @RequestParam("code") String code,
+            @RequestHeader(value = "referer", required = false) String referer) {
+        return registerUseCase.getCredentialFromKaKao(code, referer);
     }
 
     @Operation(summary = "개발용 회원가입입니다 클라이언트가 몰라도 됩니다.", deprecated = true)

diff --git a/DuDoong-Api/src/main/java/band/gosrock/api/auth/model/dto/response/OauthTokenResponse.java b/DuDoong-Api/src/main/java/band/gosrock/api/auth/model/dto/response/OauthTokenResponse.java
@@ -0,0 +1,22 @@
+package band.gosrock.api.auth.model.dto.response;
+
+
+import band.gosrock.infrastructure.outer.api.oauth.dto.KakaoTokenResponse;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder
+public class OauthTokenResponse {
+    private String accessToken;
+    private String refreshToken;
+    private String idToken;
+
+    public static OauthTokenResponse from(KakaoTokenResponse kakaoTokenResponse) {
+        return OauthTokenResponse.builder()
+                .idToken(kakaoTokenResponse.getIdToken())
+                .refreshToken(kakaoTokenResponse.getRefreshToken())
+                .accessToken(kakaoTokenResponse.getAccessToken())
+                .build();
+    }
+}
diff --git a/DuDoong-Api/src/main/java/band/gosrock/api/auth/service/RegisterUseCase.java b/DuDoong-Api/src/main/java/band/gosrock/api/auth/service/RegisterUseCase.java
@@ -5,6 +5,7 @@
 import band.gosrock.api.auth.model.dto.request.RegisterRequest;
 import band.gosrock.api.auth.model.dto.response.AvailableRegisterResponse;
 import band.gosrock.api.auth.model.dto.response.OauthLoginLinkResponse;
+import band.gosrock.api.auth.model.dto.response.OauthTokenResponse;
 import band.gosrock.api.auth.model.dto.response.TokenAndUserResponse;
 import band.gosrock.api.auth.service.helper.KakaoOauthHelper;
 import band.gosrock.api.auth.service.helper.TokenGenerateHelper;
@@ -13,7 +14,6 @@
 import band.gosrock.domain.domains.user.domain.Profile;
 import band.gosrock.domain.domains.user.domain.User;
 import band.gosrock.domain.domains.user.service.UserDomainService;
-import band.gosrock.infrastructure.outer.api.oauth.dto.OauthTokenResponse;
 import lombok.RequiredArgsConstructor;
 
 @UseCase
@@ -39,7 +39,7 @@ public OauthLoginLinkResponse getKaKaoOauthLink(String referer) {
      * @return
      */
     public TokenAndUserResponse upsertKakaoOauthUser(String code) {
-        String oauthAccessToken = kakaoOauthHelper.getOauthToken(code).getAccessToken();
+        String oauthAccessToken = kakaoOauthHelper.getOauthTokenTest(code).getAccessToken();
         KakaoUserInfoDto oauthUserInfo = kakaoOauthHelper.getUserInfo(oauthAccessToken);
 
         Profile profile = oauthUserInfo.toProfile();
@@ -62,7 +62,13 @@ public TokenAndUserResponse registerUserByOCIDToken(
         return tokenGenerateHelper.execute(user);
     }
 
-    public OauthTokenResponse getCredentialFromKaKao(String code) {
-        return kakaoOauthHelper.getOauthToken(code);
+    public OauthTokenResponse getCredentialFromKaKao(String code, String referer) {
+
+        return OauthTokenResponse.from(kakaoOauthHelper.getOauthToken(code, referer));
+    }
+
+    public OauthTokenResponse getCredentialFromKaKaoTest(String code) {
+
+        return OauthTokenResponse.from(kakaoOauthHelper.getOauthTokenTest(code));
     }
 }
diff --git a/DuDoong-Api/src/main/java/band/gosrock/api/auth/service/helper/KakaoOauthHelper.java b/DuDoong-Api/src/main/java/band/gosrock/api/auth/service/helper/KakaoOauthHelper.java
@@ -12,8 +12,8 @@
 import band.gosrock.infrastructure.outer.api.oauth.client.KakaoInfoClient;
 import band.gosrock.infrastructure.outer.api.oauth.client.KakaoOauthClient;
 import band.gosrock.infrastructure.outer.api.oauth.dto.KakaoInformationResponse;
+import band.gosrock.infrastructure.outer.api.oauth.dto.KakaoTokenResponse;
 import band.gosrock.infrastructure.outer.api.oauth.dto.OIDCPublicKeysResponse;
-import band.gosrock.infrastructure.outer.api.oauth.dto.OauthTokenResponse;
 import band.gosrock.infrastructure.outer.api.oauth.dto.UnlinkKaKaoTarget;
 import lombok.RequiredArgsConstructor;
 
@@ -43,7 +43,16 @@ public String getKaKaoOauthLink(String referer) {
                         referer + "kakao/callback");
     }
 
-    public OauthTokenResponse getOauthToken(String code) {
+    public KakaoTokenResponse getOauthToken(String code, String referer) {
+
+        return kakaoOauthClient.kakaoAuth(
+                oauthProperties.getKakaoClientId(),
+                referer + "kakao/callback",
+                code,
+                oauthProperties.getKakaoClientSecret());
+    }
+
+    public KakaoTokenResponse getOauthTokenTest(String code) {
 
         return kakaoOauthClient.kakaoAuth(
                 oauthProperties.getKakaoClientId(),

diff --git a/...re/src/main/java/band/gosrock/infrastructure/outer/api/oauth/client/KakaoOauthClient.java b/...re/src/main/java/band/gosrock/infrastructure/outer/api/oauth/client/KakaoOauthClient.java
@@ -2,8 +2,8 @@
 
 
 import band.gosrock.infrastructure.outer.api.oauth.config.FeignOauthConfig;
+import band.gosrock.infrastructure.outer.api.oauth.dto.KakaoTokenResponse;
 import band.gosrock.infrastructure.outer.api.oauth.dto.OIDCPublicKeysResponse;
-import band.gosrock.infrastructure.outer.api.oauth.dto.OauthTokenResponse;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -18,7 +18,7 @@ public interface KakaoOauthClient {
 
     @PostMapping(
             "/oauth/token?grant_type=authorization_code&client_id={CLIENT_ID}&redirect_uri={REDIRECT_URI}&code={CODE}&client_secret={CLIENT_SECRET}")
-    OauthTokenResponse kakaoAuth(
+    KakaoTokenResponse kakaoAuth(
             @PathVariable("CLIENT_ID") String clientId,
             @PathVariable("REDIRECT_URI") String redirectUri,
             @PathVariable("CODE") String code,

diff --git a/...ter/api/oauth/dto/OauthTokenResponse.java → ...ter/api/oauth/dto/KakaoTokenResponse.java b/...ter/api/oauth/dto/OauthTokenResponse.java → ...ter/api/oauth/dto/KakaoTokenResponse.java
@@ -9,7 +9,7 @@
 @Getter
 @NoArgsConstructor
 @JsonNaming(SnakeCaseStrategy.class)
-public class OauthTokenResponse {
+public class KakaoTokenResponse {
     private String accessToken;
     private String refreshToken;
     private String idToken;

diff --git a/DuDoong-Infrastructure/src/main/resources/application-infrastructure.yml b/DuDoong-Infrastructure/src/main/resources/application-infrastructure.yml
@@ -25,7 +25,9 @@ spring:
   config:
     activate:
       on-profile: staging
-
+logging:
+  level:
+    band.gosrock.infrastructure.outer.api.* : debug
 ---
 spring:
   config: