refactor: Unified Extended Claim Type (#121)

Ahoo-Wang · Mar 24, 2023 · bb83ab6 · bb83ab6
1 parent 29d1af0
commit bb83ab6
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 37 deletions.
diff --git a/cosec-jwt/src/main/kotlin/me/ahoo/cosec/jwt/ClaimAttributeValue.kt b/cosec-jwt/src/main/kotlin/me/ahoo/cosec/jwt/ClaimAttributeValue.kt
diff --git a/cosec-jwt/src/main/kotlin/me/ahoo/cosec/jwt/JwtTokenConverter.kt b/cosec-jwt/src/main/kotlin/me/ahoo/cosec/jwt/JwtTokenConverter.kt
@@ -48,7 +48,7 @@ class JwtTokenConverter(
                 !Jwts.isRegisteredClaim(it.key)
             }
             .map {
-                it.key to it.value.value
+                it.key to it.value.asString()
             }
             .toMap()
 
@@ -60,6 +60,7 @@ class JwtTokenConverter(
             .withPayload(payloadClaims)
             .withIssuedAt(now)
             .withExpiresAt(accessTokenExp)
+
         if (principal is TenantCapable) {
             val tenantCapable = principal as TenantCapable
             accessTokenBuilder

diff --git a/cosec-jwt/src/main/kotlin/me/ahoo/cosec/jwt/Jwts.kt b/cosec-jwt/src/main/kotlin/me/ahoo/cosec/jwt/Jwts.kt
@@ -20,7 +20,7 @@ import me.ahoo.cosec.api.principal.RoleCapable
 import me.ahoo.cosec.api.tenant.Tenant.Companion.TENANT_ID_KEY
 import me.ahoo.cosec.api.token.TokenPrincipal
 import me.ahoo.cosec.api.token.TokenTenantPrincipal
-import me.ahoo.cosec.jwt.ClaimAttributeValue.Companion.asClaimAttributeValue
+import me.ahoo.cosec.principal.ObjectAttributeValue.Companion.asAttributeValue
 import me.ahoo.cosec.principal.SimplePrincipal
 import me.ahoo.cosec.tenant.SimpleTenant
 import me.ahoo.cosec.token.SimpleAccessToken
@@ -70,7 +70,7 @@ object Jwts {
             .claims
             .asSequence()
             .filter { !isRegisteredClaim(it.key) }
-            .associateBy({ it.key }, { it.value.asClaimAttributeValue() })
+            .associateBy({ it.key }, { it.value.asString().asAttributeValue() })
 
         val policyClaim = decodedAccessToken.getClaim(PolicyCapable.POLICY_KEY)
         val policies = if (policyClaim.isMissing) emptySet() else policyClaim.asList(String::class.java).toSet()

diff --git a/cosec-jwt/src/test/kotlin/me/ahoo/cosec/jwt/JwtTokenConverterTest.kt b/cosec-jwt/src/test/kotlin/me/ahoo/cosec/jwt/JwtTokenConverterTest.kt
@@ -45,6 +45,7 @@ internal class JwtTokenConverterTest {
                 setOf("roleId"),
                 mapOf(
                     "attr_string" to "attr_string_value".asAttributeValue(),
+                    "attr_number" to 1.asAttributeValue(),
                     "attr_list" to listOf("attr_list_value").asAttributeValue()
                 )
             )
@@ -53,6 +54,10 @@ internal class JwtTokenConverterTest {
         val verified = jwtTokenVerifier.verify<TokenPrincipal>(token)
         assertThat(verified.id, equalTo(principal.id))
         assertThat(verified.attributes["attr_string"]!!.asString(), equalTo("attr_string_value"))
+        assertThat(verified.attributes["attr_number"]!!.asString(), equalTo("1"))
+        assertThat(verified.attributes["attr_number"]!!.asObject(Int::class.java), equalTo(1))
         assertThat(verified.attributes["attr_list"]!!.asObject(List::class.java), equalTo(listOf("attr_list_value")))
+        val token2 = jwtTokenConverter.asToken(verified)
+        assertThat(token2, notNullValue())
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -11,7 +11,7 @@
 # limitations under the License.
 #
 group=me.ahoo.cosec
-version=1.16.4
+version=1.16.5
 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