Refactor jwt

app/src/filters/auth/OptionalAuthFilter.kt

@@ -1,13 +1,14 @@
 package be.simplenotes.app.filters.auth
 
 import be.simplenotes.app.filters.auth.JwtSource.Cookie
-import be.simplenotes.domain.security.JwtPayloadExtractor
+import be.simplenotes.domain.security.SimpleJwt
+import be.simplenotes.types.LoggedInUser
 import org.http4k.core.Filter
 import org.http4k.core.HttpHandler
 import org.http4k.core.with
 
 class OptionalAuthFilter(
-    private val extractor: JwtPayloadExtractor,
+    private val simpleJwt: SimpleJwt<LoggedInUser>,
     private val lens: OptionalAuthLens,
     private val source: JwtSource = Cookie,
 ) : Filter {
@@ -17,6 +18,6 @@ class OptionalAuthFilter(
             Cookie -> it.bearerTokenCookie()
         }
 
-        next(it.with(lens of token?.let { extractor(it) }))
+        next(it.with(lens of token?.let { simpleJwt.extract(it) }))
     }
 }

app/src/filters/auth/RequiredAuthFilter.kt

@@ -1,7 +1,8 @@
 package be.simplenotes.app.filters.auth
 
 import be.simplenotes.app.extensions.redirect
-import be.simplenotes.domain.security.JwtPayloadExtractor
+import be.simplenotes.domain.security.SimpleJwt
+import be.simplenotes.types.LoggedInUser
 import org.http4k.core.Filter
 import org.http4k.core.HttpHandler
 import org.http4k.core.Response
@@ -9,7 +10,7 @@ import org.http4k.core.Status.Companion.UNAUTHORIZED
 import org.http4k.core.with
 
 class RequiredAuthFilter(
-    private val extractor: JwtPayloadExtractor,
+    private val simpleJwt: SimpleJwt<LoggedInUser>,
     private val lens: RequiredAuthLens,
     private val source: JwtSource = JwtSource.Cookie,
     private val redirect: Boolean = true,
@@ -19,7 +20,7 @@ class RequiredAuthFilter(
             JwtSource.Header -> it.bearerTokenHeader()
             JwtSource.Cookie -> it.bearerTokenCookie()
         }
-        val jwtPayload = token?.let { extractor(token) }
+        val jwtPayload = token?.let { simpleJwt.extract(token) }
 
         if (jwtPayload != null) next(it.with(lens of jwtPayload))
         else {

app/src/modules/AuthModule.kt

@@ -1,7 +1,8 @@
 package be.simplenotes.app.modules
 
 import be.simplenotes.app.filters.auth.*
-import be.simplenotes.domain.security.JwtPayloadExtractor
+import be.simplenotes.domain.security.SimpleJwt
+import be.simplenotes.types.LoggedInUser
 import io.micronaut.context.annotation.Factory
 import io.micronaut.context.annotation.Primary
 import org.http4k.core.RequestContexts
@@ -21,21 +22,21 @@ class AuthModule {
     fun requiredAuthLens(ctx: RequestContexts): RequiredAuthLens = RequestContextKey.required(ctx)
 
     @Singleton
-    fun optionalAuth(extractor: JwtPayloadExtractor, @Named("optional") lens: OptionalAuthLens) =
-        OptionalAuthFilter(extractor, lens)
+    fun optionalAuth(simpleJwt: SimpleJwt<LoggedInUser>, @Named("optional") lens: OptionalAuthLens) =
+        OptionalAuthFilter(simpleJwt, lens)
 
     @Primary
     @Singleton
-    fun requiredAuth(extractor: JwtPayloadExtractor, @Named("required") lens: RequiredAuthLens) =
-        RequiredAuthFilter(extractor, lens)
+    fun requiredAuth(simpleJwt: SimpleJwt<LoggedInUser>, @Named("required") lens: RequiredAuthLens) =
+        RequiredAuthFilter(simpleJwt, lens)
 
     @Singleton
     @Named("api")
     internal fun apiAuthFilter(
-        jwtPayloadExtractor: JwtPayloadExtractor,
+        simpleJwt: SimpleJwt<LoggedInUser>,
         @Named("required") lens: RequiredAuthLens,
     ) = RequiredAuthFilter(
-        extractor = jwtPayloadExtractor,
+        simpleJwt = simpleJwt,
         lens = lens,
         source = JwtSource.Header,
         redirect = false

app/test/filters/RequiredAuthFilterTest.kt

@@ -6,6 +6,7 @@ import be.simplenotes.app.filters.auth.RequiredAuthFilter
 import be.simplenotes.app.filters.auth.RequiredAuthLens
 import be.simplenotes.config.JwtConfig
 import be.simplenotes.domain.security.SimpleJwt
+import be.simplenotes.domain.security.UserJwtMapper
 import be.simplenotes.types.LoggedInUser
 import com.natpryce.hamkrest.assertion.assertThat
 import io.micronaut.context.BeanContext
@@ -32,7 +33,7 @@ internal class RequiredAuthFilterTest {
 
     // region setup
     private val jwtConfig = JwtConfig("secret", 1, TimeUnit.HOURS)
-    private val simpleJwt = SimpleJwt(jwtConfig)
+    private val simpleJwt = SimpleJwt(jwtConfig, UserJwtMapper())
 
     private val beanCtx = BeanContext.build()
         .registerSingleton(jwtConfig)