Merge branch 'feature/DRAW-440' into sandbox

TeamTroublePainter · Nov 17, 2024 · 31e2051 · 31e2051
2 parents 87f024b + 0432666
commit 31e2051
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/app/websocket/src/main/kotlin/com/xorker/draw/websocket/handler/BaseWebSocketHandler.kt b/app/websocket/src/main/kotlin/com/xorker/draw/websocket/handler/BaseWebSocketHandler.kt
@@ -156,9 +156,14 @@ internal abstract class BaseWebSocketHandler(
 
     private fun getUser(session: WebSocketSession): User? {
         val userId = getUserId(session) ?: return null
-        val encodedNickname = session.getHeader(HEADER_NICKNAME) ?: return null
+        val encodedNickname = session.getHeader(HEADER_NICKNAME)
         val user = userUseCase.getUserDetail(userId)
-        val nickname = user?.name ?: URLDecoder.decode(encodedNickname, StandardCharsets.UTF_8.toString())
+
+        if (user?.name != null) return User(userId, user.name!!)
+
+        if (encodedNickname == null) throw InvalidRequestValueException
+
+        val nickname = URLDecoder.decode(encodedNickname, StandardCharsets.UTF_8.toString())
 
         return User(userId, nickname)
     }