Merge branch 'main' into develop

team-aliens · May 16, 2023 · 3b68f4d · 3b68f4d
2 parents ba72583 + 1ace8f7
commit 3b68f4d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/dms-core/src/main/kotlin/team/aliens/dms/common/aop/ValidateSameSchoolAspect.kt b/dms-core/src/main/kotlin/team/aliens/dms/common/aop/ValidateSameSchoolAspect.kt
@@ -18,7 +18,7 @@ class ValidateSameSchoolAspect(
         returning = "ret"
     )
     fun validateSameSchool(joinPoint: JoinPoint, ret: SchoolIdDomain) {
-        if (ret.schoolId != securityPort.getCurrentUserSchoolId()) {
+        if (securityPort.isAuthenticated() && ret.schoolId != securityPort.getCurrentUserSchoolId()) {
             throw SchoolMismatchException
         }
     }

diff --git a/dms-core/src/main/kotlin/team/aliens/dms/common/spi/SecurityPort.kt b/dms-core/src/main/kotlin/team/aliens/dms/common/spi/SecurityPort.kt
@@ -6,6 +6,8 @@ interface SecurityPort {
 
     fun isPasswordMatch(rawPassword: String, encodedPassword: String): Boolean
 
+    fun isAuthenticated(): Boolean
+
     fun getCurrentUserId(): UUID
 
     fun getCurrentUserSchoolId(): UUID

diff --git a/dms-infrastructure/src/main/kotlin/team/aliens/dms/global/security/SecurityAdapter.kt b/dms-infrastructure/src/main/kotlin/team/aliens/dms/global/security/SecurityAdapter.kt
@@ -12,6 +12,13 @@ class SecurityAdapter(
     private val passwordEncoder: PasswordEncoder
 ) : SecurityPort {
 
+    override fun isPasswordMatch(rawPassword: String, encodedPassword: String) = passwordEncoder.matches(
+        rawPassword, encodedPassword
+    )
+
+    override fun isAuthenticated() =
+        SecurityContextHolder.getContext().authentication.principal is CustomDetails
+
     override fun getCurrentUserId(): UUID {
         return (SecurityContextHolder.getContext().authentication.principal as CustomDetails).userId
     }
@@ -20,9 +27,5 @@ class SecurityAdapter(
         return (SecurityContextHolder.getContext().authentication.principal as CustomDetails).schoolId
     }
 
-    override fun isPasswordMatch(rawPassword: String, encodedPassword: String) = passwordEncoder.matches(
-        rawPassword, encodedPassword
-    )
-
     override fun encodePassword(password: String): String = passwordEncoder.encode(password)
 }