Refactor jwt

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