Skip to content

Oppdaterte til okhttp 5.1 #884

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 15, 2025
Merged

Oppdaterte til okhttp 5.1 #884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ val assertjVersion = "3.27.4"
val kotlinLoggingVersion = "3.0.5"
val logbackVersion = "1.5.18"
val nimbusSdkVersion = "11.28"
val mockWebServerVersion = "4.12.0"
val mockWebServerVersion = "5.1.0"
val jacksonVersion = "2.20.0"
val nettyVersion = "4.2.5.Final"
val junitJupiterVersion = "5.13.4"
Expand Down
10 changes: 9 additions & 1 deletion src/main/kotlin/no/nav/security/mock/oauth2/debugger/Client.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import okhttp3.MediaType.Companion.toMediaType
import okhttp3.OkHttpClient
import okhttp3.Request
import okhttp3.RequestBody.Companion.toRequestBody
import okhttp3.internal.toHostHeader
import java.net.URLEncoder
import java.nio.charset.StandardCharsets
import javax.net.ssl.SSLContext
Expand Down Expand Up @@ -44,6 +43,15 @@ internal class TokenRequest(
} +
"\n\n$body"

private fun HttpUrl.toHostHeader(includeDefaultPort: Boolean = false): String {
val host = if (":" in host) "[$host]" else host
return if (includeDefaultPort || port != HttpUrl.defaultPort(scheme)) {
"$host:$port"
} else {
host
}
}

private fun Map<String, String>.toKeyValueString(entrySeparator: String): String =
this
.map { "${it.key}=${it.value}" }
Expand Down