chore(authorization): move extractUserId to companion object

Author: slisson

authorization/src/main/kotlin/org/modelix/authorization/AccessTokenPrincipal.kt

@@ -4,7 +4,7 @@ import com.auth0.jwt.interfaces.DecodedJWT
 import io.ktor.server.auth.Principal
 
 class AccessTokenPrincipal(val jwt: DecodedJWT) : Principal {
-    fun getUserName(): String? = ModelixJWTUtil().extractUserId(jwt)
+    fun getUserName(): String? = ModelixJWTUtil.extractUserId(jwt)
 
     override fun equals(other: Any?): Boolean {
         if (other !is AccessTokenPrincipal) return false

authorization/src/main/kotlin/org/modelix/authorization/ModelixJWTUtil.kt

@@ -253,8 +253,7 @@ class ModelixJWTUtil {
     }
 
     fun extractUserId(jwt: DecodedJWT): String? {
-        return jwt.getClaim(KeycloakTokenConstants.EMAIL)?.asString()
-            ?: jwt.getClaim(KeycloakTokenConstants.PREFERRED_USERNAME)?.asString()
+        return Companion.extractUserId(jwt)
     }
 
     fun extractUserRoles(jwt: DecodedJWT): List<String> {
@@ -327,6 +326,13 @@ class ModelixJWTUtil {
             builder.claim(name, value)
         }
     }
+
+    companion object {
+        fun extractUserId(jwt: DecodedJWT): String? {
+            return jwt.getClaim(KeycloakTokenConstants.EMAIL)?.asString()
+                ?: jwt.getClaim(KeycloakTokenConstants.PREFERRED_USERNAME)?.asString()
+        }
+    }
 }
 
 class KtorResourceRetriever(val client: HttpClient) : AbstractRestrictedResourceRetriever(1000, 1000, 0) {