feat: userId만 필요한경우, InternalAuth를 사용하도록 수정한다

devxb · devxb · commit 3847683be352 · 2025-04-12T18:39:25.000+09:00
diff --git a/src/main/kotlin/org/gitanimals/core/advice/GlobalExceptionHandler.kt b/src/main/kotlin/org/gitanimals/core/advice/GlobalExceptionHandler.kt
@@ -1,5 +1,6 @@
 package org.gitanimals.core.advice
 
+import org.gitanimals.core.AuthorizationException
 import org.gitanimals.core.ErrorResponse
 import org.slf4j.LoggerFactory
 import org.springframework.http.HttpStatus
@@ -52,4 +53,9 @@ class GlobalExceptionHandler {
     fun handleNoHandlerFoundException(exception: Exception): ErrorResponse {
         return ErrorResponse("CANNOT FOUND ANY RESOURCE.")
     }
+
+    @ExceptionHandler(AuthorizationException::class)
+    @ResponseStatus(HttpStatus.UNAUTHORIZED)
+    fun handleAuthorizationException(exception: AuthorizationException): ErrorResponse =
+        ErrorResponse.from(exception)
 }
diff --git a/src/main/kotlin/org/gitanimals/core/auth/InternalAuth.kt b/src/main/kotlin/org/gitanimals/core/auth/InternalAuth.kt
@@ -1,6 +1,7 @@
 package org.gitanimals.core.auth
 
 import jakarta.servlet.http.HttpServletRequest
+import org.gitanimals.core.AUTHORIZATION_EXCEPTION
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.http.HttpHeaders
@@ -25,6 +26,16 @@ class InternalAuth(
         SecretKeySpec(decodedKey, "AES")
     }
 
+    fun getUserId(throwOnFailure: () -> Unit = throwCannotGetUserId): Long {
+        val userId = findUserId()
+
+        if (userId == null) {
+            throwOnFailure.invoke()
+        }
+
+        return userId ?: throw AUTHORIZATION_EXCEPTION
+    }
+
     fun findUserId(): Long? {
         val token: String? = httpServletRequest.getHeader(HttpHeaders.AUTHORIZATION)
         val iv: String? = httpServletRequest.getHeader(INTERNAL_AUTH_IV_KEY)
@@ -83,6 +94,10 @@ class InternalAuth(
     companion object {
         const val INTERNAL_AUTH_IV_KEY = "Internal-Auth-Iv"
         const val INTERNAL_AUTH_SECRET_KEY = "Internal-Auth-Secret"
+
+        private val throwCannotGetUserId: () -> Unit = {
+            throw AUTHORIZATION_EXCEPTION
+        }
     }
 }
 
diff --git a/src/main/kotlin/org/gitanimals/guild/app/AcceptJoinGuildFacade.kt b/src/main/kotlin/org/gitanimals/guild/app/AcceptJoinGuildFacade.kt
@@ -1,19 +1,20 @@
 package org.gitanimals.guild.app
 
+import org.gitanimals.core.auth.InternalAuth
 import org.gitanimals.guild.domain.GuildService
 import org.springframework.stereotype.Service
 
 @Service
 class AcceptJoinGuildFacade(
-    private val identityApi: IdentityApi,
+    private val internalAuth: InternalAuth,
     private val guildService: GuildService,
 ) {
 
-    fun acceptJoin(token: String, guildId: Long, acceptUserId: Long) {
-        val user = identityApi.getUserByToken(token)
+    fun acceptJoin(guildId: Long, acceptUserId: Long) {
+        val userId = internalAuth.getUserId()
 
         guildService.acceptJoin(
-            acceptorId = user.id.toLong(),
+            acceptorId = userId,
             guildId = guildId,
             acceptUserId = acceptUserId,
         )
diff --git a/src/main/kotlin/org/gitanimals/guild/app/ChangeGuildFacade.kt b/src/main/kotlin/org/gitanimals/guild/app/ChangeGuildFacade.kt
@@ -1,22 +1,23 @@
 package org.gitanimals.guild.app
 
+import org.gitanimals.core.auth.InternalAuth
 import org.gitanimals.guild.domain.GuildService
 import org.gitanimals.guild.domain.request.ChangeGuildRequest
 import org.springframework.stereotype.Service
 
 @Service
 class ChangeGuildFacade(
-    private val identityApi: IdentityApi,
+    private val internalAuth: InternalAuth,
     private val guildService: GuildService,
 ) {
 
-    fun changeGuild(token: String, guildId: Long, changeGuildRequest: ChangeGuildRequest) {
+    fun changeGuild(guildId: Long, changeGuildRequest: ChangeGuildRequest) {
         changeGuildRequest.requireValidTitle()
         
-        val user = identityApi.getUserByToken(token)
+        val userId = internalAuth.getUserId()
 
         guildService.changeGuild(
-            changeRequesterId = user.id.toLong(),
+            changeRequesterId = userId,
             guildId = guildId,
             request = changeGuildRequest,
         )
diff --git a/src/main/kotlin/org/gitanimals/guild/app/DenyJoinGuildFacade.kt b/src/main/kotlin/org/gitanimals/guild/app/DenyJoinGuildFacade.kt
@@ -1,17 +1,18 @@
 package org.gitanimals.guild.app
 
+import org.gitanimals.core.auth.InternalAuth
 import org.gitanimals.guild.domain.GuildService
 import org.springframework.stereotype.Service
 
 @Service
 class DenyJoinGuildFacade(
-    private val identityApi: IdentityApi,
+    private val internalAuth: InternalAuth,
     private val guildService: GuildService,
 ) {
 
-    fun denyJoin(token: String, guildId: Long, denyUserId: Long) {
-        val user = identityApi.getUserByToken(token)
+    fun denyJoin(guildId: Long, denyUserId: Long) {
+        val userId = internalAuth.getUserId()
 
-        guildService.denyJoin(denierId = user.id.toLong(), guildId = guildId, denyUserId = denyUserId)
+        guildService.denyJoin(denierId = userId, guildId = guildId, denyUserId = denyUserId)
     }
 }
diff --git a/src/main/kotlin/org/gitanimals/guild/app/GetJoinedGuildFacade.kt b/src/main/kotlin/org/gitanimals/guild/app/GetJoinedGuildFacade.kt
@@ -1,18 +1,19 @@
 package org.gitanimals.guild.app
 
+import org.gitanimals.core.auth.InternalAuth
 import org.gitanimals.guild.domain.Guild
 import org.gitanimals.guild.domain.GuildService
 import org.springframework.stereotype.Service
 
 @Service
 class GetJoinedGuildFacade(
-    private val identityApi: IdentityApi,
+    private val internalAuth: InternalAuth,
     private val guildService: GuildService,
 ) {
 
-    fun getJoinedGuilds(token: String): List<Guild> {
-        val user = identityApi.getUserByToken(token)
+    fun getJoinedGuilds(): List<Guild> {
+        val userId = internalAuth.getUserId()
 
-        return guildService.findAllGuildByUserId(user.id.toLong())
+        return guildService.findAllGuildByUserId(userId)
     }
 }
diff --git a/src/main/kotlin/org/gitanimals/guild/app/KickGuildFacade.kt b/src/main/kotlin/org/gitanimals/guild/app/KickGuildFacade.kt
@@ -1,19 +1,20 @@
 package org.gitanimals.guild.app
 
+import org.gitanimals.core.auth.InternalAuth
 import org.gitanimals.guild.domain.GuildService
 import org.springframework.stereotype.Service
 
 @Service
 class KickGuildFacade(
-    private val identityApi: IdentityApi,
+    private val internalAuth: InternalAuth,
     private val guildService: GuildService,
 ) {
 
-    fun kickMember(token: String, guildId: Long, kickUserId: Long) {
-        val user = identityApi.getUserByToken(token)
+    fun kickMember(guildId: Long, kickUserId: Long) {
+        val userId = internalAuth.getUserId()
 
         guildService.kickMember(
-            kickerId = user.id.toLong(),
+            kickerId = userId,
             guildId = guildId,
             kickUserId = kickUserId,
         )
diff --git a/src/main/kotlin/org/gitanimals/guild/app/LeaveGuildFacade.kt b/src/main/kotlin/org/gitanimals/guild/app/LeaveGuildFacade.kt
@@ -1,17 +1,18 @@
 package org.gitanimals.guild.app
 
+import org.gitanimals.core.auth.InternalAuth
 import org.gitanimals.guild.domain.GuildService
 import org.springframework.stereotype.Component
 
 @Component
 class LeaveGuildFacade(
-    private val identityApi: IdentityApi,
+    private val internalAuth: InternalAuth,
     private val guildService: GuildService,
 ) {
 
-    fun leave(token: String, guildId: Long) {
-        val user = identityApi.getUserByToken(token)
+    fun leave(guildId: Long) {
+        val userId = internalAuth.getUserId()
 
-        guildService.leave(guildId, user.id.toLong())
+        guildService.leave(guildId, userId)
     }
 }
diff --git a/src/main/kotlin/org/gitanimals/guild/controller/GuildController.kt b/src/main/kotlin/org/gitanimals/guild/controller/GuildController.kt
@@ -55,7 +55,7 @@ class GuildController(
         @RequestHeader(HttpHeaders.AUTHORIZATION) token: String,
         @PathVariable("guildId") guildId: Long,
         @RequestParam("user-id") acceptUserId: Long,
-    ) = acceptJoinGuildFacade.acceptJoin(token, guildId, acceptUserId)
+    ) = acceptJoinGuildFacade.acceptJoin(guildId, acceptUserId)
 
 
     @ResponseStatus(HttpStatus.OK)
@@ -64,7 +64,7 @@ class GuildController(
         @RequestHeader(HttpHeaders.AUTHORIZATION) token: String,
         @PathVariable("guildId") guildId: Long,
         @RequestParam("user-id") kickUserId: Long,
-    ) = kickGuildFacade.kickMember(token, guildId, kickUserId)
+    ) = kickGuildFacade.kickMember(guildId, kickUserId)
 
 
     @ResponseStatus(HttpStatus.OK)
@@ -73,7 +73,7 @@ class GuildController(
         @RequestHeader(HttpHeaders.AUTHORIZATION) token: String,
         @PathVariable("guildId") guildId: Long,
         @RequestBody changeGuildRequest: ChangeGuildRequest,
-    ) = changeGuildFacade.changeGuild(token, guildId, changeGuildRequest)
+    ) = changeGuildFacade.changeGuild(guildId, changeGuildRequest)
 
     @ResponseStatus(HttpStatus.OK)
     @GetMapping("/guilds/{guildId}")
@@ -92,7 +92,7 @@ class GuildController(
     fun getAllJoinedGuild(
         @RequestHeader(HttpHeaders.AUTHORIZATION) token: String,
     ): GuildsResponse {
-        val guilds = joinedGuildFacade.getJoinedGuilds(token)
+        val guilds = joinedGuildFacade.getJoinedGuilds()
 
         return GuildsResponse.from(guilds)
     }
@@ -144,15 +144,14 @@ class GuildController(
     fun leaveGuild(
         @RequestHeader(HttpHeaders.AUTHORIZATION) token: String,
         @PathVariable("guildId") guildId: Long,
-    ) = leaveGuildFacade.leave(token, guildId)
+    ) = leaveGuildFacade.leave(guildId)
 
     @PostMapping("guilds/{guildId}/deny")
     fun deny(
         @RequestHeader(HttpHeaders.AUTHORIZATION) token: String,
         @PathVariable("guildId") guildId: Long,
         @RequestParam("user-id") denyUserId: Long,
     ) = denyJoinGuildFacade.denyJoin(
-        token = token,
         guildId = guildId,
         denyUserId = denyUserId,
     )
