Merge pull request #190 from ptrsd/add-user-info-to-well-known-response

Add user info to well known response

Author: jksolbakken

README.md

@@ -85,6 +85,7 @@ A request to `http://localhost:8080/default/.well-known/openid-configuration` wi
    "issuer":"http://localhost:8080/default",
    "authorization_endpoint":"http://localhost:8080/default/authorize",
    "token_endpoint":"http://localhost:8080/default/token",
+   "userinfo_endpoint":"http://localhost:8080/default/userinfo",
    "jwks_uri":"http://localhost:8080/default/jwks",
    "response_types_supported":[
       "query",

src/main/kotlin/no/nav/security/mock/oauth2/debugger/Client.kt

@@ -77,4 +77,4 @@ internal fun OkHttpClient.post(tokenRequest: TokenRequest): String =
             .url(tokenRequest.url)
             .post(tokenRequest.body.toRequestBody("application/x-www-form-urlencoded".toMediaType()))
             .build()
-    ).execute().body?.string() ?: throw RuntimeException("could not get responsebody from url=${tokenRequest.url}")
+    ).execute().body?.string() ?: throw RuntimeException("could not get response body from url=${tokenRequest.url}")

src/main/kotlin/no/nav/security/mock/oauth2/http/OAuth2HttpRequest.kt

@@ -11,6 +11,7 @@ import no.nav.security.mock.oauth2.extensions.isDebuggerUrl
 import no.nav.security.mock.oauth2.extensions.isEndSessionEndpointUrl
 import no.nav.security.mock.oauth2.extensions.isJwksUrl
 import no.nav.security.mock.oauth2.extensions.isTokenEndpointUrl
+import no.nav.security.mock.oauth2.extensions.isUserInfoUrl
 import no.nav.security.mock.oauth2.extensions.isWellKnownUrl
 import no.nav.security.mock.oauth2.extensions.keyValuesToMap
 import no.nav.security.mock.oauth2.extensions.requirePrivateKeyJwt
@@ -19,6 +20,7 @@ import no.nav.security.mock.oauth2.extensions.toEndSessionEndpointUrl
 import no.nav.security.mock.oauth2.extensions.toIssuerUrl
 import no.nav.security.mock.oauth2.extensions.toJwksUrl
 import no.nav.security.mock.oauth2.extensions.toTokenEndpointUrl
+import no.nav.security.mock.oauth2.extensions.toUserInfoUrl
 import no.nav.security.mock.oauth2.grant.TokenExchangeGrant
 import no.nav.security.mock.oauth2.http.RequestType.AUTHORIZATION
 import no.nav.security.mock.oauth2.http.RequestType.DEBUGGER
@@ -30,6 +32,7 @@ import no.nav.security.mock.oauth2.http.RequestType.PREFLIGHT
 import no.nav.security.mock.oauth2.http.RequestType.TOKEN
 import no.nav.security.mock.oauth2.http.RequestType.UNKNOWN
 import no.nav.security.mock.oauth2.http.RequestType.WELL_KNOWN
+import no.nav.security.mock.oauth2.http.RequestType.USER_INFO
 import no.nav.security.mock.oauth2.missingParameter
 import okhttp3.Headers
 import okhttp3.HttpUrl
@@ -82,6 +85,7 @@ data class OAuth2HttpRequest(
         url.isAuthorizationEndpointUrl() -> AUTHORIZATION
         url.isTokenEndpointUrl() -> TOKEN
         url.isEndSessionEndpointUrl() -> END_SESSION
+        url.isUserInfoUrl() -> USER_INFO
         url.isJwksUrl() -> JWKS
         url.isDebuggerUrl() -> DEBUGGER
         url.isDebuggerCallbackUrl() -> DEBUGGER_CALLBACK
@@ -102,7 +106,8 @@ data class OAuth2HttpRequest(
             authorizationEndpoint = this.proxyAwareUrl().toAuthorizationEndpointUrl().toString(),
             tokenEndpoint = this.proxyAwareUrl().toTokenEndpointUrl().toString(),
             endSessionEndpoint = this.proxyAwareUrl().toEndSessionEndpointUrl().toString(),
-            jwksUri = this.proxyAwareUrl().toJwksUrl().toString()
+            jwksUri = this.proxyAwareUrl().toJwksUrl().toString(),
+            userInfoEndpoint = this.proxyAwareUrl().toUserInfoUrl().toString()
         )
 
     internal fun proxyAwareUrl(): HttpUrl {
@@ -135,5 +140,5 @@ data class OAuth2HttpRequest(
 
 enum class RequestType {
     WELL_KNOWN, AUTHORIZATION, TOKEN, END_SESSION, JWKS,
-    DEBUGGER, DEBUGGER_CALLBACK, FAVICON, PREFLIGHT, UNKNOWN
+    DEBUGGER, DEBUGGER_CALLBACK, FAVICON, PREFLIGHT, UNKNOWN, USER_INFO
 }

src/main/kotlin/no/nav/security/mock/oauth2/http/OAuth2HttpResponse.kt

@@ -30,6 +30,8 @@ data class WellKnown(
     val endSessionEndpoint: String,
     @JsonProperty("token_endpoint")
     val tokenEndpoint: String,
+    @JsonProperty("userinfo_endpoint")
+    val userInfoEndpoint: String,
     @JsonProperty("jwks_uri")
     val jwksUri: String,
     @JsonProperty("response_types_supported")

src/test/kotlin/no/nav/security/mock/oauth2/http/OAuth2HttpRequestTest.kt

@@ -80,4 +80,20 @@ internal class OAuth2HttpRequestTest {
         )
         req2.toWellKnown().issuer shouldBe "https://fakedings.nais.io:444/mypath"
     }
+
+    @Test
+    fun `wellKnown should contain urls exposed by mock service`() {
+        val req1 = OAuth2HttpRequest(
+            headers = Headers.headersOf(),
+            method = "GET",
+            originalUrl = "http://localhost:8080/mypath?query=1".toHttpUrl()
+        )
+
+        req1.toWellKnown().issuer shouldBe "http://localhost:8080/mypath"
+        req1.toWellKnown().userInfoEndpoint shouldBe "http://localhost:8080/mypath/userinfo"
+        req1.toWellKnown().authorizationEndpoint shouldBe "http://localhost:8080/mypath/authorize"
+        req1.toWellKnown().endSessionEndpoint shouldBe "http://localhost:8080/mypath/endsession"
+        req1.toWellKnown().tokenEndpoint shouldBe "http://localhost:8080/mypath/token"
+        req1.toWellKnown().jwksUri shouldBe "http://localhost:8080/mypath/jwks"
+    }
 }