Merge branch 'master' into fpd-update

prebid · Jan 16, 2020 · 7e59386 · 7e59386
2 parents 3b728dd + 0d2835e
commit 7e59386
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 41 deletions.
diff --git a/src/main/java/org/prebid/server/auction/BidResponseCreator.java b/src/main/java/org/prebid/server/auction/BidResponseCreator.java
@@ -103,7 +103,7 @@ Future<BidResponse> create(List<BidderResponse> bidderResponses, BidRequest bidR
             result = Future.succeededFuture(BidResponse.builder()
                     .id(bidRequest.getId())
                     .cur(bidRequest.getCur().get(0))
-                    .nbr(2)  // signal "Invalid Request"
+                    .nbr(0) // signal "Unknown Error"
                     .seatbid(Collections.emptyList())
                     .ext(Json.mapper.valueToTree(toExtBidResponse(
                             bidderResponses, bidRequest, CacheServiceResult.empty(), debugEnabled, null)))

diff --git a/src/main/java/org/prebid/server/bidder/facebook/FacebookBidder.java b/src/main/java/org/prebid/server/bidder/facebook/FacebookBidder.java
@@ -59,13 +59,11 @@ public class FacebookBidder implements Bidder<BidRequest> {
 
     private final String endpointUrl;
     private final String platformId;
-    private final String appId;
     private final String appSecret;
 
-    public FacebookBidder(String endpointUrl, String platformId, String appId, String appSecret) {
+    public FacebookBidder(String endpointUrl, String platformId, String appSecret) {
         this.endpointUrl = HttpUtil.validateUrl(Objects.requireNonNull(endpointUrl));
         this.platformId = checkBlankString(Objects.requireNonNull(platformId), "platform-id");
-        this.appId = checkBlankString(Objects.requireNonNull(appId), "app-id");
         this.appSecret = checkBlankString(Objects.requireNonNull(appSecret), "app-secret");
     }
 
@@ -85,7 +83,6 @@ public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest bidRequ
         }
 
         final MultiMap headers = HttpUtil.headers()
-                .add("Auth-Token", appId + "|" + appSecret)
                 .add("X-Fb-Pool-Routing-Token", bidRequest.getUser().getBuyeruid());
 
         final List<BidderError> errors = new ArrayList<>();

diff --git a/src/main/java/org/prebid/server/spring/config/bidder/FacebookConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/FacebookConfiguration.java
@@ -47,7 +47,7 @@ BidderDeps facebookBidderDeps() {
                 .usersyncerCreator(UsersyncerCreator.create(usersync, null))
                 .bidderCreator(configProperties.getEnabled()
                         ? () -> new FacebookBidder(configProperties.getEndpoint(), configProperties.getPlatformId(),
-                        configProperties.getAppId(), configProperties.getAppSecret())
+                        configProperties.getAppSecret())
                         : null)
                 .assemble();
     }
@@ -61,9 +61,6 @@ private static class FacebookConfigurationProperties extends BidderConfiguration
         @NotNull
         private String platformId;
 
-        @NotNull
-        private String appId;
-
         @NotNull
         private String appSecret;
     }

diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
@@ -89,8 +89,8 @@ geolocation:
   type: maxmind
   maxmind:
     remote-file-syncer:
-      download-url: https://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.tar.gz
-      save-filepath: /var/tmp/prebid/GeoLite2-Country.tar.gz
+      download-url: https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz
+      save-filepath: /var/tmp/prebid/GeoLite2-City.tar.gz
       retry-count: 3
       retry-interval-ms: 3000
       timeout-ms: 300000
@@ -101,4 +101,4 @@ health-check:
   database:
     enabled: false
   geolocation:
-    enabled: false
+    enabled: false
diff --git a/src/main/resources/bidder-config/facebook.yaml b/src/main/resources/bidder-config/facebook.yaml
@@ -3,7 +3,6 @@ adapters:
     enabled: false
     endpoint: https://an.facebook.com/placementbid.ortb
     platform-id:
-    app-id:
     app-secret:
     pbs-enforces-gdpr: true
     modifying-vast-xml-allowed: true

diff --git a/src/main/resources/bidder-config/pubmatic.yaml b/src/main/resources/bidder-config/pubmatic.yaml
@@ -1,7 +1,7 @@
 adapters:
   pubmatic:
     enabled: false
-    endpoint: http://hbopenbid.pubmatic.com/translator?source=prebid-server
+    endpoint: https://hbopenbid.pubmatic.com/translator?source=prebid-server
     pbs-enforces-gdpr: true
     modifying-vast-xml-allowed: true
     deprecated-names:

diff --git a/src/test/java/org/prebid/server/auction/BidResponseCreatorTest.java b/src/test/java/org/prebid/server/auction/BidResponseCreatorTest.java
@@ -296,7 +296,7 @@ public void shouldSetNbrValueTwoAndEmptySeatbidWhenIncomingBidResponsesAreEmpty(
                 null, ACCOUNT, timeout, false).result();
 
         // then
-        assertThat(bidResponse).returns(2, BidResponse::getNbr);
+        assertThat(bidResponse).returns(0, BidResponse::getNbr);
         assertThat(bidResponse).returns(emptyList(), BidResponse::getSeatbid);
 
         verify(cacheService, never()).cacheBidsOpenrtb(anyList(), anyList(), any(), any(), any());
@@ -314,7 +314,7 @@ public void shouldSetNbrValueTwoAndEmptySeatbidWhenIncomingBidResponsesDoNotCont
                 null, ACCOUNT, timeout, false).result();
 
         // then
-        assertThat(bidResponse).returns(2, BidResponse::getNbr);
+        assertThat(bidResponse).returns(0, BidResponse::getNbr);
         assertThat(bidResponse).returns(emptyList(), BidResponse::getSeatbid);
 
         verify(cacheService, never()).cacheBidsOpenrtb(anyList(), anyList(), any(), any(), any());

diff --git a/src/test/java/org/prebid/server/bidder/facebook/FacebookBidderTest.java b/src/test/java/org/prebid/server/bidder/facebook/FacebookBidderTest.java
@@ -17,7 +17,6 @@
 import com.iab.openrtb.response.SeatBid;
 import io.vertx.core.MultiMap;
 import io.vertx.core.http.HttpMethod;
-import org.assertj.core.api.Assertions;
 import org.junit.Before;
 import org.junit.Test;
 import org.prebid.server.VertxTest;
@@ -49,47 +48,40 @@ public class FacebookBidderTest extends VertxTest {
 
     private static final String ENDPOINT_URL = "https://test/auction";
     private static final String PLATFORM_ID = "101";
-    private static final String APP_ID = "123";
     private static final String APP_SECRET = "6237";
     private static final String DEFAULT_BID_CURRENCY = "USD";
 
     private FacebookBidder facebookBidder;
 
     @Before
     public void setUp() {
-        facebookBidder = new FacebookBidder(ENDPOINT_URL, PLATFORM_ID, APP_ID, APP_SECRET);
+        facebookBidder = new FacebookBidder(ENDPOINT_URL, PLATFORM_ID, APP_SECRET);
     }
 
     @Test
     public void creationShouldFailOnNullArguments() {
         assertThatNullPointerException().isThrownBy(
-                () -> new FacebookBidder(null, PLATFORM_ID, APP_ID, APP_SECRET));
+                () -> new FacebookBidder(null, PLATFORM_ID, APP_SECRET));
         assertThatNullPointerException().isThrownBy(
-                () -> new FacebookBidder(ENDPOINT_URL, null, APP_ID, APP_SECRET));
+                () -> new FacebookBidder(ENDPOINT_URL, null, APP_SECRET));
         assertThatNullPointerException().isThrownBy(
-                () -> new FacebookBidder(ENDPOINT_URL, PLATFORM_ID, null, APP_SECRET));
-        assertThatNullPointerException().isThrownBy(
-                () -> new FacebookBidder(ENDPOINT_URL, PLATFORM_ID, APP_ID, null));
+                () -> new FacebookBidder(ENDPOINT_URL, PLATFORM_ID, null));
     }
 
     @Test
     public void creationShouldFailOnBlankArguments() {
         assertThatIllegalArgumentException().isThrownBy(
-                () -> new FacebookBidder(ENDPOINT_URL, " ", APP_ID, APP_SECRET))
+                () -> new FacebookBidder(ENDPOINT_URL, " ", APP_SECRET))
                 .withMessageStartingWith("No facebook platform-id specified.");
         assertThatIllegalArgumentException().isThrownBy(
-                () -> new FacebookBidder(ENDPOINT_URL, PLATFORM_ID, " ", APP_SECRET))
-                .withMessageStartingWith("No facebook app-id specified.");
-        assertThatIllegalArgumentException().isThrownBy(
-                () -> new FacebookBidder(ENDPOINT_URL, PLATFORM_ID, APP_ID, " "))
+                () -> new FacebookBidder(ENDPOINT_URL, PLATFORM_ID, " "))
                 .withMessageStartingWith("No facebook app-secret specified.");
     }
 
     @Test
     public void creationShouldFailOnInvalidEndpoints() {
         assertThatIllegalArgumentException()
-                .isThrownBy(() -> new FacebookBidder("invalid_url", PLATFORM_ID,
-                        APP_ID, APP_SECRET))
+                .isThrownBy(() -> new FacebookBidder("invalid_url", PLATFORM_ID, APP_SECRET))
                 .withMessage("URL supplied is not valid: invalid_url");
     }
 
@@ -268,7 +260,6 @@ public void makeHttpRequestsShouldReturnRequestWithExpectedHeaders() {
                 .containsOnly(
                         tuple("Content-Type", "application/json;charset=utf-8"),
                         tuple("Accept", "application/json"),
-                        tuple("Auth-Token", "123|6237"),
                         tuple("X-Fb-Pool-Routing-Token", "bUid"));
     }
 
@@ -501,8 +492,8 @@ public void makeBidsShouldReturnEmptyListIfBidResponseIsNull() throws JsonProces
         final Result<List<BidderBid>> result = facebookBidder.makeBids(httpCall, BidRequest.builder().build());
 
         // then
-        Assertions.assertThat(result.getErrors()).isEmpty();
-        Assertions.assertThat(result.getValue()).isEmpty();
+        assertThat(result.getErrors()).isEmpty();
+        assertThat(result.getValue()).isEmpty();
     }
 
     @Test
@@ -514,8 +505,8 @@ public void makeBidsShouldReturnEmptyListIfBidResponseSeatBidIsNull() throws Jso
         final Result<List<BidderBid>> result = facebookBidder.makeBids(httpCall, BidRequest.builder().build());
 
         // then
-        Assertions.assertThat(result.getErrors()).isEmpty();
-        Assertions.assertThat(result.getValue()).isEmpty();
+        assertThat(result.getErrors()).isEmpty();
+        assertThat(result.getValue()).isEmpty();
     }
 
     @Test

diff --git a/src/test/java/org/prebid/server/it/FacebookTest.java b/src/test/java/org/prebid/server/it/FacebookTest.java
@@ -17,7 +17,6 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
 import static io.restassured.RestAssured.given;
 import static java.util.Collections.singletonList;
-import static org.assertj.core.api.Assertions.assertThat;
 
 @RunWith(SpringRunner.class)
 public class FacebookTest extends IntegrationTest {
@@ -28,21 +27,18 @@ public void openrtb2AuctionShouldRespondWithBidsFromFacebook() throws IOExceptio
         // facebook bid response for impId001
         wireMockRule.stubFor(post(urlPathEqualTo("/audienceNetwork-exchange"))
                 .withHeader("X-Fb-Pool-Routing-Token", equalTo("FB-UID"))
-                .withHeader("Auth-Token", equalTo("123|67234"))
                 .withRequestBody(equalToJson(jsonFrom("openrtb2/facebook/test-facebook-bid-request-1.json")))
                 .willReturn(aResponse().withBody(jsonFrom("openrtb2/facebook/test-facebook-bid-response-1.json"))));
 
         // facebook bid response for impId002
         wireMockRule.stubFor(post(urlPathEqualTo("/audienceNetwork-exchange"))
                 .withHeader("X-Fb-Pool-Routing-Token", equalTo("FB-UID"))
-                .withHeader("Auth-Token", equalTo("123|67234"))
                 .withRequestBody(equalToJson(jsonFrom("openrtb2/facebook/test-facebook-bid-request-2.json")))
                 .willReturn(aResponse().withBody(jsonFrom("openrtb2/facebook/test-facebook-bid-response-2.json"))));
 
         // facebook bid response for impId003
         wireMockRule.stubFor(post(urlPathEqualTo("/audienceNetwork-exchange"))
                 .withHeader("X-Fb-Pool-Routing-Token", equalTo("FB-UID"))
-                .withHeader("Auth-Token", equalTo("123|67234"))
                 .withRequestBody(equalToJson(jsonFrom("openrtb2/facebook/test-facebook-bid-request-3.json")))
                 .willReturn(aResponse().withBody(jsonFrom("openrtb2/facebook/test-facebook-bid-response-3.json"))));
 

diff --git a/src/test/resources/org/prebid/server/it/test-application.properties b/src/test/resources/org/prebid/server/it/test-application.properties
@@ -64,7 +64,6 @@ adapters.facebook.enabled=true
 adapters.facebook.endpoint=http://localhost:8090/audienceNetwork-exchange
 adapters.facebook.pbs-enforces-gdpr=true
 adapters.facebook.platform-id=101
-adapters.facebook.app-id=123
 adapters.facebook.app-secret=67234
 adapters.facebook.usersync.url=//facebook-usersync
 adapters.gamma.enabled=true