From e90d854e8def49b9910dcb5cc19c189798add441 Mon Sep 17 00:00:00 2001 From: joowojr Date: Wed, 5 Feb 2025 10:43:38 +0900 Subject: [PATCH 1/8] =?UTF-8?q?CLAP-275=20Refactor:=20=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EC=9D=B8=20response=EC=97=90=20=ED=9A=8C=EC=9B=90=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/dto/auth/response/LoginResponse.java | 6 +----- .../application/mapper/AuthResponseMapper.java | 16 ++-------------- .../application/service/auth/AuthService.java | 4 ++-- 3 files changed, 5 insertions(+), 21 deletions(-) diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/auth/response/LoginResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/auth/response/LoginResponse.java index 87c025dd..ab135c93 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/auth/response/LoginResponse.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/auth/response/LoginResponse.java @@ -1,11 +1,7 @@ package clap.server.adapter.inbound.web.dto.auth.response; -import io.swagger.v3.oas.annotations.media.Schema; - public record LoginResponse( String accessToken, - String refreshToken, - @Schema(description = "회원 정보") - MemberInfoResponse memberInfo + String refreshToken ) {} diff --git a/src/main/java/clap/server/application/mapper/AuthResponseMapper.java b/src/main/java/clap/server/application/mapper/AuthResponseMapper.java index ea7b219b..b423a4ab 100644 --- a/src/main/java/clap/server/application/mapper/AuthResponseMapper.java +++ b/src/main/java/clap/server/application/mapper/AuthResponseMapper.java @@ -11,22 +11,10 @@ private AuthResponseMapper() { throw new IllegalArgumentException(); } - public static LoginResponse toLoginResponse(final String accessToken, final String refreshToken, final Member member) { + public static LoginResponse toLoginResponse(final String accessToken, final String refreshToken) { return new LoginResponse( accessToken, - refreshToken, - toMemberInfoResponse(member) - ); - } - - public static MemberInfoResponse toMemberInfoResponse(Member member) { - return new MemberInfoResponse( - member.getMemberId(), - member.getMemberInfo().getName(), - member.getMemberInfo().getNickname(), - member.getImageUrl(), - member.getMemberInfo().getRole(), - member.getStatus() + refreshToken ); } diff --git a/src/main/java/clap/server/application/service/auth/AuthService.java b/src/main/java/clap/server/application/service/auth/AuthService.java index 58b6f83b..af265d8f 100644 --- a/src/main/java/clap/server/application/service/auth/AuthService.java +++ b/src/main/java/clap/server/application/service/auth/AuthService.java @@ -41,13 +41,13 @@ public LoginResponse login(String nickname, String password, String clientIp) { if (member.getStatus().equals(MemberStatus.APPROVAL_REQUEST)) { String temporaryToken = manageTokenService.issueTemporaryToken(member.getMemberId()); - return AuthResponseMapper.toLoginResponse(temporaryToken, null, member); + return AuthResponseMapper.toLoginResponse(temporaryToken, null); } CustomJwts jwtTokens = manageTokenService.issueTokens(member); refreshTokenService.saveRefreshToken(manageTokenService.issueRefreshToken(member.getMemberId())); loginAttemptService.resetFailedAttempts(clientIp); - return AuthResponseMapper.toLoginResponse(jwtTokens.accessToken(), jwtTokens.refreshToken(), member); + return AuthResponseMapper.toLoginResponse(jwtTokens.accessToken(), jwtTokens.refreshToken()); } @Override From c032e8300e4f02d09ce6966fad478bf47c14e527 Mon Sep 17 00:00:00 2001 From: joowojr Date: Wed, 5 Feb 2025 11:58:57 +0900 Subject: [PATCH 2/8] =?UTF-8?q?CLAP-275=20Refactor:=20request=20body=20str?= =?UTF-8?q?ing=20=ED=98=95=EC=8B=9D=EC=97=90=EC=84=9C=20dto=EB=A1=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit