[250331]-Users : 토큰기능 추가 / 유저정보 validation / 유닛테스트

Author: HJjung1234

build.gradle

@@ -26,12 +26,17 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-jdbc'
     implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'io.jsonwebtoken:jjwt-api:0.12.6'
+    runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.6'
+    runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.12.6' // JSON 처리를 위한 의존성
     compileOnly 'org.projectlombok:lombok'
+    testCompileOnly 'org.projectlombok:lombok'
     developmentOnly 'org.springframework.boot:spring-boot-devtools'
     runtimeOnly 'com.mysql:mysql-connector-j'
     annotationProcessor 'org.projectlombok:lombok'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    implementation 'com.google.code.gson:gson'
 }
 
 tasks.named('test') {

src/main/java/com/ecommerce/member/dto/requset/LoginRequest.java

@@ -6,4 +6,9 @@ public class LoginRequest {
 
     public String password;
 
+    public LoginRequest(String email, String password) {
+        this.email = email;
+        this.password = password;
+    }
+
 }

src/main/java/com/ecommerce/member/dto/requset/ModifyUserRequest.java

@@ -2,9 +2,12 @@
 
 public class ModifyUserRequest {
 
-    public String email;
-
     public String userName;
 
     public String phoneNumber;
+
+    public ModifyUserRequest(String userName, String phoneNumber) {
+        this.userName = userName;
+        this.phoneNumber = phoneNumber;
+    }
 }

src/main/java/com/ecommerce/member/dto/requset/RegisterRequest.java

@@ -16,4 +16,11 @@ public boolean hasNotPassword() {
         return password == null || password.isBlank();
     }
 
+    public RegisterRequest(String email, String userName, String phoneNumber, String role, String password) {
+        this.email = email;
+        this.userName = userName;
+        this.phoneNumber = phoneNumber;
+        this.role = role;
+        this.password = password;
+    }
 }

src/main/java/com/ecommerce/member/memberController/MemberController.java

@@ -21,6 +21,7 @@
 @RequiredArgsConstructor
 public class MemberController {
 
+    private final JwtUtil jwtUtil;
     private final UserService userService;
 
     @PostMapping("/member/users/registration")
@@ -30,7 +31,7 @@ public UserEntity register(@RequestBody RegisterRequest registerRequest) throws
 
     @PostMapping("/member/users/modify")
     public UserEntity modifyUser(@RequestBody ModifyUserRequest dto, @RequestHeader("Authorization") String token) {
-        String email = JwtUtil.extractEmail(token);
+        String email = jwtUtil.extractEmail(token);
         return userService.modifyUser(email, dto);
     }
 

src/main/java/com/ecommerce/member/memberEntity/UserEntity.java

@@ -4,6 +4,7 @@
 import jakarta.persistence.*;
 
 @Entity
+@Table(name = "users")
 public class UserEntity {
 
     @Id
@@ -13,16 +14,25 @@ public class UserEntity {
     @Column(unique = true)
     public String email;
 
-    public String userName;
-
     public String password;
 
     public String salt;
 
-    @Column(unique = true)
+    @Column(name = "user_name")
+    public String userName;
+
+    @Column(name = "phone_number", unique = true)
     public String phoneNumber;
 
+    public String role;
+
+    public UserEntity() {
+    }
+
     public UserEntity(String email, String userName, String password, String salt, String phoneNumber, String role) {
+        if(email == null    || email.isBlank())    throw new IllegalArgumentException("Email is necessary");
+        if(password == null || password.isBlank()) throw new IllegalArgumentException("Password is necessary");
+
         this.email = email;
         this.userName = userName;
         this.password = password;
@@ -31,12 +41,4 @@ public UserEntity(String email, String userName, String password, String salt, S
         this.role = role;
     }
 
-    public String role;
-
-    public UserEntity() {
-    }
-
-
-
-
 }

src/main/java/com/ecommerce/member/memberService/UserService.java

@@ -17,6 +17,7 @@
 @RequiredArgsConstructor
 public class UserService {
 
+    private final JwtUtil jwtUtil;
     private final UserRepository userRepository;
 
     public UserEntity registerUser(RegisterRequest registerRequest) throws NoSuchAlgorithmException {
@@ -33,7 +34,8 @@ public UserEntity registerUser(RegisterRequest registerRequest) throws NoSuchAlg
     }
 
     public UserEntity modifyUser(String email, ModifyUserRequest dto) {
-        var user = userRepository.findByEmail(email).orElseThrow();
+        var user = userRepository.findByEmail(email)
+                .orElseThrow(() -> new IllegalArgumentException("User not found"));
 
         user.userName = dto.userName;
         user.phoneNumber = dto.phoneNumber;
@@ -44,7 +46,7 @@ public UserEntity modifyUser(String email, ModifyUserRequest dto) {
 
     public LoginResponse responseToken(LoginRequest loginRequest) throws NoSuchAlgorithmException {
         UserEntity loginUser = checkValidPasswd(loginRequest);
-        String token = JwtUtil.generateToken(loginUser.email);
+        String token = jwtUtil.generateToken(loginUser.email);
 
         return new LoginResponse(token);
     }
@@ -54,14 +56,15 @@ public UserEntity checkValidPasswd(LoginRequest loginRequest) throws NoSuchAlgor
         String hashWithSalt = PasswordUtil.hashWithSalt(loginRequest.password, user.salt);
 
         if (!hashWithSalt.equals(user.password)) {
-            throw new IllegalArgumentException("It has not valid password");
+            throw new IllegalArgumentException("Not valid password");
         }
 
         return user;
     }
 
     private UserEntity getUserByEmail(LoginRequest loginRequest) {
-        return userRepository.findByEmail(loginRequest.email).orElseThrow();
+        return userRepository.findByEmail(loginRequest.email)
+                .orElseThrow(() -> new IllegalArgumentException("User not found"));
     }
 
 

src/main/java/com/ecommerce/util/JsonUtilsDeco.java

@@ -0,0 +1,31 @@
+package com.ecommerce.util;
+
+import com.google.gson.FieldNamingPolicy;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
+
+import java.util.Map;
+
+public interface JsonUtilsDeco {
+    Gson prettyGson = new GsonBuilder()
+            .setPrettyPrinting()
+            .disableHtmlEscaping()
+            .serializeNulls()
+            .create();
+    Gson gson = new GsonBuilder()
+            .disableHtmlEscaping()
+            .serializeNulls()
+            .create();
+    Gson snakeGson = new GsonBuilder()
+            .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
+            .disableHtmlEscaping()
+            .serializeNulls()
+            .create();
+
+    static String convertMapToJsonString(Map<String, String> payload) {
+        JsonObject obj = new JsonObject();
+        payload.forEach(obj::addProperty);
+        return prettyGson.toJson(obj);
+    }
+}

src/main/java/com/ecommerce/util/JwtKeyProvider.java

@@ -0,0 +1,20 @@
+package com.ecommerce.util;
+
+import io.jsonwebtoken.security.Keys;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import javax.crypto.SecretKey;
+import java.nio.charset.StandardCharsets;
+
+@Component
+public class JwtKeyProvider {
+
+    @Value("${jwt.secret}")
+    private String secret;
+
+    public SecretKey getKey() {
+        return Keys.hmacShaKeyFor(secret.getBytes(StandardCharsets.UTF_8));
+    }
+}

src/main/java/com/ecommerce/util/JwtUtil.java

@@ -1,12 +1,37 @@
 package com.ecommerce.util;
 
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jws;
+import io.jsonwebtoken.Jwts;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+@Component
+@RequiredArgsConstructor
 public class JwtUtil {
 
-    public static String generateToken(String userId) {
-        return new String();
+    private final JwtKeyProvider keyProvider;
+
+    public String generateToken(String id) {
+
+        return Jwts.builder()
+                .setSubject(id)
+                .setIssuedAt(new Date())
+                .setExpiration(new Date(System.currentTimeMillis() + 1000 * 60 * 60))
+                .signWith(keyProvider.getKey(), Jwts.SIG.HS256)
+                .compact();
+
+    }
+
+    public String extractEmail(String token) {
+        Jws<Claims> claimsJws = Jwts.parser().verifyWith(keyProvider.getKey()).build().parseSignedClaims(token);
+        return replacePrefix(claimsJws.getPayload().getSubject());
     }
 
-    public static String extractEmail(String token) {
-        return new String();
+    private String replacePrefix(String subject) {
+        return subject.replace("Bearer ", "");
     }
+
 }

src/main/resources/application.yaml

@@ -4,12 +4,15 @@ spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://127.0.0.1:3306/ecommerce
-    username: root
-    password: User#1234
+    username:
+    password:
   jpa:
-    generate-ddl: true
+    generate-ddl: false
     hibernate:
-      ddl-auto: update
+      ddl-auto: none
+      show_sql: true
+      format_sql: true
+
 
 logging:
   level:
@@ -21,3 +24,7 @@ logging:
             sql:
               BasicBinder: TRACE
 
+
+
+jwt:
+  secret: ""

src/test/java/com/ecommerce/member/memberService/UserServiceTest.java

@@ -0,0 +1,83 @@
+package com.ecommerce.member.memberService;
+
+import com.ecommerce.member.dto.requset.LoginRequest;
+import com.ecommerce.member.dto.requset.ModifyUserRequest;
+import com.ecommerce.member.dto.requset.RegisterRequest;
+import com.ecommerce.member.dto.response.LoginResponse;
+import com.ecommerce.member.memberEntity.UserEntity;
+import com.ecommerce.member.memberRepository.UserRepository;
+import com.ecommerce.util.JsonUtilsDeco;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.security.NoSuchAlgorithmException;
+
+import static org.assertj.core.api.BDDAssertions.then;
+
+//@SpringBootTest(classes ={
+//          UserEntity.class
+//        , UserService.class
+//        , JwtUtil.class
+//        , JwtKeyProvider.class
+//        , PasswordUtil.class})
+//@EnableJpaRepositories(basePackages ="com.ecommerce.member.memberRepository")
+//@EntityScan(basePackages ="com.ecommerce.member.UserEntity")
+//@DataJpaTest
+@SpringBootTest
+class UserServiceTest {
+
+    @Autowired private UserService sut;
+    @Autowired private UserRepository userRepository;
+
+
+    @Test
+    @DisplayName("빈이 Null은 아닌지")
+    void isBeanNotEmpty() {
+        then(sut).isNotNull();
+    }
+
+
+    @Test
+    @DisplayName("회원가입 테스트")
+    void registerTest() throws NoSuchAlgorithmException {
+
+        // Given
+        RegisterRequest registerRequest = new RegisterRequest("[email protected]", "tempuser", "010-0000-0000", "CUSTOMER", "passwordTest");
+
+        // When
+        UserEntity userEntity = sut.registerUser(registerRequest);
+
+        // Then
+        then(userEntity).isNotNull();
+
+    }
+
+
+    @Test
+    @DisplayName("로그인 요청시 JWT 토큰생성과 응답 테스트")
+    void responseTokenTest() throws NoSuchAlgorithmException {
+
+        // Given
+        LoginRequest passwordTest = new LoginRequest("[email protected]", "passwordTest");
+
+        // When
+        LoginResponse loginResponse = sut.responseToken(passwordTest);
+
+        // Then
+        then(loginResponse).isNotNull();
+
+        JsonUtilsDeco.prettyGson.toJson(loginResponse);
+    }
+
+    @Test
+    @DisplayName("유저 정보 변경 테스트")
+    void modifyUserTest() {
+        String email = "[email protected]";
+        ModifyUserRequest userRequest = new ModifyUserRequest("tempuser", "010-0000-1234");
+        sut.modifyUser(email, userRequest);
+    }
+
+}
+