diff --git a/src/main/java/org/prebid/server/auction/requestfactory/AmpRequestFactory.java b/src/main/java/org/prebid/server/auction/requestfactory/AmpRequestFactory.java index b014c508678..fb8187ed231 100644 --- a/src/main/java/org/prebid/server/auction/requestfactory/AmpRequestFactory.java +++ b/src/main/java/org/prebid/server/auction/requestfactory/AmpRequestFactory.java @@ -274,6 +274,7 @@ private static User createUser(ConsentParam consentParam, String addtlConsent) { final ExtUser extUser = consentedProvidersSettings != null ? ExtUser.builder() + .deprecatedConsentedProvidersSettings(consentedProvidersSettings) .consentedProvidersSettings(consentedProvidersSettings) .build() : null; diff --git a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtUser.java b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtUser.java index 900a355a9fb..c570e221362 100644 --- a/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtUser.java +++ b/src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtUser.java @@ -55,8 +55,13 @@ public class ExtUser extends FlexibleExtension { /** * Defines the contract for bidrequest.user.ext.ConsentedProvidersSettings + *
+ * TODO: Remove after PBS 4.0 */ + @Deprecated(forRemoval = true) @JsonProperty("ConsentedProvidersSettings") + ConsentedProvidersSettings deprecatedConsentedProvidersSettings; + ConsentedProvidersSettings consentedProvidersSettings; @JsonIgnore diff --git a/src/test/java/org/prebid/server/auction/requestfactory/AmpRequestFactoryTest.java b/src/test/java/org/prebid/server/auction/requestfactory/AmpRequestFactoryTest.java index 9b716645aa7..1e0f63b9192 100644 --- a/src/test/java/org/prebid/server/auction/requestfactory/AmpRequestFactoryTest.java +++ b/src/test/java/org/prebid/server/auction/requestfactory/AmpRequestFactoryTest.java @@ -1277,10 +1277,12 @@ public void shouldReturnBidRequestWithProvidersSettingsContainsAddtlConsentIfPar final BidRequest result = target.fromRequest(routingContext, 0L).result().getBidRequest(); // then + final ConsentedProvidersSettings settings = ConsentedProvidersSettings.of("someConsent"); assertThat(result.getUser()) .isEqualTo(User.builder() .ext(ExtUser.builder() - .consentedProvidersSettings(ConsentedProvidersSettings.of("someConsent")) + .deprecatedConsentedProvidersSettings(settings) + .consentedProvidersSettings(settings) .build()) .build()); } diff --git a/src/test/java/org/prebid/server/bidder/improvedigital/ImprovedigitalBidderTest.java b/src/test/java/org/prebid/server/bidder/improvedigital/ImprovedigitalBidderTest.java index 37ab6635458..82c9ff1e659 100644 --- a/src/test/java/org/prebid/server/bidder/improvedigital/ImprovedigitalBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/improvedigital/ImprovedigitalBidderTest.java @@ -116,7 +116,7 @@ public void makeHttpRequestsShouldUseProperEndpoints() { public void makeHttpRequestsShouldProperProcessConsentedProvidersSetting() { // given final ExtUser extUser = ExtUser.builder() - .consentedProvidersSettings(ConsentedProvidersSettings.of("1~10.20.90")) + .deprecatedConsentedProvidersSettings(ConsentedProvidersSettings.of("1~10.20.90")) .build(); final BidRequest bidRequest = givenBidRequest(bidRequestBuilder -> bidRequestBuilder @@ -145,7 +145,7 @@ public void makeHttpRequestsShouldProperProcessConsentedProvidersSetting() { public void makeHttpRequestsShouldProperProcessConsentedProvidersSettingWithMultipleTilda() { // given final ExtUser extUser = ExtUser.builder() - .consentedProvidersSettings(ConsentedProvidersSettings.of("1~10.20.90~anything")) + .deprecatedConsentedProvidersSettings(ConsentedProvidersSettings.of("1~10.20.90~anything")) .build(); final BidRequest bidRequest = givenBidRequest(bidRequestBuilder -> bidRequestBuilder @@ -174,7 +174,7 @@ public void makeHttpRequestsShouldProperProcessConsentedProvidersSettingWithMult public void makeHttpRequestsShouldReturnUserExtIfConsentedProvidersIsNotProvided() { // given final ExtUser extUser = ExtUser.builder() - .consentedProvidersSettings(ConsentedProvidersSettings.of(null)) + .deprecatedConsentedProvidersSettings(ConsentedProvidersSettings.of(null)) .build(); final BidRequest bidRequest = givenBidRequest(bidRequestBuilder -> diff --git a/src/test/resources/org/prebid/server/it/amp/test-generic-bid-request.json b/src/test/resources/org/prebid/server/it/amp/test-generic-bid-request.json index 5cc33c6206c..4d45a82bbc0 100644 --- a/src/test/resources/org/prebid/server/it/amp/test-generic-bid-request.json +++ b/src/test/resources/org/prebid/server/it/amp/test-generic-bid-request.json @@ -51,6 +51,9 @@ "ext": { "ConsentedProvidersSettings": { "consented_providers": "someConsent" + }, + "consented_providers_settings": { + "consented_providers": "someConsent" } } }, diff --git a/src/test/resources/org/prebid/server/it/amp/test-genericAlias-bid-request.json b/src/test/resources/org/prebid/server/it/amp/test-genericAlias-bid-request.json index 1d28937fef6..65febdb9a16 100644 --- a/src/test/resources/org/prebid/server/it/amp/test-genericAlias-bid-request.json +++ b/src/test/resources/org/prebid/server/it/amp/test-genericAlias-bid-request.json @@ -49,6 +49,9 @@ "ext": { "ConsentedProvidersSettings": { "consented_providers": "someConsent" + }, + "consented_providers_settings": { + "consented_providers": "someConsent" } } },