feat : redis 연동 및 로그인

app/api/build.gradle

@@ -6,6 +6,9 @@ allprojects {
         //swagger
         implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0'
 
+        implementation 'org.springframework.data:spring-data-commons:3.3.0'
+
+
         implementation "org.springframework.boot:spring-boot-starter-web"
         implementation 'org.springframework.boot:spring-boot-starter-validation'
         testImplementation "org.springframework.boot:spring-boot-starter-test"
@@ -14,12 +17,5 @@ allprojects {
 
 dependencies {
     implementation project(":app:api:user-api")
-
-    // spring-security
-    implementation 'org.springframework.boot:spring-boot-starter-security'
-
-    // jwt
-    implementation 'io.jsonwebtoken:jjwt-api:0.12.5'
-    runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.5'
-    runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.12.5'
+    implementation project(":app:api:common-api")
 }

app/api/common-api/build.gradle

@@ -0,0 +1,14 @@
+bootJar.enabled = false
+jar.enabled = true
+
+dependencies {
+    implementation project(":app:domain:user-domain")
+
+    // spring-security
+    implementation 'org.springframework.boot:spring-boot-starter-security'
+
+    // jwt
+    implementation 'io.jsonwebtoken:jjwt-api:0.12.5'
+    runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.5'
+    runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.12.5'
+}

app/api/common-api/src/main/java/org/example/config/CommonApiConfig.java

@@ -0,0 +1,13 @@
+package org.example.config;
+
+import org.example.property.TokenProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@EnableConfigurationProperties(TokenProperty.class)
+@ComponentScan(basePackages = "org.example")
+public class CommonApiConfig {
+
+}

app/api/src/main/java/org/example/filter/JWTFilter.java → app/api/common-api/src/main/java/org/example/filter/JWTFilter.java

@@ -33,7 +33,7 @@ protected void doFilterInternal(
         FilterChain filterChain
     ) throws ServletException, IOException {
         if (request.getHeader("Refresh") != null) {
-            TokenParam token = refreshTokenProcessor.process(request, response);
+            TokenParam token = refreshTokenProcessor.reissueToken(request);
             response.getWriter().write(new ObjectMapper().writeValueAsString(token));
             return;
         }

app/api/common-api/src/main/java/org/example/repository/RedisRepository.java

@@ -0,0 +1,9 @@
+package org.example.repository;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public interface RedisRepository {
+
+    void save(String userId, String refreshToken);
+}

app/api/src/main/java/org/example/security/dto/UserParam.java → app/api/common-api/src/main/java/org/example/security/dto/UserParam.java

@@ -3,6 +3,7 @@
 import java.util.Map;
 import java.util.UUID;
 import lombok.Builder;
+import org.example.vo.UserRole;
 import org.example.vo.UserRoleApiType;
 
 @Builder
@@ -26,4 +27,8 @@ public static UserParam fromPayload(Object payload) {
             .role(UserRoleApiType.valueOf(claim.get("role")))
             .build();
     }
+
+    public static UserParam as(UUID userId, UserRole userRole) {
+        return new UserParam(userId, UserRoleApiType.valueOf(userRole.name()));
+    }
 }

app/api/common-api/src/main/java/org/example/security/token/RefreshTokenProcessor.java

@@ -0,0 +1,27 @@
+package org.example.security.token;
+
+import jakarta.servlet.http.HttpServletRequest;
+import java.util.Date;
+import lombok.RequiredArgsConstructor;
+import org.example.repository.RedisRepository;
+import org.example.security.dto.TokenParam;
+import org.example.security.dto.UserParam;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class RefreshTokenProcessor {
+
+    private final JWTHandler jwtHandler;
+    private final JWTGenerator jwtGenerator;
+    private final RedisRepository redisRepository;
+
+    public TokenParam reissueToken(HttpServletRequest request) {
+        String refreshToken = jwtHandler.extractRefreshToken(request);
+        UserParam userParam = jwtHandler.extractUserFrom(refreshToken);
+        TokenParam newTokenParam = jwtGenerator.generate(userParam, new Date());
+
+        redisRepository.save(userParam.userId().toString(), newTokenParam.refreshToken());
+        return newTokenParam;
+    }
+}

app/api/src/main/java/org/example/config/ApiConfig.java

@@ -1,15 +1,10 @@
 package org.example.config;
 
-import org.example.property.TokenProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
 @Configuration
-@Import(UserApiConfig.class)
-@EnableConfigurationProperties(TokenProperty.class)
-@ComponentScan(basePackages = "org.example")
+@Import({UserApiConfig.class, CommonApiConfig.class})
 public class ApiConfig {
 
 }

app/api/user-api/build.gradle

@@ -4,4 +4,6 @@ jar.enabled = true
 dependencies {
     implementation project(":app:domain")
     implementation project(":app:domain:user-domain")
+
+    implementation project(":app:api:common-api")
 }

app/api/user-api/src/main/java/org/example/controller/UserController.java

@@ -1,10 +1,12 @@
 package org.example.controller;
 
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.example.dto.request.SignUpRequest;
 import org.example.entity.User;
+import org.example.security.dto.TokenParam;
 import org.example.service.UserService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -20,13 +22,13 @@ public class UserController {
     private final UserService userService;
 
     @PostMapping("/sign-up")
-    @Operation(summary = "유저 회원가입", description = "사용자는 회원가입을 할 수 있다.", tags = {"user"})
-    public ResponseEntity<String> signUp(@Valid @RequestBody SignUpRequest request) {
+    @Tag(name = "user")
+    @Operation(summary = "유저 로그인", description = "사용자는 소셜 로그인을 할 수 있다.")
+    public ResponseEntity<TokenParam> signUp(@Valid @RequestBody SignUpRequest request) {
         final User createdUser = request.toUser();
-        final User user = userService.signUp(createdUser);
-        final String nickName = userService.findNickname(user);
+        TokenParam tokenParam = userService.signUp(createdUser);
 
-        return ResponseEntity.ok(nickName + "사용자 생성 성공!");
+        return ResponseEntity.ok(tokenParam);
     }
 
 }

app/api/user-api/src/main/java/org/example/dto/request/SignUpRequest.java

@@ -2,14 +2,25 @@
 
 import jakarta.validation.constraints.NotNull;
 import org.example.entity.User;
+import org.example.vo.SocialLoginType;
 
 public record SignUpRequest(
 
     @NotNull(message = "닉네임은 필수 입력값입니다.")
-    String nickname
+    String nickname,
+
+    @NotNull(message = "소셜 타입은 필수 입력값입니다.")
+    SocialLoginType socialLoginType,
+
+    @NotNull(message = "소셜 식별자는 필수 입력값입니다.")
+    String socialIdentifier
 ) {
 
     public User toUser() {
-        return new User(nickname);
+        return User.builder()
+            .nickname(nickname)
+            .socialLoginType(socialLoginType)
+            .socialIdentifier(socialIdentifier)
+            .build();
     }
 }

app/api/user-api/src/main/java/org/example/repository/RedisRepository.java

@@ -0,0 +1,9 @@
+package org.example.repository;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public interface RedisRepository {
+
+    void save(String userId, String refreshToken);
+}

app/api/user-api/src/main/java/org/example/service/UserService.java

@@ -1,7 +1,12 @@
 package org.example.service;
 
+import java.util.Date;
 import lombok.RequiredArgsConstructor;
 import org.example.entity.User;
+import org.example.repository.RedisRepository;
+import org.example.security.dto.TokenParam;
+import org.example.security.dto.UserParam;
+import org.example.security.token.JWTGenerator;
 import org.example.usecase.UserUseCase;
 import org.springframework.stereotype.Service;
 
@@ -10,9 +15,17 @@
 public class UserService {
 
     private final UserUseCase userUseCase;
+    private final JWTGenerator jwtGenerator;
+    private final RedisRepository redisRepository;
 
-    public User signUp(final User user) {
-        return userUseCase.save(user);
+    public TokenParam signUp(final User user) {
+        User createdUser = userUseCase.save(user);
+        UserParam userParam = UserParam.as(createdUser.getId(), createdUser.getUserRole());
+        TokenParam tokenParam = jwtGenerator.generate(userParam, new Date());
+
+        redisRepository.save(userParam.userId().toString(), tokenParam.refreshToken());
+
+        return tokenParam;
     }
 
     public String findNickname(final User user) {

app/build.gradle

@@ -18,6 +18,8 @@ allprojects {
 dependencies {
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation project(":app:api")
+    implementation project(":app:domain")
+    implementation project(":app:infrastructure")
 
     // docker-compose
     developmentOnly 'org.springframework.boot:spring-boot-docker-compose'

app/domain/src/main/java/org/example/config/DomainConfig.java

@@ -0,0 +1,10 @@
+package org.example.config;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ComponentScan(basePackages = "org.example")
+public class DomainConfig {
+
+}

app/domain/src/main/java/org/example/entity/BaseEntity.java

@@ -10,15 +10,16 @@
 import lombok.Getter;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.domain.Persistable;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 @Getter
 @EntityListeners(value = {AuditingEntityListener.class})
 @MappedSuperclass
-public abstract class BaseEntity {
+public abstract class BaseEntity implements Persistable<UUID> {
 
     @Id
-    @Column(name = "id")
+    @Column(name = "id", updatable = false, nullable = false)
     private UUID id = UlidCreator.getMonotonicUlid().toUuid();
 
     @CreatedDate
@@ -28,4 +29,9 @@ public abstract class BaseEntity {
     @LastModifiedDate
     @Column(name = "updated_at", nullable = false)
     private LocalDateTime updatedAt;
+
+    @Override
+    public boolean isNew() {
+        return id != null;
+    }
 }

app/domain/user-domain/build.gradle

@@ -2,5 +2,8 @@ bootJar.enabled = false
 jar.enabled = true
 
 dependencies {
+    // hypersistence utils
+    implementation 'io.hypersistence:hypersistence-utils-hibernate-63:3.7.6'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.4'
     implementation project(":app:domain")
 }

app/domain/user-domain/src/main/java/org/example/entity/User.java

@@ -1,11 +1,20 @@
 package org.example.entity;
 
 import jakarta.persistence.Column;
+import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
 import jakarta.persistence.Table;
+import java.time.LocalDate;
 import lombok.AccessLevel;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.example.entity.credential.SocialCredentials;
+import org.example.vo.SocialLoginType;
+import org.example.vo.UserGender;
+import org.example.vo.UserRole;
 
 @Entity
 @Getter
@@ -16,7 +25,27 @@ public class User extends BaseEntity {
     @Column(name = "nickname", nullable = false)
     private String nickname;
 
-    public User(String nickname) {
+    @Column(name = "birth")
+    private LocalDate birth;
+
+    @Column(name = "fcm_token")
+    private String fcmToken;
+
+    @Embedded
+    private SocialCredentials socialCredentials = new SocialCredentials();
+
+    @Column(name = "gender")
+    @Enumerated(value = EnumType.STRING)
+    private UserGender userGender;
+
+    @Column(name = "role", nullable = false)
+    @Enumerated(value = EnumType.STRING)
+    private UserRole userRole;
+
+    @Builder
+    private User(String nickname, SocialLoginType socialLoginType, String socialIdentifier) {
         this.nickname = nickname;
+        this.socialCredentials.put(socialLoginType, socialIdentifier);
+        this.userRole = UserRole.USER;
     }
 }