Use Boolean field for OidcUserInfo.phoneNumberVerified

Related spring-projects/spring-security#11315 Closes gh-923
spring-projects · Oct 24, 2022 · 629e220 · 629e220
1 parent 9c964e3
commit 629e220
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/...src/docs/asciidoc/examples/src/main/java/sample/userinfo/idtoken/OidcUserInfoService.java b/...src/docs/asciidoc/examples/src/main/java/sample/userinfo/idtoken/OidcUserInfoService.java
@@ -66,7 +66,6 @@ private static Map<String, Object> createUser(String username) {
 					.zoneinfo("Europe/Paris")
 					.locale("en-US")
 					.phoneNumber("+1 (604) 555-1234;ext=5678")
-					.phoneNumberVerified("false")
 					.claim("address", Collections.singletonMap("formatted", "Champ de Mars\n5 Av. Anatole France\n75007 Paris\nFrance"))
 					.updatedAt("1970-01-01T00:00:00Z")
 					.build()

diff --git a/...cs/asciidoc/examples/src/test/java/sample/userinfo/EnableUserInfoSecurityConfigTests.java b/...cs/asciidoc/examples/src/test/java/sample/userinfo/EnableUserInfoSecurityConfigTests.java
@@ -127,7 +127,6 @@ public void userInfoWhenIdTokenCustomizerThenIdTokenClaimsMappedToResponse() thr
 						jsonPath("zoneinfo").value("Europe/Paris"),
 						jsonPath("locale").value("en-US"),
 						jsonPath("phone_number").value("+1 (604) 555-1234;ext=5678"),
-						jsonPath("phone_number_verified").value("false"),
 						jsonPath("address.formatted").value("Champ de Mars\n5 Av. Anatole France\n75007 Paris\nFrance"),
 						jsonPath("updated_at").value("1970-01-01T00:00:00Z")
 				);

diff --git a/...rity/oauth2/server/authorization/config/annotation/web/configurers/OidcUserInfoTests.java b/...rity/oauth2/server/authorization/config/annotation/web/configurers/OidcUserInfoTests.java
@@ -253,7 +253,7 @@ private static OidcUserInfo createUserInfo() {
 				.zoneinfo("Europe/Paris")
 				.locale("en-US")
 				.phoneNumber("+1 (604) 555-1234;ext=5678")
-				.phoneNumberVerified("false")
+				.phoneNumberVerified(false)
 				.claim("address", Collections.singletonMap("formatted", "Champ de Mars\n5 Av. Anatole France\n75007 Paris\nFrance"))
 				.updatedAt("1970-01-01T00:00:00Z")
 				.build();

diff --git a/...th2/server/authorization/oidc/authentication/OidcUserInfoAuthenticationProviderTests.java b/...th2/server/authorization/oidc/authentication/OidcUserInfoAuthenticationProviderTests.java
@@ -278,7 +278,7 @@ private static OidcUserInfo createUserInfo() {
 				.zoneinfo("Europe/Paris")
 				.locale("en-US")
 				.phoneNumber("+1 (604) 555-1234;ext=5678")
-				.phoneNumberVerified("false")
+				.phoneNumberVerified(false)
 				.claim("address", Collections.singletonMap("formatted", "Champ de Mars\n5 Av. Anatole France\n75007 Paris\nFrance"))
 				.updatedAt("1970-01-01T00:00:00Z")
 				.build();

diff --git a/...mework/security/oauth2/server/authorization/oidc/web/OidcUserInfoEndpointFilterTests.java b/...mework/security/oauth2/server/authorization/oidc/web/OidcUserInfoEndpointFilterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -204,7 +204,7 @@ private static OidcUserInfo createUserInfo() {
 				.zoneinfo("Europe/Paris")
 				.locale("en-US")
 				.phoneNumber("+1 (604) 555-1234;ext=5678")
-				.phoneNumberVerified("false")
+				.phoneNumberVerified(false)
 				.address("Champ de Mars\n5 Av. Anatole France\n75007 Paris\nFrance")
 				.updatedAt("1970-01-01T00:00:00Z")
 				.build();
@@ -228,7 +228,7 @@ private static void assertUserInfoResponse(String userInfoResponse) {
 		assertThat(userInfoResponse).contains("\"zoneinfo\":\"Europe/Paris\"");
 		assertThat(userInfoResponse).contains("\"locale\":\"en-US\"");
 		assertThat(userInfoResponse).contains("\"phone_number\":\"+1 (604) 555-1234;ext=5678\"");
-		assertThat(userInfoResponse).contains("\"phone_number_verified\":\"false\"");
+		assertThat(userInfoResponse).contains("\"phone_number_verified\":false");
 		assertThat(userInfoResponse).contains("\"address\":\"Champ de Mars\\n5 Av. Anatole France\\n75007 Paris\\nFrance\"");
 		assertThat(userInfoResponse).contains("\"updated_at\":\"1970-01-01T00:00:00Z\"");
 	}