diff --git a/src/main/java/umc/codeplay/controller/OAuthController.java b/src/main/java/umc/codeplay/controller/OAuthController.java index 9564851..2d3acbb 100644 --- a/src/main/java/umc/codeplay/controller/OAuthController.java +++ b/src/main/java/umc/codeplay/controller/OAuthController.java @@ -92,8 +92,8 @@ public ApiResponse OAuthCallback( // (3-b) 카카오 UserInfo Endpoint 로 이메일, 프로필 등 조회 Map kakaoAccount = (Map) userInfo.get("kakao_account"); - Map kakaoProperties = - (Map) userInfo.get("properties"); + // Map kakaoProperties = + // (Map) userInfo.get("properties"); email = (String) kakaoAccount.get("email"); // name = (String) kakaoProperties.get("nickname"); } diff --git a/src/main/java/umc/codeplay/converter/MemberConverter.java b/src/main/java/umc/codeplay/converter/MemberConverter.java index b205e0b..9c27b5d 100644 --- a/src/main/java/umc/codeplay/converter/MemberConverter.java +++ b/src/main/java/umc/codeplay/converter/MemberConverter.java @@ -73,7 +73,7 @@ public MemberResponseDTO.GetMyTrackDTO toGetMyTrackDTO(Track track, Member membe .musicId(track.getMusic().getId()) .musicTitle(track.getTitle()) .createdAt(track.getCreatedAt()) - .bassUrl(track.getBassUrl()) + .vocalUrl(track.getVocalUrl()) .instrumentalUrl(track.getInstrumentalUrl()) .bassUrl(track.getBassUrl()) .drumsUrl(track.getDrumsUrl()) diff --git a/src/main/java/umc/codeplay/service/MemberService.java b/src/main/java/umc/codeplay/service/MemberService.java index 1518ff2..86a8a0f 100644 --- a/src/main/java/umc/codeplay/service/MemberService.java +++ b/src/main/java/umc/codeplay/service/MemberService.java @@ -1,6 +1,7 @@ package umc.codeplay.service; import java.security.InvalidParameterException; +import java.security.SecureRandom; import java.util.List; import java.util.stream.Collectors; import jakarta.transaction.Transactional; @@ -36,6 +37,10 @@ public class MemberService { private final MemberConverter memberConverter; private final TrackRepository trackRepository; + private static final String CHAR_SET = + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; + private static final SecureRandom RANDOM = new SecureRandom(); + public Member joinMember(MemberRequestDTO.JoinDto request) { if (memberRepository.findByEmail(request.getEmail()).isPresent()) { @@ -56,6 +61,7 @@ public Member findOrCreateOAuthMember(String email, SocialStatus socialStatus) { Member.builder() .email(email) .role(Role.USER) + .password(passwordEncoder.encode(generateRandomPassword(10))) .socialStatus(socialStatus) .build(); return memberRepository.save(member); @@ -171,4 +177,13 @@ public boolean newPassword(String email, String newPassword) { memberRepository.save(member); return true; } + + public static String generateRandomPassword(int length) { + StringBuilder sb = new StringBuilder(length); + for (int i = 0; i < length; i++) { + int index = RANDOM.nextInt(CHAR_SET.length()); + sb.append(CHAR_SET.charAt(index)); + } + return sb.toString(); + } }