From edba963a2dd7792fc5942050516dce66b5da2e3a Mon Sep 17 00:00:00 2001 From: andrew Date: Thu, 6 Feb 2025 19:54:43 +0900 Subject: [PATCH 1/2] =?UTF-8?q?CLAP-305=20Fix=20:=20=EC=B4=88=EA=B8=B0=20?= =?UTF-8?q?=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=20redirection=20url=20?= =?UTF-8?q?=EC=97=B0=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clap/server/adapter/outbound/api/EmailClient.java | 6 +++--- .../server/adapter/outbound/api/EmailTemplateBuilder.java | 8 +++++--- .../application/port/outbound/email/SendEmailPort.java | 2 +- .../application/service/admin/SendInvitationService.java | 5 +++-- src/main/resources/templates/invitation.html | 5 +++-- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/main/java/clap/server/adapter/outbound/api/EmailClient.java b/src/main/java/clap/server/adapter/outbound/api/EmailClient.java index 6ed9f9a4..bcb335e0 100644 --- a/src/main/java/clap/server/adapter/outbound/api/EmailClient.java +++ b/src/main/java/clap/server/adapter/outbound/api/EmailClient.java @@ -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); @@ -71,4 +71,4 @@ public void sendVerificationEmail(String memberEmail, String receiverName, Strin } -} +} \ No newline at end of file diff --git a/src/main/java/clap/server/adapter/outbound/api/EmailTemplateBuilder.java b/src/main/java/clap/server/adapter/outbound/api/EmailTemplateBuilder.java index b1ded3e0..eed0646b 100644 --- a/src/main/java/clap/server/adapter/outbound/api/EmailTemplateBuilder.java +++ b/src/main/java/clap/server/adapter/outbound/api/EmailTemplateBuilder.java @@ -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); @@ -80,4 +82,4 @@ public EmailTemplate createVerificationCodeTemplate(String receiver, String rece String body = templateEngine.process(templateName, context); return new EmailTemplate(receiver, subject, body); } -} +} \ No newline at end of file diff --git a/src/main/java/clap/server/application/port/outbound/email/SendEmailPort.java b/src/main/java/clap/server/application/port/outbound/email/SendEmailPort.java index 7375cbc8..6cd8cf86 100644 --- a/src/main/java/clap/server/application/port/outbound/email/SendEmailPort.java +++ b/src/main/java/clap/server/application/port/outbound/email/SendEmailPort.java @@ -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); diff --git a/src/main/java/clap/server/application/service/admin/SendInvitationService.java b/src/main/java/clap/server/application/service/admin/SendInvitationService.java index b6b6bd34..9bdee671 100644 --- a/src/main/java/clap/server/application/service/admin/SendInvitationService.java +++ b/src/main/java/clap/server/application/service/admin/SendInvitationService.java @@ -44,7 +44,8 @@ public void sendInvitation(SendInvitationRequest request) { sendEmailPort.sendInvitationEmail( member.getMemberInfo().getEmail(), member.getMemberInfo().getName(), - initialPassword + initialPassword, + member.getNickname() ); } -} +} \ No newline at end of file diff --git a/src/main/resources/templates/invitation.html b/src/main/resources/templates/invitation.html index 1c132809..b457fdf0 100644 --- a/src/main/resources/templates/invitation.html +++ b/src/main/resources/templates/invitation.html @@ -1,3 +1,4 @@ +Invitation.html @@ -72,7 +73,7 @@

안녕하세요, 님!

TaskFlow 회원가입 초대 메일입니다.

@@ -86,4 +87,4 @@
- + \ No newline at end of file From edfc8fb083c51e5198547d72c17541c77de64630 Mon Sep 17 00:00:00 2001 From: andrew Date: Thu, 6 Feb 2025 19:55:18 +0900 Subject: [PATCH 2/2] =?UTF-8?q?CLAP-305=20Fix=20:=20=EC=B4=88=EA=B8=B0=20?= =?UTF-8?q?=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=20redirection=20url=20?= =?UTF-8?q?=EC=97=B0=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/invitation.html | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/resources/templates/invitation.html b/src/main/resources/templates/invitation.html index b457fdf0..f6aa37ed 100644 --- a/src/main/resources/templates/invitation.html +++ b/src/main/resources/templates/invitation.html @@ -1,4 +1,3 @@ -Invitation.html