From 771dbeced040c5d1f993fd1f68b94cad3dce7945 Mon Sep 17 00:00:00 2001 From: Klaus Date: Tue, 8 Aug 2023 12:47:49 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A0=88=EB=94=94=EC=8A=A4=20JWT=20=ED=86=A0?= =?UTF-8?q?=ED=81=B0=20=EC=A0=80=EC=9E=A5=EC=86=8C=20-=20tokenList=20?= =?UTF-8?q?=EA=B0=80=20=EA=B3=84=EC=86=8D=20null=20=EC=9D=B4=20=EB=90=98?= =?UTF-8?q?=EB=A9=B4=EC=84=9C=20=EC=B4=88=EA=B8=B0=ED=99=94=EA=B0=80=20?= =?UTF-8?q?=EB=90=98=EC=A7=80=20=EC=95=8A=EC=95=84=20set=20=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD=ED=95=98=EA=B3=A0=20default=20va?= =?UTF-8?q?lue=20=EB=A5=BC=20=EC=9D=B4=EC=9A=A9=ED=95=9C=20=EC=B4=88?= =?UTF-8?q?=EA=B8=B0=ED=99=94=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kotlin/kr/co/vividnext/sodalive/jwt/TokenProvider.kt | 8 +++----- .../kr/co/vividnext/sodalive/member/MemberService.kt | 4 +--- .../kr/co/vividnext/sodalive/member/token/MemberToken.kt | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/jwt/TokenProvider.kt b/src/main/kotlin/kr/co/vividnext/sodalive/jwt/TokenProvider.kt index 2393dff..0ec16ac 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/jwt/TokenProvider.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/jwt/TokenProvider.kt @@ -66,11 +66,9 @@ class TokenProvider( val lock = getOrCreateLock(memberId = memberId) lock.write { val memberToken = tokenRepository.findByIdOrNull(memberId) - ?: MemberToken(id = memberId, tokenList = mutableListOf()) + ?: MemberToken(id = memberId) - val memberTokenSet = memberToken.tokenList.toMutableSet() - memberTokenSet.add(token) - memberToken.tokenList = memberTokenSet.toMutableList() + memberToken.tokenSet.add(token) tokenRepository.save(memberToken) } @@ -89,7 +87,7 @@ class TokenProvider( val memberToken = tokenRepository.findByIdOrNull(id = claims.subject.toLong()) ?: throw SodaException("로그인 정보를 확인해주세요.") - if (!memberToken.tokenList.contains(token)) throw SodaException("로그인 정보를 확인해주세요.") + if (!memberToken.tokenSet.contains(token)) throw SodaException("로그인 정보를 확인해주세요.") val member = repository.findByIdOrNull(id = claims.subject.toLong()) ?: throw SodaException("로그인 정보를 확인해주세요.") diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt index 3dc8967..a916159 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt @@ -371,9 +371,7 @@ class MemberService( val memberToken = tokenRepository.findByIdOrNull(memberId) ?: throw SodaException("로그인 정보를 확인해주세요.") - val memberTokenSet = memberToken.tokenList.toMutableSet() - memberTokenSet.remove(token) - memberToken.tokenList = memberTokenSet.toMutableList() + memberToken.tokenSet.remove(token) tokenRepository.save(memberToken) } } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/member/token/MemberToken.kt b/src/main/kotlin/kr/co/vividnext/sodalive/member/token/MemberToken.kt index 1027928..1af6273 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/member/token/MemberToken.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/token/MemberToken.kt @@ -7,5 +7,5 @@ import org.springframework.data.redis.core.RedisHash data class MemberToken( @Id val id: Long, - var tokenList: MutableList + var tokenSet: MutableSet = mutableSetOf() )