Skip to content

Commit 4ac2363

Browse files
rpanchykrpanchyk
authored
Remove bidder pbs-enforces-gdpr property (#1489)
1 parent b4ead33 commit 4ac2363

File tree

11 files changed

+10
-35
lines changed

11 files changed

+10
-35
lines changed

‎docs/config-app.md

-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ Removes and downloads file again if depending service cant process probably corr
119119
There are several typical keys:
120120
- `adapters.<BIDDER_NAME>.enabled` - indicates the bidder should be active and ready for auction. By default all bidders are disabled.
121121
- `adapters.<BIDDER_NAME>.endpoint` - the url for submitting bids.
122-
- `adapters.<BIDDER_NAME>.pbs-enforces-gdpr` - indicates if PBS server provides GDPR support for bidder or bidder will handle it itself.
123122
- `adapters.<BIDDER_NAME>.pbs-enforces-ccpa` - indicates if PBS server provides CCPA support for bidder or bidder will handle it itself.
124123
- `adapters.<BIDDER_NAME>.modifying-vast-xml-allowed` - indicates if PBS server is allowed to modify VAST creatives received from this bidder.
125124
- `adapters.<BIDDER_NAME>.deprecated-names` - comma separated deprecated names of bidder.

‎src/main/java/org/prebid/server/proto/response/BidderInfo.java

+1-8
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ public static BidderInfo create(boolean enabled,
3535
List<String> siteMediaTypes,
3636
List<String> supportedVendors,
3737
int vendorId,
38-
boolean enforceGdpr,
3938
boolean ccpaEnforced,
4039
boolean modifyingVastXmlAllowed) {
4140

@@ -46,7 +45,7 @@ public static BidderInfo create(boolean enabled,
4645
new MaintainerInfo(maintainerEmail),
4746
new CapabilitiesInfo(platformInfo(appMediaTypes), platformInfo(siteMediaTypes)),
4847
supportedVendors,
49-
new GdprInfo(vendorId, enforceGdpr),
48+
new GdprInfo(vendorId),
5049
ccpaEnforced,
5150
modifyingVastXmlAllowed);
5251
}
@@ -91,11 +90,5 @@ public static class GdprInfo {
9190
*/
9291
@JsonProperty("vendorId")
9392
int vendorId;
94-
95-
/**
96-
* Flag, which true value means that PBS will keep gdpr logic for bidder, otherwise bidder will keep
97-
* gdpr support and request should be sent without gdpr changes.
98-
*/
99-
boolean enforced;
10093
}
10194
}

‎src/main/java/org/prebid/server/spring/config/bidder/model/BidderConfigurationProperties.java

-3
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ public class BidderConfigurationProperties {
2828
@NotBlank
2929
private String endpoint;
3030

31-
private Boolean pbsEnforcesGdpr;
32-
3331
private Boolean pbsEnforcesCcpa;
3432

3533
private Boolean modifyingVastXmlAllowed;
@@ -55,7 +53,6 @@ public BidderConfigurationProperties() {
5553
@PostConstruct
5654
private void init() {
5755
enabled = ObjectUtils.defaultIfNull(enabled, defaultProperties.getEnabled());
58-
pbsEnforcesGdpr = ObjectUtils.defaultIfNull(pbsEnforcesGdpr, defaultProperties.getPbsEnforcesGdpr());
5956
pbsEnforcesCcpa = ObjectUtils.defaultIfNull(pbsEnforcesCcpa, defaultProperties.getPbsEnforcesCcpa());
6057
modifyingVastXmlAllowed = ObjectUtils.defaultIfNull(modifyingVastXmlAllowed,
6158
defaultProperties.getModifyingVastXmlAllowed());

‎src/main/java/org/prebid/server/spring/config/bidder/model/DefaultBidderConfigurationProperties.java

-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ public class DefaultBidderConfigurationProperties {
1515
@NotNull
1616
private Boolean enabled;
1717

18-
@NotNull
19-
private Boolean pbsEnforcesGdpr;
20-
2118
@NotNull
2219
private Boolean pbsEnforcesCcpa;
2320

‎src/main/java/org/prebid/server/spring/config/bidder/util/BidderInfoCreator.java

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ public static BidderInfo create(BidderConfigurationProperties configurationPrope
2525
metaInfo.getSiteMediaTypes(),
2626
metaInfo.getSupportedVendors(),
2727
metaInfo.getVendorId(),
28-
configurationProperties.getPbsEnforcesGdpr(),
2928
configurationProperties.getPbsEnforcesCcpa(),
3029
configurationProperties.getModifyingVastXmlAllowed());
3130
}

‎src/main/resources/application.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ data-center: dataCenter
100100
profile: profile
101101
adapter-defaults:
102102
enabled: false
103-
pbs-enforces-gdpr: true
104103
pbs-enforces-ccpa: true
105104
modifying-vast-xml-allowed: true
106105
auction:

‎src/test/java/org/prebid/server/auction/PrivacyEnforcementServiceTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1764,7 +1764,7 @@ private static BidderInfo givenBidderInfo(int gdprVendorId, boolean enforceCcpa)
17641764
null,
17651765
null,
17661766
null,
1767-
new BidderInfo.GdprInfo(gdprVendorId, true),
1767+
new BidderInfo.GdprInfo(gdprVendorId),
17681768
enforceCcpa,
17691769
false);
17701770
}

‎src/test/java/org/prebid/server/bidder/BidderCatalogTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ public void metaInfoByNameShouldReturnMetaInfoForKnownBidder() {
9494
null,
9595
99,
9696
true,
97-
true,
9897
false);
9998

10099
final BidderDeps bidderDeps = BidderDeps.of(singletonList(BidderInstanceDeps.builder()
@@ -169,7 +168,6 @@ public void nameByVendorIdShouldReturnBidderNameForVendorId() {
169168
null,
170169
99,
171170
true,
172-
true,
173171
false);
174172

175173
final BidderDeps bidderDeps = BidderDeps.of(singletonList(BidderInstanceDeps.builder()

‎src/test/java/org/prebid/server/handler/CookieSyncHandlerTest.java

+8-13
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,7 @@ public void shouldTolerateRejectedBidderByTcf() throws IOException {
664664
given(bidderCatalog.isActive(APPNEXUS)).willReturn(true);
665665

666666
given(bidderCatalog.bidderInfoByName(APPNEXUS))
667-
.willReturn(BidderInfo.create(true, null, null, null, null, null, null, 2, true, true, false));
667+
.willReturn(BidderInfo.create(true, null, null, null, null, null, null, 2, true, false));
668668

669669
givenTcfServiceReturningVendorIdResult(singleton(1));
670670
givenTcfServiceReturningBidderNamesResult(singleton(RUBICON));
@@ -730,7 +730,7 @@ bidderCatalog, tcfDefinerService, privacyEnforcementService, null, false, emptyL
730730

731731
given(bidderCatalog.bidderInfoByName(APPNEXUS))
732732
.willReturn(BidderInfo.create(true, null, null, null,
733-
null, null, null, 2, true, true, false));
733+
null, null, null, 2, true, false));
734734

735735
givenTcfServiceReturningBidderNamesResult(singleton(RUBICON));
736736

@@ -760,7 +760,7 @@ public void shouldUpdateCookieSyncSetAndRejectByTcfMetricForEachRejectedAndSynce
760760
given(bidderCatalog.isActive(APPNEXUS)).willReturn(true);
761761

762762
given(bidderCatalog.bidderInfoByName(APPNEXUS))
763-
.willReturn(BidderInfo.create(true, null, null, null, null, null, null, 2, true, true, false));
763+
.willReturn(BidderInfo.create(true, null, null, null, null, null, null, 2, true, false));
764764

765765
givenTcfServiceReturningVendorIdResult(singleton(1));
766766
givenTcfServiceReturningBidderNamesResult(singleton(RUBICON));
@@ -1316,25 +1316,20 @@ public void shouldPassSuccessfulEventToAnalyticsReporter() {
13161316
}
13171317

13181318
@Test
1319-
public void shouldRespondWithNoCookieWhenBothCcpaAndGdprRejectBidders() throws IOException {
1319+
public void shouldRespondWithNoCookieWhenCcpaRejectsBidder() throws IOException {
13201320
// given
13211321
given(uidsCookieService.parseFromRequest(any(RoutingContext.class))).willReturn(new UidsCookie(
13221322
Uids.builder().uids(emptyMap()).build(), jacksonMapper));
13231323

13241324
given(routingContext.getBody())
1325-
.willReturn(givenRequestBody(CookieSyncRequest.builder().bidders(asList(RUBICON, APPNEXUS)).build()));
1325+
.willReturn(givenRequestBody(CookieSyncRequest.builder().bidders(singletonList(RUBICON)).build()));
13261326

13271327
rubiconUsersyncer = createUsersyncer(RUBICON, "", null);
1328-
appnexusUsersyncer = createUsersyncer(APPNEXUS_COOKIE, "", null);
13291328
givenUsersyncersReturningFamilyName();
13301329

13311330
given(bidderCatalog.isActive(RUBICON)).willReturn(true);
1332-
given(bidderCatalog.isActive(APPNEXUS)).willReturn(true);
1333-
13341331
given(bidderCatalog.bidderInfoByName(RUBICON)).willReturn(
1335-
BidderInfo.create(true, null, null, null, null, null, null, 2, true, true, false));
1336-
given(bidderCatalog.bidderInfoByName(APPNEXUS)).willReturn(
1337-
BidderInfo.create(true, null, null, null, null, null, null, 2, true, false, false));
1332+
BidderInfo.create(true, null, null, null, null, null, null, 2, true, false));
13381333

13391334
given(privacyEnforcementService.isCcpaEnforced(any(), any())).willReturn(true);
13401335

@@ -1347,9 +1342,9 @@ public void shouldRespondWithNoCookieWhenBothCcpaAndGdprRejectBidders() throws I
13471342
// then
13481343
final CookieSyncResponse cookieSyncResponse = captureCookieSyncResponse();
13491344
assertThat(cookieSyncResponse.getStatus()).isEqualTo("no_cookie");
1350-
assertThat(cookieSyncResponse.getBidderStatus()).hasSize(2)
1345+
assertThat(cookieSyncResponse.getBidderStatus()).hasSize(1)
13511346
.extracting(BidderUsersyncStatus::getBidder, BidderUsersyncStatus::getError)
1352-
.containsOnly(tuple(APPNEXUS, "Rejected by TCF"), tuple(RUBICON, "Rejected by CCPA"));
1347+
.containsOnly(tuple(RUBICON, "Rejected by CCPA"));
13531348
}
13541349

13551350
private void givenTcfServiceReturningVendorIdResult(Set<Integer> vendorIds) {

‎src/test/java/org/prebid/server/handler/info/BidderDetailsHandlerTest.java

-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,6 @@ private static BidderInfo givenBidderInfo(boolean enabled, String endpoint, Stri
189189
null,
190190
0,
191191
true,
192-
true,
193192
false);
194193
}
195194

‎src/test/java/org/prebid/server/validation/BidderParamValidatorTest.java

-1
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,6 @@ private static BidderInfo givenBidderInfo(String aliasOf) {
450450
null,
451451
0,
452452
true,
453-
true,
454453
false);
455454
}
456455

0 commit comments

Comments
 (0)