From 15c7497c72606924cbbd6694cf73876cf4df36b2 Mon Sep 17 00:00:00 2001 From: Alex Maltsev Date: Thu, 2 Feb 2023 14:23:15 +0200 Subject: [PATCH] Rubicon: Fix `user.consent` population (#2143) --- .../server/bidder/rubicon/RubiconBidder.java | 24 ++++++++++++++---- .../rubicon/proto/request/RubiconUserExt.java | 2 -- .../bidder/rubicon/RubiconBidderTest.java | 25 +++++++++++++++++-- .../it/deals/test-auction-response.json | 8 +++--- .../it/deals/test-rubicon-bid-request-1.json | 5 +++- .../it/deals/test-rubicon-bid-request-2.json | 5 +++- .../it/deals/test-rubicon-bid-request-3.json | 5 +++- .../it/deals/test-rubicon-bid-request-4.json | 5 +++- .../it/deals/test-rubicon-bid-request-5.json | 2 +- .../reject/test-rubicon-bid-request-1.json | 4 +-- .../test-rubicon-bid-request-1.json | 2 +- .../rubicon/test-auction-rubicon-request.json | 1 - .../rubicon/test-rubicon-bid-request.json | 3 +-- 13 files changed, 67 insertions(+), 24 deletions(-) diff --git a/src/main/java/org/prebid/server/bidder/rubicon/RubiconBidder.java b/src/main/java/org/prebid/server/bidder/rubicon/RubiconBidder.java index be5fc728f8b..dfdead1993d 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/RubiconBidder.java +++ b/src/main/java/org/prebid/server/bidder/rubicon/RubiconBidder.java @@ -409,7 +409,7 @@ private BidRequest createSingleRequest(Imp imp, return bidRequest.toBuilder() .imp(Collections.singletonList(makeImp(imp, extImpRubicon, bidRequest, errors))) - .user(makeUser(bidRequest.getUser(), extImpRubicon)) + .user(downgradeUserConsent(makeUser(bidRequest.getUser(), extImpRubicon))) .device(makeDevice(bidRequest.getDevice())) .site(makeSite(bidRequest.getSite(), impLanguage, extImpRubicon)) .app(makeApp(bidRequest.getApp(), extImpRubicon)) @@ -1157,7 +1157,6 @@ private User makeUser(User user, ExtImpRubicon rubiconImpExt) { final RubiconUserExtRp userExtRp = rubiconUserExtRp(user, rubiconImpExt, sourceToUserEid); final ObjectNode userExtData = extUser != null ? extUser.getData() : null; final String liverampId = extractLiverampId(sourceToUserEid); - final String consent = user != null ? user.getConsent() : null; if (userExtRp == null && userExtData == null @@ -1166,7 +1165,6 @@ private User makeUser(User user, ExtImpRubicon rubiconImpExt) { && resolvedId == null && Objects.equals(userBuyeruid, resolvedBuyeruid) && !hasStypeToRemove - && consent == null ) { return hasDataToRemove @@ -1181,7 +1179,6 @@ private User makeUser(User user, ExtImpRubicon rubiconImpExt) { final RubiconUserExt rubiconUserExt = RubiconUserExt.builder() .rp(userExtRp) .liverampIdl(liverampId) - .consent(consent) .build(); final User.UserBuilder userBuilder = user != null ? user.toBuilder() : User.builder(); @@ -1194,11 +1191,28 @@ private User makeUser(User user, ExtImpRubicon rubiconImpExt) { .geo(null) .data(null) .eids(null) - .consent(null) .ext(mapper.fillExtension(userExt, rubiconUserExt)) .build(); } + // TODO: Refactor this + private User downgradeUserConsent(User user) { + if (user == null || user.getConsent() == null) { + return user; + } + + final ExtUser newUserExt = Optional.ofNullable(user.getExt()) + .map(ExtUser::toBuilder) + .orElseGet(ExtUser::builder) + .consent(user.getConsent()) + .build(); + + return user.toBuilder() + .consent(null) + .ext(newUserExt) + .build(); + } + private static String resolveUserId(List userEids) { return CollectionUtils.emptyIfNull(userEids) .stream() diff --git a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconUserExt.java b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconUserExt.java index 095ca4ec1a0..fea9ee05074 100644 --- a/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconUserExt.java +++ b/src/main/java/org/prebid/server/bidder/rubicon/proto/request/RubiconUserExt.java @@ -10,6 +10,4 @@ public class RubiconUserExt { RubiconUserExtRp rp; String liverampIdl; - - String consent; } diff --git a/src/test/java/org/prebid/server/bidder/rubicon/RubiconBidderTest.java b/src/test/java/org/prebid/server/bidder/rubicon/RubiconBidderTest.java index a28b1ee7da4..c34dffaafcd 100644 --- a/src/test/java/org/prebid/server/bidder/rubicon/RubiconBidderTest.java +++ b/src/test/java/org/prebid/server/bidder/rubicon/RubiconBidderTest.java @@ -1366,8 +1366,29 @@ public void makeHttpRequestsShouldRemoveUserGenderYobGeoExtData() { .extracting(BidRequest::getUser) .containsOnly(User.builder() .buyeruid("buyeruid") - .ext(ExtUser.builder() - .consent("consent").build()) + .ext(ExtUser.builder().consent("consent").build()) + .build()); + } + + @Test + public void makeHttpRequestsShouldMoveUserConsentToUserExtConsent() { + // given + final BidRequest bidRequest = givenBidRequest( + builder -> builder.user(User.builder().consent("consent").build()), + builder -> builder.video(Video.builder().build()), + identity()); + + // when + final Result>> result = rubiconBidder.makeHttpRequests(bidRequest); + + // then + assertThat(result.getErrors()).isEmpty(); + assertThat(result.getValue()) + .extracting(HttpRequest::getPayload) + .extracting(BidRequest::getUser) + .containsExactly( + User.builder() + .ext(ExtUser.builder().consent("consent").build()) .build()); } diff --git a/src/test/resources/org/prebid/server/it/deals/test-auction-response.json b/src/test/resources/org/prebid/server/it/deals/test-auction-response.json index 682389dc6b9..9cd1578a479 100644 --- a/src/test/resources/org/prebid/server/it/deals/test-auction-response.json +++ b/src/test/resources/org/prebid/server/it/deals/test-auction-response.json @@ -171,7 +171,7 @@ "application/json;charset=utf-8" ] }, - "requestbody": "{\"id\":\"tid\",\"imp\":[{\"id\":\"impId4\",\"banner\":{\"format\":[{\"w\":300,\"h\":250}],\"ext\":{\"rp\":{\"mime\":\"text/html\"}}},\"pmp\":{\"deals\":[{\"id\":\"dealId3\",\"ext\":{\"line\":{\"lineitemid\":\"lineItem3\",\"extlineitemid\":\"extLineItem3\",\"sizes\":[{\"w\":300,\"h\":250}]}}}]},\"secure\":1,\"ext\":{\"rp\":{\"zone_id\":4001,\"target\":{\"line_item\":\"extLineItem3\"},\"track\":{\"mint\":\"\",\"mint_version\":\"\"}},\"maxbids\":1}}],\"site\":{\"domain\":\"www.example.com\",\"page\":\"http://www.example.com\",\"publisher\":{\"ext\":{\"rp\":{\"account_id\":2001}}},\"ext\":{\"amp\":0,\"rp\":{\"site_id\":3001}}},\"device\":{\"ua\":\"userAgent\",\"ip\":\"185.199.110.0\",\"ext\":{\"rp\":{}}},\"user\":{\"buyeruid\":\"J5VLCWQP-26-CWFT\",\"ext\":{\"consent\":\"CPBCa-mPBCa-mAAAAAENA0CAAEAAAAAAACiQAaQAwAAgAgABoAAAAAA\",\"fcapids\":[\"fcapId3\"],\"time\":{\"userdow\":{{ userdow }},\"userhour\":{{ userhour }}}}},\"at\":1,\"tmax\":5000,\"source\":{\"tid\":\"someTid\"}}", + "requestbody": "{\"id\":\"tid\",\"imp\":[{\"id\":\"impId4\",\"banner\":{\"format\":[{\"w\":300,\"h\":250}],\"ext\":{\"rp\":{\"mime\":\"text/html\"}}},\"pmp\":{\"deals\":[{\"id\":\"dealId3\",\"ext\":{\"line\":{\"lineitemid\":\"lineItem3\",\"extlineitemid\":\"extLineItem3\",\"sizes\":[{\"w\":300,\"h\":250}]}}}]},\"secure\":1,\"ext\":{\"rp\":{\"zone_id\":4001,\"target\":{\"page\":[\"http://www.example.com\"],\"line_item\":\"extLineItem3\"},\"track\":{\"mint\":\"\",\"mint_version\":\"\"}},\"maxbids\":1}}],\"site\":{\"domain\":\"www.example.com\",\"page\":\"http://www.example.com\",\"publisher\":{\"ext\":{\"rp\":{\"account_id\":2001}}},\"ext\":{\"amp\":0,\"rp\":{\"site_id\":3001}}},\"device\":{\"ua\":\"userAgent\",\"ip\":\"185.199.110.0\",\"ext\":{\"rp\":{}}},\"user\":{\"buyeruid\":\"J5VLCWQP-26-CWFT\",\"consent\":\"CPBCa-mPBCa-mAAAAAENA0CAAEAAAAAAACiQAaQAwAAgAgABoAAAAAA\",\"ext\":{\"fcapids\":[\"fcapId3\"],\"time\":{\"userdow\":{{ userdow }},\"userhour\":{{ userhour }}}}},\"at\":1,\"tmax\":5000,\"source\":{\"tid\":\"someTid\"}}", "responsebody": "{\"id\":\"bidResponseId4\",\"seatbid\":[{\"seat\":\"seatId4\",\"bid\":[{\"id\":\"bidId4\",\"impid\":\"impId4\",\"dealid\":\"dealId3\",\"price\":8.43,\"adm\":\"\",\"crid\":\"crid1\",\"w\":300,\"h\":250}]}]}", "status": 200 }, @@ -191,7 +191,7 @@ "application/json;charset=utf-8" ] }, - "requestbody": "{\"id\":\"tid\",\"imp\":[{\"id\":\"impId1\",\"banner\":{\"format\":[{\"w\":300,\"h\":250}],\"ext\":{\"rp\":{\"mime\":\"text/html\"}}},\"pmp\":{\"deals\":[{\"id\":\"dealId1\",\"ext\":{\"line\":{\"lineitemid\":\"lineItem1\",\"extlineitemid\":\"extLineItem1\",\"sizes\":[{\"w\":300,\"h\":250}]}}},{\"id\":\"dealId3\",\"ext\":{\"line\":{\"lineitemid\":\"lineItem3\",\"extlineitemid\":\"extLineItem3\",\"sizes\":[{\"w\":300,\"h\":250}]}}}]},\"secure\":1,\"ext\":{\"rp\":{\"zone_id\":4001,\"target\":{\"line_item\":\"extLineItem1\"},\"track\":{\"mint\":\"\",\"mint_version\":\"\"}},\"maxbids\":1}}],\"site\":{\"domain\":\"www.example.com\",\"page\":\"http://www.example.com\",\"publisher\":{\"ext\":{\"rp\":{\"account_id\":2001}}},\"ext\":{\"amp\":0,\"rp\":{\"site_id\":3001}}},\"device\":{\"ua\":\"userAgent\",\"ip\":\"185.199.110.0\",\"ext\":{\"rp\":{}}},\"user\":{\"buyeruid\":\"J5VLCWQP-26-CWFT\",\"ext\":{\"consent\":\"CPBCa-mPBCa-mAAAAAENA0CAAEAAAAAAACiQAaQAwAAgAgABoAAAAAA\",\"fcapids\":[\"fcapId3\"],\"time\":{\"userdow\":{{ userdow }},\"userhour\":{{ userhour }}}}},\"at\":1,\"tmax\":5000,\"source\":{\"tid\":\"someTid\"}}", + "requestbody": "{\"id\":\"tid\",\"imp\":[{\"id\":\"impId1\",\"banner\":{\"format\":[{\"w\":300,\"h\":250}],\"ext\":{\"rp\":{\"mime\":\"text/html\"}}},\"pmp\":{\"deals\":[{\"id\":\"dealId1\",\"ext\":{\"line\":{\"lineitemid\":\"lineItem1\",\"extlineitemid\":\"extLineItem1\",\"sizes\":[{\"w\":300,\"h\":250}]}}},{\"id\":\"dealId3\",\"ext\":{\"line\":{\"lineitemid\":\"lineItem3\",\"extlineitemid\":\"extLineItem3\",\"sizes\":[{\"w\":300,\"h\":250}]}}}]},\"secure\":1,\"ext\":{\"rp\":{\"zone_id\":4001,\"target\":{\"page\":[\"http://www.example.com\"],\"line_item\":\"extLineItem1\"},\"track\":{\"mint\":\"\",\"mint_version\":\"\"}},\"maxbids\":1}}],\"site\":{\"domain\":\"www.example.com\",\"page\":\"http://www.example.com\",\"publisher\":{\"ext\":{\"rp\":{\"account_id\":2001}}},\"ext\":{\"amp\":0,\"rp\":{\"site_id\":3001}}},\"device\":{\"ua\":\"userAgent\",\"ip\":\"185.199.110.0\",\"ext\":{\"rp\":{}}},\"user\":{\"buyeruid\":\"J5VLCWQP-26-CWFT\",\"consent\":\"CPBCa-mPBCa-mAAAAAENA0CAAEAAAAAAACiQAaQAwAAgAgABoAAAAAA\",\"ext\":{\"fcapids\":[\"fcapId3\"],\"time\":{\"userdow\":{{ userdow }},\"userhour\":{{ userhour }}}}},\"at\":1,\"tmax\":5000,\"source\":{\"tid\":\"someTid\"}}", "responsebody": "{\"id\":\"bidResponseId1\",\"seatbid\":[{\"seat\":\"seatId1\",\"bid\":[{\"id\":\"bidId1\",\"impid\":\"impId1\",\"dealid\":\"dealId1\",\"price\":8.43,\"adm\":\"\",\"crid\":\"crid1\",\"w\":300,\"h\":250}]}]}", "status": 200 }, @@ -211,7 +211,7 @@ "application/json;charset=utf-8" ] }, - "requestbody": "{\"id\":\"tid\",\"imp\":[{\"id\":\"impId2\",\"banner\":{\"format\":[{\"w\":320,\"h\":320}],\"ext\":{\"rp\":{\"mime\":\"text/html\"}}},\"pmp\":{\"deals\":[{\"id\":\"dealId2\",\"ext\":{\"line\":{\"lineitemid\":\"lineItem2\",\"extlineitemid\":\"extLineItem2\",\"sizes\":[{\"w\":320,\"h\":320}]}}}]},\"secure\":1,\"ext\":{\"rp\":{\"zone_id\":4001,\"target\":{\"line_item\":\"extLineItem2\"},\"track\":{\"mint\":\"\",\"mint_version\":\"\"}},\"maxbids\":1}}],\"site\":{\"domain\":\"www.example.com\",\"page\":\"http://www.example.com\",\"publisher\":{\"ext\":{\"rp\":{\"account_id\":2001}}},\"ext\":{\"amp\":0,\"rp\":{\"site_id\":3001}}},\"device\":{\"ua\":\"userAgent\",\"ip\":\"185.199.110.0\",\"ext\":{\"rp\":{}}},\"user\":{\"buyeruid\":\"J5VLCWQP-26-CWFT\",\"ext\":{\"consent\":\"CPBCa-mPBCa-mAAAAAENA0CAAEAAAAAAACiQAaQAwAAgAgABoAAAAAA\",\"fcapids\":[\"fcapId3\"],\"time\":{\"userdow\":{{ userdow }},\"userhour\":{{ userhour }}}}},\"at\":1,\"tmax\":5000,\"source\":{\"tid\":\"someTid\"}}", + "requestbody": "{\"id\":\"tid\",\"imp\":[{\"id\":\"impId2\",\"banner\":{\"format\":[{\"w\":320,\"h\":320}],\"ext\":{\"rp\":{\"mime\":\"text/html\"}}},\"pmp\":{\"deals\":[{\"id\":\"dealId2\",\"ext\":{\"line\":{\"lineitemid\":\"lineItem2\",\"extlineitemid\":\"extLineItem2\",\"sizes\":[{\"w\":320,\"h\":320}]}}}]},\"secure\":1,\"ext\":{\"rp\":{\"zone_id\":4001,\"target\":{\"page\":[\"http://www.example.com\"],\"line_item\":\"extLineItem2\"},\"track\":{\"mint\":\"\",\"mint_version\":\"\"}},\"maxbids\":1}}],\"site\":{\"domain\":\"www.example.com\",\"page\":\"http://www.example.com\",\"publisher\":{\"ext\":{\"rp\":{\"account_id\":2001}}},\"ext\":{\"amp\":0,\"rp\":{\"site_id\":3001}}},\"device\":{\"ua\":\"userAgent\",\"ip\":\"185.199.110.0\",\"ext\":{\"rp\":{}}},\"user\":{\"buyeruid\":\"J5VLCWQP-26-CWFT\",\"consent\":\"CPBCa-mPBCa-mAAAAAENA0CAAEAAAAAAACiQAaQAwAAgAgABoAAAAAA\",\"ext\":{\"fcapids\":[\"fcapId3\"],\"time\":{\"userdow\":{{ userdow }},\"userhour\":{{ userhour }}}}},\"at\":1,\"tmax\":5000,\"source\":{\"tid\":\"someTid\"}}", "responsebody": "{\"id\":\"bidResponseId2\",\"seatbid\":[{\"seat\":\"seatId2\",\"bid\":[{\"id\":\"bidId2\",\"impid\":\"impId2\",\"dealid\":\"dealId2\",\"price\":8.43,\"adm\":\"\",\"crid\":\"crid2\",\"w\":320,\"h\":320}]}]}", "status": 200 }, @@ -231,7 +231,7 @@ "application/json;charset=utf-8" ] }, - "requestbody": "{\"id\":\"tid\",\"imp\":[{\"id\":\"impId1\",\"banner\":{\"format\":[{\"w\":300,\"h\":250}],\"ext\":{\"rp\":{\"mime\":\"text/html\"}}},\"pmp\":{\"deals\":[{\"id\":\"dealId1\",\"ext\":{\"line\":{\"lineitemid\":\"lineItem1\",\"extlineitemid\":\"extLineItem1\",\"sizes\":[{\"w\":300,\"h\":250}]}}},{\"id\":\"dealId3\",\"ext\":{\"line\":{\"lineitemid\":\"lineItem3\",\"extlineitemid\":\"extLineItem3\",\"sizes\":[{\"w\":300,\"h\":250}]}}}]},\"secure\":1,\"ext\":{\"rp\":{\"zone_id\":4001,\"target\":{\"line_item\":\"extLineItem3\"},\"track\":{\"mint\":\"\",\"mint_version\":\"\"}},\"maxbids\":1}}],\"site\":{\"domain\":\"www.example.com\",\"page\":\"http://www.example.com\",\"publisher\":{\"ext\":{\"rp\":{\"account_id\":2001}}},\"ext\":{\"amp\":0,\"rp\":{\"site_id\":3001}}},\"device\":{\"ua\":\"userAgent\",\"ip\":\"185.199.110.0\",\"ext\":{\"rp\":{}}},\"user\":{\"buyeruid\":\"J5VLCWQP-26-CWFT\",\"ext\":{\"consent\":\"CPBCa-mPBCa-mAAAAAENA0CAAEAAAAAAACiQAaQAwAAgAgABoAAAAAA\",\"fcapids\":[\"fcapId3\"],\"time\":{\"userdow\":{{ userdow }},\"userhour\":{{ userhour }}}}},\"at\":1,\"tmax\":5000,\"source\":{\"tid\":\"someTid\"}}", + "requestbody": "{\"id\":\"tid\",\"imp\":[{\"id\":\"impId1\",\"banner\":{\"format\":[{\"w\":300,\"h\":250}],\"ext\":{\"rp\":{\"mime\":\"text/html\"}}},\"pmp\":{\"deals\":[{\"id\":\"dealId1\",\"ext\":{\"line\":{\"lineitemid\":\"lineItem1\",\"extlineitemid\":\"extLineItem1\",\"sizes\":[{\"w\":300,\"h\":250}]}}},{\"id\":\"dealId3\",\"ext\":{\"line\":{\"lineitemid\":\"lineItem3\",\"extlineitemid\":\"extLineItem3\",\"sizes\":[{\"w\":300,\"h\":250}]}}}]},\"secure\":1,\"ext\":{\"rp\":{\"zone_id\":4001,\"target\":{\"page\":[\"http://www.example.com\"],\"line_item\":\"extLineItem3\"},\"track\":{\"mint\":\"\",\"mint_version\":\"\"}},\"maxbids\":1}}],\"site\":{\"domain\":\"www.example.com\",\"page\":\"http://www.example.com\",\"publisher\":{\"ext\":{\"rp\":{\"account_id\":2001}}},\"ext\":{\"amp\":0,\"rp\":{\"site_id\":3001}}},\"device\":{\"ua\":\"userAgent\",\"ip\":\"185.199.110.0\",\"ext\":{\"rp\":{}}},\"user\":{\"buyeruid\":\"J5VLCWQP-26-CWFT\",\"consent\":\"CPBCa-mPBCa-mAAAAAENA0CAAEAAAAAAACiQAaQAwAAgAgABoAAAAAA\",\"ext\":{\"fcapids\":[\"fcapId3\"],\"time\":{\"userdow\":{{ userdow }},\"userhour\":{{ userhour }}}}},\"at\":1,\"tmax\":5000,\"source\":{\"tid\":\"someTid\"}}", "responsebody": "{\"id\":\"bidResponseId3\",\"seatbid\":[{\"seat\":\"seatId3\",\"bid\":[{\"id\":\"bidId3\",\"impid\":\"impId1\",\"dealid\":\"dealId3\",\"price\":8.43,\"adm\":\"\",\"crid\":\"crid3\",\"w\":300,\"h\":250}]}]}", "status": 200 } diff --git a/src/test/resources/org/prebid/server/it/deals/test-rubicon-bid-request-1.json b/src/test/resources/org/prebid/server/it/deals/test-rubicon-bid-request-1.json index ef123b0c3d7..14d0fc0bb6e 100644 --- a/src/test/resources/org/prebid/server/it/deals/test-rubicon-bid-request-1.json +++ b/src/test/resources/org/prebid/server/it/deals/test-rubicon-bid-request-1.json @@ -95,7 +95,10 @@ }, "user": { "ext": { - "consent": "CPBCa-mPBCa-mAAAAAENA0CAAEAAAAAAACiQAaQAwAAgAgABoAAAAAA" + "consent": "CPBCa-mPBCa-mAAAAAENA0CAAEAAAAAAACiQAaQAwAAgAgABoAAAAAA", + "fcapids": [ + "fcapId3" + ] } }, "at": 1, diff --git a/src/test/resources/org/prebid/server/it/deals/test-rubicon-bid-request-2.json b/src/test/resources/org/prebid/server/it/deals/test-rubicon-bid-request-2.json index 4a1a920a590..bce83486019 100644 --- a/src/test/resources/org/prebid/server/it/deals/test-rubicon-bid-request-2.json +++ b/src/test/resources/org/prebid/server/it/deals/test-rubicon-bid-request-2.json @@ -80,7 +80,10 @@ }, "user": { "ext": { - "consent": "CPBCa-mPBCa-mAAAAAENA0CAAEAAAAAAACiQAaQAwAAgAgABoAAAAAA" + "consent": "CPBCa-mPBCa-mAAAAAENA0CAAEAAAAAAACiQAaQAwAAgAgABoAAAAAA", + "fcapids": [ + "fcapId3" + ] } }, "at": 1, diff --git a/src/test/resources/org/prebid/server/it/deals/test-rubicon-bid-request-3.json b/src/test/resources/org/prebid/server/it/deals/test-rubicon-bid-request-3.json index 65953b0e42b..70dace2cea0 100644 --- a/src/test/resources/org/prebid/server/it/deals/test-rubicon-bid-request-3.json +++ b/src/test/resources/org/prebid/server/it/deals/test-rubicon-bid-request-3.json @@ -95,7 +95,10 @@ }, "user": { "ext": { - "consent": "CPBCa-mPBCa-mAAAAAENA0CAAEAAAAAAACiQAaQAwAAgAgABoAAAAAA" + "consent": "CPBCa-mPBCa-mAAAAAENA0CAAEAAAAAAACiQAaQAwAAgAgABoAAAAAA", + "fcapids": [ + "fcapId3" + ] } }, "at": 1, diff --git a/src/test/resources/org/prebid/server/it/deals/test-rubicon-bid-request-4.json b/src/test/resources/org/prebid/server/it/deals/test-rubicon-bid-request-4.json index 0fbd0450f59..ea1973fddf0 100644 --- a/src/test/resources/org/prebid/server/it/deals/test-rubicon-bid-request-4.json +++ b/src/test/resources/org/prebid/server/it/deals/test-rubicon-bid-request-4.json @@ -80,7 +80,10 @@ }, "user": { "ext": { - "consent": "CPBCa-mPBCa-mAAAAAENA0CAAEAAAAAAACiQAaQAwAAgAgABoAAAAAA" + "consent": "CPBCa-mPBCa-mAAAAAENA0CAAEAAAAAAACiQAaQAwAAgAgABoAAAAAA", + "fcapids": [ + "fcapId3" + ] } }, "at": 1, diff --git a/src/test/resources/org/prebid/server/it/deals/test-rubicon-bid-request-5.json b/src/test/resources/org/prebid/server/it/deals/test-rubicon-bid-request-5.json index 35b3c0c7bbf..2a8ac52c74a 100644 --- a/src/test/resources/org/prebid/server/it/deals/test-rubicon-bid-request-5.json +++ b/src/test/resources/org/prebid/server/it/deals/test-rubicon-bid-request-5.json @@ -93,8 +93,8 @@ } }, "user": { - "consent": "CPBCa-mPBCa-mAAAAAENA0CAAEAAAAAAACiQAaQAwAAgAgABoAAAAAA", "ext": { + "consent": "CPBCa-mPBCa-mAAAAAENA0CAAEAAAAAAACiQAaQAwAAgAgABoAAAAAA", "fcapids": [ "fcapId3" ] diff --git a/src/test/resources/org/prebid/server/it/hooks/reject/test-rubicon-bid-request-1.json b/src/test/resources/org/prebid/server/it/hooks/reject/test-rubicon-bid-request-1.json index f5e264f7aed..5637a0f0026 100644 --- a/src/test/resources/org/prebid/server/it/hooks/reject/test-rubicon-bid-request-1.json +++ b/src/test/resources/org/prebid/server/it/hooks/reject/test-rubicon-bid-request-1.json @@ -67,8 +67,8 @@ } }, "user": { - "ext" : { - "consent": "CPBCa-mPBCa-mAAAAAENA0CAAEAAAAAAACiQAaQAwAAgAgABoAAAAAA" + "ext": { + "consent": "CPBCa-mPBCa-mAAAAAENA0CAAEAAAAAAACiQAaQAwAAgAgABoAAAAAA" } }, "at": 1, diff --git a/src/test/resources/org/prebid/server/it/hooks/sample-module/test-rubicon-bid-request-1.json b/src/test/resources/org/prebid/server/it/hooks/sample-module/test-rubicon-bid-request-1.json index 587d50bfb8d..89d2ac57bcb 100644 --- a/src/test/resources/org/prebid/server/it/hooks/sample-module/test-rubicon-bid-request-1.json +++ b/src/test/resources/org/prebid/server/it/hooks/sample-module/test-rubicon-bid-request-1.json @@ -69,7 +69,7 @@ } }, "user": { - "ext" : { + "ext": { "consent": "CPBCa-mPBCa-mAAAAAENA0CAAEAAAAAAACiQAaQAwAAgAgABoAAAAAA" } }, diff --git a/src/test/resources/org/prebid/server/it/openrtb2/rubicon/test-auction-rubicon-request.json b/src/test/resources/org/prebid/server/it/openrtb2/rubicon/test-auction-rubicon-request.json index e2a169efe94..51068a20cc7 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/rubicon/test-auction-rubicon-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/rubicon/test-auction-rubicon-request.json @@ -50,7 +50,6 @@ } }, "user": { - "consent": "CPBCa-mPBCa-mAAAAAENA0CAAEAAAAAAACiQAaQAwAAgAgABoAAAAAA", "data": [ { "ext": { diff --git a/src/test/resources/org/prebid/server/it/openrtb2/rubicon/test-rubicon-bid-request.json b/src/test/resources/org/prebid/server/it/openrtb2/rubicon/test-rubicon-bid-request.json index de97a661126..15584c3d343 100644 --- a/src/test/resources/org/prebid/server/it/openrtb2/rubicon/test-rubicon-bid-request.json +++ b/src/test/resources/org/prebid/server/it/openrtb2/rubicon/test-rubicon-bid-request.json @@ -60,7 +60,7 @@ }, "device": { "ua": "userAgent", - "ip": "193.168.244.0", + "ip": "193.168.244.1", "ext": { "rp": { } @@ -68,7 +68,6 @@ }, "user": { "ext": { - "consent": "CPBCa-mPBCa-mAAAAAENA0CAAEAAAAAAACiQAaQAwAAgAgABoAAAAAA", "rp": { "target": { "iab": [