refactor : 리팩터링 (#128)

* refactor : auth class

* refactor : util class

* reafactor : id to non nullable

* refactor : etcs

* fix compile err

* fix : add suppress

Author: kshired

src/main/kotlin/io/csbroker/apiserver/auth/AuthToken.kt

@@ -18,21 +18,17 @@ class AuthToken(
     private val key: Key,
 ) {
     constructor(email: String, expiry: Date, key: Key, role: String? = null) : this("", key) {
-        if (role != null) {
-            token = createAuthToken(email, expiry, role)
+        token = if (role != null) {
+            createAuthToken(email, expiry, role)
         } else {
-            token = createAuthToken(email, expiry)
+            createAuthToken(email, expiry)
         }
     }
 
     val tokenClaims: Claims?
         get() {
             try {
-                return Jwts.parserBuilder()
-                    .setSigningKey(key)
-                    .build()
-                    .parseClaimsJws(token)
-                    .body
+                return parseJwt()
             } catch (e: SecurityException) {
                 log.error("Invalid JWT signature.")
             } catch (e: MalformedJwtException) {
@@ -52,11 +48,7 @@ class AuthToken(
     val expiredTokenClaims: Claims?
         get() {
             try {
-                Jwts.parserBuilder()
-                    .setSigningKey(key)
-                    .build()
-                    .parseClaimsJws(token)
-                    .body
+                parseJwt()
             } catch (e: ExpiredJwtException) {
                 log.info("Expired JWT token.")
                 return e.claims
@@ -77,6 +69,12 @@ class AuthToken(
     val isValid: Boolean
         get() = tokenClaims != null
 
+    private fun parseJwt(): Claims? = Jwts.parserBuilder()
+        .setSigningKey(key)
+        .build()
+        .parseClaimsJws(token)
+        .body
+
     private fun createAuthToken(email: String, expiry: Date): String {
         return Jwts.builder()
             .setSubject(email)

src/main/kotlin/io/csbroker/apiserver/auth/AuthTokenProvider.kt

@@ -30,8 +30,8 @@ class AuthTokenProvider(
                 .map(::SimpleGrantedAuthority)
                 .toList()
             return UsernamePasswordAuthenticationToken(User(claims.subject, "", authorities), authToken, authorities)
-        } else {
-            throw UnAuthorizedException(ErrorCode.TOKEN_INVALID, "올바르지 않은 Token입니다.")
         }
+
+        throw UnAuthorizedException(ErrorCode.TOKEN_INVALID, "올바르지 않은 Token입니다.")
     }
 }

src/main/kotlin/io/csbroker/apiserver/auth/GithubOAuth2UserInfo.kt

@@ -2,21 +2,9 @@ package io.csbroker.apiserver.auth
 
 class GithubOAuth2UserInfo(
     attributes: MutableMap<String, Any>,
-) : OAuth2UserInfo(attributes) {
-
-    override fun getId(): String {
-        return (attributes["id"] as Int).toString()
-    }
-
-    override fun getName(): String {
-        return attributes["login"] as String
-    }
-
-    override fun getEmail(): String {
-        return attributes["email"] as String
-    }
-
-    override fun getImageUrl(): String {
-        return attributes["avatar_url"] as String
-    }
-}
+) : OAuth2UserInfo(
+    id = (attributes["id"] as Int).toString(),
+    name = attributes["login"] as String,
+    email = attributes["email"] as String,
+    imageUrl = attributes["avatar_url"] as String,
+)

src/main/kotlin/io/csbroker/apiserver/auth/GoogleOAuth2UserInfo.kt

@@ -2,21 +2,9 @@ package io.csbroker.apiserver.auth
 
 class GoogleOAuth2UserInfo(
     attributes: MutableMap<String, Any>,
-) : OAuth2UserInfo(attributes) {
-
-    override fun getId(): String {
-        return attributes["sub"] as String
-    }
-
-    override fun getName(): String {
-        return attributes["name"] as String
-    }
-
-    override fun getEmail(): String {
-        return attributes["email"] as String
-    }
-
-    override fun getImageUrl(): String {
-        return attributes["picture"] as String
-    }
-}
+) : OAuth2UserInfo(
+    id = attributes["sub"] as String,
+    name = attributes["name"] as String,
+    email = attributes["email"] as String,
+    imageUrl = attributes["picture"] as String,
+)

src/main/kotlin/io/csbroker/apiserver/auth/OAuth2UserInfo.kt

@@ -1,13 +1,8 @@
 package io.csbroker.apiserver.auth
 
 abstract class OAuth2UserInfo(
-    val attributes: MutableMap<String, Any>,
-) {
-    abstract fun getId(): String
-
-    abstract fun getName(): String
-
-    abstract fun getEmail(): String
-
-    abstract fun getImageUrl(): String
-}
+    val id: String,
+    val name: String,
+    val email: String,
+    val imageUrl: String,
+)

src/main/kotlin/io/csbroker/apiserver/auth/OAuth2UserInfoFactory.kt

@@ -8,9 +8,7 @@ class OAuth2UserInfoFactory {
             return when (providerType) {
                 ProviderType.GOOGLE -> GoogleOAuth2UserInfo(attributes)
                 ProviderType.GITHUB -> GithubOAuth2UserInfo(attributes)
-                else -> throw OAuthProviderMissMatchException(
-                    "프로바이더 타입이 일치하지 않습니다. ${providerType.name}",
-                )
+                else -> throw OAuthProviderMissMatchException("프로바이더 타입이 일치하지 않습니다. ${providerType.name}")
             }
         }
     }

src/main/kotlin/io/csbroker/apiserver/common/filter/TokenAuthenticationFilter.kt

@@ -17,7 +17,7 @@ class TokenAuthenticationFilter(
         response: HttpServletResponse,
         filterChain: FilterChain,
     ) {
-        val tokenStr = getAccessToken(request)
+        val tokenStr = request.getAccessToken()
 
         tokenStr ?: run {
             filterChain.doFilter(request, response)

src/main/kotlin/io/csbroker/apiserver/common/handler/OAuth2AuthenticationSuccessHandler.kt

@@ -88,9 +88,9 @@ class OAuth2AuthenticationSuccessHandler(
         val user = authentication.principal as OidcUser
         val userInfo = OAuth2UserInfoFactory.getOauth2UserInfo(providerType, user.attributes)
 
-        return userRepository.findByEmailOrProviderId(userInfo.getEmail(), userInfo.getId())
+        return userRepository.findByEmailOrProviderId(userInfo.email, userInfo.id)
             ?: throw EntityNotFoundException(
-                "유저를 찾을 수 없습니다. email = [${userInfo.getEmail()}], providerId = [${userInfo.getId()}] )",
+                "유저를 찾을 수 없습니다. email = [${userInfo.email}], providerId = [${userInfo.id}] )",
             )
     }
 

src/main/kotlin/io/csbroker/apiserver/common/util/CookieUtil.kt

@@ -1,5 +1,6 @@
 package io.csbroker.apiserver.common.util
 
+import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationRequest
 import org.springframework.util.SerializationUtils
 import java.util.Base64
 import javax.servlet.http.Cookie
@@ -21,19 +22,17 @@ fun addCookie(response: HttpServletResponse, name: String, value: String, maxAge
 }
 
 fun deleteCookie(request: HttpServletRequest, response: HttpServletResponse, name: String) {
-    request.cookies?.let {
-        it.find { cookie -> cookie.name == name }?.let { cookie ->
-            cookie.value = ""
-            cookie.path = "/"
-            cookie.maxAge = 0
-            response.addCookie(cookie)
-        }
+    request.cookies?.find { cookie -> cookie.name == name }?.let { cookie ->
+        cookie.value = ""
+        cookie.path = "/"
+        cookie.maxAge = 0
+        response.addCookie(cookie)
     }
 }
 
-fun serialize(obj: Any): String {
+fun OAuth2AuthorizationRequest.serialize(): String {
     return Base64.getUrlEncoder()
-        .encodeToString(SerializationUtils.serialize(obj))
+        .encodeToString(SerializationUtils.serialize(this))
 }
 
 fun <T> deserialize(cookie: Cookie, cls: Class<T>): T {

src/main/kotlin/io/csbroker/apiserver/common/util/HeaderUtil.kt

@@ -5,7 +5,7 @@ import javax.servlet.http.HttpServletRequest
 const val HEADER_AUTHORIZATION = "Authorization"
 const val TOKEN_PREFIX = "Bearer "
 
-fun getAccessToken(request: HttpServletRequest): String? {
-    val headerValue = request.getHeader(HEADER_AUTHORIZATION)
+fun HttpServletRequest.getAccessToken(): String? {
+    val headerValue = this.getHeader(HEADER_AUTHORIZATION)
     return if (headerValue?.startsWith(TOKEN_PREFIX) == true) headerValue.substring(TOKEN_PREFIX.length) else null
 }