🐛[Fix] 로그인하지 않은 사용자가 비밀번호 재설정을 할 경우 임시 비밀번호를 본인 메일로 발송

src/main/java/com/gamegoo/controller/member/AuthController.java

@@ -46,7 +46,7 @@ public ApiResponse<String> sendEmailwithCheckDuplication(
         String email = emailRequestDTO.getEmail();
 
         authService.verifyEmailforNewUser(email);
-        authService.sendEmail(email);
+        authService.sendEmailVerification(email);
         return ApiResponse.onSuccess("인증 이메일을 발송했습니다.");
     }
 
@@ -55,7 +55,7 @@ public ApiResponse<String> sendEmailwithCheckDuplication(
     public ApiResponse<String> sendEmail(
             @Valid @RequestBody MemberRequest.EmailRequestDTO emailRequestDTO) {
         String email = emailRequestDTO.getEmail();
-        authService.sendEmail(email);
+        authService.sendEmailVerification(email);
         return ApiResponse.onSuccess("인증 이메일을 발송했습니다.");
     }
 
@@ -68,7 +68,7 @@ public ApiResponse<String> sendEmailforUser(
         // DB에 없는 사용자일 경우 에러 발생
         authService.verifyEmailforExistUser(email);
 
-        authService.sendEmail(email);
+        authService.sendEmailVerification(email);
         return ApiResponse.onSuccess("인증 이메일을 발송했습니다.");
     }
 

src/main/java/com/gamegoo/controller/member/PasswordController.java

@@ -55,7 +55,7 @@ public ApiResponse<String> resetPasswordWithJWT(
     public ApiResponse<String> resetPassword(
             @Valid @RequestBody MemberRequest.PasswordRequestDTO passwordRequestDTO) {
 
-        passwordService.updatePasswordWithEmail(passwordRequestDTO.getEmail(), passwordRequestDTO.getOldPassword(), passwordRequestDTO.getNewPassword());
+        passwordService.updatePasswordWithEmail(passwordRequestDTO.getEmail());
 
         return ApiResponse.onSuccess("비밀번호 재설정을 완료했습니다.");
     }

src/main/java/com/gamegoo/dto/member/MemberRequest.java

@@ -74,10 +74,6 @@ public static class PasswordRequestDTO {
         @Email(message = "Email 형식이 올바르지 않습니다.")
         @NotBlank(message = "Email은 비워둘 수 없습니다.")
         String email;
-        @NotBlank(message = "newPassword는 비워둘 수 없습니다.")
-        String newPassword;
-        @NotBlank(message = "oldPassword는 비워둘 수 없습니다.")
-        String oldPassword;
 
     }
 

src/main/java/com/gamegoo/service/member/AuthService.java

@@ -175,10 +175,10 @@ public void verifyEmailforExistUser(String email) {
      * @param email
      */
     @Transactional
-    public void sendEmail(String email) {
+    public void sendEmailVerification(String email) {
 
         // 랜덤 코드 생성하기
-        String certificationNumber = CodeGeneratorUtil.generateRandomCode();
+        String certificationNumber = CodeGeneratorUtil.generateEmailRandomCode();
 
         // 메일 전송하기
         sendEmailInternal(email, certificationNumber);
@@ -256,7 +256,7 @@ public void verifyEmail(String email, String code) {
      * @param email
      * @param certificationNumber
      */
-    private void sendEmailInternal(String email, String certificationNumber) {
+    public void sendEmailInternal(String email, String certificationNumber) {
         try {
             log.info("Starting email send process for email: {}, certificationNumber: {}", email,
                 certificationNumber);

src/main/java/com/gamegoo/service/member/PasswordService.java

@@ -4,16 +4,26 @@
 import com.gamegoo.apiPayload.exception.handler.MemberHandler;
 import com.gamegoo.domain.member.Member;
 import com.gamegoo.repository.member.MemberRepository;
+import com.gamegoo.util.CodeGeneratorUtil;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+
 @Service
 @RequiredArgsConstructor
+@Slf4j
 public class PasswordService {
 
     private final MemberRepository memberRepository;
     private final BCryptPasswordEncoder bCryptPasswordEncoder;
+    private final JavaMailSender javaMailSender;
+
 
     /**
      * 비밀번호가 맞는지 확인
@@ -29,7 +39,7 @@ public boolean checkPasswordById(Long userId, String password) {
     }
 
     /**
-     * 비밀번호 수정
+     * 비밀번호 수정 (로그인O)
      *
      * @param userId
      * @param newPassword
@@ -49,28 +59,204 @@ public void updatePassword(Long userId, String oldPassword, String newPassword)
             throw new MemberHandler(ErrorStatus.PASSWORD_INVALID);
         }
 
-
     }
 
     /**
-     * 비밀번호 수정
+     * 비밀번호 수정 (로그인X)
      *
      * @param email
-     * @param newPassword
      */
-    public void updatePasswordWithEmail(String email, String oldPassword, String newPassword) {
-        // jwt 토큰으로 멤버 찾기
+    public void updatePasswordWithEmail(String email) {
+        // email으로 멤버 찾기
         Member member = memberRepository.findByEmail(email)
                 .orElseThrow(() -> new MemberHandler(ErrorStatus.MEMBER_NOT_FOUND));
 
+        // 랜덤 임시 비밀번호 생성
+        String tempPassword = CodeGeneratorUtil.generatePasswordRandomCode();
+
+        // 이메일 전송
+        sendEmailInternal(email,tempPassword);
 
-        if (bCryptPasswordEncoder.matches(oldPassword,member.getPassword())) {
             // 비밀번호 재설정
-            member.updatePassword(bCryptPasswordEncoder.encode(newPassword));
+            member.updatePassword(bCryptPasswordEncoder.encode(tempPassword));
             memberRepository.save(member);
-        }else{
-            throw new MemberHandler(ErrorStatus.PASSWORD_INVALID);
+    }
+
+    /**
+     * Gmail 발송
+     *
+     * @param email
+     * @param tempPassword
+     */
+    public void sendEmailInternal(String email, String tempPassword) {
+        try {
+            log.info("Starting email send process for email: {}, certificationNumber: {}", email,
+                    tempPassword);
+
+            MimeMessage message = javaMailSender.createMimeMessage();
+            MimeMessageHelper mimeMessageHelper = new MimeMessageHelper(message, true);
+
+            String htmlContent = getTempPasswordMessage(tempPassword);
+
+            mimeMessageHelper.setTo(email);
+            mimeMessageHelper.setSubject("GameGoo 임시 비밀번호 발급");
+            mimeMessageHelper.setText(htmlContent, true);
+            log.debug("Prepared email message for email: {}", email);
+
+            javaMailSender.send(message);
+            log.info("Email sent successfully to email: {}", email);
+
+
+        } catch (MessagingException e) {
+            log.error("Failed to send email to email: {}, certificationNumber: {}, error: {}",
+                    email, tempPassword, e.getMessage());
+
+            throw new MemberHandler(ErrorStatus.EMAIL_SEND_ERROR);
         }
     }
 
+    /**
+     * 메일 내용 편집
+     *
+     * @param tempPassword
+     * @return
+     */
+    private String getTempPasswordMessage(String tempPassword) {
+        String certificationMessage = ""
+                + "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"
+                +
+                "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n" +
+                "  <head>\n" +
+                "    <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n" +
+                "    <title>Gamegoo 임시 비밀번호 발급</title>\n" +
+                "    <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\" />\n" +
+                "  </head>\n" +
+                "  <body>\n" +
+                "    <table\n" +
+                "      style=\"\n" +
+                "        width: 628px;\n" +
+                "        box-sizing: border-box;\n" +
+                "        border-collapse: collapse;\n" +
+                "        background-color: #ffffff;\n" +
+                "        border: 1px solid #c0c0c0;\n" +
+                "        text-align: left;\n" +
+                "        margin: 0 auto;\n" +
+                "      \"\n" +
+                "    >\n" +
+                "      <tbody>\n" +
+                "        <tr>\n" +
+                "          <td>\n" +
+                "            <table\n" +
+                "              cellpadding=\"0\"\n" +
+                "              cellspacing=\"0\"\n" +
+                "              style=\"width: 628px; height: 521px; padding: 53px 62px 42px 62px\"\n" +
+                "            >\n" +
+                "              <tbody>\n" +
+                "                <tr>\n" +
+                "                  <td style=\"padding-bottom: 11.61px\">\n" +
+                "                    <img\n" +
+                "                      src=\"https://ifh.cc/g/BY3XG2.png\"\n" +
+                "                      style=\"display: block\"\n" +
+                "                      width=\"137\"\n" +
+                "                      height=\"24\"\n" +
+                "                      alt=\"Gamegoo\"\n" +
+                "                    />\n" +
+                "                  </td>\n" +
+                "                </tr>\n" +
+                "                <tr>\n" +
+                "                  <td style=\"padding-top: 20px\">\n" +
+                "                    <span\n" +
+                "                      style=\"\n" +
+                "                        color: #2d2d2d;\n" +
+                "                        font-family: Pretendard;\n" +
+                "                        font-size: 25px;\n" +
+                "                        font-style: normal;\n" +
+                "                        font-weight: 400;\n" +
+                "                        line-height: 150%;\n" +
+                "                      \"\n" +
+                "                    >\n" +
+                "                      임시 비밀번호를 확인해주세요\n" +
+                "                    </span>\n" +
+                "                  </td>\n" +
+                "                </tr>\n" +
+                "                <tr>\n" +
+                "                  <td style=\"padding-top: 38px\">\n" +
+                "                    <span\n" +
+                "                      style=\"\n" +
+                "                        color: #5a42ee;\n" +
+                "                        color: #2d2d2d;\n" +
+                "                        font-size: 32px;\n" +
+                "                        font-style: normal;\n" +
+                "                        font-weight: 700;\n" +
+                "                        line-height: 150%;\n" +
+                "                        margin-bottom: 30px;\n" +
+                "                      \"\n" +
+                "                    >\n" +
+                tempPassword +
+                "                    </span>\n" +
+                "                  </td>\n" +
+                "                </tr>\n" +
+                "                <tr>\n" +
+                "                  <td style=\"padding-top: 30px\">\n" +
+                "                    <span\n" +
+                "                      style=\"\n" +
+                "                        color: #2d2d2d;\n" +
+                "                        font-family: Pretendard;\n" +
+                "                        font-size: 18px;\n" +
+                "                        font-style: normal;\n" +
+                "                        font-weight: 400;\n" +
+                "                        line-height: 150%;\n" +
+                "                      \"\n" +
+                "                    >\n" +
+                "                      임시 비밀번호가 발급되었습니다. \n" +
+                "                      감사합니다.\n" +
+                "                    </span>\n" +
+                "                  </td>\n" +
+                "                </tr>\n" +
+                "              </tbody>\n" +
+                "            </table>\n" +
+                "            <table\n" +
+                "              cellpadding=\"0\"\n" +
+                "              cellspacing=\"0\"\n" +
+                "              style=\"\n" +
+                "                width: 628px;\n" +
+                "                height: 292px;\n" +
+                "                padding: 37px 0px 153px 62px;\n" +
+                "                background: #f7f7f9;\n" +
+                "              \"\n" +
+                "            >\n" +
+                "              <tbody>\n" +
+                "                <tr>\n" +
+                "                  <td>\n" +
+                "                    <span\n" +
+                "                      style=\"\n" +
+                "                        color: #606060;\n" +
+                "                        font-family: Pretendard;\n" +
+                "                        font-size: 11px;\n" +
+                "                        font-style: normal;\n" +
+                "                        font-weight: 500;\n" +
+                "                        line-height: 150%;\n" +
+                "                      \"\n" +
+                "                    >\n" +
+                "                      본 메일은 발신 전용으로 회신되지 않습니다.<br />\n" +
+                "                      궁금하신 점은 겜구 이메일이나 카카오 채널을 통해\n" +
+                "                      문의하시기 바랍니다.<br /><br />\n" +
+                "                      email: [email protected]<br />\n" +
+                "                      kakao: https://pf.kakao.com/_Rrxiqn<br />\n" +
+                "                      copyright 2024. GameGoo All Rights Reserved.<br />\n" +
+                "                    </span>\n" +
+                "                  </td>\n" +
+                "                </tr>\n" +
+                "              </tbody>\n" +
+                "            </table>\n" +
+                "          </td>\n" +
+                "        </tr>\n" +
+                "      </tbody>\n" +
+                "    </table>\n" +
+                "  </body>\n" +
+                "</html>\n";
+
+        return certificationMessage;
+    }
+
 }

src/main/java/com/gamegoo/util/CodeGeneratorUtil.java

@@ -4,24 +4,58 @@
 
 public class CodeGeneratorUtil {
 
-    private static final String CHARACTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+    private static final String UPPER_CASE = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+    private static final String LOWER_CASE = "abcdefghijklmnopqrstuvwxyz";
+    private static final String DIGITS = "0123456789";
+    private static final String ALL_CHARACTERS = UPPER_CASE + LOWER_CASE + DIGITS;
     private static final SecureRandom random = new SecureRandom();
-    private static final int CODE_LENGTH = 5;
+    private static final int EMAIL_CODE_LENGTH = 5;
+    private static final int PASSWORD_CODE_LENGTH = 12;
 
     /**
      * 이메일 인증에 사용하는 메소드 : 랜덤 코드 만들기
      *
      * @return
      */
-    public static String generateRandomCode() {
-        StringBuilder code = new StringBuilder(CODE_LENGTH);
-        for (int i = 0; i < CODE_LENGTH; i++) {
-            int index = random.nextInt(CHARACTERS.length());
-            code.append(CHARACTERS.charAt(index));
+    public static String generateEmailRandomCode() {
+        StringBuilder code = new StringBuilder(EMAIL_CODE_LENGTH);
+        for (int i = 0; i < EMAIL_CODE_LENGTH; i++) {
+            int index = random.nextInt(UPPER_CASE.length() + DIGITS.length());
+            code.append(UPPER_CASE.charAt(index % UPPER_CASE.length()));
         }
-        System.out.println(code);
         return code.toString();
     }
 
+    /**
+     * 비밀번호 재설정하는 랜덤 코드 생성
+     * @return
+     */
+    public static String generatePasswordRandomCode(){
+        StringBuilder code = new StringBuilder(PASSWORD_CODE_LENGTH);
+
+        // 최소한 하나의 대문자, 소문자, 숫자, 특수문자를 포함하도록 함
+        code.append(UPPER_CASE.charAt(random.nextInt(UPPER_CASE.length())));
+        code.append(LOWER_CASE.charAt(random.nextInt(LOWER_CASE.length())));
+        code.append(DIGITS.charAt(random.nextInt(DIGITS.length())));
+
+        // 나머지 길이를 랜덤한 모든 문자로 채움
+        for (int i = 4; i < PASSWORD_CODE_LENGTH; i++) {
+            int index = random.nextInt(ALL_CHARACTERS.length());
+            code.append(ALL_CHARACTERS.charAt(index));
+        }
+
+        // 생성된 비밀번호를 섞어서 반환
+        return shuffleString(code.toString());
+    }
 
+    private static String shuffleString(String input) {
+        char[] characters = input.toCharArray();
+        for (int i = 0; i < characters.length; i++) {
+            int randomIndex = random.nextInt(characters.length);
+            char temp = characters[i];
+            characters[i] = characters[randomIndex];
+            characters[randomIndex] = temp;
+        }
+        return new String(characters);
+    }
 }