feat : redis 연동 및 로그인

app/api/build.gradle

@@ -17,9 +17,4 @@ dependencies {
 
     // 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/src/main/java/org/example/config/ApiConfig.java

@@ -1,14 +1,11 @@
 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")
 public class ApiConfig {
 

app/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/user-api/build.gradle

@@ -4,4 +4,11 @@ jar.enabled = true
 dependencies {
     implementation project(":app:domain")
     implementation project(":app:domain:user-domain")
+
+    implementation project(":app:infrastructure")
+
+    // 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/user-api/src/main/java/org/example/config/UserApiConfig.java

@@ -1,11 +1,14 @@
 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(UserDomainConfig.class)
+@EnableConfigurationProperties(TokenProperty.class)
 @ComponentScan(basePackages = "org.example")
 public class UserApiConfig {
 

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

@@ -5,6 +5,7 @@
 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 +21,12 @@ public class UserController {
     private final UserService userService;
 
     @PostMapping("/sign-up")
-    @Operation(summary = "유저 회원가입", description = "사용자는 회원가입을 할 수 있다.", tags = {"user"})
-    public ResponseEntity<String> signUp(@Valid @RequestBody SignUpRequest request) {
+    @Operation(summary = "유저 로그인", description = "사용자는 소셜 로그인을 할 수 있다.", tags = {"user"})
+    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.SocialType;
 
 public record SignUpRequest(
 
     @NotNull(message = "닉네임은 필수 입력값입니다.")
-    String nickname
+    String nickname,
+
+    @NotNull(message = "소셜 타입은 필수 입력값입니다.")
+    SocialType socialType,
+
+    @NotNull(message = "소셜 식별자는 필수 입력값입니다.")
+    String socialIdentifier
 ) {
 
     public User toUser() {
-        return new User(nickname);
+        return User.builder()
+            .nickname(nickname)
+            .socialType(socialType)
+            .socialIdentifier(socialIdentifier)
+            .build();
     }
 }

app/api/src/main/java/org/example/security/dto/UserParam.java → app/api/user-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/user-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/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,7 @@ allprojects {
 dependencies {
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation project(":app:api")
+    implementation project(":app:infrastructure")
 
     // docker-compose
     developmentOnly 'org.springframework.boot:spring-boot-docker-compose'

app/domain/user-domain/build.gradle

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

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

@@ -1,11 +1,22 @@
 package org.example.entity;
 
+import io.hypersistence.utils.hibernate.type.json.JsonType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
 import jakarta.persistence.Table;
+import java.time.LocalDate;
+import java.util.HashMap;
+import java.util.Map;
 import lombok.AccessLevel;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.example.vo.SocialType;
+import org.example.vo.UserGender;
+import org.example.vo.UserRole;
+import org.hibernate.annotations.Type;
 
 @Entity
 @Getter
@@ -16,7 +27,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;
+    @Type(JsonType.class)
+    @Column(name = "social_type", columnDefinition = "jsonb")
+    private Map<SocialType, String> socialCredentials = new HashMap<>();
+
+    @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, SocialType socialType, String socialIdentifier) {
         this.nickname = nickname;
+        this.socialCredentials.put(socialType, socialIdentifier);
+        this.userRole = UserRole.USER;
     }
 }

app/domain/user-domain/src/main/java/org/example/usecase/UserUseCase.java

@@ -4,13 +4,15 @@
 import org.example.entity.User;
 import org.example.repository.UserRepository;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 
 @Component
 @RequiredArgsConstructor
 public class UserUseCase {
 
     private final UserRepository userRepository;
 
+    @Transactional
     public User save(final User user) {
         return userRepository.save(user);
     }

app/domain/user-domain/src/main/java/org/example/vo/SocialType.java

@@ -0,0 +1,5 @@
+package org.example.vo;
+
+public enum SocialType {
+    GOOGLE, KAKAO, APPLE
+}

app/domain/user-domain/src/main/java/org/example/vo/UserGender.java

@@ -0,0 +1,5 @@
+package org.example.vo;
+
+public enum UserGender {
+    MAN, WOMAN
+}

app/infrastructure/build.gradle

@@ -0,0 +1,10 @@
+bootJar.enabled = false;
+jar.enabled = true;
+
+dependencies {
+    implementation "org.springframework.boot:spring-boot-starter-web"
+
+    //redis
+    implementation 'org.springframework.data:spring-data-redis'
+    implementation 'io.lettuce:lettuce-core:6.3.0.RELEASE'
+}

app/infrastructure/src/main/java/org/example/config/InfraStructureConfig.java

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

app/infrastructure/src/main/java/org/example/config/RedisConfig.java

@@ -0,0 +1,31 @@
+package org.example.config;
+
+import lombok.RequiredArgsConstructor;
+import org.example.property.RedisProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.serializer.GenericToStringSerializer;
+
+@Configuration
+@RequiredArgsConstructor
+public class RedisConfig {
+
+    private final RedisProperty redisProperty;
+
+    @Bean
+    public RedisConnectionFactory redisConnectionFactory() {
+        return new LettuceConnectionFactory(redisProperty.host(), redisProperty.port());
+    }
+
+    @Bean
+    StringRedisTemplate stringRedisTemplate(RedisConnectionFactory redisConnectionFactory) {
+        final StringRedisTemplate template = new StringRedisTemplate();
+        template.setConnectionFactory(redisConnectionFactory);
+        template.setHashKeySerializer(new GenericToStringSerializer<>(Object.class));
+
+        return template;
+    }
+}

app/infrastructure/src/main/java/org/example/property/RedisProperty.java

@@ -0,0 +1,11 @@
+package org.example.property;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(prefix = "spring.data.redis")
+public record RedisProperty(
+    String host,
+    int port
+) {
+
+}