feat: openapi filter 优化 #10679

TencentBlueKing · Sep 20, 2024 · e80c3f8 · e80c3f8
1 parent d4ddd69
commit e80c3f8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/...api/biz-openapi/src/main/kotlin/com/tencent/devops/openapi/config/OpenAPiConfiguration.kt b/...api/biz-openapi/src/main/kotlin/com/tencent/devops/openapi/config/OpenAPiConfiguration.kt
@@ -26,7 +26,12 @@
  */
 
 package com.tencent.devops.openapi.config
+
+import com.tencent.devops.openapi.filter.manager.ApiFilterManagerCache
+import com.tencent.devops.openapi.filter.manager.ApiFilterManagerChain
+import com.tencent.devops.openapi.filter.manager.DefaultApiFilterChain
 import com.tencent.devops.openapi.service.op.DefaultOpAppUserService
+import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
@@ -39,4 +44,8 @@ class OpenAPiConfiguration {
     @Bean
     @ConditionalOnMissingBean(name = ["opAppUserService"])
     fun opAppUserService() = DefaultOpAppUserService()
+
+    @Bean
+    @ConditionalOnMissingBean(ApiFilterManagerChain::class)
+    fun opAppUserService(@Autowired managerCache: ApiFilterManagerCache) = DefaultApiFilterChain(managerCache)
 }
diff --git a/...pi/filter/manager/SampleApiFilterChain.kt → ...i/filter/manager/DefaultApiFilterChain.kt b/...pi/filter/manager/SampleApiFilterChain.kt → ...i/filter/manager/DefaultApiFilterChain.kt
@@ -27,16 +27,13 @@
 
 package com.tencent.devops.openapi.filter.manager
 
+import com.tencent.devops.openapi.filter.manager.impl.AccessTokenFilter
 import com.tencent.devops.openapi.filter.manager.impl.ApiPathFilter
 import com.tencent.devops.openapi.filter.manager.impl.BlueKingApiFilter
 import com.tencent.devops.openapi.filter.manager.impl.NoPermissionFilter
-import com.tencent.devops.openapi.filter.manager.impl.SampleApiFilter
 import javax.ws.rs.container.ContainerRequestContext
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.stereotype.Service
 
-@Service
-class SampleApiFilterChain @Autowired constructor(
+class DefaultApiFilterChain(
     private val managerCache: ApiFilterManagerCache
 ) : ApiFilterManagerChain {
 
@@ -45,7 +42,7 @@ class SampleApiFilterChain @Autowired constructor(
             requestContext = FilterContext(requestContext),
             chain = listOf(
                 managerCache.getFilter(ApiPathFilter::class.java),
-                managerCache.getFilter(SampleApiFilter::class.java),
+                managerCache.getFilter(AccessTokenFilter::class.java),
                 managerCache.getFilter(NoPermissionFilter::class.java),
                 managerCache.getFilter(BlueKingApiFilter::class.java)
             ).iterator()

diff --git a/...pi/filter/manager/impl/SampleApiFilter.kt → .../filter/manager/impl/AccessTokenFilter.kt b/...pi/filter/manager/impl/SampleApiFilter.kt → .../filter/manager/impl/AccessTokenFilter.kt
@@ -13,11 +13,11 @@ import org.springframework.beans.factory.annotation.Value
 import org.springframework.stereotype.Service
 
 @Service
-class SampleApiFilter constructor(
+class AccessTokenFilter constructor(
     private val client: Client
 ) : ApiFilterManager {
     companion object {
-        private val logger = LoggerFactory.getLogger(SampleApiFilter::class.java)
+        private val logger = LoggerFactory.getLogger(AccessTokenFilter::class.java)
     }
 
     @Value("\${auth.accessToken.enabled:#{null}}")