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
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ public void sendWebhookEmail(PushNotificationTemplate request, String taskDetail
}

@Override
public void sendInvitationEmail(String memberEmail, String receiverName, String initialPassword) {
public void sendInvitationEmail(String memberEmail, String receiverName, String initialPassword, String userNickname) {
try {
MimeMessage mimeMessage = mailSender.createMimeMessage();
MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true, "UTF-8");

EmailTemplate template = emailTemplateBuilder.createInvitationTemplate(memberEmail, receiverName, initialPassword);
EmailTemplate template = emailTemplateBuilder.createInvitationTemplate(memberEmail, receiverName, initialPassword, userNickname);
helper.setTo(template.email());
helper.setSubject(template.subject());
helper.setText(template.body(), true);
Expand Down Expand Up @@ -71,4 +71,4 @@ public void sendVerificationEmail(String memberEmail, String receiverName, Strin
}


}
}
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,13 @@ public EmailTemplate createWebhookTemplate(PushNotificationTemplate request, Str
return new EmailTemplate(request.email(), subject, body);
}

public EmailTemplate createInvitationTemplate(String receiver, String receiverName, String initialPassword) {
public EmailTemplate createInvitationTemplate(String receiver, String receiverName,
String initialPassword, String userNickname) {
Context context = new Context();
String templateName = "invitation";
String subject = "[TaskFlow 초대] 회원가입을 환영합니다.";
context.setVariable("invitationLink", "https://example.com/reset-password"); //TODO:비밀번호 설정 링크로 변경 예정
context.setVariable("userNickname", userNickname);
context.setVariable("invitationLink", "https://localhost:5173/login"); //TODO:비밀번호 설정 링크로 변경 예정
context.setVariable("initialPassword", initialPassword);
context.setVariable("receiverName", receiverName);
String body = templateEngine.process(templateName, context);
Expand All @@ -80,4 +82,4 @@ public EmailTemplate createVerificationCodeTemplate(String receiver, String rece
String body = templateEngine.process(templateName, context);
return new EmailTemplate(receiver, subject, body);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

public interface SendEmailPort {

void sendInvitationEmail(String memberEmail, String receiverName, String initialPassword);
void sendInvitationEmail(String memberEmail, String receiverName, String initialPassword, String userNickname);

void sendVerificationEmail(String memberEmail, String receiverName, String verificationCode);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ public void sendInvitation(SendInvitationRequest request) {
sendEmailPort.sendInvitationEmail(
member.getMemberInfo().getEmail(),
member.getMemberInfo().getName(),
initialPassword
initialPassword,
member.getNickname()
);
}
}
}
4 changes: 2 additions & 2 deletions src/main/resources/templates/invitation.html
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<p>안녕하세요, <strong th:text="${receiverName}"></strong>님!</p>
<p>TaskFlow 회원가입 초대 메일입니다.</p>
<ul>
<li>초대 링크: <a href="https://example.com/register" target="_blank" th:href="${invitationLink}">회원가입 링크</a></li>
<li>아이디: <a href="https://example.com/register" target="_blank" th:href="${userNickname}">회원가입 링크</a></li>
<li>초기 비밀번호: <strong th:text="${initialPassword}"></strong></li>
</ul>
<div class="cta-button">
Expand All @@ -86,4 +86,4 @@
</div>
</div>
</body>
</html>
</html>