#155 feat: 로그인 시 디바이스 토큰 정보 추가

PSR-Co · Aug 30, 2023 · 4b02cf2 · 4b02cf2
1 parent be1d734
commit 4b02cf2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/main/kotlin/com/psr/psr/PsrApplication.kt b/src/main/kotlin/com/psr/psr/PsrApplication.kt
@@ -3,9 +3,11 @@ package com.psr.psr
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.runApplication
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing
+import org.springframework.scheduling.annotation.EnableScheduling
 
 @SpringBootApplication
 @EnableJpaAuditing
+@EnableScheduling
 class PsrApplication
 
 fun main(args: Array<String>) {

diff --git a/src/main/kotlin/com/psr/psr/user/dto/request/LoginReq.kt b/src/main/kotlin/com/psr/psr/user/dto/request/LoginReq.kt
@@ -1,13 +1,8 @@
 package com.psr.psr.user.dto.request
 
-import com.psr.psr.user.entity.*
-import jakarta.annotation.Nullable
 import jakarta.validation.constraints.Email
 import jakarta.validation.constraints.NotBlank
-import jakarta.validation.constraints.NotEmpty
 import jakarta.validation.constraints.Pattern
-import org.jetbrains.annotations.NotNull
-import java.util.stream.Collectors
 
 
 data class LoginReq (
@@ -19,5 +14,6 @@ data class LoginReq (
         regexp = "^.*(?=^.{8,15}\$)(?=.*\\d)(?=.*[a-zA-Z])(?=.*[!@#\$%^&+=]).*\$",
         message = "비밀번호를 숫자, 문자, 특수문자 포함 8~15자리 이내로 입력해주세요"
     )
-    var password: String
+    var password: String,
+    val deviceToken: String? = null
     )
diff --git a/src/main/kotlin/com/psr/psr/user/service/UserService.kt b/src/main/kotlin/com/psr/psr/user/service/UserService.kt
@@ -119,6 +119,7 @@ class UserService(
     fun login(loginReq: LoginReq) : TokenDto{
         val user = userRepository.findByEmail(loginReq.email).orElseThrow{BaseException(NOT_EXIST_EMAIL)}
         if(!passwordEncoder.matches(loginReq.password, user.password)) throw BaseException(INVALID_PASSWORD)
+        if (loginReq.deviceToken != null) user.deviceToken = loginReq.deviceToken
         return createToken(user, loginReq.password)
     }