Skip to content

Commit 0cbbcc9

Browse files
chore: update to springboot-3.4.4
jira: STL-802, STL-883 risk: low
1 parent 6186a0a commit 0cbbcc9

File tree

5 files changed

+10
-126
lines changed

5 files changed

+10
-126
lines changed

gooddata-server-oauth2-autoconfigure/src/main/kotlin/AuthenticationUtils.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
package com.gooddata.oauth2.server
1919

2020
import com.gooddata.oauth2.server.OAuthConstants.GD_USER_GROUPS_SCOPE
21-
import com.gooddata.oauth2.server.oauth2.client.fromOidcConfiguration
2221
import com.nimbusds.jose.JWSAlgorithm
2322
import com.nimbusds.jose.jwk.JWKSet
2423
import com.nimbusds.jose.jwk.source.JWKSecurityContextJWKSet
@@ -51,6 +50,7 @@ import org.springframework.security.core.Authentication
5150
import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken
5251
import org.springframework.security.oauth2.client.registration.ClientRegistration
5352
import org.springframework.security.oauth2.client.registration.ClientRegistrations
53+
import org.springframework.security.oauth2.client.registration.ClientRegistrations.fromOidcConfiguration
5454
import org.springframework.security.oauth2.core.AuthenticationMethod
5555
import org.springframework.security.oauth2.core.AuthorizationGrantType
5656
import org.springframework.security.oauth2.core.converter.ClaimConversionService

gooddata-server-oauth2-autoconfigure/src/main/kotlin/jackson/OidcIdTokenDeserializer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ internal class OidcIdTokenDeserializer : JsonDeserializer<OidcIdToken>() {
3434
val node = codec.readTree<JsonNode>(parser)
3535

3636
val tokenValue = node.findTextValue("tokenValue")
37-
return OidcIdToken(tokenValue, null, null, mapOf(IdTokenClaimNames.SUB to null))
37+
return OidcIdToken(tokenValue, null, null, mapOf(IdTokenClaimNames.SUB to ""))
3838
}
3939
}

gooddata-server-oauth2-autoconfigure/src/main/kotlin/oauth2/client/CustomClientRegistrations.kt

Lines changed: 0 additions & 119 deletions
This file was deleted.

gooddata-server-oauth2-autoconfigure/src/test/kotlin/AuthenticationUtilsTest.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import com.github.tomakehurst.wiremock.WireMockServer
2020
import com.github.tomakehurst.wiremock.client.WireMock
2121
import com.github.tomakehurst.wiremock.core.WireMockConfiguration
2222
import com.gooddata.oauth2.server.OAuthConstants.GD_USER_GROUPS_SCOPE
23-
import com.gooddata.oauth2.server.oauth2.client.fromOidcConfiguration
2423
import io.mockk.coVerify
2524
import io.mockk.every
2625
import io.mockk.mockk
@@ -38,6 +37,7 @@ import org.junit.jupiter.params.provider.MethodSource
3837
import org.springframework.http.HttpStatus
3938
import org.springframework.security.core.Authentication
4039
import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken
40+
import org.springframework.security.oauth2.client.registration.ClientRegistrations.fromOidcConfiguration
4141
import org.springframework.security.oauth2.core.AuthorizationGrantType
4242
import org.springframework.security.oauth2.core.oidc.IdTokenClaimNames
4343
import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken
@@ -153,6 +153,7 @@ internal class AuthenticationUtilsTest {
153153
}
154154
}
155155

156+
@Suppress("MaxLineLength")
156157
@Test
157158
fun `should call handleAzureB2CClientRegistration method`() {
158159
val azureB2CIssuerId = "someAzureB2CIssuerId"
@@ -177,7 +178,9 @@ internal class AuthenticationUtilsTest {
177178
// that the `handleAzureB2CClientRegistration` method is called when the issuer is an Azure B2C issuer.
178179
assertEquals(HttpStatus.NOT_FOUND, ex.statusCode)
179180
assertEquals(
180-
"404 Not Found: \"The resource you are looking for has been removed, had its name changed, " +
181+
"404 Not Found on GET request for " +
182+
"\"https://tenant.b2clogin.com/tenant.onmicrosoft.com/policy/v2.0/.well-known/openid-configuration\": " +
183+
"\"The resource you are looking for has been removed, had its name changed, " +
181184
"or is temporarily unavailable.\"", ex.message
182185
)
183186
}

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ striktVersion=0.34.1
2929
tinkVersion=1.13.0
3030
wiremockVersion=3.8.0
3131
kotlinVersion=1.9.23
32-
springBootVersion=3.3.2
33-
springDependencyManagementVersion=1.1.6
34-
springSecurityVersion=6.3.1
32+
springBootVersion=3.4.4
33+
springDependencyManagementVersion=1.1.7
34+
springSecurityVersion=6.4.4

0 commit comments

Comments
 (0)