Merge pull request #79 from letmeknowmyfriend/Chore/Set_Up_For_Deploy

[Fix] 이메일에 https://로 변경
letmeknowmyfriend · Dec 28, 2023 · 17bafbb · 17bafbb
2 parents 91c9c27 + 91be403
commit 17bafbb
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/src/main/java/com/letmeknow/service/member/MemberService.java b/src/main/java/com/letmeknow/service/member/MemberService.java
@@ -208,13 +208,19 @@ public void sendChangePasswordVerificationEmail(String email) throws NoSuchMembe
         // PasswordVerificationCode 업데이트
         member.updatePasswordVerificationCode(verificationCode);
 
+        // domain에서 http://를 제거한다.
+        String newDomain = domain.replace("http://", "");
+
+        // newDomain 앞에 https://를 붙인다.
+        newDomain = "https://" + newDomain;
+
         // 비밀번호 재설정 이메일 발송
         emailService.sendMail(Email.builder()
                 .subject(EmailEnum.CHANGE_PASSWORD_EMAIL_SUBJECT.getMessage())
                 .receiver(email)
                 .message(EmailEnum.CHANGE_PASSWORD_EMAIL_MESSAGE.getMessage() +
                         EmailEnum.CHANGE_PASSWORD_EMAIL_CONTENT_1.getMessage() +
-                        domain +
+                        newDomain +
                         EmailEnum.CHANGE_PASSWORD_EMAIL_CONTENT_2.getMessage() +
                         URLEncoder.encode(verificationCode, "UTF-8") +
                         EmailEnum.CHANGE_PASSWORD_EMAIL_CONTENT_3.getMessage())

diff --git a/src/main/java/com/letmeknow/service/member/TemporaryMemberService.java b/src/main/java/com/letmeknow/service/member/TemporaryMemberService.java
@@ -84,13 +84,19 @@ public Long joinTemporaryMember(@Valid MemberSignUpForm memberSignUpForm) throws
                         .build())
                 .getId();
 
+        // domain에서 http://를 제거한다.
+        String newDomain = domain.replace("http://", "");
+
+        // newDomain 앞에 https://를 붙인다.
+        newDomain = "https://" + newDomain;
+
         //이메일 발송
         emailService.sendMail(Email.builder()
                 .subject(EmailEnum.VERIFICATION_EMAIL_SUBJECT.getMessage())
                 .receiver(memberSignUpForm.getEmail())
                 .message(EmailEnum.VERIFICATION_EMAIL_MESSAGE.getMessage() +
                         EmailEnum.VERIFICATION_EMAIL_CONTENT_1.getMessage() +
-                        domain +
+                        newDomain +
                         EmailEnum.VERIFICATION_EMAIL_CONTENT_2.getMessage() +
                         URLEncoder.encode(verificationCode, "UTF-8") +
                         EmailEnum.VERIFICATION_EMAIL_CONTENT_3.getMessage())
@@ -110,13 +116,19 @@ public void resendVerificationEmailById(long id) throws NoSuchTemporaryMemberExc
         //temporaryMember의 verificationCode 변경
         temporaryMember.updateVerificationCode(verificationCode);
 
+        // domain에서 http://를 제거한다.
+        String newDomain = domain.replace("http://", "");
+
+        // newDomain 앞에 https://를 붙인다.
+        newDomain = "https://" + newDomain;
+
         //이메일 발송
         emailService.sendMail(Email.builder()
                 .subject(EmailEnum.VERIFICATION_EMAIL_SUBJECT.getMessage())
                 .receiver(temporaryMember.getEmail())
                 .message(EmailEnum.VERIFICATION_EMAIL_MESSAGE.getMessage() +
                         EmailEnum.VERIFICATION_EMAIL_CONTENT_1.getMessage() +
-                        domain +
+                        newDomain +
                         EmailEnum.VERIFICATION_EMAIL_CONTENT_2.getMessage() +
                         URLEncoder.encode(verificationCode, "UTF-8") +
                         EmailEnum.VERIFICATION_EMAIL_CONTENT_3.getMessage())
@@ -134,13 +146,19 @@ public void resendVerificationEmailByEmail(String email) throws NoSuchTemporaryM
         // temporaryMember의 verificationCode 변경
         temporaryMember.updateVerificationCode(verificationCode);
 
+        // domain에서 http://를 제거한다.
+        String newDomain = domain.replace("http://", "");
+
+        // newDomain 앞에 https://를 붙인다.
+        newDomain = "https://" + newDomain;
+
         // 이메일 발송
         emailService.sendMail(Email.builder()
                 .subject(EmailEnum.VERIFICATION_EMAIL_SUBJECT.getMessage())
                 .receiver(temporaryMember.getEmail())
                 .message(EmailEnum.VERIFICATION_EMAIL_MESSAGE.getMessage() +
                         EmailEnum.VERIFICATION_EMAIL_CONTENT_1.getMessage() +
-                        domain +
+                        newDomain +
                         EmailEnum.VERIFICATION_EMAIL_CONTENT_2.getMessage() +
                         URLEncoder.encode(verificationCode, "UTF-8") +
                         EmailEnum.VERIFICATION_EMAIL_CONTENT_3.getMessage())