Skip to content

Commit 709dfec

Browse files
authored
6차 배포 (#150)
minor fix
2 parents bafeb06 + dbdfcd9 commit 709dfec

3 files changed

Lines changed: 18 additions & 3 deletions

File tree

src/main/java/umc/codeplay/controller/OAuthController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ public ApiResponse<MemberResponseDTO.LoginResultDTO> OAuthCallback(
9292
// (3-b) 카카오 UserInfo Endpoint 로 이메일, 프로필 등 조회
9393
Map<String, Object> kakaoAccount =
9494
(Map<String, Object>) userInfo.get("kakao_account");
95-
Map<String, Object> kakaoProperties =
96-
(Map<String, Object>) userInfo.get("properties");
95+
// Map<String, Object> kakaoProperties =
96+
// (Map<String, Object>) userInfo.get("properties");
9797
email = (String) kakaoAccount.get("email");
9898
// name = (String) kakaoProperties.get("nickname");
9999
}

src/main/java/umc/codeplay/converter/MemberConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public MemberResponseDTO.GetMyTrackDTO toGetMyTrackDTO(Track track, Member membe
7373
.musicId(track.getMusic().getId())
7474
.musicTitle(track.getTitle())
7575
.createdAt(track.getCreatedAt())
76-
.bassUrl(track.getBassUrl())
76+
.vocalUrl(track.getVocalUrl())
7777
.instrumentalUrl(track.getInstrumentalUrl())
7878
.bassUrl(track.getBassUrl())
7979
.drumsUrl(track.getDrumsUrl())

src/main/java/umc/codeplay/service/MemberService.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package umc.codeplay.service;
22

33
import java.security.InvalidParameterException;
4+
import java.security.SecureRandom;
45
import java.util.List;
56
import java.util.stream.Collectors;
67
import jakarta.transaction.Transactional;
@@ -36,6 +37,10 @@ public class MemberService {
3637
private final MemberConverter memberConverter;
3738
private final TrackRepository trackRepository;
3839

40+
private static final String CHAR_SET =
41+
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
42+
private static final SecureRandom RANDOM = new SecureRandom();
43+
3944
public Member joinMember(MemberRequestDTO.JoinDto request) {
4045

4146
if (memberRepository.findByEmail(request.getEmail()).isPresent()) {
@@ -56,6 +61,7 @@ public Member findOrCreateOAuthMember(String email, SocialStatus socialStatus) {
5661
Member.builder()
5762
.email(email)
5863
.role(Role.USER)
64+
.password(passwordEncoder.encode(generateRandomPassword(10)))
5965
.socialStatus(socialStatus)
6066
.build();
6167
return memberRepository.save(member);
@@ -171,4 +177,13 @@ public boolean newPassword(String email, String newPassword) {
171177
memberRepository.save(member);
172178
return true;
173179
}
180+
181+
public static String generateRandomPassword(int length) {
182+
StringBuilder sb = new StringBuilder(length);
183+
for (int i = 0; i < length; i++) {
184+
int index = RANDOM.nextInt(CHAR_SET.length());
185+
sb.append(CHAR_SET.charAt(index));
186+
}
187+
return sb.toString();
188+
}
174189
}

0 commit comments

Comments
 (0)