From 7f31cd29a525cc7af165d43ce24981a5c2ebec60 Mon Sep 17 00:00:00 2001 From: Anna-Jin Date: Fri, 22 Jul 2022 22:44:54 +0900 Subject: [PATCH] =?UTF-8?q?#18=20[Update]=20=EC=BD=94=EB=93=9C=20=EB=A6=AC?= =?UTF-8?q?=ED=8C=A9=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mpnp/baechelin/exception/ErrorCode.java | 6 +++--- .../login/oauth/service/CustomOAuth2UserService.java | 2 +- .../store/service/UserRegisterStoreService.java | 4 ++-- .../com/mpnp/baechelin/user/service/UserService.java | 9 ++++++++- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/mpnp/baechelin/exception/ErrorCode.java b/src/main/java/com/mpnp/baechelin/exception/ErrorCode.java index 13d12ca..0b32641 100644 --- a/src/main/java/com/mpnp/baechelin/exception/ErrorCode.java +++ b/src/main/java/com/mpnp/baechelin/exception/ErrorCode.java @@ -16,10 +16,10 @@ public enum ErrorCode { WRONG_TYPE_SIGNATURE(401, "E-WTS401", "잘못된 JWT 서명입니다."), ACCESS_DENIED(401, "E-ACD401","접근이 거부되었습니다."), TOKEN_NOT_EXIST(401, "E-TNE401", "토큰이 존재하지 않습니다."), - ALREADY_LOGIN_ACCOUNT(400, "E-ALA400","다른 계정으로 로그인 되었습니다."), - + ALREADY_LOGIN_ACCOUNT(400, "E-ALA400","다른 계정으로 회원가입 되었습니다."), + WRONG_INPUT(400, "E_WRI400", "입력 값을 확인해주세요."), API_LOAD_FAILURE(500, "E-ALF500", "API 로딩에 실패하였습니다."), - API_NO_RESULT(500, "E-ALF500", "API 결과가 존재하지 않습니다."), + API_NO_RESULT(500, "E-ANR500", "API 결과가 존재하지 않습니다."), NULL_POINTER_EXCEPTION(500, "E-NPE500", "빈 값이 들어올 수 없습니다."); diff --git a/src/main/java/com/mpnp/baechelin/login/oauth/service/CustomOAuth2UserService.java b/src/main/java/com/mpnp/baechelin/login/oauth/service/CustomOAuth2UserService.java index fecee38..7bcfffa 100644 --- a/src/main/java/com/mpnp/baechelin/login/oauth/service/CustomOAuth2UserService.java +++ b/src/main/java/com/mpnp/baechelin/login/oauth/service/CustomOAuth2UserService.java @@ -61,7 +61,7 @@ private OAuth2User process(OAuth2UserRequest userRequest, OAuth2User user) { if (savedUser != null) { // DB에 유저 정보가 있을 때 if (providerType != savedUser.getProviderType()) { - throw new OAuthProviderMissMatchException(ErrorCode.ALREADY_LOGIN_ACCOUNT.getCode() + "," + providerType); + throw new OAuthProviderMissMatchException(ErrorCode.ALREADY_LOGIN_ACCOUNT.getCode() + "&provider_type=" + savedUser.getProviderType()); } updateUser(savedUser, userInfo); } else { diff --git a/src/main/java/com/mpnp/baechelin/store/service/UserRegisterStoreService.java b/src/main/java/com/mpnp/baechelin/store/service/UserRegisterStoreService.java index b04341e..2ac224a 100644 --- a/src/main/java/com/mpnp/baechelin/store/service/UserRegisterStoreService.java +++ b/src/main/java/com/mpnp/baechelin/store/service/UserRegisterStoreService.java @@ -29,8 +29,8 @@ public class UserRegisterStoreService { /** * 유저 업장 등록 - * @param userRegisterStoreRequestDto - * @param socialId + * @param userRegisterStoreRequestDto 유저가 등록한 업장 정보가 담겨있는 DTO + * @param socialId 유저 소셜 아이디 */ public void registerStore(UserRegisterStoreRequestDto userRegisterStoreRequestDto, String socialId) { User user = userRepository.findBySocialId(socialId); diff --git a/src/main/java/com/mpnp/baechelin/user/service/UserService.java b/src/main/java/com/mpnp/baechelin/user/service/UserService.java index f0515c9..6195b9f 100644 --- a/src/main/java/com/mpnp/baechelin/user/service/UserService.java +++ b/src/main/java/com/mpnp/baechelin/user/service/UserService.java @@ -1,10 +1,13 @@ package com.mpnp.baechelin.user.service; +import com.mpnp.baechelin.login.jwt.AuthToken; +import com.mpnp.baechelin.login.jwt.AuthTokenProvider; import com.mpnp.baechelin.login.jwt.repository.UserRefreshTokenRepository; import com.mpnp.baechelin.user.domain.User; import com.mpnp.baechelin.user.dto.UserResponseDto; import com.mpnp.baechelin.user.repository.UserRepository; import com.mpnp.baechelin.util.CookieUtil; +import com.mpnp.baechelin.util.HeaderUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -18,10 +21,14 @@ public class UserService { private final UserRepository userRepository; private final UserRefreshTokenRepository userRefreshTokenRepository; + private final AuthTokenProvider tokenProvider; public void logout(HttpServletRequest request, HttpServletResponse response, String socialId) { - userRefreshTokenRepository.deleteBySocialId(socialId); + // Cookie에 담겨있는 refresh token 삭제 CookieUtil.deleteCookie(request, response, "refresh_token"); + + // DB에 저장되어 있는 refresh token 삭제 + userRefreshTokenRepository.deleteBySocialId(socialId); } public UserResponseDto getUserInfo(String socialId) {