[PR]User Authentication

spring-boot-api/build.gradle

@@ -17,8 +17,14 @@ repositories {
 
 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-//	implementation 'org.springframework.boot:spring-boot-starter-security'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
+	// security
+	implementation 'org.springframework.boot:spring-boot-starter-security'
+	implementation 'io.jsonwebtoken:jjwt:0.9.1'
+	// https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api
+	implementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.1'
+
+
 	// for swagger
 	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.4'
 	runtimeOnly 'com.mysql:mysql-connector-j'

spring-boot-api/src/main/java/com/ssafy/springbootapi/domain/user/api/UserController.java

@@ -13,6 +13,8 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.UUID;
+
 @RestController
 @RequestMapping("/api/v1/users")
 @RequiredArgsConstructor
@@ -29,21 +31,21 @@ public ResponseEntity<UserSignUpResponse> signUp(@RequestBody UserSignUpRequest
     @GetMapping("/{id}")
     @ToException
     @Operation(summary = "회원 정보", description = "유저정보 얻을 때 사용하는 API")
-    public ResponseEntity<UserInfoResponse> getInfo(@PathVariable Long id){
+    public ResponseEntity<UserInfoResponse> getInfo(@PathVariable UUID id){
         return ResponseEntity.status(HttpStatus.ACCEPTED).body(userService.getUserInfo(id));
     }
 
-    @PatchMapping
+    @PatchMapping("/{id}")
     @ToException
     @Operation(summary = "회원 정보 수정", description = "회원 정보 수정 할 때 사용하는 API")
-    public ResponseEntity<UserUpdateResponse> update(@RequestBody UserUpdateRequest userUpdateRequest){
-        return ResponseEntity.status(HttpStatus.OK).body(userService.updateUserInfo(userUpdateRequest));
+    public ResponseEntity<UserUpdateResponse> update(@PathVariable(name = "id", required = true) UUID id, @RequestBody UserUpdateRequest userUpdateRequest){
+        return ResponseEntity.status(HttpStatus.OK).body(userService.updateUserInfo(id, userUpdateRequest));
     }
 
     @DeleteMapping("/{id}")
     @ToException
     @Operation(summary = "회원 탈퇴", description = "회원 탈퇴 할 때 사용하는 API")
-    public ResponseEntity<Boolean> remove(@PathVariable Long id){
+    public ResponseEntity<Boolean> remove(@PathVariable UUID id){
         userService.removeUser(id);
         return ResponseEntity.status(HttpStatus.OK).build();
     }

spring-boot-api/src/main/java/com/ssafy/springbootapi/domain/user/application/UserService.java

@@ -6,10 +6,14 @@
 import com.ssafy.springbootapi.domain.user.dto.*;
 import com.ssafy.springbootapi.domain.user.exception.UserDuplicatedException;
 import com.ssafy.springbootapi.domain.user.exception.UserNotFoundException;
+import com.ssafy.springbootapi.global.auth.jwt.refreshToken.RefreshTokenRepository;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
+import java.util.UUID;
+
 /*
  * TODO:: 사용자 정의 exception
  *  - user not found exception
@@ -18,44 +22,62 @@
 @RequiredArgsConstructor
 public class UserService {
     private final UserRepository userRepository;
+    private final RefreshTokenRepository refreshTokenRepository;
     private final UserMapper userMapper;
+    private final PasswordEncoder passwordEncoder;
 
     public UserSignUpResponse signUp(UserSignUpRequest requestDTO){
         if(userRepository.findByEmail(requestDTO.getEmail()).isPresent()){
             throw new UserDuplicatedException(requestDTO.getEmail()+"이미 존재하는 사용자");
         }
-        User user = userRepository.save(requestDTO.toEntity());
+        User user = userRepository.save(
+                User.builder()
+                .email(requestDTO.getEmail())
+                .password(passwordEncoder.encode(requestDTO.getPassword())) // password 암호화
+                .name(requestDTO.getName())
+                .addresses(null)
+                .build());
+
         return UserSignUpResponse.builder()
                 .email(user.getEmail())
                 .name(user.getName())
                 .build();
     }
 
 
-    public UserInfoResponse getUserInfo(Long id) {
+    public UserInfoResponse getUserInfo(UUID id) {
         User user = userRepository.findById(id)
                 .orElseThrow(()->new UserNotFoundException(id+" 사용자 없음"));
         return UserInfoResponse.builder()
                 .email(user.getEmail())
                 .name(user.getName())
+                .createdAt(user.getCreatedAt())
                 .addresses(user.getAddresses())
                 .build();
     }
 
     @Transactional
-    public UserUpdateResponse updateUserInfo(UserUpdateRequest requestDTO) {
-        User user = userRepository.findById(requestDTO.getId())
-                .orElseThrow(()->new UserNotFoundException(requestDTO.getEmail()+" 사용자 없음"));
+    public UserUpdateResponse updateUserInfo(UUID id, UserUpdateRequest requestDTO) {
+        User user = userRepository.findById(id)
+                .orElseThrow(()->new UserNotFoundException(id+" 사용자 없음"));
 
+        requestDTO.setPassword(passwordEncoder.encode(requestDTO.getPassword()));
         userMapper.updateUserFromDto(requestDTO,user);
+
         user = userRepository.save(user);
 
-        return UserUpdateResponse.builder().email(user.getEmail()).name(user.getName()).build();
+        return UserUpdateResponse.builder().email(user.getEmail()).name(user.getName()).createdAt(user.getCreatedAt()).build();
     }
 
-    public void removeUser(Long id) {
+    @Transactional
+    public void removeUser(UUID id) {
         User user = userRepository.findById(id)
                 .orElseThrow(()->new UserNotFoundException(id+" 사용자 없음"));
+
+        // refresh 토큰 삭제
+        refreshTokenRepository.findByUserId(id)
+                        .ifPresent(refreshTokenRepository::delete);
+
         userRepository.delete(user);
     }
 

spring-boot-api/src/main/java/com/ssafy/springbootapi/domain/user/dao/UserRepository.java

@@ -5,8 +5,9 @@
 import org.springframework.stereotype.Repository;
 
 import java.util.Optional;
+import java.util.UUID;
 
 @Repository
-public interface UserRepository extends JpaRepository<User, Long> {
+public interface UserRepository extends JpaRepository<User, UUID> {
     Optional<User> findByEmail(String email);
 }

spring-boot-api/src/main/java/com/ssafy/springbootapi/domain/user/domain/Address.java

@@ -1,5 +1,6 @@
 package com.ssafy.springbootapi.domain.user.domain;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -26,8 +27,9 @@ public class Address {
     @Enumerated(EnumType.STRING)
     private IsDefault isDefault;
 
-    @ManyToOne // optional true => nullable
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "id")
+    @JsonIgnore
     private User user;
 
 }

spring-boot-api/src/main/java/com/ssafy/springbootapi/domain/user/domain/User.java

@@ -1,28 +1,36 @@
 package com.ssafy.springbootapi.domain.user.domain;
 
 import jakarta.persistence.*;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+import lombok.*;
+import org.hibernate.annotations.CreationTimestamp;
+import org.hibernate.annotations.GenericGenerator;
 
+import java.time.LocalDateTime;
 import java.util.List;
+import java.util.UUID;
 
 
 /*
  * TODO:: id to uuid
  */
 @Entity
-@Table(name = "users")
+@Table(name = "user")
 @NoArgsConstructor
 @AllArgsConstructor
 @Getter
+@Setter
 @Builder
+@ToString
 public class User {
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private Long id;
+    @GeneratedValue(generator = "UUID")
+    @GenericGenerator(name = "UUID", strategy = "org.hibernate.id.UUIDGenerator")
+    @Column(updatable = false, nullable = false)
+    private UUID id;
+//    @Id
+//    @GeneratedValue(strategy = GenerationType.IDENTITY)
+//    @Column(name = "id")
+//    private Long id;
 
     @Column(name = "email", unique = true, nullable = false)
     private String email;
@@ -33,18 +41,15 @@ public class User {
     @Column(name = "name", unique = false, nullable = false)
     private String name;
 
-    @OneToMany(mappedBy = "user")
-    @Column(name = "addresses" , nullable = true)
+    @Enumerated(EnumType.STRING)
+    @Column(name = "type", columnDefinition = "varchar(255) default 'BUYER'")
+    private UserType type = UserType.BUYER;
+
+    @Column(nullable = false, updatable = false)
+    @CreationTimestamp
+    private LocalDateTime createdAt;
+
+    @OneToMany(mappedBy = "user", fetch = FetchType.LAZY)
     private List<Address> addresses;
 
-    @Override
-    public String toString() {
-        return "User{" +
-                "id=" + id +
-                ", email='" + email + '\'' +
-                ", password='" + password + '\'' +
-                ", name='" + name + '\'' +
-                ", addresses=" + addresses +
-                '}';
-    }
 }

spring-boot-api/src/main/java/com/ssafy/springbootapi/domain/user/domain/UserType.java

@@ -0,0 +1,14 @@
+package com.ssafy.springbootapi.domain.user.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum UserType {
+    ADMIN("ADMIN"),
+    BUYER("BUYER"),
+    SELLER("SELLER");
+
+    private String description;
+}

spring-boot-api/src/main/java/com/ssafy/springbootapi/domain/user/dto/UserInfoResponse.java

@@ -5,6 +5,7 @@
 import lombok.Builder;
 import lombok.Getter;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 @AllArgsConstructor
@@ -13,5 +14,7 @@
 public class UserInfoResponse {
     private String email;
     private String name;
+    private LocalDateTime createdAt;
     private List<Address> addresses;
+
 }

spring-boot-api/src/main/java/com/ssafy/springbootapi/domain/user/dto/UserLoginRequest.java

@@ -0,0 +1,28 @@
+package com.ssafy.springbootapi.domain.user.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@NoArgsConstructor
+@AllArgsConstructor
+@Getter
+@Setter
+public class UserLoginRequest {
+
+    @NotBlank(message = "email is blank!")
+    public String email;
+
+    @NotBlank(message = "password is blank!")
+    public String password;
+
+    @Override
+    public String toString() {
+        return "UserSignUpRequestDTO{" +
+                "email='" + email + '\'' +
+                ", password='" + password + '\'' +
+                '}';
+    }
+}

spring-boot-api/src/main/java/com/ssafy/springbootapi/domain/user/dto/UserLoginResponse.java

@@ -0,0 +1,10 @@
+package com.ssafy.springbootapi.domain.user.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public class UserLoginResponse {
+    String accessToken;
+}

spring-boot-api/src/main/java/com/ssafy/springbootapi/domain/user/dto/UserSignUpRequest.java

@@ -4,10 +4,13 @@
 import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.password.PasswordEncoder;
 
 @AllArgsConstructor
 @Getter
 public class UserSignUpRequest {
+
     @NotBlank(message = "email is blank!")
     public String email;
 
@@ -17,15 +20,6 @@ public class UserSignUpRequest {
     @NotBlank(message = "name is blank!")
     public String name;
 
-    public User toEntity(){
-        return User.builder()
-                .email(email)
-                .password(password)
-                .name(name)
-                .addresses(null)
-                .build();
-    }
-
     @Override
     public String toString() {
         return "UserSignUpRequestDTO{" +

spring-boot-api/src/main/java/com/ssafy/springbootapi/domain/user/dto/UserUpdateRequest.java

@@ -3,22 +3,12 @@
 import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.Setter;
 
 @AllArgsConstructor
 @Getter
+@Setter
 public class UserUpdateRequest {
-    @NotBlank(message = "id is blank!")
-    public Long id;
-    public String email;
     public String password;
     public String name;
-
-    @Override
-    public String toString() {
-        return "UserSignUpRequestDTO{" +
-                "email='" + email + '\'' +
-                ", password='" + password + '\'' +
-                ", name='" + name + '\'' +
-                '}';
-    }
 }

spring-boot-api/src/main/java/com/ssafy/springbootapi/domain/user/dto/UserUpdateResponse.java

@@ -4,10 +4,13 @@
 import lombok.Builder;
 import lombok.Getter;
 
+import java.time.LocalDateTime;
+
 @AllArgsConstructor
 @Getter
 @Builder
 public class UserUpdateResponse {
     private String email;
     private String name;
+    private LocalDateTime createdAt;
 }