Merge branch 'authentication-checkerr-refactor' into develop

MaeumGaGym · Jun 20, 2024 · fd47ad5 · fd47ad5
2 parents 0e72e0e + 024989e
commit fd47ad5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 15 deletions.
diff --git a/...fo/maeumgagym/security/access/checker/AbstractAnnotationBasedUserAuthenticationChecker.kt b/...fo/maeumgagym/security/access/checker/AbstractAnnotationBasedUserAuthenticationChecker.kt
@@ -3,7 +3,6 @@ package com.info.maeumgagym.security.access.checker
 import com.info.maeumgagym.common.exception.AuthenticationException
 import org.springframework.security.authentication.AnonymousAuthenticationToken
 import org.springframework.security.core.context.SecurityContextHolder
-import kotlin.reflect.KClass
 
 /**
  * [AnnotationBasedUserAuthenticationChecker]의 구현체에서 사용되는 일부 중복 코드에 대해 추출된 함수 집합의 추상화
@@ -13,15 +12,8 @@ import kotlin.reflect.KClass
  * @author Daybreak312
  * @since 20-04-2024
  */
-abstract class AbstractAnnotationBasedUserAuthenticationChecker : AnnotationBasedUserAuthenticationChecker {
-
-    protected fun <A : Annotation> Any.getAnnotationOrNull(annotation: KClass<A>): A? {
-        this::class.annotations.forEach {
-            if (it.annotationClass == annotation) return it as A
-        }
-
-        return null
-    }
+abstract class AbstractAnnotationBasedUserAuthenticationChecker
+    : AnnotationBasedUserAuthenticationChecker {
 
     protected fun checkInvalidAuthentication() {
         if (SecurityContextHolder.getContext().authentication == null ||

diff --git a/src/main/kotlin/com/info/maeumgagym/security/access/checker/impl/RequireRoleChecker.kt b/src/main/kotlin/com/info/maeumgagym/security/access/checker/impl/RequireRoleChecker.kt
@@ -24,10 +24,8 @@ class RequireRoleChecker(
 
         checkInvalidAuthentication()
 
-        readCurrentUserPort.readCurrentUser().roles.forEach {
-            if (it == annotation.role) return
+        if (!readCurrentUserPort.readCurrentUser().roles.contains(annotation.role)) {
+            throw AuthenticationException.ROLE_REQUIRED
         }
-
-        throw AuthenticationException.ROLE_REQUIRED
     }
 }
diff --git a/...fo/maeumgagym/security/authentication/provider/impl/UserModelAuthenticationFactoryImpl.kt b/...fo/maeumgagym/security/authentication/provider/impl/UserModelAuthenticationFactoryImpl.kt
@@ -15,7 +15,7 @@ class UserModelAuthenticationFactoryImpl(
         UserModelAuthentication(
             userSubject = username,
             user = readUserPort.readByOAuthId(username)
-                ?: throw CriticalException("Cannot Find User By username : $username")
+                ?: throw CriticalException("Cannot Find User By username : $username, user was deleted but token did not revoked.")
         )
 
     override fun createEmptyAuthentication(username: String): UserModelAuthentication =