From 852f50ec642c5279de54240168e007053ef72abc Mon Sep 17 00:00:00 2001 From: JoJaeHyeon Date: Sat, 9 Mar 2024 15:37:30 +0900 Subject: [PATCH] =?UTF-8?q?refactor=20:=20=EB=A0=88=EC=9D=B4=EC=96=B4=20?= =?UTF-8?q?=EC=97=AD=EC=B0=B8=EC=A1=B0=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4?= =?UTF-8?q?=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lime/domains/auth/api/AuthController.java | 11 ++++++----- .../domains/auth/api/dto/MemberLoginResponse.java | 13 +++++++++++++ .../domains/auth/application/OAuthUserService.java | 6 +++--- .../dto/MemberLoginServiceResponse.java} | 11 ++++------- 4 files changed, 26 insertions(+), 15 deletions(-) create mode 100644 lime-api/src/main/java/com/programmers/lime/domains/auth/api/dto/MemberLoginResponse.java rename lime-api/src/main/java/com/programmers/lime/domains/{member/api/dto/response/MemberLoginResponse.java => auth/application/dto/MemberLoginServiceResponse.java} (57%) diff --git a/lime-api/src/main/java/com/programmers/lime/domains/auth/api/AuthController.java b/lime-api/src/main/java/com/programmers/lime/domains/auth/api/AuthController.java index 0c3302993..1739b587c 100644 --- a/lime-api/src/main/java/com/programmers/lime/domains/auth/api/AuthController.java +++ b/lime-api/src/main/java/com/programmers/lime/domains/auth/api/AuthController.java @@ -9,8 +9,9 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import com.programmers.lime.domains.auth.api.dto.MemberLoginResponse; import com.programmers.lime.domains.auth.application.OAuthUserService; -import com.programmers.lime.domains.member.api.dto.response.MemberLoginResponse; +import com.programmers.lime.domains.auth.application.dto.MemberLoginServiceResponse; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; @@ -26,10 +27,10 @@ public ResponseEntity loginKakao( @RequestParam final String code, HttpServletResponse response ) { - MemberLoginResponse loginResponse = oauthUserService.login(code); - sendRefreshToken(response, loginResponse); + MemberLoginServiceResponse loginServiceResponse = oauthUserService.login(code); + sendRefreshToken(response, loginServiceResponse); - return ResponseEntity.ok(loginResponse); + return ResponseEntity.ok(MemberLoginResponse.from(loginServiceResponse)); } @GetMapping("/join") @@ -39,7 +40,7 @@ public ResponseEntity join(){ private void sendRefreshToken( final HttpServletResponse response, - final MemberLoginResponse loginResponse + final MemberLoginServiceResponse loginResponse ) { final ResponseCookie cookie = ResponseCookie.from("refresh-token", loginResponse.refreshToken()) .maxAge(COOKIE_AGE_SECONDS) diff --git a/lime-api/src/main/java/com/programmers/lime/domains/auth/api/dto/MemberLoginResponse.java b/lime-api/src/main/java/com/programmers/lime/domains/auth/api/dto/MemberLoginResponse.java new file mode 100644 index 000000000..e9ec1d8ab --- /dev/null +++ b/lime-api/src/main/java/com/programmers/lime/domains/auth/api/dto/MemberLoginResponse.java @@ -0,0 +1,13 @@ +package com.programmers.lime.domains.auth.api.dto; + +import com.programmers.lime.domains.auth.application.dto.MemberLoginServiceResponse; + +public record MemberLoginResponse( + Long memberId, + String nickname, + String accessToken +) { + public static MemberLoginResponse from(final MemberLoginServiceResponse response) { + return new MemberLoginResponse(response.memberId(), response.nickname(), response.accessToken()); + } +} diff --git a/lime-api/src/main/java/com/programmers/lime/domains/auth/application/OAuthUserService.java b/lime-api/src/main/java/com/programmers/lime/domains/auth/application/OAuthUserService.java index 26d08316d..170e44a82 100644 --- a/lime-api/src/main/java/com/programmers/lime/domains/auth/application/OAuthUserService.java +++ b/lime-api/src/main/java/com/programmers/lime/domains/auth/application/OAuthUserService.java @@ -4,7 +4,7 @@ import org.springframework.transaction.annotation.Transactional; import com.programmers.lime.domains.auth.api.dto.KakaoMemberResponse; -import com.programmers.lime.domains.member.api.dto.response.MemberLoginResponse; +import com.programmers.lime.domains.auth.application.dto.MemberLoginServiceResponse; import com.programmers.lime.domains.member.domain.Member; import com.programmers.lime.domains.member.domain.vo.SocialType; import com.programmers.lime.domains.member.implementation.MemberAppender; @@ -23,7 +23,7 @@ public class OAuthUserService { private final JwtService jwtService; @Transactional - public MemberLoginResponse login(final String code) { + public MemberLoginServiceResponse login(final String code) { String kakaoAccessToken = kakaoOAuthClient.getAccessToken(code); KakaoMemberResponse response = kakaoOAuthClient.getMemberInfo(kakaoAccessToken); @@ -35,7 +35,7 @@ public MemberLoginResponse login(final String code) { String accessToken = jwtService.generateAccessToken(String.valueOf(foundMember.getId())); String refreshToken = jwtService.generateRefreshToken(); - return MemberLoginResponse.from(foundMember, accessToken, refreshToken); + return MemberLoginServiceResponse.from(foundMember, accessToken, refreshToken); } private Member saveMember(final KakaoMemberResponse response) { diff --git a/lime-api/src/main/java/com/programmers/lime/domains/member/api/dto/response/MemberLoginResponse.java b/lime-api/src/main/java/com/programmers/lime/domains/auth/application/dto/MemberLoginServiceResponse.java similarity index 57% rename from lime-api/src/main/java/com/programmers/lime/domains/member/api/dto/response/MemberLoginResponse.java rename to lime-api/src/main/java/com/programmers/lime/domains/auth/application/dto/MemberLoginServiceResponse.java index e6b02bee3..cd3a4eae6 100644 --- a/lime-api/src/main/java/com/programmers/lime/domains/member/api/dto/response/MemberLoginResponse.java +++ b/lime-api/src/main/java/com/programmers/lime/domains/auth/application/dto/MemberLoginServiceResponse.java @@ -1,22 +1,19 @@ -package com.programmers.lime.domains.member.api.dto.response; +package com.programmers.lime.domains.auth.application.dto; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.programmers.lime.domains.member.domain.Member; -public record MemberLoginResponse( +public record MemberLoginServiceResponse( Long memberId, String nickname, String accessToken, - - @JsonIgnore String refreshToken ) { - public static MemberLoginResponse from( + public static MemberLoginServiceResponse from( final Member member, final String accessToken, final String refreshToken ) { - return new MemberLoginResponse( + return new MemberLoginServiceResponse( member.getId(), member.getNickname(), accessToken,