Refactor jwt

domain/test/security/LoggedInUserExtractorTest.kt

@@ -16,14 +16,13 @@ import java.util.stream.Stream
 
 internal class LoggedInUserExtractorTest {
     private val jwtConfig = JwtConfig("a secret", 1, TimeUnit.HOURS)
-    private val simpleJwt = SimpleJwt(jwtConfig)
-    private val jwtPayloadExtractor = JwtPayloadExtractor(simpleJwt)
+    private val mapper = UserJwtMapper()
+    private val simpleJwt = SimpleJwt(jwtConfig, mapper)
 
     private fun createToken(username: String? = null, id: Int? = null, secret: String = jwtConfig.secret): Token {
         val algo = Algorithm.HMAC256(secret)
         return JWT.create().apply {
-            username?.let { withClaim(usernameField, it) }
-            id?.let { withClaim(userIdField, it) }
+            if (username != null && id != null) mapper.build(this, LoggedInUser(id, username))
         }.sign(algo)
     }
 
@@ -40,12 +39,12 @@ internal class LoggedInUserExtractorTest {
     @ParameterizedTest(name = "[{index}] token `{0}` should be invalid")
     @MethodSource("invalidTokens")
     fun `parse invalid tokens`(token: String) {
-        assertThat(jwtPayloadExtractor(token), absent())
+        assertThat(simpleJwt.extract(token), absent())
     }
 
     @Test
     fun `parse valid token`() {
         val token = createToken(username = "someone", id = 1)
-        assertThat(jwtPayloadExtractor(token), equalTo(LoggedInUser(1, "someone")))
+        assertThat(simpleJwt.extract(token), equalTo(LoggedInUser(1, "someone")))
     }
 }