Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: Sending an authentication email to user #43

Merged
merged 7 commits into from
Feb 4, 2024
Merged
Show file tree
Hide file tree
Changes from 4 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
1 change: 0 additions & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ jobs:
- name: Set up Environment
working-directory: ./src/main
run: |
mkdir ./resources
cd ./resources
touch ./application.yml
echo "${{ secrets.APPLICATION_YML }}" | base64 --decode >> application.yml
Expand Down
6 changes: 6 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,12 @@ dependencies {
implementation 'io.jsonwebtoken:jjwt-impl:0.11.5'
implementation 'io.jsonwebtoken:jjwt-jackson:0.11.5'
implementation 'com.auth0:java-jwt:4.4.0'

// SMTP μ„€μ •
implementation 'org.springframework.boot:spring-boot-starter-mail'

// Thymeleaf μ„€μ •
implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
}

tasks.named('test') {
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/fullcar/core/response/ErrorCode.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ public enum ErrorCode {

/* 400 BAD REQUEST */
FAILED_TO_GENERATE_PUBLIC_KEY(BAD_REQUEST, "μ• ν”Œ κ³΅κ°œν‚€ 생성 쀑 문제 λ°œμƒ"),
EMAIL_ADDRESS_IN_BLACKLIST(BAD_REQUEST, "λΈ”λž™λ¦¬μŠ€νŠΈμ— μžˆλŠ” 이메일 μ£Όμ†Œμž…λ‹ˆλ‹€."),

/* 401 UNAUTHORIZED */
UNAUTHORIZED_KAKAO_TOKEN(UNAUTHORIZED, "μœ νš¨ν•˜μ§€ μ•Šμ€ 카카였 토큰"),
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/fullcar/core/response/SuccessCode.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ public enum SuccessCode {
/* 200 OK */
SIGNIN_SUCCESS(OK, "μ†Œμ…œλ‘œκ·ΈμΈ 성곡"),
GET_NEW_TOKEN_SUCCESS(OK, "토큰 μž¬λ°œκΈ‰ 성곡"),
READ_SUCCESS(OK, "쑰회 성곡");
READ_SUCCESS(OK, "쑰회 성곡"),
EMAIL_SENT_SUCCESS(OK, "인증메일 λ°œμ†‘ 성곡");

private final HttpStatus status;
private final String message;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package com.fullcar.member.application.member;

import com.fullcar.member.domain.member.EmailMessage;
import com.fullcar.member.domain.member.Member;
import com.fullcar.member.presentation.member.dto.request.EmailRequestDto;
import com.fullcar.member.presentation.member.dto.response.MemberGetResponseDto;
import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;
Expand All @@ -16,4 +18,11 @@ public MemberGetResponseDto toDto(Member member) {
.companyName(member.getCompany().getCompanyName())
.build();
}

public EmailMessage toEntity(EmailRequestDto emailRequestDto) {
return EmailMessage.builder()
.to(emailRequestDto.getEmail())
.subject("[FullCar] νšŒμ‚¬ 이메일 인증")
.build();
}
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

메일 전솑은 μ™ΈλΆ€μ‹œμŠ€ν…œμ„ 톡해 λ³΄λ‚΄λŠ” 것이기 λ•Œλ¬Έμ— μœ„ 그림처럼 도메인 μ„œλΉ„μŠ€μ—μ„œ 도메인 κ΄€μ μ˜ μΈν„°νŽ˜μ΄μŠ€λ₯Ό μ •μ˜ν•˜κ³  MailClient와 같은 Infra μ˜μ—­μ˜ 객체λ₯Ό λ§Œλ“€μ–΄ μ²˜λ¦¬ν•˜λŠ” 것도 쒋을 것 κ°™μŠ΅λ‹ˆλ‹€!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

μ’‹μ•„μš”!!! 반영 μ™„λ£Œν–ˆμŠ΅λ‹ˆλ‹€πŸ‘πŸ‘

Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,33 @@

import com.fullcar.core.exception.NotFoundException;
import com.fullcar.core.response.ErrorCode;
import com.fullcar.member.domain.blacklist.BlacklistRepository;
import com.fullcar.member.domain.member.*;
import com.fullcar.member.presentation.member.dto.request.CompanyRequestDto;
import com.fullcar.member.presentation.member.dto.request.EmailRequestDto;
import com.fullcar.member.presentation.member.dto.response.MemberGetResponseDto;
import jakarta.mail.MessagingException;
import jakarta.mail.internet.MimeMessage;
import lombok.RequiredArgsConstructor;
import org.springframework.core.io.ClassPathResource;
import org.springframework.mail.javamail.JavaMailSender;
import org.springframework.mail.javamail.MimeMessageHelper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.thymeleaf.spring6.SpringTemplateEngine;
import org.thymeleaf.context.Context;

@Validated
@Service
@RequiredArgsConstructor
public class MemberService {
private final MemberRepository memberRepository;
private final BlacklistRepository blacklistRepository;
private final CompanyMapper companyMapper;
private final MemberMapper memberMapper;
private final JavaMailSender javaMailSender;
private final SpringTemplateEngine templateEngine;

/**
* νšŒμ›μ„ μ‹λ³„μžλ‘œ μ‘°νšŒν•©λ‹ˆλ‹€.
Expand All @@ -40,4 +52,29 @@ public void registerCompany(Member member, CompanyRequestDto companyRequestDto)
public MemberGetResponseDto getMember(Member member) {
return memberMapper.toDto(member);
}

public void sendMail(EmailRequestDto emailRequestDto) {
String email = emailRequestDto.getEmail();
String emailDomain = email.substring(email.lastIndexOf("@")+1);
blacklistRepository.findByEmailThrow(emailDomain);

EmailMessage emailMessage = memberMapper.toEntity(emailRequestDto);
MimeMessage mimeMessage = javaMailSender.createMimeMessage();

try {
MimeMessageHelper mimeMessageHelper = new MimeMessageHelper(mimeMessage, true, "UTF-8");
mimeMessageHelper.setTo(emailMessage.getTo());
mimeMessageHelper.setSubject(emailMessage.getSubject());
mimeMessageHelper.setText(setContext(),true);
mimeMessageHelper.addInline("image", new ClassPathResource("static/images/fullcar_logo.png"));
javaMailSender.send(mimeMessage);
} catch (MessagingException e) {
throw new RuntimeException(e);
}
}

public String setContext() {
Context context = new Context();
return templateEngine.process("email", context);
}
}
25 changes: 25 additions & 0 deletions src/main/java/com/fullcar/member/domain/blacklist/Blacklist.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package com.fullcar.member.domain.blacklist;

import jakarta.persistence.EmbeddedId;
import jakarta.persistence.Entity;
import jakarta.persistence.EntityListeners;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;

import static lombok.AccessLevel.PROTECTED;

@Entity
@Getter
@NoArgsConstructor(access = PROTECTED)
@AllArgsConstructor(access = PROTECTED)
@EntityListeners(AuditingEntityListener.class)
@Builder
public class Blacklist {
@EmbeddedId
private BlacklistId id;

private String email;
}
21 changes: 21 additions & 0 deletions src/main/java/com/fullcar/member/domain/blacklist/BlacklistId.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package com.fullcar.member.domain.blacklist;

import jakarta.persistence.Column;
import jakarta.persistence.Embeddable;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;

import java.io.Serializable;

import static lombok.AccessLevel.PROTECTED;

@Embeddable
@Getter
@NoArgsConstructor(access = PROTECTED)
@AllArgsConstructor
public class BlacklistId implements Serializable {

@Column(name = "id")
private Long id;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package com.fullcar.member.domain.blacklist;

import com.fullcar.core.exception.CustomException;
import com.fullcar.core.response.ErrorCode;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;

@Repository
public interface BlacklistRepository extends JpaRepository<Blacklist, BlacklistId> {
boolean existsByEmail(String email);

default void findByEmailThrow(String email) {
if (existsByEmail(email)) {
throw new CustomException(ErrorCode.EMAIL_ADDRESS_IN_BLACKLIST);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package com.fullcar.member.domain.blacklist.service;

import com.fullcar.core.id.SnowFlake;
import com.fullcar.member.domain.blacklist.BlacklistId;
import org.springframework.stereotype.Service;

@Service
public class BlacklistIdService {
private final SnowFlake snowFlake;

public BlacklistIdService() {
snowFlake = new SnowFlake(255);
}

public BlacklistId nextId() {
return new BlacklistId(snowFlake.nextId());
}
}
12 changes: 12 additions & 0 deletions src/main/java/com/fullcar/member/domain/member/EmailMessage.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package com.fullcar.member.domain.member;

import lombok.Builder;
import lombok.Getter;

@Getter
@Builder
public class EmailMessage {
private String to;
private String subject;
private String message;
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.fullcar.member.application.member.MemberService;
import com.fullcar.member.domain.member.Member;
import com.fullcar.member.presentation.member.dto.request.CompanyRequestDto;
import com.fullcar.member.presentation.member.dto.request.EmailRequestDto;
import com.fullcar.member.presentation.member.dto.response.MemberGetResponseDto;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
Expand Down Expand Up @@ -44,4 +45,15 @@ public ApiResponse<MemberGetResponseDto> getMember(@CurrentMember Member member)
MemberGetResponseDto response = memberService.getMember(member);
return ApiResponse.success(SuccessCode.READ_SUCCESS, response);
}

@Operation(summary = "νšŒμ‚¬ 메일 인증 API")
@ApiResponses({
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "인증메일 λ°œμ†‘ 성곡"),
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "500", description = "μ„œλ²„ λ‚΄λΆ€ 였λ₯˜", content = @Content)
})
@PostMapping("/onboarding/company/email")
public ApiResponse<Object> sendAuthenticationMail(@RequestBody EmailRequestDto emailRequestDto) {
memberService.sendMail(emailRequestDto);
return ApiResponse.success(SuccessCode.EMAIL_SENT_SUCCESS);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.fullcar.member.presentation.member.dto.request;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;

@Getter
@AllArgsConstructor(access = AccessLevel.PROTECTED)
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class EmailRequestDto {
@Schema(description = "νšŒμ‚¬ 이메일", example = "[email protected]")
private String email;
}
Binary file added src/main/resources/static/images/fullcar_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 40 additions & 0 deletions src/main/resources/templates/email.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org" lang="UTF-8">

<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
</head>

<body style="font-family: 'Noto Sans', 'Arial', 'sans-serif'; margin: 0; padding: 0;">
<div class="container" style="margin: auto;">
<div class="logo">
<img src="cid:image" alt="Fullcar 둜고">
</div>
<p style="margin-top: 20px; padding: 0;">μ•ˆλ…•ν•˜μ„Έμš”.</p><br>
<p style="margin-top: 10px;">νšŒμ‚¬ 메일 인증을 ν†΅ν•œ μ•ˆμ „ν•œ <span class="highlight" style="color: #6C7AF1; font-weight: bold;">μΉ΄ν’€ μ„œλΉ„μŠ€ ν’€μΉ΄</span>μž…λ‹ˆλ‹€.</p>
<p style="margin-top: 10px; margin-bottom: 10px;">ν’€μΉ΄ μ΄μš©μ„ μœ„ν•΄ <span class="highlight" style="color: #6C7AF1; font-weight: bold;">μ•„λž˜ λ²„νŠΌμ„ 클릭</span>ν•΄ 인증을 진행해 μ£Όμ„Έμš”.</p>

<script th:inline="javascript">
$("#bt").click(function() {
alert('성곡');
});

</script>

<button type="button" id="bt" onclick="alert('성곡')" style="display: inline-block; text-decoration: none; font-weight: 500;
color: #fff;
background-color: #6C7AF1;
padding: 15px 36px;
border-color: #6C7AF1;
border-radius: 8px;
font-size: 14px;
margin-top: 20px;
transition: background-color 0.3s;">νšŒμ‚¬ 메일 μΈμ¦ν•˜κΈ°</button>
<div class="help-text">
<a href="#" style="display: block; color: #505967; margin-top: 20px; text-decoration: underline;">인증이 잘 λ˜μ§€ μ•Šλ‚˜μš”?</a>
</div>
</div>
</body>

</html>

Loading