Refactor CoSecJwtAutoConfiguration (#38)

Ahoo-Wang · Dec 31, 2022 · bb1c0b0 · bb1c0b0
1 parent 9289510
commit bb1c0b0
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 29 deletions.
diff --git a/...tarter/src/main/kotlin/me/ahoo/cosec/spring/boot/starter/jwt/CoSecJwtAutoConfiguration.kt b/...tarter/src/main/kotlin/me/ahoo/cosec/spring/boot/starter/jwt/CoSecJwtAutoConfiguration.kt
@@ -18,7 +18,6 @@ import me.ahoo.cosec.jwt.JwtTokenConverter
 import me.ahoo.cosec.jwt.JwtTokenVerifier
 import me.ahoo.cosec.spring.boot.starter.ConditionalOnCoSecEnabled
 import me.ahoo.cosec.spring.boot.starter.authentication.ConditionalOnAuthenticationEnabled
-import me.ahoo.cosec.spring.boot.starter.authorization.ConditionalOnAuthorizationEnabled
 import me.ahoo.cosec.token.TokenCompositeAuthentication
 import me.ahoo.cosec.token.TokenConverter
 import me.ahoo.cosec.token.TokenVerifier
@@ -63,25 +62,33 @@ class CoSecJwtAutoConfiguration {
         }
     }
 
+    @Bean
+    @ConditionalOnMissingBean
+    fun cosecJwtTokenVerifier(
+        algorithm: Algorithm
+    ): TokenVerifier {
+        return JwtTokenVerifier(algorithm)
+    }
+
+    @Bean
+    @ConditionalOnMissingBean
+    fun cosecTokenConverter(
+        idGenerator: IdGenerator,
+        algorithm: Algorithm,
+        jwtProperties: JwtProperties
+    ): TokenConverter {
+        return JwtTokenConverter(
+            idGenerator,
+            algorithm,
+            jwtProperties.tokenValidity.access,
+            jwtProperties.tokenValidity.refresh
+        )
+    }
+
     @Configuration
     @ConditionalOnAuthenticationEnabled
     class OnAuthentication {
 
-        @Bean
-        @ConditionalOnMissingBean
-        fun cosecTokenConverter(
-            idGenerator: IdGenerator,
-            algorithm: Algorithm,
-            jwtProperties: JwtProperties
-        ): TokenConverter {
-            return JwtTokenConverter(
-                idGenerator,
-                algorithm,
-                jwtProperties.tokenValidity.access,
-                jwtProperties.tokenValidity.refresh
-            )
-        }
-
         @Bean
         @ConditionalOnBean(CompositeAuthentication::class)
         fun tokenCompositeAuthentication(
@@ -91,16 +98,4 @@ class CoSecJwtAutoConfiguration {
             return TokenCompositeAuthentication(compositeAuthentication, tokenConverter)
         }
     }
-
-    @Configuration
-    @ConditionalOnAuthorizationEnabled
-    class OnAuthorization {
-        @Bean
-        @ConditionalOnMissingBean
-        fun cosecJwtTokenVerifier(
-            algorithm: Algorithm
-        ): TokenVerifier {
-            return JwtTokenVerifier(algorithm)
-        }
-    }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -11,7 +11,7 @@
 # limitations under the License.
 #
 group=me.ahoo.cosec
-version=1.6.5
+version=1.6.6
 description=RBAC-based And Policy-based Multi-Tenant Reactive Security Framework
 website=https://github.com/Ahoo-Wang/CoSec
 issues=https://github.com/Ahoo-Wang/CoSec/issues