Skip to content

Bug: TD-31 회원 정보 요청 #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
M00NPANG merged 1 commit into from
Oct 3, 2025
Merged

Bug: TD-31 회원 정보 요청 #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions src/main/java/com/yeoro/twogether/domain/member/service/Impl/MemberServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand Down Expand Up @@ -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(
Expand All @@ -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(
Expand All @@ -555,7 +555,6 @@ private LoginResponse createLoginResponse(Long memberId,
);
}


public LoginResponse privateCreateLoginResponse(Long memberId,
HttpServletRequest request,
HttpServletResponse response) {
Expand Down
7 changes: 2 additions & 5 deletions src/main/java/com/yeoro/twogether/global/config/SecurityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -19,16 +18,15 @@
import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;

import java.util.Arrays;

@Configuration
@EnableWebSecurity
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) {
Expand Down Expand Up @@ -79,7 +77,6 @@ public UrlBasedCorsConfigurationSource corsConfigurationSource() {
configuration.setAllowedOrigins(
Arrays.asList(
frontUrl,
vercelUrl,
"http://localhost:3000",
"https://localhost:3000",
"https://localhost",
Expand Down