Merge pull request #4 from MEOGO-DSM/3-user

🏄 :: (Meogo-3) user

src/main/kotlin/org/meogo/domain/user/domain/User.kt

@@ -0,0 +1,29 @@
+package org.meogo.domain.user.domain
+
+import org.meogo.global.base.BaseUUIDEntity
+import java.util.UUID
+import javax.persistence.Column
+import javax.persistence.Entity
+import javax.persistence.EnumType
+import javax.persistence.Enumerated
+
+@Entity
+class User(
+    id: UUID? = null,
+
+    @Column(nullable = false, length = 4)
+    val name: String,
+
+    @Column(name = "account_id", nullable = false, length = 15, unique = true)
+    val accountId: String,
+
+    val password: String,
+
+    @Column(name = "enrolled_school", nullable = true)
+    val enrolledSchool: Int? = 0,
+
+    val profile: String? = null,
+
+    @Enumerated(EnumType.STRING)
+    val role: UserRole
+) : BaseUUIDEntity(id)

src/main/kotlin/org/meogo/domain/user/domain/UserRole.kt

@@ -0,0 +1,7 @@
+package org.meogo.domain.user.domain
+
+enum class UserRole {
+    MANAGER,
+    USER,
+    ADMIN
+}

src/main/kotlin/org/meogo/domain/user/exception/UserNotFoundException.kt

@@ -0,0 +1,8 @@
+package org.meogo.domain.user.exception
+
+import org.meogo.global.error.exception.ErrorCode
+import org.meogo.global.error.exception.MeogoException
+
+object UserNotFoundException : MeogoException(
+    ErrorCode.USER_NOT_FOUND
+)

src/main/kotlin/org/meogo/domain/user/facade/UserFacade.kt

@@ -0,0 +1,22 @@
+package org.meogo.domain.user.facade
+
+import org.meogo.domain.user.domain.User
+import org.meogo.domain.user.exception.UserNotFoundException
+import org.meogo.domain.user.repository.UserRepository
+import org.springframework.security.core.context.SecurityContextHolder
+import org.springframework.stereotype.Component
+
+@Component
+class UserFacade(
+    private val userRepository: UserRepository
+) {
+
+    fun currentUser(): User? {
+        val authentication = SecurityContextHolder.getContext().authentication
+        val accountId = authentication?.name
+        return accountId?.let { getUserByAccountId(it) }
+    }
+
+    fun getUserByAccountId(accountId: String): User =
+        userRepository.findByAccountId(accountId) ?: throw UserNotFoundException
+}

src/main/kotlin/org/meogo/domain/user/repository/UserRepository.kt

@@ -0,0 +1,13 @@
+package org.meogo.domain.user.repository
+
+import org.meogo.domain.user.domain.User
+import org.springframework.data.repository.Repository
+import java.util.UUID
+
+interface UserRepository : Repository<User, UUID> {
+    fun save(entity: User): User
+
+    fun findByAccountId(accountId: String): User?
+
+    fun existsByAccountId(accountId: String): Boolean
+}

src/main/kotlin/org/meogo/global/error/exception/ErrorCode.kt

@@ -7,6 +7,8 @@ enum class ErrorCode(
     INVALID_TOKEN(401, "Invalid Token"),
     EXPIRED_TOKEN(401, "Expired Token"),
 
+    USER_NOT_FOUND(404, "User not found"),
+
     // Internal Server Error
     INTERNAL_SERVER_ERROR(500, "Internal Server Error")
 }

src/main/kotlin/org/meogo/global/jwt/JwtTokenProvider.kt

@@ -12,7 +12,6 @@ import org.meogo.global.jwt.entity.repository.RefreshTokenRepository
 import org.meogo.global.jwt.exception.ExpiredTokenException
 import org.meogo.global.jwt.exception.InvalidJwtException
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken
-import org.springframework.security.core.userdetails.UserDetails
 import org.springframework.stereotype.Component
 import java.util.Date
 import javax.servlet.http.HttpServletRequest
@@ -29,16 +28,17 @@ class JwtTokenProvider(
     }
 
     fun getToken(name: String): TokenResponse {
-        val accessToken: String = generateAccessToken(name, ACCESS_KEY, jwtProperties.accessExp)
-        val refreshToken: String = generateRefreshToken(REFRESH_KEY, jwtProperties.refreshExp)
+        val accessToken = generateAccessToken(name, ACCESS_KEY, jwtProperties.accessExp)
+        val refreshToken = generateRefreshToken(REFRESH_KEY, jwtProperties.refreshExp)
         refreshTokenRepository.save(
             RefreshToken(name, refreshToken, jwtProperties.refreshExp)
         )
-        return TokenResponse(accessToken = accessToken, refreshToken = refreshToken)
+        return TokenResponse(accessToken, refreshToken)
     }
 
     private fun generateAccessToken(name: String, type: String, expiration: Long): String {
-        return Jwts.builder().signWith(SignatureAlgorithm.HS256, jwtProperties.secretKey)
+        return Jwts.builder()
+            .signWith(SignatureAlgorithm.HS256, jwtProperties.secretKey)
             .setSubject(name)
             .setHeaderParam("type", type)
             .setIssuedAt(Date())
@@ -47,48 +47,45 @@ class JwtTokenProvider(
     }
 
     private fun generateRefreshToken(type: String, ttl: Long): String {
-        return Jwts.builder().signWith(SignatureAlgorithm.HS256, jwtProperties.secretKey)
+        return Jwts.builder()
+            .signWith(SignatureAlgorithm.HS256, jwtProperties.secretKey)
             .setHeaderParam("type", type)
             .setIssuedAt(Date())
             .setExpiration(Date(System.currentTimeMillis() + ttl * 1000))
             .compact()
     }
 
     fun resolveToken(request: HttpServletRequest): String? {
-        val bearer: String? = request.getHeader("Authorization")
-
+        val bearer = request.getHeader("Authorization")
         return parseToken(bearer)
     }
 
     fun parseToken(bearerToken: String?): String? {
         return if (bearerToken != null && bearerToken.startsWith("Bearer ")) {
-            return bearerToken.replace("Bearer ", "")
+            bearerToken.removePrefix("Bearer ")
         } else {
             null
         }
     }
 
     fun authorization(token: String): UsernamePasswordAuthenticationToken {
-        return token.let {
-            val userDetails: UserDetails = authDetailsService.loadUserByUsername(getTokenSubject(token))
-            return UsernamePasswordAuthenticationToken(userDetails, "", userDetails.authorities)
-        }
+        val userDetails = authDetailsService.loadUserByUsername(getTokenSubject(token))
+        return UsernamePasswordAuthenticationToken(userDetails, "", userDetails.authorities)
     }
 
-    private fun getTokenSubject(subject: String): String {
-        return getTokenBody(subject).subject
+    private fun getTokenSubject(token: String): String {
+        return getTokenBody(token).subject
     }
 
     private fun getTokenBody(token: String?): Claims {
         return try {
-            Jwts.parser().setSigningKey(jwtProperties.secretKey)
-                .parseClaimsJws(token).body
+            Jwts.parser().setSigningKey(jwtProperties.secretKey).parseClaimsJws(token).body
+        } catch (e: ExpiredJwtException) {
+            throw ExpiredTokenException
+        } catch (e: InvalidClaimException) {
+            throw InvalidJwtException
         } catch (e: Exception) {
-            when (e) {
-                is ExpiredJwtException -> throw ExpiredTokenException
-                is InvalidClaimException -> throw InvalidJwtException
-                else -> throw InvalidJwtException
-            }
+            throw InvalidJwtException
         }
     }
 }