From cc7a62c5290eb87fb954e1222046e715717901af Mon Sep 17 00:00:00 2001 From: gwony Date: Sat, 4 Oct 2025 02:31:56 +0900 Subject: [PATCH] =?UTF-8?q?Bug:=20TD-31=20=ED=9A=8C=EC=9B=90=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=9A=94=EC=B2=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/service/Impl/MemberServiceImpl.java | 15 +++++++-------- .../twogether/global/config/SecurityConfig.java | 7 ++----- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/yeoro/twogether/domain/member/service/Impl/MemberServiceImpl.java b/src/main/java/com/yeoro/twogether/domain/member/service/Impl/MemberServiceImpl.java index 0f69b11..bbfa90b 100644 --- a/src/main/java/com/yeoro/twogether/domain/member/service/Impl/MemberServiceImpl.java +++ b/src/main/java/com/yeoro/twogether/domain/member/service/Impl/MemberServiceImpl.java @@ -289,7 +289,7 @@ public Long findOrCreateMember(OauthProfile profile, LoginPlatform loginPlatform @Override @Transactional(readOnly = true) public Member getCurrentMember(Long memberId) { - return memberRepository.findById(memberId) + return memberRepository.findByIdWithPartner(memberId) .orElseThrow(() -> new ServiceException(ErrorCode.MEMBER_NOT_FOUND)); } @@ -515,14 +515,17 @@ public LoginResponse kakaoLogin(String accessToken, HttpServletRequest request, /** * 중복된 JWT 발급 및 LoginResponse 생성을 처리하는 공통 메서드 */ + @Transactional(readOnly = true) private LoginResponse createLoginResponse(Long memberId, HttpServletRequest request, HttpServletResponse response) { - Member me = memberRepository.findById(memberId) + Member me = memberRepository.findByIdWithPartner(memberId) .orElseThrow(() -> new ServiceException(MEMBER_NOT_FOUND)); Member partner = me.getPartner(); Long partnerId = (partner != null) ? partner.getId() : null; + String partnerName = (partner != null) ? partner.getName() : null; + String partnerNickname = (partner != null) ? partner.getNickname() : null; // 토큰 TokenPair tokenPair = tokenService.createTokenPair( @@ -535,12 +538,9 @@ private LoginResponse createLoginResponse(Long memberId, tokenService.sendTokensToClient(request, response, tokenPair); tokenService.storeRefreshTokenInRedis(memberId, tokenPair.getRefreshToken()); - // + // 나의 정보 String name = me.getName(); - String myNickname = me.getNickname(); // 파트너가 '나'에게 준 애칭 - String partnerName = (partner != null) ? partner.getName() : null; - String partnerNickname = (partner != null) ? partner.getNickname() : null; - + String myNickname = me.getNickname(); LocalDate relationshipStartDate = me.getRelationshipStartDate(); return LoginResponse.of( @@ -555,7 +555,6 @@ private LoginResponse createLoginResponse(Long memberId, ); } - public LoginResponse privateCreateLoginResponse(Long memberId, HttpServletRequest request, HttpServletResponse response) { diff --git a/src/main/java/com/yeoro/twogether/global/config/SecurityConfig.java b/src/main/java/com/yeoro/twogether/global/config/SecurityConfig.java index c140026..881a1d9 100644 --- a/src/main/java/com/yeoro/twogether/global/config/SecurityConfig.java +++ b/src/main/java/com/yeoro/twogether/global/config/SecurityConfig.java @@ -1,7 +1,6 @@ package com.yeoro.twogether.global.config; import com.yeoro.twogether.global.filter.JwtAuthenticationFilter; -import java.util.Arrays; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -19,6 +18,8 @@ import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; +import java.util.Arrays; + @Configuration @EnableWebSecurity public class SecurityConfig { @@ -26,9 +27,6 @@ public class SecurityConfig { @Value("${custom.site.frontUrl}") private String frontUrl; - @Value("${custom.site.vercelUrl}") - private String vercelUrl; - private final JwtAuthenticationFilter jwtAuthenticationFilter; public SecurityConfig(JwtAuthenticationFilter jwtAuthenticationFilter) { @@ -79,7 +77,6 @@ public UrlBasedCorsConfigurationSource corsConfigurationSource() { configuration.setAllowedOrigins( Arrays.asList( frontUrl, - vercelUrl, "http://localhost:3000", "https://localhost:3000", "https://localhost",