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
4 changes: 2 additions & 2 deletions src/main/java/umc/codeplay/controller/OAuthController.java
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ public ApiResponse<MemberResponseDTO.LoginResultDTO> OAuthCallback(
// (3-b) 카카오 UserInfo Endpoint 로 이메일, 프로필 등 조회
Map<String, Object> kakaoAccount =
(Map<String, Object>) userInfo.get("kakao_account");
Map<String, Object> kakaoProperties =
(Map<String, Object>) userInfo.get("properties");
// Map<String, Object> kakaoProperties =
// (Map<String, Object>) userInfo.get("properties");
email = (String) kakaoAccount.get("email");
// name = (String) kakaoProperties.get("nickname");
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/umc/codeplay/converter/MemberConverter.java
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
15 changes: 15 additions & 0 deletions src/main/java/umc/codeplay/service/MemberService.java
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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()) {
Expand All @@ -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);
Expand Down Expand Up @@ -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();
}
}
Loading