From b557a06add97c211973d4a1a09a0d92c925f9dc9 Mon Sep 17 00:00:00 2001 From: coke98 Date: Tue, 8 Oct 2024 14:33:19 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=EB=B0=98=EB=B3=B5=20=EC=9D=B8?= =?UTF-8?q?=EC=A6=9D=20=EC=9A=94=EC=B2=AD=EC=8B=9C=20=EC=9D=B4=EB=A9=94?= =?UTF-8?q?=EC=9D=BC=20=EC=95=94=ED=98=B8=ED=99=94=20=EB=A1=9C=EC=A7=81?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=9D=B8=ED=95=B4=20=EA=B0=80=EC=9E=85=20?= =?UTF-8?q?=EC=A7=84=ED=96=89=EC=9D=B4=20=EB=B6=88=EA=B0=80=EB=8A=A5?= =?UTF-8?q?=ED=95=98=EC=97=AC=20=EB=A1=9C=EC=A7=81=20=EC=9E=84=EC=8B=9C=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ref: #148 --- .../com/aliens/backend/email/service/EmailService.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/aliens/backend/email/service/EmailService.java b/src/main/java/com/aliens/backend/email/service/EmailService.java index 9937da10..950cb5f1 100644 --- a/src/main/java/com/aliens/backend/email/service/EmailService.java +++ b/src/main/java/com/aliens/backend/email/service/EmailService.java @@ -5,9 +5,8 @@ import com.aliens.backend.email.controller.response.EmailResponse; import com.aliens.backend.email.domain.EmailAuthentication; import com.aliens.backend.email.domain.repository.EmailAuthenticationRepository; -import com.aliens.backend.member.sevice.SymmetricKeyEncoder; -import com.aliens.backend.global.response.error.EmailError; import com.aliens.backend.global.exception.RestApiException; +import com.aliens.backend.global.response.error.EmailError; import com.aliens.backend.member.controller.dto.event.TemporaryPasswordEvent; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Service; @@ -48,7 +47,7 @@ public String sendAuthenticationEmail(final String email) { EmailAuthentication emailEntity = new EmailAuthentication(email); emailAuthenticationRepository.save(emailEntity); - String emailToken = SymmetricKeyEncoder.encrypt(email); + String emailToken = email; emailSender.sendAuthenticationEmail(email, emailToken); return EmailResponse.EMAIL_SEND_SUCCESS.getMessage(); @@ -68,7 +67,7 @@ private void deleteExistsEmail(final String email) { @Transactional public String authenticateEmail(final String token) { - String email = SymmetricKeyEncoder.decrypt(token); + String email = token; EmailAuthentication emailEntity = getEmailAuthenticationByEmail(email); emailEntity.authenticate(); return EmailResponse.EMAIL_AUTHENTICATION_SUCCESS.getMessage(); From 8c2e18ab3c0b7cea8c31fa206eb93944d3d38f9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=AA=85=EC=A4=80?= <86913355+mjj111@users.noreply.github.com> Date: Tue, 8 Oct 2024 15:26:23 +0900 Subject: [PATCH 2/2] =?UTF-8?q?test=20(authenticateEmailTest)=20:=20=20giv?= =?UTF-8?q?enEmail=EB=A1=9C=20=EB=8F=99=EC=9E=91=ED=95=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/aliens/backend/email/service/EmailServiceTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/java/com/aliens/backend/email/service/EmailServiceTest.java b/src/test/java/com/aliens/backend/email/service/EmailServiceTest.java index a0d5d834..f6494ad0 100644 --- a/src/test/java/com/aliens/backend/email/service/EmailServiceTest.java +++ b/src/test/java/com/aliens/backend/email/service/EmailServiceTest.java @@ -69,10 +69,9 @@ void sendAuthenticationEmailTest() throws Exception { void authenticateEmailTest() throws Exception { //Given emailAuthenticationRepository.save(emailEntity); - String token = symmetricKeyEncoder.encrypt(givenEmail); //When - String result = emailService.authenticateEmail(token); + String result = emailService.authenticateEmail(givenEmail); //Then Assertions.assertEquals(EmailResponse.EMAIL_AUTHENTICATION_SUCCESS.getMessage(), result);