Skip to content

Commit 629e220

Browse files
committed
Use Boolean field for OidcUserInfo.phoneNumberVerified
Related spring-projects/spring-security#11315 Closes gh-923
1 parent 9c964e3 commit 629e220

File tree

5 files changed

+5
-7
lines changed

5 files changed

+5
-7
lines changed

docs/src/docs/asciidoc/examples/src/main/java/sample/userinfo/idtoken/OidcUserInfoService.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ private static Map<String, Object> createUser(String username) {
6666
.zoneinfo("Europe/Paris")
6767
.locale("en-US")
6868
.phoneNumber("+1 (604) 555-1234;ext=5678")
69-
.phoneNumberVerified("false")
7069
.claim("address", Collections.singletonMap("formatted", "Champ de Mars\n5 Av. Anatole France\n75007 Paris\nFrance"))
7170
.updatedAt("1970-01-01T00:00:00Z")
7271
.build()

docs/src/docs/asciidoc/examples/src/test/java/sample/userinfo/EnableUserInfoSecurityConfigTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ public void userInfoWhenIdTokenCustomizerThenIdTokenClaimsMappedToResponse() thr
127127
jsonPath("zoneinfo").value("Europe/Paris"),
128128
jsonPath("locale").value("en-US"),
129129
jsonPath("phone_number").value("+1 (604) 555-1234;ext=5678"),
130-
jsonPath("phone_number_verified").value("false"),
131130
jsonPath("address.formatted").value("Champ de Mars\n5 Av. Anatole France\n75007 Paris\nFrance"),
132131
jsonPath("updated_at").value("1970-01-01T00:00:00Z")
133132
);

oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcUserInfoTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ private static OidcUserInfo createUserInfo() {
253253
.zoneinfo("Europe/Paris")
254254
.locale("en-US")
255255
.phoneNumber("+1 (604) 555-1234;ext=5678")
256-
.phoneNumberVerified("false")
256+
.phoneNumberVerified(false)
257257
.claim("address", Collections.singletonMap("formatted", "Champ de Mars\n5 Av. Anatole France\n75007 Paris\nFrance"))
258258
.updatedAt("1970-01-01T00:00:00Z")
259259
.build();

oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcUserInfoAuthenticationProviderTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ private static OidcUserInfo createUserInfo() {
278278
.zoneinfo("Europe/Paris")
279279
.locale("en-US")
280280
.phoneNumber("+1 (604) 555-1234;ext=5678")
281-
.phoneNumberVerified("false")
281+
.phoneNumberVerified(false)
282282
.claim("address", Collections.singletonMap("formatted", "Champ de Mars\n5 Av. Anatole France\n75007 Paris\nFrance"))
283283
.updatedAt("1970-01-01T00:00:00Z")
284284
.build();

oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/oidc/web/OidcUserInfoEndpointFilterTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020-2021 the original author or authors.
2+
* Copyright 2020-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -204,7 +204,7 @@ private static OidcUserInfo createUserInfo() {
204204
.zoneinfo("Europe/Paris")
205205
.locale("en-US")
206206
.phoneNumber("+1 (604) 555-1234;ext=5678")
207-
.phoneNumberVerified("false")
207+
.phoneNumberVerified(false)
208208
.address("Champ de Mars\n5 Av. Anatole France\n75007 Paris\nFrance")
209209
.updatedAt("1970-01-01T00:00:00Z")
210210
.build();
@@ -228,7 +228,7 @@ private static void assertUserInfoResponse(String userInfoResponse) {
228228
assertThat(userInfoResponse).contains("\"zoneinfo\":\"Europe/Paris\"");
229229
assertThat(userInfoResponse).contains("\"locale\":\"en-US\"");
230230
assertThat(userInfoResponse).contains("\"phone_number\":\"+1 (604) 555-1234;ext=5678\"");
231-
assertThat(userInfoResponse).contains("\"phone_number_verified\":\"false\"");
231+
assertThat(userInfoResponse).contains("\"phone_number_verified\":false");
232232
assertThat(userInfoResponse).contains("\"address\":\"Champ de Mars\\n5 Av. Anatole France\\n75007 Paris\\nFrance\"");
233233
assertThat(userInfoResponse).contains("\"updated_at\":\"1970-01-01T00:00:00Z\"");
234234
}

0 commit comments

Comments
 (0)