Merge pull request prebid#103 in AOLP_ADS_JS/prebid.js from release/Prebid-1.22.0 to aolgithub-master

* commit '06ac7c72658678177dfa9aaa643267c0d78754a7':
  Added test cases for not resolved endpoints.
  Added tests for testing aliases.
  Fixed access to Marketplace via onedisplay bidder code.
  Fixed issue with using aol as bidder code for aliases.
  Fixed review notes.
  Fixed reporting when marketplace params are missed.
  Added changelog entry.
  Pick up nexage endpoint if marketplace and nexage params are specified.
  Add aliases for AOL adapter.

Author: vzhukovsky

CHANGELOG

@@ -1,3 +1,8 @@
+AOL Prebid 1.22.0
+----------------
+Added aliases for AOL adapter.
+
+
 AOL Prebid 1.21.0
 ----------------
 Updated to Prebid 0.23.1

adapters.json

@@ -68,6 +68,16 @@
     "trion",
     "prebidServer",
     "adsupply",
+    {
+      "aol": {
+        "alias": "onemobile"
+      }
+    },
+    {
+      "aol": {
+        "alias": "onedisplay"
+      }
+    },
     {
       "appnexus": {
         "alias": "brealtime"

src/adapters/analytics/aol.js

@@ -14,7 +14,11 @@ const utils = require('../../utils');
 
 const AUCTION_END = CONSTANTS.EVENTS.AUCTION_END;
 const BID_WON = CONSTANTS.EVENTS.BID_WON;
-const AOL_BIDDER_CODE = 'aol';
+const AOL_BIDDERS_CODES = {
+  aol: 'aol',
+  onemobile: 'onemobile',
+  onedisplay: 'onedisplay'
+};
 const analyticsType = 'endpoint';
 
 const serverMap = {
@@ -310,9 +314,13 @@ function initAdUnit(adUnitCode) {
   };
 }
 
+function isAolBidder(bidderCode) {
+  return AOL_BIDDERS_CODES[bidderCode];
+}
+
 function addAolParams(adUnit, adUnitsConf, bidsReceived) {
   const filteredBids = bidsReceived.filter(
-    bid => bid.bidderCode === AOL_BIDDER_CODE && bid.adUnitCode === adUnit.code
+    bid => isAolBidder(bid.bidderCode) && bid.adUnitCode === adUnit.code
   );
   const onlyOneBid = filteredBids.length === 1;
   const pubapiId = (onlyOneBid) ? filteredBids[0].pubapiId : '';
@@ -321,7 +329,7 @@ function addAolParams(adUnit, adUnitsConf, bidsReceived) {
   adUnitsConf.forEach(adUnitConf => {
     if (adUnitConf.code === adUnit.code) {
       adUnitConf.bids.forEach(adUnitBid => {
-        if (adUnitBid.bidder === AOL_BIDDER_CODE && adUnitBid.params.placement && adUnitBid.params.network) {
+        if (isAolBidder(adUnitBid.bidder) && adUnitBid.params.placement && adUnitBid.params.network) {
           adUnit.aolParams = adUnitBid.params;
           adUnit.aolParams.pubapiId = pubapiId;
           adUnit.aolParams.currencyCode = currencyCode;

src/adapters/analytics/aolPartnersIds.json

@@ -72,5 +72,7 @@
   "pubgears": 71,
   "adsupply": 72,
   "quantcast": 73,
-  "prebidServer": 74
+  "prebidServer": 74,
+  "onemobile": 75,
+  "onedisplay": 76
 }

src/adapters/aol.js

@@ -3,6 +3,7 @@ const ajax = require('../ajax.js').ajax;
 const bidfactory = require('../bidfactory.js');
 const bidmanager = require('../bidmanager.js');
 const constants = require('../constants.json');
+const BaseAdapter = require('./adapter.js');
 
 $$PREBID_GLOBAL$$.aolGlobals = {
   pixelsDropped: false
@@ -14,7 +15,6 @@ const AolAdapter = function AolAdapter() {
   const pubapiTemplate = template`${'protocol'}://${'host'}/pubapi/3.0/${'network'}/${'placement'}/${'pageid'}/${'sizeid'}/ADTECH;v=2;cmd=bid;cors=yes;alias=${'alias'}${'bidfloor'};misc=${'misc'}`;
   const nexageBaseApiTemplate = template`${'protocol'}://${'host'}/bidRequest?`;
   const nexageGetApiTemplate = template`dcn=${'dcn'}&pos=${'pos'}&cmd=bid${'ext'}`;
-  const BIDDER_CODE = 'aol';
   const MP_SERVER_MAP = {
     us: 'adserver-us.adtech.advertising.com',
     eu: 'adserver-eu.adtech.advertising.com',
@@ -25,6 +25,11 @@ const AolAdapter = function AolAdapter() {
     iframe: 'IFRAME',
     img: 'IMG'
   };
+  const AOL_BIDDERS_CODES = {
+    aol: 'aol',
+    onemobile: 'onemobile',
+    onedisplay: 'onedisplay'
+  };
 
   let domReady = (() => {
     let readyEventFired = false;
@@ -175,7 +180,7 @@ const AolAdapter = function AolAdapter() {
 
   function _addErrorBidResponse(bid, response = {}) {
     const bidResponse = bidfactory.createBid(2, bid);
-    bidResponse.bidderCode = BIDDER_CODE;
+    bidResponse.bidderCode = bid.bidder;
     bidResponse.reason = response.nbr;
     bidResponse.raw = response;
     bidmanager.addBidResponse(bid.placementCode, bidResponse);
@@ -199,7 +204,7 @@ const AolAdapter = function AolAdapter() {
       cpm = bidData.price;
 
       if (cpm === null || isNaN(cpm)) {
-        utils.logError('Invalid price in bid response', BIDDER_CODE, bid);
+        utils.logError('Invalid price in bid response', AOL_BIDDERS_CODES.aol, bid);
         _addErrorBidResponse(bid, response);
         return;
       }
@@ -219,7 +224,7 @@ const AolAdapter = function AolAdapter() {
     }
 
     const bidResponse = bidfactory.createBid(1, bid);
-    bidResponse.bidderCode = BIDDER_CODE;
+    bidResponse.bidderCode = bid.bidder;
     bidResponse.ad = ad;
     bidResponse.cpm = cpm;
     bidResponse.width = bidData.w;
@@ -234,15 +239,31 @@ const AolAdapter = function AolAdapter() {
     bidmanager.addBidResponse(bid.placementCode, bidResponse);
   }
 
+  function _isMarketplaceBidder(bidder) {
+    return bidder === AOL_BIDDERS_CODES.aol || bidder === AOL_BIDDERS_CODES.onedisplay;
+  }
+
+  function _isNexageBidder(bidder) {
+    return bidder === AOL_BIDDERS_CODES.aol || bidder === AOL_BIDDERS_CODES.onemobile;
+  }
+
   function _isNexageRequestPost(bid) {
-    if (bid.params.id && bid.params.imp && bid.params.imp[0]) {
+    if (_isNexageBidder(bid.bidder) && bid.params.id && bid.params.imp && bid.params.imp[0]) {
       let imp = bid.params.imp[0];
       return imp.id && imp.tagid &&
           ((imp.banner && imp.banner.w && imp.banner.h) ||
           (imp.video && imp.video.mimes && imp.video.minduration && imp.video.maxduration));
     }
   }
 
+  function _isNexageRequestGet(bid) {
+    return _isNexageBidder(bid.bidder) && bid.params.dcn && bid.params.pos;
+  }
+
+  function _isMarketplaceRequest(bid) {
+    return _isMarketplaceBidder(bid.bidder) && bid.params.placement && bid.params.network;
+  }
+
   function _callBids(params) {
     utils._each(params.bids, bid => {
       let apiUrl;
@@ -251,9 +272,10 @@ const AolAdapter = function AolAdapter() {
         withCredentials: true
       };
       let isNexageRequestPost = _isNexageRequestPost(bid);
-      if (bid.params.placement && bid.params.network) {
-        apiUrl = _buildMarketplaceUrl(bid);
-      } else if(bid.params.dcn && bid.params.pos || isNexageRequestPost) {
+      let isNexageRequestGet = _isNexageRequestGet(bid);
+      let isMarketplaceRequest = _isMarketplaceRequest(bid);
+
+      if (isNexageRequestGet || isNexageRequestPost) {
         apiUrl = _buildNexageApiUrl(bid);
         if (isNexageRequestPost) {
           data = bid.params;
@@ -263,7 +285,10 @@ const AolAdapter = function AolAdapter() {
           options.method = 'POST';
           options.contentType = 'application/json';
         }
+      } else if (isMarketplaceRequest) {
+        apiUrl = _buildMarketplaceUrl(bid);
       }
+
       if (apiUrl) {
         ajax(apiUrl, response => {
           // Needs to be here in case bidderSettings are defined after requestBids() is called
@@ -279,15 +304,15 @@ const AolAdapter = function AolAdapter() {
           showCpmAdjustmentWarning = false; // warning is shown at most once
 
           if (!response && response.length <= 0) {
-            utils.logError('Empty bid response', BIDDER_CODE, bid);
+            utils.logError('Empty bid response', AOL_BIDDERS_CODES.aol, bid);
             _addErrorBidResponse(bid, response);
             return;
           }
 
           try {
             response = JSON.parse(response);
           } catch (e) {
-            utils.logError('Invalid JSON in bid response', BIDDER_CODE, bid);
+            utils.logError('Invalid JSON in bid response', AOL_BIDDERS_CODES.aol, bid);
             _addErrorBidResponse(bid, response);
             return;
           }
@@ -299,9 +324,12 @@ const AolAdapter = function AolAdapter() {
     });
   }
 
-  return {
-    callBids: _callBids
-  };
+  return Object.assign(BaseAdapter.createNew(AOL_BIDDERS_CODES.aol), {
+    callBids: _callBids,
+    createNew: function () {
+      return new AolAdapter();
+    }
+  });
 };
 
 module.exports = AolAdapter;