From ea1d649ed191b9d25ef208cf6e40d5c6b9d486f9 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Mon, 1 Aug 2022 15:05:27 -0400 Subject: [PATCH] Fix references to OidcUserInfo.phoneNumberVerified() --- .../java/sample/userinfo/idtoken/OidcUserInfoService.java | 2 +- .../config/annotation/web/configurers/OidcUserInfoTests.java | 2 +- .../OidcUserInfoAuthenticationProviderTests.java | 2 +- .../oidc/web/OidcUserInfoEndpointFilterTests.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/src/docs/asciidoc/examples/src/main/java/sample/userinfo/idtoken/OidcUserInfoService.java b/docs/src/docs/asciidoc/examples/src/main/java/sample/userinfo/idtoken/OidcUserInfoService.java index 0ae3f0da..31824196 100644 --- a/docs/src/docs/asciidoc/examples/src/main/java/sample/userinfo/idtoken/OidcUserInfoService.java +++ b/docs/src/docs/asciidoc/examples/src/main/java/sample/userinfo/idtoken/OidcUserInfoService.java @@ -66,7 +66,7 @@ public class OidcUserInfoService { .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/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcUserInfoTests.java b/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcUserInfoTests.java index 10dde2dd..cb975340 100644 --- a/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcUserInfoTests.java +++ b/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcUserInfoTests.java @@ -252,7 +252,7 @@ public class OidcUserInfoTests { .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/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcUserInfoAuthenticationProviderTests.java b/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcUserInfoAuthenticationProviderTests.java index 7f274d83..719f0844 100644 --- a/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcUserInfoAuthenticationProviderTests.java +++ b/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcUserInfoAuthenticationProviderTests.java @@ -278,7 +278,7 @@ public class OidcUserInfoAuthenticationProviderTests { .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/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/oidc/web/OidcUserInfoEndpointFilterTests.java b/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/oidc/web/OidcUserInfoEndpointFilterTests.java index 243d5ffa..ccfa9179 100644 --- a/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/oidc/web/OidcUserInfoEndpointFilterTests.java +++ b/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/oidc/web/OidcUserInfoEndpointFilterTests.java @@ -204,7 +204,7 @@ public class OidcUserInfoEndpointFilterTests { .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 @@ public class OidcUserInfoEndpointFilterTests { 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\""); }