redis를 이전하기 위해 설정했던 모든 커밋 Revert

This commit is contained in:
2024-11-24 01:23:41 +09:00
parent e38ed331b6
commit b7d7afb8a5
34 changed files with 214 additions and 637 deletions

View File

@@ -12,8 +12,7 @@ import kr.co.vividnext.sodalive.common.SodaException
import kr.co.vividnext.sodalive.member.MemberAdapter
import kr.co.vividnext.sodalive.member.MemberRepository
import kr.co.vividnext.sodalive.member.token.MemberToken
import kr.co.vividnext.sodalive.redis.v1.MemberTokenRepository
import kr.co.vividnext.sodalive.redis.v2.MemberTokenRepositoryV2
import kr.co.vividnext.sodalive.member.token.MemberTokenRepository
import org.slf4j.LoggerFactory
import org.springframework.beans.factory.InitializingBean
import org.springframework.beans.factory.annotation.Value
@@ -36,8 +35,7 @@ class TokenProvider(
@Value("\${jwt.token-validity-in-seconds}")
private val tokenValidityInSeconds: Long,
private val repository: MemberRepository,
private val tokenRepository: MemberTokenRepository,
private val tokenRepositoryV2: MemberTokenRepositoryV2
private val tokenRepository: MemberTokenRepository
) : InitializingBean {
private val logger = LoggerFactory.getLogger(TokenProvider::class.java)
@@ -67,11 +65,11 @@ class TokenProvider(
val lock = getOrCreateLock(memberId = memberId)
lock.write {
val memberToken = saveAndGetTokenById(memberId)
val memberToken = tokenRepository.findByIdOrNull(memberId)
?: MemberToken(id = memberId)
memberToken.tokenSet.add(token)
tokenRepositoryV2.save(memberToken)
tokenRepository.save(memberToken)
}
return token
@@ -86,7 +84,7 @@ class TokenProvider(
.body
val authorities = claims[AUTHORITIES_KEY].toString().split(",").map { SimpleGrantedAuthority(it) }
val memberToken = saveAndGetTokenById(id = claims.subject.toLong())
val memberToken = tokenRepository.findByIdOrNull(id = claims.subject.toLong())
?: throw SodaException("로그인 정보를 확인해주세요.")
if (!memberToken.tokenSet.contains(token)) throw SodaException("로그인 정보를 확인해주세요.")
@@ -98,21 +96,6 @@ class TokenProvider(
return UsernamePasswordAuthenticationToken(principal, token, authorities)
}
private fun saveAndGetTokenById(id: Long): MemberToken? {
var memberToken = tokenRepositoryV2.findByIdOrNull(id = id)
if (memberToken == null) {
memberToken = tokenRepository.findByIdOrNull(id = id)
if (memberToken != null) {
tokenRepositoryV2.save(memberToken)
tokenRepository.delete(memberToken)
}
}
return memberToken
}
fun validateToken(token: String): Boolean {
try {
Jwts.parserBuilder()