Skip to content

Commit aadf8d7

Browse files
authored
Merge pull request #371 from TaskFlow-CLAP/CLAP-305
CLAP-305 초기 회원가입 redirection url 연결
2 parents 4bc7a3e + edfc8fb commit aadf8d7

File tree

5 files changed

+14
-11
lines changed

5 files changed

+14
-11
lines changed

src/main/java/clap/server/adapter/outbound/api/EmailClient.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ public void sendWebhookEmail(PushNotificationTemplate request, String taskDetail
3737
}
3838

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

45-
EmailTemplate template = emailTemplateBuilder.createInvitationTemplate(memberEmail, receiverName, initialPassword);
45+
EmailTemplate template = emailTemplateBuilder.createInvitationTemplate(memberEmail, receiverName, initialPassword, userNickname);
4646
helper.setTo(template.email());
4747
helper.setSubject(template.subject());
4848
helper.setText(template.body(), true);
@@ -71,4 +71,4 @@ public void sendVerificationEmail(String memberEmail, String receiverName, Strin
7171
}
7272

7373

74-
}
74+
}

src/main/java/clap/server/adapter/outbound/api/EmailTemplateBuilder.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,13 @@ public EmailTemplate createWebhookTemplate(PushNotificationTemplate request, Str
6060
return new EmailTemplate(request.email(), subject, body);
6161
}
6262

63-
public EmailTemplate createInvitationTemplate(String receiver, String receiverName, String initialPassword) {
63+
public EmailTemplate createInvitationTemplate(String receiver, String receiverName,
64+
String initialPassword, String userNickname) {
6465
Context context = new Context();
6566
String templateName = "invitation";
6667
String subject = "[TaskFlow 초대] 회원가입을 환영합니다.";
67-
context.setVariable("invitationLink", "https://example.com/reset-password"); //TODO:비밀번호 설정 링크로 변경 예정
68+
context.setVariable("userNickname", userNickname);
69+
context.setVariable("invitationLink", "https://localhost:5173/login"); //TODO:비밀번호 설정 링크로 변경 예정
6870
context.setVariable("initialPassword", initialPassword);
6971
context.setVariable("receiverName", receiverName);
7072
String body = templateEngine.process(templateName, context);
@@ -80,4 +82,4 @@ public EmailTemplate createVerificationCodeTemplate(String receiver, String rece
8082
String body = templateEngine.process(templateName, context);
8183
return new EmailTemplate(receiver, subject, body);
8284
}
83-
}
85+
}

src/main/java/clap/server/application/port/outbound/email/SendEmailPort.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
public interface SendEmailPort {
44

5-
void sendInvitationEmail(String memberEmail, String receiverName, String initialPassword);
5+
void sendInvitationEmail(String memberEmail, String receiverName, String initialPassword, String userNickname);
66

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

src/main/java/clap/server/application/service/admin/SendInvitationService.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ public void sendInvitation(SendInvitationRequest request) {
4444
sendEmailPort.sendInvitationEmail(
4545
member.getMemberInfo().getEmail(),
4646
member.getMemberInfo().getName(),
47-
initialPassword
47+
initialPassword,
48+
member.getNickname()
4849
);
4950
}
50-
}
51+
}

src/main/resources/templates/invitation.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<p>안녕하세요, <strong th:text="${receiverName}"></strong>님!</p>
7373
<p>TaskFlow 회원가입 초대 메일입니다.</p>
7474
<ul>
75-
<li>초대 링크: <a href="https://example.com/register" target="_blank" th:href="${invitationLink}">회원가입 링크</a></li>
75+
<li>아이디: <a href="https://example.com/register" target="_blank" th:href="${userNickname}">회원가입 링크</a></li>
7676
<li>초기 비밀번호: <strong th:text="${initialPassword}"></strong></li>
7777
</ul>
7878
<div class="cta-button">
@@ -86,4 +86,4 @@
8686
</div>
8787
</div>
8888
</body>
89-
</html>
89+
</html>

0 commit comments

Comments
 (0)