Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 9 additions & 2 deletions src/main/java/umc/codeplay/controller/AuthController.java
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,14 @@ public ApiResponse<MemberResponseDTO.LoginResultDTO> login(
String token = jwtUtil.generateToken(authentication.getName(), authorities);
String refreshToken =
jwtUtil.generateRefreshToken(authentication.getName(), authorities);
String profileImage = memberService.getMemberProfileImage(request.getEmail());

return ApiResponse.onSuccess(
MemberConverter.toLoginResultDTO(
request.getEmail(), token, refreshToken)); // 예시로 토큰만 문자열로 반환
request.getEmail(),
profileImage,
token,
refreshToken)); // 예시로 토큰만 문자열로 반환
} catch (Exception e) {
throw new GeneralHandler(ErrorStatus.ID_OR_PASSWORD_WRONG);
}
Expand Down Expand Up @@ -113,9 +118,11 @@ public ApiResponse<MemberResponseDTO.LoginResultDTO> refresh(

// 새로운 액세스 토큰 생성
String newAccessToken = jwtUtil.generateToken(usernameFromToken, authorities);
String profileImage = memberService.getMemberProfileImage(email);

return ApiResponse.onSuccess(
MemberConverter.toLoginResultDTO(usernameFromToken, newAccessToken, null));
MemberConverter.toLoginResultDTO(
usernameFromToken, profileImage, newAccessToken, null));
} else {
throw new GeneralHandler(ErrorStatus.INVALID_REFRESH_TOKEN);
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/umc/codeplay/converter/MemberConverter.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,11 @@ public static MemberResponseDTO.JoinResultDTO toJoinResultDTO(Member member) {
}

public static MemberResponseDTO.LoginResultDTO toLoginResultDTO(
String email, String token, String refreshToken) {
String email, String profileUrl, String token, String refreshToken) {

return MemberResponseDTO.LoginResultDTO.builder()
.email(email)
.profileUrl(profileUrl)
.token(token)
.refreshToken(refreshToken)
.build();
Expand Down
1 change: 1 addition & 0 deletions src/main/java/umc/codeplay/dto/MemberResponseDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public static class JoinResultDTO {
@AllArgsConstructor
public static class LoginResultDTO {
String email;
String profileUrl;
String token;
String refreshToken;
}
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/umc/codeplay/service/MemberService.java
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,13 @@ public class MemberService {
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
private static final SecureRandom RANDOM = new SecureRandom();

public String getMemberProfileImage(String email) {
return memberRepository
.findByEmail(email)
.orElseThrow(() -> new GeneralHandler(ErrorStatus.MEMBER_NOT_FOUND))
.getProfileUrl();
}

public Member joinMember(MemberRequestDTO.JoinDto request) {

if (memberRepository.findByEmail(request.getEmail()).isPresent()) {
Expand Down