From 629e220c2f39e9512abab642a178d87b28d69b6d Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Mon, 24 Oct 2022 14:41:08 -0400 Subject: [PATCH] Use Boolean field for OidcUserInfo.phoneNumberVerified Related https://github.com/spring-projects/spring-security/issues/11315 Closes gh-923 --- .../java/sample/userinfo/idtoken/OidcUserInfoService.java | 1 - .../sample/userinfo/EnableUserInfoSecurityConfigTests.java | 1 - .../annotation/web/configurers/OidcUserInfoTests.java | 2 +- .../OidcUserInfoAuthenticationProviderTests.java | 2 +- .../oidc/web/OidcUserInfoEndpointFilterTests.java | 6 +++--- 5 files changed, 5 insertions(+), 7 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..3fa9d71b 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,6 @@ public class OidcUserInfoService { .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/docs/src/docs/asciidoc/examples/src/test/java/sample/userinfo/EnableUserInfoSecurityConfigTests.java b/docs/src/docs/asciidoc/examples/src/test/java/sample/userinfo/EnableUserInfoSecurityConfigTests.java index ea435466..b30bc231 100644 --- a/docs/src/docs/asciidoc/examples/src/test/java/sample/userinfo/EnableUserInfoSecurityConfigTests.java +++ b/docs/src/docs/asciidoc/examples/src/test/java/sample/userinfo/EnableUserInfoSecurityConfigTests.java @@ -127,7 +127,6 @@ public class EnableUserInfoSecurityConfigTests { 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/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 8e071319..ee9363e8 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 @@ -253,7 +253,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 232e1514..528285c5 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 @@ -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 @@ 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\""); }