diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurerTests.java index 8246698881e..05e58625720 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurerTests.java @@ -717,7 +717,7 @@ private static OAuth2UserService createOauth2User private static OAuth2UserService createOidcUserService() { OidcIdToken idToken = TestOidcIdTokens.idToken().build(); - return (request) -> new DefaultOidcUser(Collections.singleton(new OidcUserAuthority(idToken)), idToken); + return (request) -> new DefaultOidcUser(idToken, Collections.singleton(new OidcUserAuthority(idToken))); } private static GrantedAuthoritiesMapper createGrantedAuthoritiesMapper() { diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/userinfo/OidcUserRequestUtils.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/userinfo/OidcUserRequestUtils.java index a9f3629aae9..30473511455 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/userinfo/OidcUserRequestUtils.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/userinfo/OidcUserRequestUtils.java @@ -93,7 +93,7 @@ static OidcUser getUser(OidcUserRequest userRequest, OidcUserInfo userInfo) { if (StringUtils.hasText(userNameAttributeName)) { return new DefaultOidcUser(authorities, userRequest.getIdToken(), userInfo, userNameAttributeName); } - return new DefaultOidcUser(authorities, userRequest.getIdToken(), userInfo); + return new DefaultOidcUser(userRequest.getIdToken(), userInfo, authorities); } private OidcUserRequestUtils() { diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/jackson2/OAuth2AuthenticationTokenMixinTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/jackson2/OAuth2AuthenticationTokenMixinTests.java index 6fe7d05b501..eee0306b933 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/jackson2/OAuth2AuthenticationTokenMixinTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/jackson2/OAuth2AuthenticationTokenMixinTests.java @@ -87,7 +87,7 @@ public void serializeWhenMixinRegisteredThenSerializes() throws Exception { @Test public void serializeWhenRequiredAttributesOnlyThenSerializes() throws Exception { DefaultOidcUser principal = TestOidcUsers.create(); - principal = new DefaultOidcUser(principal.getAuthorities(), principal.getIdToken()); + principal = new DefaultOidcUser(principal.getIdToken(), principal.getAuthorities()); OAuth2AuthenticationToken authentication = new OAuth2AuthenticationToken(principal, Collections.emptyList(), "registration-id"); String expectedJson = asJson(authentication); @@ -147,7 +147,7 @@ public void deserializeWhenMixinRegisteredThenDeserializes() throws Exception { @Test public void deserializeWhenRequiredAttributesOnlyThenDeserializes() throws Exception { DefaultOidcUser expectedPrincipal = TestOidcUsers.create(); - expectedPrincipal = new DefaultOidcUser(expectedPrincipal.getAuthorities(), expectedPrincipal.getIdToken()); + expectedPrincipal = new DefaultOidcUser(expectedPrincipal.getIdToken(), expectedPrincipal.getAuthorities()); OAuth2AuthenticationToken expectedAuthentication = new OAuth2AuthenticationToken(expectedPrincipal, Collections.emptyList(), "registration-id"); String json = asJson(expectedAuthentication); diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/authentication/OidcAuthorizationCodeReactiveAuthenticationManagerTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/authentication/OidcAuthorizationCodeReactiveAuthenticationManagerTests.java index 6932311a1bc..5d813ed6796 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/authentication/OidcAuthorizationCodeReactiveAuthenticationManagerTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/authentication/OidcAuthorizationCodeReactiveAuthenticationManagerTests.java @@ -254,7 +254,7 @@ public void authenticationWhenOAuth2UserFoundThenSuccess() { claims.put(IdTokenClaimNames.NONCE, this.nonceHash); Jwt idToken = TestJwts.jwt().claims((c) -> c.putAll(claims)).build(); given(this.accessTokenResponseClient.getTokenResponse(any())).willReturn(Mono.just(accessTokenResponse)); - DefaultOidcUser user = new DefaultOidcUser(AuthorityUtils.createAuthorityList("ROLE_USER"), this.idToken); + DefaultOidcUser user = new DefaultOidcUser(this.idToken, AuthorityUtils.createAuthorityList("ROLE_USER")); given(this.userService.loadUser(any())).willReturn(Mono.just(user)); given(this.jwtDecoder.decode(any())).willReturn(Mono.just(idToken)); this.manager.setJwtDecoderFactory((c) -> this.jwtDecoder); @@ -285,7 +285,7 @@ public void authenticationWhenRefreshTokenThenRefreshTokenInAuthorizedClient() { claims.put(IdTokenClaimNames.NONCE, this.nonceHash); Jwt idToken = TestJwts.jwt().claims((c) -> c.putAll(claims)).build(); given(this.accessTokenResponseClient.getTokenResponse(any())).willReturn(Mono.just(accessTokenResponse)); - DefaultOidcUser user = new DefaultOidcUser(AuthorityUtils.createAuthorityList("ROLE_USER"), this.idToken); + DefaultOidcUser user = new DefaultOidcUser(this.idToken, AuthorityUtils.createAuthorityList("ROLE_USER")); given(this.userService.loadUser(any())).willReturn(Mono.just(user)); given(this.jwtDecoder.decode(any())).willReturn(Mono.just(idToken)); this.manager.setJwtDecoderFactory((c) -> this.jwtDecoder); @@ -321,7 +321,7 @@ public void authenticateWhenTokenSuccessResponseThenAdditionalParametersAddedToU claims.put(IdTokenClaimNames.NONCE, this.nonceHash); Jwt idToken = TestJwts.jwt().claims((c) -> c.putAll(claims)).build(); given(this.accessTokenResponseClient.getTokenResponse(any())).willReturn(Mono.just(accessTokenResponse)); - DefaultOidcUser user = new DefaultOidcUser(AuthorityUtils.createAuthorityList("ROLE_USER"), this.idToken); + DefaultOidcUser user = new DefaultOidcUser(this.idToken, AuthorityUtils.createAuthorityList("ROLE_USER")); ArgumentCaptor userRequestArgCaptor = ArgumentCaptor.forClass(OidcUserRequest.class); given(this.userService.loadUser(userRequestArgCaptor.capture())).willReturn(Mono.just(user)); given(this.jwtDecoder.decode(any())).willReturn(Mono.just(idToken)); @@ -349,7 +349,7 @@ public void authenticateWhenAuthoritiesMapperSetThenReturnMappedAuthorities() { claims.put(IdTokenClaimNames.NONCE, this.nonceHash); Jwt idToken = TestJwts.jwt().claims((c) -> c.putAll(claims)).build(); given(this.accessTokenResponseClient.getTokenResponse(any())).willReturn(Mono.just(accessTokenResponse)); - DefaultOidcUser user = new DefaultOidcUser(AuthorityUtils.createAuthorityList("ROLE_USER"), this.idToken); + DefaultOidcUser user = new DefaultOidcUser(this.idToken, AuthorityUtils.createAuthorityList("ROLE_USER")); ArgumentCaptor userRequestArgCaptor = ArgumentCaptor.forClass(OidcUserRequest.class); given(this.userService.loadUser(userRequestArgCaptor.capture())).willReturn(Mono.just(user)); List mappedAuthorities = AuthorityUtils.createAuthorityList("ROLE_OIDC_USER"); diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/session/InMemoryOidcSessionRegistryTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/session/InMemoryOidcSessionRegistryTests.java index 6064e74b033..a7b1c41229d 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/session/InMemoryOidcSessionRegistryTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/session/InMemoryOidcSessionRegistryTests.java @@ -48,7 +48,7 @@ public void registerWhenDefaultsThenStoresSessionInformation() { public void registerWhenIdTokenHasSessionIdThenStoresSessionInformation() { InMemoryOidcSessionRegistry sessionRegistry = new InMemoryOidcSessionRegistry(); OidcIdToken idToken = TestOidcIdTokens.idToken().claim("sid", "provider").build(); - OidcUser user = new DefaultOidcUser(AuthorityUtils.NO_AUTHORITIES, idToken); + OidcUser user = new DefaultOidcUser(idToken, AuthorityUtils.NO_AUTHORITIES); OidcSessionInformation info = TestOidcSessionInformations.create("client", user); sessionRegistry.saveSessionInformation(info); OidcLogoutToken logoutToken = TestOidcLogoutTokens.withSessionId(idToken.getIssuer().toString(), "provider") @@ -61,15 +61,15 @@ public void registerWhenIdTokenHasSessionIdThenStoresSessionInformation() { public void unregisterWhenMultipleSessionsThenRemovesAllMatching() { InMemoryOidcSessionRegistry sessionRegistry = new InMemoryOidcSessionRegistry(); OidcIdToken idToken = TestOidcIdTokens.idToken().claim("sid", "providerOne").subject("otheruser").build(); - OidcUser user = new DefaultOidcUser(AuthorityUtils.NO_AUTHORITIES, idToken); + OidcUser user = new DefaultOidcUser(idToken, AuthorityUtils.NO_AUTHORITIES); OidcSessionInformation oneSession = TestOidcSessionInformations.create("clientOne", user); sessionRegistry.saveSessionInformation(oneSession); idToken = TestOidcIdTokens.idToken().claim("sid", "providerTwo").build(); - user = new DefaultOidcUser(AuthorityUtils.NO_AUTHORITIES, idToken); + user = new DefaultOidcUser(idToken, AuthorityUtils.NO_AUTHORITIES); OidcSessionInformation twoSession = TestOidcSessionInformations.create("clientTwo", user); sessionRegistry.saveSessionInformation(twoSession); idToken = TestOidcIdTokens.idToken().claim("sid", "providerThree").build(); - user = new DefaultOidcUser(AuthorityUtils.NO_AUTHORITIES, idToken); + user = new DefaultOidcUser(idToken, AuthorityUtils.NO_AUTHORITIES); OidcSessionInformation threeSession = TestOidcSessionInformations.create("clientThree", user); sessionRegistry.saveSessionInformation(threeSession); OidcLogoutToken logoutToken = TestOidcLogoutTokens @@ -86,7 +86,7 @@ public void unregisterWhenMultipleSessionsThenRemovesAllMatching() { public void unregisterWhenNoSessionsThenEmptyList() { InMemoryOidcSessionRegistry sessionRegistry = new InMemoryOidcSessionRegistry(); OidcIdToken idToken = TestOidcIdTokens.idToken().claim("sid", "provider").build(); - OidcUser user = new DefaultOidcUser(AuthorityUtils.NO_AUTHORITIES, idToken); + OidcUser user = new DefaultOidcUser(idToken, AuthorityUtils.NO_AUTHORITIES); OidcSessionInformation info = TestOidcSessionInformations.create("client", user); sessionRegistry.saveSessionInformation(info); OidcLogoutToken logoutToken = TestOidcLogoutTokens.withSessionId(idToken.getIssuer().toString(), "wrong") diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/userinfo/OidcReactiveOAuth2UserServiceTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/userinfo/OidcReactiveOAuth2UserServiceTests.java index efe2e29b35e..fbeb12b2bf7 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/userinfo/OidcReactiveOAuth2UserServiceTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/userinfo/OidcReactiveOAuth2UserServiceTests.java @@ -250,8 +250,7 @@ public void loadUserWhenCustomOidcUserMapperSetThenUsed() { AuthorityUtils.createAuthorityList("ROLE_USER")); given(this.oauth2UserService.loadUser(any(OidcUserRequest.class))).willReturn(Mono.just(oauth2User)); BiFunction> customOidcUserMapper = mock(BiFunction.class); - OidcUser actualUser = new DefaultOidcUser(AuthorityUtils.createAuthorityList("a", "b"), this.idToken, - IdTokenClaimNames.SUB); + OidcUser actualUser = new DefaultOidcUser(this.idToken, AuthorityUtils.createAuthorityList("a", "b")); given(customOidcUserMapper.apply(any(OidcUserRequest.class), any(OidcUserInfo.class))) .willReturn(Mono.just(actualUser)); this.userService.setOidcUserMapper(customOidcUserMapper); @@ -277,8 +276,7 @@ public void loadUserWhenCustomOidcUserMapperSetAndUserInfoNotRetrievedThenUsed() Collections.emptySet()); // @formatter:on BiFunction> customOidcUserMapper = mock(BiFunction.class); - OidcUser actualUser = new DefaultOidcUser(AuthorityUtils.createAuthorityList("a", "b"), this.idToken, - IdTokenClaimNames.SUB); + OidcUser actualUser = new DefaultOidcUser(this.idToken, AuthorityUtils.createAuthorityList("a", "b")); given(customOidcUserMapper.apply(any(OidcUserRequest.class), isNull())).willReturn(Mono.just(actualUser)); this.userService.setOidcUserMapper(customOidcUserMapper); OidcUserRequest userRequest = userRequest(); diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/userinfo/OidcUserServiceTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/userinfo/OidcUserServiceTests.java index baa574fa1eb..81aa62b0750 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/userinfo/OidcUserServiceTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/userinfo/OidcUserServiceTests.java @@ -285,8 +285,7 @@ public void loadUserWhenCustomOidcUserMapperSetThenUsed() { ClientRegistration clientRegistration = this.clientRegistrationBuilder.userInfoUri(userInfoUri).build(); this.accessToken = TestOAuth2AccessTokens.noScopes(); BiFunction customOidcUserMapper = mock(BiFunction.class); - OidcUser actualUser = new DefaultOidcUser(AuthorityUtils.createAuthorityList("a", "b"), this.idToken, - IdTokenClaimNames.SUB); + OidcUser actualUser = new DefaultOidcUser(this.idToken, AuthorityUtils.createAuthorityList("a", "b")); given(customOidcUserMapper.apply(any(OidcUserRequest.class), any(OidcUserInfo.class))).willReturn(actualUser); this.userService.setOidcUserMapper(customOidcUserMapper); OidcUserRequest userRequest = new OidcUserRequest(clientRegistration, this.accessToken, this.idToken); diff --git a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/oidc/user/DefaultOidcUserTests.java b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/oidc/user/DefaultOidcUserTests.java index 4c4ae825005..9f145123470 100644 --- a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/oidc/user/DefaultOidcUserTests.java +++ b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/oidc/user/DefaultOidcUserTests.java @@ -69,17 +69,18 @@ public class DefaultOidcUserTests { @Test public void constructorWhenIdTokenIsNullThenThrowIllegalArgumentException() { - assertThatIllegalArgumentException().isThrownBy(() -> new DefaultOidcUser(AUTHORITIES, null)); + assertThatIllegalArgumentException().isThrownBy(() -> new DefaultOidcUser(null, AUTHORITIES)); } @Test + @Deprecated public void constructorWhenNameAttributeKeyInvalidThenThrowIllegalArgumentException() { assertThatIllegalArgumentException().isThrownBy(() -> new DefaultOidcUser(AUTHORITIES, ID_TOKEN, "invalid")); } @Test public void constructorWhenAuthoritiesIsNullThenCreatedWithEmptyAuthorities() { - DefaultOidcUser user = new DefaultOidcUser(null, ID_TOKEN); + DefaultOidcUser user = new DefaultOidcUser(ID_TOKEN, null); assertThat(user.getClaims()).containsOnlyKeys(IdTokenClaimNames.ISS, IdTokenClaimNames.SUB); assertThat(user.getIdToken()).isEqualTo(ID_TOKEN); assertThat(user.getName()).isEqualTo(SUBJECT); @@ -89,7 +90,7 @@ public void constructorWhenAuthoritiesIsNullThenCreatedWithEmptyAuthorities() { @Test public void constructorWhenAuthoritiesIsEmptyThenCreated() { - DefaultOidcUser user = new DefaultOidcUser(AuthorityUtils.NO_AUTHORITIES, ID_TOKEN); + DefaultOidcUser user = new DefaultOidcUser(ID_TOKEN, AuthorityUtils.NO_AUTHORITIES); assertThat(user.getClaims()).containsOnlyKeys(IdTokenClaimNames.ISS, IdTokenClaimNames.SUB); assertThat(user.getIdToken()).isEqualTo(ID_TOKEN); assertThat(user.getName()).isEqualTo(SUBJECT); @@ -99,7 +100,7 @@ public void constructorWhenAuthoritiesIsEmptyThenCreated() { @Test public void constructorWhenAuthoritiesIdTokenProvidedThenCreated() { - DefaultOidcUser user = new DefaultOidcUser(AUTHORITIES, ID_TOKEN); + DefaultOidcUser user = new DefaultOidcUser(ID_TOKEN, AUTHORITIES); assertThat(user.getClaims()).containsOnlyKeys(IdTokenClaimNames.ISS, IdTokenClaimNames.SUB); assertThat(user.getIdToken()).isEqualTo(ID_TOKEN); assertThat(user.getName()).isEqualTo(SUBJECT); @@ -109,6 +110,7 @@ public void constructorWhenAuthoritiesIdTokenProvidedThenCreated() { } @Test + @Deprecated public void constructorWhenAuthoritiesIdTokenNameAttributeKeyProvidedThenCreated() { DefaultOidcUser user = new DefaultOidcUser(AUTHORITIES, ID_TOKEN, IdTokenClaimNames.SUB); assertThat(user.getClaims()).containsOnlyKeys(IdTokenClaimNames.ISS, IdTokenClaimNames.SUB); @@ -121,7 +123,7 @@ public void constructorWhenAuthoritiesIdTokenNameAttributeKeyProvidedThenCreated @Test public void constructorWhenAuthoritiesIdTokenUserInfoProvidedThenCreated() { - DefaultOidcUser user = new DefaultOidcUser(AUTHORITIES, ID_TOKEN, USER_INFO); + DefaultOidcUser user = new DefaultOidcUser(ID_TOKEN, USER_INFO, AUTHORITIES); assertThat(user.getClaims()).containsOnlyKeys(IdTokenClaimNames.ISS, IdTokenClaimNames.SUB, StandardClaimNames.NAME, StandardClaimNames.EMAIL); assertThat(user.getIdToken()).isEqualTo(ID_TOKEN); @@ -134,6 +136,7 @@ public void constructorWhenAuthoritiesIdTokenUserInfoProvidedThenCreated() { } @Test + @Deprecated public void constructorWhenAllParametersProvidedAndValidThenCreated() { DefaultOidcUser user = new DefaultOidcUser(AUTHORITIES, ID_TOKEN, USER_INFO, StandardClaimNames.EMAIL); assertThat(user.getClaims()).containsOnlyKeys(IdTokenClaimNames.ISS, IdTokenClaimNames.SUB, diff --git a/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersOidcLoginTests.java b/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersOidcLoginTests.java index 2ac0d771475..4bd727080df 100644 --- a/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersOidcLoginTests.java +++ b/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersOidcLoginTests.java @@ -148,9 +148,9 @@ public void oidcLoginWhenUserInfoSpecifiedThenUserHasClaims() throws Exception { @Test public void oidcUserWhenNameSpecifiedThenUserHasName() throws Exception { - OidcUser oidcUser = new DefaultOidcUser(AuthorityUtils.commaSeparatedStringToAuthorityList("SCOPE_read"), + OidcUser oidcUser = new DefaultOidcUser("test-subject", OidcIdToken.withTokenValue("id-token").claim("custom-attribute", "test-subject").build(), - "custom-attribute"); + AuthorityUtils.commaSeparatedStringToAuthorityList("SCOPE_read")); this.client.mutateWith(SecurityMockServerConfigurers.mockOAuth2Login().oauth2User(oidcUser)) .get() .uri("/token") @@ -172,8 +172,8 @@ public void oidcUserWhenNameSpecifiedThenUserHasName() throws Exception { // gh-7794 @Test public void oidcLoginWhenOidcUserSpecifiedThenLastCalledTakesPrecedence() throws Exception { - OidcUser oidcUser = new DefaultOidcUser(AuthorityUtils.createAuthorityList("SCOPE_read"), - TestOidcIdTokens.idToken().build()); + OidcUser oidcUser = new DefaultOidcUser(TestOidcIdTokens.idToken().build(), + AuthorityUtils.createAuthorityList("SCOPE_read")); this.client .mutateWith( SecurityMockServerConfigurers.mockOidcLogin().idToken((i) -> i.subject("foo")).oidcUser(oidcUser)) diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsOidcLoginTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsOidcLoginTests.java index 418cd4f4e7c..bd6afad23ab 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsOidcLoginTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsOidcLoginTests.java @@ -124,9 +124,9 @@ public void oidcLoginWhenUserInfoSpecifiedThenUserHasClaims() throws Exception { @Test public void oidcLoginWhenNameSpecifiedThenUserHasName() throws Exception { - OidcUser oidcUser = new DefaultOidcUser(AuthorityUtils.commaSeparatedStringToAuthorityList("SCOPE_read"), + OidcUser oidcUser = new DefaultOidcUser("test-subject", OidcIdToken.withTokenValue("id-token").claim("custom-attribute", "test-subject").build(), - "custom-attribute"); + AuthorityUtils.commaSeparatedStringToAuthorityList("SCOPE_read")); this.mvc.perform(get("/id-token/custom-attribute").with(oidcLogin().oidcUser(oidcUser))) .andExpect(content().string("test-subject")); this.mvc.perform(get("/name").with(oidcLogin().oidcUser(oidcUser))).andExpect(content().string("test-subject")); @@ -137,8 +137,8 @@ public void oidcLoginWhenNameSpecifiedThenUserHasName() throws Exception { // gh-7794 @Test public void oidcLoginWhenOidcUserSpecifiedThenLastCalledTakesPrecedence() throws Exception { - OidcUser oidcUser = new DefaultOidcUser(AuthorityUtils.createAuthorityList("SCOPE_read"), - TestOidcIdTokens.idToken().build()); + OidcUser oidcUser = new DefaultOidcUser(TestOidcIdTokens.idToken().build(), + AuthorityUtils.createAuthorityList("SCOPE_read")); this.mvc.perform(get("/id-token/sub").with(oidcLogin().idToken((i) -> i.subject("foo")).oidcUser(oidcUser))) .andExpect(status().isOk()) .andExpect(content().string("subject"));