6주차 과제 - 로그인 구현하기

app/src/main/java/com/codesoom/assignment/application/AuthenticationService.java

@@ -1,8 +1,12 @@
 package com.codesoom.assignment.application;
 
 import com.codesoom.assignment.domain.User;
+import com.codesoom.assignment.dto.UserLoginData;
+import com.codesoom.assignment.errors.InvalidTokenException;
+import com.codesoom.assignment.errors.UserNotFoundException;
+import com.codesoom.assignment.errors.WrongPasswordException;
 import com.codesoom.assignment.utils.JwtUtil;
-import io.jsonwebtoken.Claims;
+import com.github.dozermapper.core.Mapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -12,16 +16,39 @@ public class AuthenticationService {
 
     private final JwtUtil jwtUtil;
     private final UserService userService;
+    private final Mapper mapper;
 
-    public AuthenticationService(JwtUtil jwtUtil, UserService userService) {
+    public AuthenticationService(JwtUtil jwtUtil, UserService userService , Mapper dozerMapper) {
         this.jwtUtil = jwtUtil;
         this.userService = userService;
+        this.mapper = dozerMapper;
+
     }
 
-    public String login(){
-        return jwtUtil.encode(1L);
+    /**
+     * JWT 토큰을 반환한다.
+     *
+     * @param loginData 로그인 정보
+     * @throws UserNotFoundException 로그인 정보에 해당하는 사용자가 존재하지 않을 경우
+     * @throws WrongPasswordException 사용자의 패스워드 정보가 일치하지 않은 경우
+     * @return JWT 반환
+     */
+    public String login(UserLoginData loginData){
+        User user = mapper.map(loginData , User.class);
+        User findUser = userService.findByEmail(user.getEmail());
+        if(!findUser.authenticate(user.getPassword())){
+            throw new WrongPasswordException();
+        }
+        return jwtUtil.encode(findUser.getId());
     }
 
+    /**
+     * JWT를 검증한다.
+     *
+     * @param token JWT
+     * @throws InvalidTokenException 토큰 정보가 null 또는 사이즈가 0이거나 첫 글자가 공백 , 유효하지 않은 토큰이라면 예외를 던진다.
+     * @throws UserNotFoundException 페이로드에 담긴 식별자에 해당하는 사용자가 없는 경우
+     */
     public void tokenValidation(String token){
         Long id = jwtUtil.getUserIdFromToken(token);
         userService.findUser(id);

app/src/main/java/com/codesoom/assignment/application/UserService.java

@@ -80,4 +80,16 @@ public User findUser(Long id) {
         return userRepository.findByIdAndDeletedIsFalse(id)
                 .orElseThrow(() -> new UserNotFoundException(id));
     }
+
+    /**
+     * 사용자를 조회한다.
+     *
+     * @param email 조회할 사용자의 이메일
+     * @throws UserNotFoundException 이메일에 해당하는 사용자가 존재하지 않을 경우
+     * @return 이메일에 해당하는 사용자
+     */
+    public User findByEmail(String email){
+        return userRepository.findByEmail(email)
+                .orElseThrow(() -> new UserNotFoundException(email));
+    }
 }

app/src/main/java/com/codesoom/assignment/controllers/ControllerErrorAdvice.java

@@ -5,6 +5,7 @@
 import com.codesoom.assignment.errors.ProductNotFoundException;
 import com.codesoom.assignment.errors.UserEmailDuplicationException;
 import com.codesoom.assignment.errors.UserNotFoundException;
+import com.codesoom.assignment.errors.WrongPasswordException;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
@@ -37,4 +38,10 @@ public ErrorResponse handleUserEmailIsAlreadyExisted() {
     public ErrorResponse handleInvalidToken(InvalidTokenException e){
         return new ErrorResponse("Invalid Token Exception" + e.getMessage());
     }
+
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ExceptionHandler(WrongPasswordException.class)
+    public ErrorResponse handleWrongPassword(){
+        return new ErrorResponse("Wrong Password Exception");
+    }
 }

app/src/main/java/com/codesoom/assignment/controllers/SessionController.java

@@ -2,12 +2,16 @@
 
 import com.codesoom.assignment.application.AuthenticationService;
 import com.codesoom.assignment.dto.SessionResponseData;
+import com.codesoom.assignment.dto.UserLoginData;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+
 /**
  * 1. Create -> 로그인 , 토큰 반환
  * 2. Read -> 세션 조회 , 유효 확인 , 세션 정보 반환
@@ -26,8 +30,8 @@ public SessionController(AuthenticationService authenticationService) {
 
     @PostMapping
     @ResponseStatus(HttpStatus.CREATED)
-    public SessionResponseData login(){
-        String accessToken = authenticationService.login();
+    public SessionResponseData login(@RequestBody @Valid UserLoginData loginData){
+        String accessToken = authenticationService.login(loginData);
         return SessionResponseData.builder()
                 .accessToken(accessToken)
                 .build();

app/src/main/java/com/codesoom/assignment/dto/UserLoginData.java

@@ -0,0 +1,32 @@
+package com.codesoom.assignment.dto;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.dozermapper.core.Mapping;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+@Getter
+public class UserLoginData {
+    @NotBlank
+    @Size(min = 3)
+    @Mapping("email")
+    private final String email;
+
+    @NotBlank
+    @Size(min = 4, max = 1024)
+    @Mapping("password")
+    private final String password;
+
+    @JsonCreator
+    public UserLoginData(@JsonProperty("email") String email,
+                         @JsonProperty("password") String password){
+        this.email = email;
+        this.password = password;
+    }
+}

app/src/main/java/com/codesoom/assignment/errors/UserNotFoundException.java

@@ -1,7 +1,7 @@
 package com.codesoom.assignment.errors;
 
 public class UserNotFoundException extends RuntimeException {
-    public UserNotFoundException(Long id) {
+    public UserNotFoundException(Object id) {
         super("User not found: " + id);
     }
 }

app/src/main/java/com/codesoom/assignment/errors/WrongPasswordException.java

@@ -0,0 +1,5 @@
+package com.codesoom.assignment.errors;
+
+public class WrongPasswordException extends RuntimeException{
+
+}

app/src/test/java/com/codesoom/assignment/applcation/AuthenticationServiceTest.java

@@ -2,8 +2,9 @@
 
 import com.codesoom.assignment.application.AuthenticationService;
 import com.codesoom.assignment.application.UserService;
-import com.codesoom.assignment.domain.User;
 import com.codesoom.assignment.utils.JwtUtil;
+import com.github.dozermapper.core.DozerBeanMapper;
+import com.github.dozermapper.core.Mapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
@@ -16,29 +17,31 @@ class AuthenticationServiceTest {
 
     private AuthenticationService service;
     private UserService userService;
-    private final String SECRET = "12345678901234567890123456789012";
+    private Mapper mapper;
+    private final String SECRET = "12345678901234567890123456789010";
 
     @BeforeEach
     void setUp() {
         JwtUtil jwtUtil = new JwtUtil(SECRET);
         userService = mock(UserService.class);
-        service = new AuthenticationService(jwtUtil, userService);
+        mapper = mock(Mapper.class);
+        service = new AuthenticationService(jwtUtil, userService , mapper);
     }
 
     @Nested
-    @DisplayName("")
-    class Describe_{
+    @DisplayName("login()")
+    class Describe_Login{
 
         @Nested
-        @DisplayName("")
+        @DisplayName("파라미터에 해당하는 사용자가 존재한다면")
         class Context_{
 
+            private final Long userId = 1L;
+
             @Test
             @DisplayName("")
             void It_(){
-                String accessToken = service.login();
-
-                assertThat(accessToken).contains(".xxxx");
+                fail("작성 필요");
             }
         }
     }

app/src/test/java/com/codesoom/assignment/controllers/ProductControllerTest.java

@@ -1,5 +1,9 @@
 package com.codesoom.assignment.controllers;
 
+import com.codesoom.assignment.application.UserService;
+import com.codesoom.assignment.dto.UserRegistrationData;
+import com.codesoom.assignment.utils.JwtUtil;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
@@ -16,6 +20,7 @@
 //@WebMvcTest(ProductController.class)
 @SpringBootTest
 @AutoConfigureMockMvc
+@DisplayName("ProductController 테스트")
 class ProductControllerTest {
 
     private final String VALID_TOKEN = "eyJhbGciOiJIUzI1NiJ9.eyJ1c2VySWQiOjF9.neCsyNLzy3lQ4o2yliotWT06FwSGZagaHpKdAkjnGGw";
@@ -24,12 +29,29 @@ class ProductControllerTest {
 
     @Autowired
     private MockMvc mockMvc;
+    @Autowired
+    private UserService service;
+    @Autowired
+    private JwtUtil jwtUtil;
 
     @BeforeEach
     void setUp() {
 
     }
 
+    long addUser(){
+        UserRegistrationData user = UserRegistrationData.builder()
+                .name("test")
+                .email("test@test.com")
+                .password("test")
+                .build();
+        return service.registerUser(user).getId();
+    }
+
+    void deleteUser(Long userId){
+        service.deleteUser(userId);
+    }
+
     @Nested
     @DisplayName("create()")
     class Describe_Create{
@@ -55,7 +77,6 @@ void It_() throws Exception {
         @DisplayName("인증 헤더의 토큰이 유효하지 않거나 공백이라면")
         class Context_NullOrBlankAuthenticationHeader{
 
-
             @Test
             @DisplayName("권한에 대한 승인이 거부되었다는 응답 코드를 반환한다.")
             void It_ThrowException() throws Exception {
@@ -105,14 +126,26 @@ void It_SaveProduct() throws Exception {
             @DisplayName("사용자가 존재한다면")
             class Context_{
 
+                private Long userId;
+                private String token;
 
+                @BeforeEach
+                void setUp() {
+                    userId = addUser();
+                    token = jwtUtil.encode(userId);
+                }
+
+                @AfterEach
+                void tearDown() {
+                    deleteUser(userId);
+                }
 
                 @Test
                 @DisplayName("상품을 저장하고 자원을 생성했다는 응답코드를 반환한다.")
                 void It_() throws Exception {
                     mockMvc.perform(
                                     post("/products")
-                                            .header("Authorization" , "Bearer " + VALID_TOKEN)
+                                            .header("Authorization" , "Bearer " + token)
                                             .accept(MediaType.APPLICATION_JSON_UTF8)
                                             .contentType(MediaType.APPLICATION_JSON)
                                             .content(CONTENT)