Merge pull request #36 from myndocs/token-info

adhesivee · web-flow · commit ba57a32eb838 · 2018-11-15T21:10:03.000+01:00
Change user info to token info
diff --git a/oauth2-server-core/src/main/java/nl/myndocs/oauth2/CallRouter.kt b/oauth2-server-core/src/main/java/nl/myndocs/oauth2/CallRouter.kt
@@ -6,16 +6,16 @@ import nl.myndocs.oauth2.client.AuthorizedGrantType.CLIENT_CREDENTIALS
 import nl.myndocs.oauth2.client.AuthorizedGrantType.PASSWORD
 import nl.myndocs.oauth2.client.AuthorizedGrantType.REFRESH_TOKEN
 import nl.myndocs.oauth2.exception.*
-import nl.myndocs.oauth2.identity.UserInfo
+import nl.myndocs.oauth2.identity.TokenInfo
 import nl.myndocs.oauth2.request.*
 import nl.myndocs.oauth2.token.toMap
 
 class CallRouter(
         private val tokenService: TokenService,
         val tokenEndpoint: String,
         val authorizeEndpoint: String,
-        val userInfoEndpoint: String,
-        private val userInfoCallback: (UserInfo) -> Map<String, Any?>
+        val tokenInfoEndpoint: String,
+        private val tokenInfoCallback: (TokenInfo) -> Map<String, Any?>
 ) {
     companion object {
         const val METHOD_POST = "post"
@@ -32,7 +32,7 @@ class CallRouter(
         when (callContext.path) {
             tokenEndpoint -> routeTokenEndpoint(callContext)
             authorizeEndpoint -> routeAuthorizeEndpoint(callContext, authorizer)
-            userInfoEndpoint -> routeUserInfoEndpoint(callContext)
+            tokenInfoEndpoint -> routeTokenInfoEndpoint(callContext)
         }
     }
 
@@ -208,7 +208,7 @@ class CallRouter(
         }
     }
 
-    private fun routeUserInfoEndpoint(callContext: CallContext) {
+    private fun routeTokenInfoEndpoint(callContext: CallContext) {
         if (callContext.method.toLowerCase() != METHOD_GET) {
             return
         }
@@ -222,8 +222,8 @@ class CallRouter(
 
         val token = authorization.substring(7)
 
-        val userInfoCallback = userInfoCallback(tokenService.userInfo(token))
+        val tokenInfoCallback = tokenInfoCallback(tokenService.tokenInfo(token))
 
-        callContext.respondJson(userInfoCallback)
+        callContext.respondJson(tokenInfoCallback)
     }
 }
diff --git a/oauth2-server-core/src/main/java/nl/myndocs/oauth2/Oauth2TokenService.kt b/oauth2-server-core/src/main/java/nl/myndocs/oauth2/Oauth2TokenService.kt
@@ -8,7 +8,7 @@ import nl.myndocs.oauth2.client.ClientService
 import nl.myndocs.oauth2.exception.*
 import nl.myndocs.oauth2.identity.Identity
 import nl.myndocs.oauth2.identity.IdentityService
-import nl.myndocs.oauth2.identity.UserInfo
+import nl.myndocs.oauth2.identity.TokenInfo
 import nl.myndocs.oauth2.request.*
 import nl.myndocs.oauth2.response.TokenResponse
 import nl.myndocs.oauth2.scope.ScopeParser
@@ -315,13 +315,12 @@ class Oauth2TokenService(
         }
     }
 
-    override fun userInfo(accessToken: String): UserInfo {
+    override fun tokenInfo(accessToken: String): TokenInfo {
         val storedAccessToken = tokenStore.accessToken(accessToken) ?: throw InvalidGrantException()
         val client = clientService.clientOf(storedAccessToken.clientId) ?: throw InvalidClientException()
         val identity = storedAccessToken.username?.let { identityService.identityOf(client, it) }
-                ?: throw InvalidIdentityException()
 
-        return UserInfo(
+        return TokenInfo(
                 identity,
                 client,
                 storedAccessToken.scopes
diff --git a/oauth2-server-core/src/main/java/nl/myndocs/oauth2/TokenService.kt b/oauth2-server-core/src/main/java/nl/myndocs/oauth2/TokenService.kt
@@ -2,7 +2,7 @@ package nl.myndocs.oauth2
 
 import nl.myndocs.oauth2.authenticator.Authenticator
 import nl.myndocs.oauth2.authenticator.IdentityScopeVerifier
-import nl.myndocs.oauth2.identity.UserInfo
+import nl.myndocs.oauth2.identity.TokenInfo
 import nl.myndocs.oauth2.request.*
 import nl.myndocs.oauth2.response.TokenResponse
 import nl.myndocs.oauth2.token.AccessToken
@@ -29,5 +29,5 @@ interface TokenService {
             identityScopeVerifier: IdentityScopeVerifier?
     ): AccessToken
 
-    fun userInfo(accessToken: String): UserInfo
+    fun tokenInfo(accessToken: String): TokenInfo
 }
diff --git a/oauth2-server-core/src/main/java/nl/myndocs/oauth2/config/CallRouterBuilder.kt b/oauth2-server-core/src/main/java/nl/myndocs/oauth2/config/CallRouterBuilder.kt
@@ -2,18 +2,18 @@ package nl.myndocs.oauth2.config
 
 import nl.myndocs.oauth2.CallRouter
 import nl.myndocs.oauth2.TokenService
-import nl.myndocs.oauth2.identity.UserInfo
+import nl.myndocs.oauth2.identity.TokenInfo
 
 internal object CallRouterBuilder {
     class Configuration {
         var tokenEndpoint: String = "/oauth/token"
         var authorizeEndpoint: String = "/oauth/authorize"
-        var userInfoEndpoint: String = "/oauth/userinfo"
-        var userInfoCallback: (UserInfo) -> Map<String, Any?> = { userInfo ->
+        var tokenInfoEndpoint: String = "/oauth/tokeninfo"
+        var tokenInfoCallback: (TokenInfo) -> Map<String, Any?> = { tokenInfo ->
             mapOf(
-                    "username" to userInfo.identity.username,
-                    "scopes" to userInfo.scopes
-            )
+                    "username" to tokenInfo.identity?.username,
+                    "scopes" to tokenInfo.scopes
+            ).filterValues { it != null }
         }
         var tokenService: TokenService? = null
     }
@@ -29,7 +29,7 @@ internal object CallRouterBuilder {
             configuration.tokenService!!,
             configuration.tokenEndpoint,
             configuration.authorizeEndpoint,
-            configuration.userInfoEndpoint,
-            configuration.userInfoCallback
+            configuration.tokenInfoEndpoint,
+            configuration.tokenInfoCallback
     )
 }
diff --git a/oauth2-server-core/src/main/java/nl/myndocs/oauth2/config/ConfigurationBuilder.kt b/oauth2-server-core/src/main/java/nl/myndocs/oauth2/config/ConfigurationBuilder.kt
@@ -2,7 +2,7 @@ package nl.myndocs.oauth2.config
 
 import nl.myndocs.oauth2.TokenService
 import nl.myndocs.oauth2.authenticator.Authorizer
-import nl.myndocs.oauth2.identity.UserInfo
+import nl.myndocs.oauth2.identity.TokenInfo
 import nl.myndocs.oauth2.request.CallContext
 import nl.myndocs.oauth2.request.auth.BasicAuthorizer
 
@@ -28,16 +28,16 @@ object ConfigurationBuilder {
                 callRouterConfiguration.tokenEndpoint = value
             }
 
-        var userInfoEndpoint: String
-            get() = callRouterConfiguration.userInfoEndpoint
+        var tokenInfoEndpoint: String
+            get() = callRouterConfiguration.tokenInfoEndpoint
             set(value) {
-                callRouterConfiguration.userInfoEndpoint = value
+                callRouterConfiguration.tokenInfoEndpoint = value
             }
 
-        var userInfoCallback: (UserInfo) -> Map<String, Any?>
-            get() = callRouterConfiguration.userInfoCallback
+        var tokenInfoCallback: (TokenInfo) -> Map<String, Any?>
+            get() = callRouterConfiguration.tokenInfoCallback
             set(value) {
-                callRouterConfiguration.userInfoCallback = value
+                callRouterConfiguration.tokenInfoCallback = value
             }
 
         var authorizerFactory: (CallContext) -> Authorizer = ::BasicAuthorizer
diff --git a/oauth2-server-core/src/main/java/nl/myndocs/oauth2/identity/TokenInfo.kt b/oauth2-server-core/src/main/java/nl/myndocs/oauth2/identity/TokenInfo.kt
@@ -2,8 +2,8 @@ package nl.myndocs.oauth2.identity
 
 import nl.myndocs.oauth2.client.Client
 
-data class UserInfo(
-        val identity: Identity,
+data class TokenInfo(
+        val identity: Identity?,
         val client: Client,
         val scopes: Set<String>
 )
diff --git a/oauth2-server-http4k/src/main/java/nl/myndocs/oauth2/http4k/Oauth2Server.kt b/oauth2-server-http4k/src/main/java/nl/myndocs/oauth2/http4k/Oauth2Server.kt
@@ -30,7 +30,7 @@ infix fun RoutingHttpHandler.`enable oauth2`(configurationCallback: Configuratio
 
                 responseBuilder.build()
             },
-            callRouter.userInfoEndpoint bind Method.GET to { request: Request ->
+            callRouter.tokenInfoEndpoint bind Method.GET to { request: Request ->
                 val responseBuilder = ResponseBuilder()
                 val callContext = Http4kCallContext(request, responseBuilder)
                 callRouter.route(callContext, configuration.authorizerFactory(callContext))
diff --git a/oauth2-server-javalin/src/main/java/nl/myndocs/oauth2/javalin/Oauth2Server.kt b/oauth2-server-javalin/src/main/java/nl/myndocs/oauth2/javalin/Oauth2Server.kt
@@ -26,7 +26,7 @@ fun Javalin.enableOauthServer(configurationCallback: ConfigurationBuilder.Config
             }
         }
 
-        path(callRouter.userInfoEndpoint) {
+        path(callRouter.tokenInfoEndpoint) {
             get { ctx ->
                 val javalinCallContext = JavalinCallContext(ctx)
                 callRouter.route(javalinCallContext, configuration.authorizerFactory(javalinCallContext))
diff --git a/oauth2-server-sparkjava/src/main/java/nl/myndocs/oauth2/sparkjava/Oauth2Server.kt b/oauth2-server-sparkjava/src/main/java/nl/myndocs/oauth2/sparkjava/Oauth2Server.kt
@@ -26,7 +26,7 @@ object Oauth2Server {
             res.body()
         }
 
-        get(callRouter.userInfoEndpoint) { req, res ->
+        get(callRouter.tokenInfoEndpoint) { req, res ->
             val sparkjavaCallContext = SparkjavaCallContext(req, res)
             callRouter.route(sparkjavaCallContext, configuration.authorizerFactory(sparkjavaCallContext))
 

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@ package nl.myndocs.oauth2.identity`
`2`	`2`
`3`	`3`	`import nl.myndocs.oauth2.client.Client`
`4`	`4`
`5`		`-data class UserInfo(`
`6`		`- val identity: Identity,`
	`5`	`+data class TokenInfo(`
	`6`	`+ val identity: Identity?,`
`7`	`7`	`val client: Client,`
`8`	`8`	`val scopes: Set<String>`
`9`	`9`	`)`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ fun Javalin.enableOauthServer(configurationCallback: ConfigurationBuilder.Config`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
`29`		`- path(callRouter.userInfoEndpoint) {`
	`29`	`+ path(callRouter.tokenInfoEndpoint) {`
`30`	`30`	`get { ctx ->`
`31`	`31`	`val javalinCallContext = JavalinCallContext(ctx)`
`32`	`32`	`callRouter.route(javalinCallContext, configuration.authorizerFactory(javalinCallContext))`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ object Oauth2Server {`
`26`	`26`	`res.body()`
`27`	`27`	`}`
`28`	`28`
`29`		`- get(callRouter.userInfoEndpoint) { req, res ->`
	`29`	`+ get(callRouter.tokenInfoEndpoint) { req, res ->`
`30`	`30`	`val sparkjavaCallContext = SparkjavaCallContext(req, res)`
`31`	`31`	`callRouter.route(sparkjavaCallContext, configuration.authorizerFactory(sparkjavaCallContext))`
`32`	`32`