Simplify authorizer factory configuration (#64)

* Simplify authorizer factory configuration

Author: adhesivee

oauth2-server-core/src/main/java/nl/myndocs/oauth2/CallRouter.kt

@@ -18,7 +18,8 @@ class CallRouter(
         val tokenInfoEndpoint: String,
         private val tokenInfoCallback: (TokenInfo) -> Map<String, Any?>,
         private val granters: List<GrantingCall.() -> Granter>,
-        private val grantingCallFactory: (CallContext) -> GrantingCall
+        private val grantingCallFactory: (CallContext) -> GrantingCall,
+        private val authorizerFactory: (CallContext) -> Authorizer
 ) {
     companion object {
         const val METHOD_POST = "post"
@@ -29,12 +30,10 @@ class CallRouter(
 
     }
 
-    fun route(
-            callContext: CallContext,
-            authorizer: Authorizer) {
+    fun route(callContext: CallContext) {
         when (callContext.path) {
             tokenEndpoint -> routeTokenEndpoint(callContext)
-            authorizeEndpoint -> routeAuthorizeEndpoint(callContext, authorizer)
+            authorizeEndpoint -> routeAuthorizeEndpoint(callContext, authorizerFactory(callContext))
             tokenInfoEndpoint -> routeTokenInfoEndpoint(callContext)
         }
     }

oauth2-server-core/src/main/java/nl/myndocs/oauth2/config/CallRouterBuilder.kt

@@ -1,6 +1,7 @@
 package nl.myndocs.oauth2.config
 
 import nl.myndocs.oauth2.CallRouter
+import nl.myndocs.oauth2.authenticator.Authorizer
 import nl.myndocs.oauth2.grant.*
 import nl.myndocs.oauth2.identity.TokenInfo
 import nl.myndocs.oauth2.request.CallContext
@@ -19,7 +20,7 @@ internal object CallRouterBuilder {
         var granters: List<GrantingCall.() -> Granter> = listOf()
     }
 
-    fun build(configuration: Configuration, grantingCallFactory: (CallContext) -> GrantingCall) = CallRouter(
+    fun build(configuration: Configuration, grantingCallFactory: (CallContext) -> GrantingCall, authorizerFactory: (CallContext) -> Authorizer) = CallRouter(
             configuration.tokenEndpoint,
             configuration.authorizeEndpoint,
             configuration.tokenInfoEndpoint,
@@ -30,6 +31,7 @@ internal object CallRouterBuilder {
                     { grantClientCredentials() },
                     { grantRefreshToken() }
             ) + configuration.granters,
-            grantingCallFactory
+            grantingCallFactory,
+            authorizerFactory
     )
 }

oauth2-server-core/src/main/java/nl/myndocs/oauth2/config/Configuration.kt

@@ -5,6 +5,5 @@ import nl.myndocs.oauth2.authenticator.Authorizer
 import nl.myndocs.oauth2.request.CallContext
 
 data class Configuration(
-        val callRouter: CallRouter,
-        val authorizerFactory: (CallContext) -> Authorizer
+        val callRouter: CallRouter
 )

oauth2-server-core/src/main/java/nl/myndocs/oauth2/config/ConfigurationBuilder.kt

@@ -76,9 +76,12 @@ object ConfigurationBuilder {
                 override val accessTokenResponder = configuration.accessTokenResponder
             }
         }
-        return nl.myndocs.oauth2.config.Configuration(
-                CallRouterBuilder.build(configuration.callRouterConfiguration, grantingCallFactory),
-                configuration.authorizerFactory
+        return Configuration(
+                CallRouterBuilder.build(
+                        configuration.callRouterConfiguration,
+                        grantingCallFactory,
+                        configuration.authorizerFactory
+                )
         )
     }
 }

oauth2-server-http4k/src/main/java/nl/myndocs/oauth2/http4k/Oauth2Server.kt

@@ -19,21 +19,21 @@ infix fun RoutingHttpHandler.`enable oauth2`(configurationCallback: Configuratio
             callRouter.tokenEndpoint bind Method.POST to { request: Request ->
                 val responseBuilder = ResponseBuilder()
                 val callContext = Http4kCallContext(request, responseBuilder)
-                callRouter.route(callContext, configuration.authorizerFactory(callContext))
+                callRouter.route(callContext)
 
                 responseBuilder.build()
             },
             callRouter.authorizeEndpoint bind Method.GET to { request: Request ->
                 val responseBuilder = ResponseBuilder()
                 val callContext = Http4kCallContext(request, responseBuilder)
-                callRouter.route(callContext, configuration.authorizerFactory(callContext))
+                callRouter.route(callContext)
 
                 responseBuilder.build()
             },
             callRouter.tokenInfoEndpoint bind Method.GET to { request: Request ->
                 val responseBuilder = ResponseBuilder()
                 val callContext = Http4kCallContext(request, responseBuilder)
-                callRouter.route(callContext, configuration.authorizerFactory(callContext))
+                callRouter.route(callContext)
 
                 responseBuilder.build()
             }

oauth2-server-javalin/src/main/java/nl/myndocs/oauth2/javalin/Oauth2Server.kt

@@ -15,21 +15,21 @@ fun Javalin.enableOauthServer(configurationCallback: ConfigurationBuilder.Config
         path(callRouter.tokenEndpoint) {
             post { ctx ->
                 val javalinCallContext = JavalinCallContext(ctx)
-                callRouter.route(javalinCallContext, configuration.authorizerFactory(javalinCallContext))
+                callRouter.route(javalinCallContext)
             }
         }
 
         path(callRouter.authorizeEndpoint) {
             get { ctx ->
                 val javalinCallContext = JavalinCallContext(ctx)
-                callRouter.route(javalinCallContext, configuration.authorizerFactory(javalinCallContext))
+                callRouter.route(javalinCallContext)
             }
         }
 
         path(callRouter.tokenInfoEndpoint) {
             get { ctx ->
                 val javalinCallContext = JavalinCallContext(ctx)
-                callRouter.route(javalinCallContext, configuration.authorizerFactory(javalinCallContext))
+                callRouter.route(javalinCallContext)
             }
         }
     }

oauth2-server-ktor/src/main/java/nl/myndocs/oauth2/ktor/feature/Oauth2ServerFeature.kt

@@ -13,9 +13,6 @@ import nl.myndocs.oauth2.request.CallContext
 class Oauth2ServerFeature(configuration: Configuration) {
     val callRouter = configuration.callRouter
 
-    val authorizerFactory: (CallContext) -> Authorizer = configuration.authorizerFactory
-
-
     companion object Feature : ApplicationFeature<ApplicationCallPipeline, ConfigurationBuilder.Configuration, Oauth2ServerFeature> {
         override val key = AttributeKey<Oauth2ServerFeature>("Oauth2ServerFeature")
 
@@ -26,9 +23,8 @@ class Oauth2ServerFeature(configuration: Configuration) {
 
             pipeline.intercept(ApplicationCallPipeline.Features) {
                 val ktorCallContext = KtorCallContext(call)
-                val authorizer = feature.authorizerFactory(ktorCallContext)
 
-                feature.callRouter.route(ktorCallContext, authorizer)
+                feature.callRouter.route(ktorCallContext)
             }
 
             return feature

oauth2-server-sparkjava/src/main/java/nl/myndocs/oauth2/sparkjava/Oauth2Server.kt

@@ -13,22 +13,22 @@ object Oauth2Server {
 
         post(callRouter.tokenEndpoint) { req, res ->
             val sparkjavaCallContext = SparkjavaCallContext(req, res)
-            callRouter.route(sparkjavaCallContext, configuration.authorizerFactory(sparkjavaCallContext))
+            callRouter.route(sparkjavaCallContext)
 
             res.body()
         }
 
 
         get(callRouter.authorizeEndpoint) { req, res ->
             val sparkjavaCallContext = SparkjavaCallContext(req, res)
-            callRouter.route(sparkjavaCallContext, configuration.authorizerFactory(sparkjavaCallContext))
+            callRouter.route(sparkjavaCallContext)
 
             res.body()
         }
 
         get(callRouter.tokenInfoEndpoint) { req, res ->
             val sparkjavaCallContext = SparkjavaCallContext(req, res)
-            callRouter.route(sparkjavaCallContext, configuration.authorizerFactory(sparkjavaCallContext))
+            callRouter.route(sparkjavaCallContext)
 
             res.body()
         }