Skip to content

Amp: update consented providers settings support #3590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CTMBNara merged 3 commits into from
Dec 3, 2024
Merged

Amp: update consented providers settings support #3590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8fd6144
Updated ExtUser property.
And1sS Dec 3, 2024
f32900b
Fixed tests.
And1sS Dec 3, 2024
c28c627
Merge remote-tracking branch 'origin/master' into amp/update-consente…
CTMBNara Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/java/org/prebid/server/auction/requestfactory/AmpRequestFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtUser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,13 @@ public class ExtUser extends FlexibleExtension {

/**
* Defines the contract for bidrequest.user.ext.ConsentedProvidersSettings
* <p>
* TODO: Remove after PBS 4.0
*/
@Deprecated(forRemoval = true)
@JsonProperty("ConsentedProvidersSettings")
ConsentedProvidersSettings deprecatedConsentedProvidersSettings;

ConsentedProvidersSettings consentedProvidersSettings;

@JsonIgnore
Expand Down
4 changes: 3 additions & 1 deletion src/test/java/org/prebid/server/auction/requestfactory/AmpRequestFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/org/prebid/server/bidder/improvedigital/ImprovedigitalBidderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 ->
Expand Down
3 changes: 3 additions & 0 deletions src/test/resources/org/prebid/server/it/amp/test-generic-bid-request.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@
"ext": {
"ConsentedProvidersSettings": {
"consented_providers": "someConsent"
},
"consented_providers_settings": {
"consented_providers": "someConsent"
}
}
},
Expand Down
3 changes: 3 additions & 0 deletions src/test/resources/org/prebid/server/it/amp/test-genericAlias-bid-request.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@
"ext": {
"ConsentedProvidersSettings": {
"consented_providers": "someConsent"
},
"consented_providers_settings": {
"consented_providers": "someConsent"
}
}
},
Expand Down
Loading