Skip to content

Admatic: Update headers for adapter #3732

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 2 commits into from
Mar 3, 2025
Merged

Admatic: Update headers for adapter #3732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c3c1ba
Admatic: Add headers #3707
przemkaczmarek Feb 6, 2025
7b60dee
fix comments
przemkaczmarek Feb 17, 2025
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
20 changes: 19 additions & 1 deletion src/main/java/org/prebid/server/bidder/admatic/AdmaticBidder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@

import com.fasterxml.jackson.core.type.TypeReference;
import com.iab.openrtb.request.BidRequest;
import com.iab.openrtb.request.Device;
import com.iab.openrtb.request.Imp;
import com.iab.openrtb.response.Bid;
import com.iab.openrtb.response.BidResponse;
import com.iab.openrtb.response.SeatBid;
import io.vertx.core.MultiMap;
import org.apache.commons.collections4.CollectionUtils;
import org.prebid.server.bidder.Bidder;
import org.prebid.server.bidder.model.BidderBid;
Expand Down Expand Up @@ -55,7 +57,11 @@ public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest request
try {
final AdmaticImpExt impExt = parseImpExt(imp);
final BidRequest modifiedBidRequest = request.toBuilder().imp(Collections.singletonList(imp)).build();
requests.add(BidderUtil.defaultRequest(modifiedBidRequest, resolveEndpoint(impExt), mapper));
requests.add(BidderUtil.defaultRequest(
modifiedBidRequest,
headers(modifiedBidRequest.getDevice()),
resolveEndpoint(impExt),
mapper));
} catch (PreBidException e) {
errors.add(BidderError.badInput(e.getMessage()));
}
Expand All @@ -76,6 +82,18 @@ private String resolveEndpoint(AdmaticImpExt impExt) {
return endpointUrl.replace(HOST_MACRO, HttpUtil.encodeUrl(impExt.getHost()));
}

private MultiMap headers(Device device) {
final MultiMap headers = HttpUtil.headers();

if (device != null) {
HttpUtil.addHeaderIfValueIsNotEmpty(headers, HttpUtil.X_FORWARDED_FOR_HEADER, device.getIpv6());
HttpUtil.addHeaderIfValueIsNotEmpty(headers, HttpUtil.X_FORWARDED_FOR_HEADER, device.getIp());
HttpUtil.addHeaderIfValueIsNotEmpty(headers, HttpUtil.USER_AGENT_HEADER, device.getUa());
}

return headers;
}

@Override
public Result<List<BidderBid>> makeBids(BidderCall<BidRequest> httpCall, BidRequest bidRequest) {
try {
Expand Down
35 changes: 31 additions & 4 deletions src/test/java/org/prebid/server/bidder/admatic/AdmaticBidderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.iab.openrtb.request.Audio;
import com.iab.openrtb.request.Banner;
import com.iab.openrtb.request.BidRequest;
import com.iab.openrtb.request.Device;
import com.iab.openrtb.request.Imp;
import com.iab.openrtb.request.Native;
import com.iab.openrtb.request.Video;
Expand Down Expand Up @@ -36,6 +37,8 @@
import static org.prebid.server.util.HttpUtil.ACCEPT_HEADER;
import static org.prebid.server.util.HttpUtil.APPLICATION_JSON_CONTENT_TYPE;
import static org.prebid.server.util.HttpUtil.CONTENT_TYPE_HEADER;
import static org.prebid.server.util.HttpUtil.USER_AGENT_HEADER;
import static org.prebid.server.util.HttpUtil.X_FORWARDED_FOR_HEADER;
import static org.springframework.util.MimeTypeUtils.APPLICATION_JSON_VALUE;

public class AdmaticBidderTest extends VertxTest {
Expand Down Expand Up @@ -95,10 +98,34 @@ public void makeHttpRequestsShouldReturnExpectedHeaders() {
// then
assertThat(result.getValue()).hasSize(1).first()
.extracting(HttpRequest::getHeaders)
.satisfies(headers -> assertThat(headers.get(CONTENT_TYPE_HEADER))
.isEqualTo(APPLICATION_JSON_CONTENT_TYPE))
.satisfies(headers -> assertThat(headers.get(ACCEPT_HEADER))
.isEqualTo(APPLICATION_JSON_VALUE));
.satisfies(headers -> {
assertThat(headers.get(CONTENT_TYPE_HEADER)).isEqualTo(APPLICATION_JSON_CONTENT_TYPE);
assertThat(headers.get(ACCEPT_HEADER)).isEqualTo(APPLICATION_JSON_VALUE);
});
assertThat(result.getErrors()).isEmpty();
}

@Test
public void makeHttpRequestsShouldReturnRequestsWithHeadersIfDeviceIsPresent() {
// given
final BidRequest bidRequest = givenBidRequest(identity())
.toBuilder()
.device(Device.builder().ua("ua").ip("ip").ipv6("ipv6").build())
.build();

// when
final Result<List<HttpRequest<BidRequest>>> result = target.makeHttpRequests(bidRequest);

// then
assertThat(result.getErrors()).isEmpty();
assertThat(result.getValue()).hasSize(1).first()
.extracting(HttpRequest::getHeaders)
.satisfies(headers -> {
assertThat(headers.get(CONTENT_TYPE_HEADER)).isEqualTo(APPLICATION_JSON_CONTENT_TYPE);
assertThat(headers.get(ACCEPT_HEADER)).isEqualTo(APPLICATION_JSON_VALUE);
assertThat(headers.get(USER_AGENT_HEADER)).isEqualTo("ua");
assertThat(headers.get(X_FORWARDED_FOR_HEADER)).isEqualTo("ipv6");
});
assertThat(result.getErrors()).isEmpty();
}

Expand Down
Loading