prebid.js 6.0.0 → 6.1.0

package/modules/trustxBidAdapter.js

@@ -76,7 +76,7 @@ export const spec = {
       if (!userIdAsEids) {
         userIdAsEids = bid.userIdAsEids;
       }
-      const {params: {uid, keywords}, mediaTypes, bidId, adUnitCode, rtd} = bid;
+      const {params: {uid, keywords}, mediaTypes, bidId, adUnitCode, rtd, ortb2Imp} = bid;
       bidsMap[bidId] = bid;
       const bidFloor = _getFloor(mediaTypes || {}, bid);
       if (rtd) {
@@ -102,6 +102,15 @@ export const spec = {
         }
       };
 
+      if (ortb2Imp && ortb2Imp.ext && ortb2Imp.ext.data) {
+        impObj.ext.data = ortb2Imp.ext.data;
+        if (impObj.ext.data.adserver && impObj.ext.data.adserver.adslot) {
+          impObj.ext.gpid = impObj.ext.data.adserver.adslot.toString();
+        } else {
+          impObj.ext.gpid = ortb2Imp.ext.data.pbadslot && ortb2Imp.ext.data.pbadslot.toString();
+        }
+      }
+
       if (!isEmpty(keywords)) {
         if (!pageKeywords) {
           pageKeywords = keywords;

package/modules/vidoomyBidAdapter.js

@@ -9,7 +9,17 @@ const ENDPOINT = `https://d.vidoomy.com/api/rtbserver/prebid/`;
 const BIDDER_CODE = 'vidoomy';
 const GVLID = 380;
 
-const COOKIE_SYNC_JSON = 'https://vpaid.vidoomy.com/sync/urls.json';
+const COOKIE_SYNC_FALLBACK_URLS = [
+  'https://x.bidswitch.net/sync?ssp=vidoomy',
+  'https://ib.adnxs.com/getuid?https%3A%2F%2Fa-prebid.vidoomy.com%2Fsetuid%3Fbidder%3Dadnxs%26gdpr%3D{{GDPR}}%26gdpr_consent%3D{{GDPR_CONSENT}}%26uid%3D%24UID',
+  'https://pixel-sync.sitescout.com/dmp/pixelSync?nid=120&redir=https%3A%2F%2Fa.vidoomy.com%2Fapi%2Frtbserver%2Fcookie%3Fi%3DCEN%26uid%3D%7BuserId%7D',
+  'https://sync.1rx.io/usersync2/vidoomy?redir=https%3A%2F%2Fa.vidoomy.com%2Fapi%2Frtbserver%2Fcookie%3Fi%3DUN%26uid%3D%5BRX_UUID%5D',
+  'https://rtb.openx.net/sync/prebid?gdpr={{GDPR}}&gdpr_consent={{GDPR_CONSENT}}&r=https%3A%2F%2Fa-prebid.vidoomy.com%2Fsetuid%3Fbidder%3Dopenx%26uid%3D$%7BUID%7D',
+  'https://ads.pubmatic.com/AdServer/js/user_sync.html?gdpr={{GDPR}}&gdpr_consent={{GDPR_CONSENT}}&us_privacy=&predirect=https%3A%2F%2Fa-prebid.vidoomy.com%2Fsetuid%3Fbidder%3Dpubmatic%26gdpr%3D{{GDPR}}%26gdpr_consent%3D{{GDPR_CONSENT}}%26uid%3D',
+  'https://cm.adform.net/cookie?redirect_url=https%3A%2F%2Fa-prebid.vidoomy.com%2Fsetuid%3Fbidder%3Dadf%26gdpr%3D{{GDPR}}%26gdpr_consent%3D{{GDPR_CONSENT}}%26uid%3D%24UID',
+  'https://ups.analytics.yahoo.com/ups/58531/occ?gdpr={{GDPR}}&gdpr_consent={{GDPR_CONSENT}}',
+  'https://ap.lijit.com/pixel?redir=https%3A%2F%2Fa-prebid.vidoomy.com%2Fsetuid%3Fbidder%3Dsovrn%26gdpr%3D{{GDPR}}%26gdpr_consent%3D{{GDPR_CONSENT}}%26uid%3D%24UID'
+];
 
 const isBidRequestValid = bid => {
   if (!bid.params) {
@@ -36,7 +46,7 @@ const isBidRequestValid = bid => {
 };
 
 const isBidResponseValid = bid => {
-  if (!bid.requestId || !bid.cpm || !bid.ttl || !bid.currency) {
+  if (!bid || !bid.requestId || !bid.cpm || !bid.ttl || !bid.currency) {
     return false;
   }
   switch (bid.mediaType) {
@@ -67,35 +77,33 @@ const buildRequests = (validBidRequests, bidderRequest) => {
 
     const videoContext = deepAccess(bid, 'mediaTypes.video.context');
 
-    const queryParams = [];
-    queryParams.push(['id', bid.params.id]);
-    queryParams.push(['adtype', adType]);
-    queryParams.push(['w', w]);
-    queryParams.push(['h', h]);
-    queryParams.push(['pos', parseInt(bid.params.position) || 1]);
-    queryParams.push(['ua', navigator.userAgent]);
-    queryParams.push(['l', navigator.language && navigator.language.indexOf('-') !== -1 ? navigator.language.split('-')[0] : '']);
-    queryParams.push(['dt', /Mobi/.test(navigator.userAgent) ? 2 : 1]);
-    queryParams.push(['pid', bid.params.pid]);
-    queryParams.push(['requestId', bid.bidId]);
-    queryParams.push(['d', getDomainWithoutSubdomain(hostname)]);
-    queryParams.push(['sp', encodeURIComponent(aElement.href)]);
+    const queryParams = {
+      id: bid.params.id,
+      adtype: adType,
+      w,
+      h,
+      pos: parseInt(bid.params.position) || 1,
+      ua: navigator.userAgent,
+      l: navigator.language && navigator.language.indexOf('-') !== -1 ? navigator.language.split('-')[0] : '',
+      dt: /Mobi/.test(navigator.userAgent) ? 2 : 1,
+      pid: bid.params.pid,
+      requestId: bid.bidId,
+      d: getDomainWithoutSubdomain(hostname),
+      sp: encodeURIComponent(aElement.href),
+      usp: bidderRequest.uspConsent || '',
+      coppa: !!config.getConfig('coppa'),
+      videoContext: videoContext || ''
+    };
+
     if (bidderRequest.gdprConsent) {
-      queryParams.push(['gdpr', bidderRequest.gdprConsent.gdprApplies]);
-      queryParams.push(['gdprcs', bidderRequest.gdprConsent.consentString]);
+      queryParams.gdpr = bidderRequest.gdprConsent.gdprApplies;
+      queryParams.gdprcs = bidderRequest.gdprConsent.consentString;
     }
-    queryParams.push(['usp', bidderRequest.uspConsent || '']);
-    queryParams.push(['coppa', !!config.getConfig('coppa')]);
-
-    const rawQueryParams = queryParams.map(qp => qp.join('=')).join('&');
 
-    cookieSync(bidderRequest)
-
-    const url = `${ENDPOINT}?${rawQueryParams}`;
     return {
       method: 'GET',
-      url: url,
-      data: {videoContext}
+      url: ENDPOINT,
+      data: queryParams
     }
   });
   return serverRequests;
@@ -117,6 +125,7 @@ const render = (bid) => {
 const interpretResponse = (serverResponse, bidRequest) => {
   try {
     let responseBody = serverResponse.body;
+    if (!responseBody) return;
     if (responseBody.mediaType === 'video') {
       responseBody.ad = responseBody.vastUrl;
       const videoContext = bidRequest.data.videoContext;
@@ -185,6 +194,21 @@ const interpretResponse = (serverResponse, bidRequest) => {
   }
 };
 
+function getUserSyncs (syncOptions, responses, gdprConsent, uspConsent) {
+  if (syncOptions.iframeEnabled || syncOptions.pixelEnabled) {
+    const pixelType = syncOptions.pixelEnabled ? 'image' : 'iframe';
+    const urls = deepAccess(responses, '0.body.pixels') || COOKIE_SYNC_FALLBACK_URLS;
+
+    return [].concat(urls).map(url => ({
+      type: pixelType,
+      url: url
+        .replace('{{GDPR}}', gdprConsent ? gdprConsent.gdprApplies : '0')
+        .replace('{{GDPR_CONSENT}}', gdprConsent ? encodeURIComponent(gdprConsent.consentString) : '')
+        .replace('{{USP_CONSENT}}', uspConsent ? encodeURIComponent(uspConsent) : '')
+    }));
+  }
+};
+
 export const spec = {
   code: BIDDER_CODE,
   supportedMediaTypes: [BANNER, VIDEO],
@@ -192,84 +216,11 @@ export const spec = {
   buildRequests,
   interpretResponse,
   gvlid: GVLID,
+  getUserSyncs,
 };
 
 registerBidder(spec);
 
-let cookieSynced = false;
-function cookieSync(bidderRequest) {
-  if (cookieSynced) return;
-  const xhr = new XMLHttpRequest();
-  xhr.open('GET', COOKIE_SYNC_JSON)
-  xhr.addEventListener('load', function () {
-    const macro = Macro({
-      gpdr: bidderRequest.gdprConsent ? bidderRequest.gdprConsent.gdprApplies : '0',
-      gpdr_consent: bidderRequest.gdprConsent ? bidderRequest.gdprConsent.consentString : '',
-    });
-    JSON.parse(this.responseText).filter(Boolean).forEach(url => {
-      firePixel(macro.replace(url))
-    })
-  })
-  xhr.send()
-  cookieSynced = true;
-}
-
-function firePixel(url) {
-  const img = document.createElement('img');
-  img.width = 1;
-  img.height = 1;
-  img.src = url;
-  document.body.appendChild(img);
-  setTimeout(() => {
-    img.remove();
-  }, 10000)
-}
-
-function normalizeKey (x) {
-  return x.replace(/_/g, '').toLowerCase();
-}
-
-function Macro (obj) {
-  const macros = {};
-  for (const key in obj) {
-    macros[normalizeKey(key)] = obj[key];
-  }
-
-  const set = (key, value) => {
-    macros[normalizeKey(key)] = typeof value === 'function' ? value : String(value);
-  };
-
-  return {
-    set,
-    setAll (obj) {
-      for (const key in obj) {
-        macros[normalizeKey(key)] = set(obj[key]);
-      }
-    },
-    replace (string, extraMacros = {}) {
-      const allMacros = {
-        ...macros,
-        ...extraMacros,
-      };
-      const regexes = [
-        /{{\s*([a-zA-Z0-9_]+)\s*}}/g,
-        /\$\$\s*([a-zA-Z0-9_]+)\s*\$\$/g,
-        /\[\s*([a-zA-Z0-9_]+)\s*\]/g,
-        /\{\s*([a-zA-Z0-9_]+)\s*\}/g,
-      ];
-      regexes.forEach(regex => {
-        string = string.replace(regex, (str, x) => {
-          x = normalizeKey(x);
-          let value = allMacros[x];
-          value = typeof value === 'function' ? value(allMacros) : value;
-          return !value && value !== 0 ? '' : value;
-        });
-      });
-      return string;
-    },
-  };
-}
-
 function getDomainWithoutSubdomain (hostname) {
   const parts = hostname.split('.');
   const newParts = [];

package/modules/visxBidAdapter.js

@@ -203,7 +203,7 @@ export const spec = {
   },
   onTimeout: function(timeoutData) {
     // Call '/track/bid_timeout' with timeout data
-    triggerPixel(buildUrl(TRACK_TIMEOUT_PATH) + '?data=' + JSON.stringify(timeoutData));
+    triggerPixel(buildUrl(TRACK_TIMEOUT_PATH) + '//' + JSON.stringify(timeoutData));
   }
 };
 

package/modules/yieldlabBidAdapter.js

@@ -1,7 +1,7 @@
 import { _each, isPlainObject, isArray, deepAccess } from '../src/utils.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js'
 import find from 'core-js-pure/features/array/find.js'
-import { VIDEO, BANNER } from '../src/mediaTypes.js'
+import { VIDEO, BANNER, NATIVE } from '../src/mediaTypes.js'
 import { Renderer } from '../src/Renderer.js'
 import { config } from '../src/config.js';
 
@@ -15,7 +15,7 @@ const GVLID = 70
 export const spec = {
   code: BIDDER_CODE,
   gvlid: GVLID,
-  supportedMediaTypes: [VIDEO, BANNER],
+  supportedMediaTypes: [VIDEO, BANNER, NATIVE],
 
   isBidRequestValid: function (bid) {
     if (bid && bid.params && bid.params.adslotId && bid.params.supplyId) {
@@ -149,6 +149,27 @@ export const spec = {
           }
         }
 
+        if (isNative(bidRequest, adType)) {
+          const url = `${ENDPOINT}/d/${matchedBid.id}/${bidRequest.params.supplyId}/?ts=${timestamp}${extId}${gdprApplies}${gdprConsent}${pvId}`
+          bidResponse.adUrl = url
+          bidResponse.mediaType = NATIVE
+          const nativeImageAssetObj = find(matchedBid.native.assets, e => e.id === 2)
+          const nativeImageAsset = nativeImageAssetObj ? nativeImageAssetObj.img : {url: '', w: 0, h: 0};
+          const nativeTitleAsset = find(matchedBid.native.assets, e => e.id === 1)
+          const nativeBodyAsset = find(matchedBid.native.assets, e => e.id === 3)
+          bidResponse.native = {
+            title: nativeTitleAsset ? nativeTitleAsset.title.text : '',
+            body: nativeBodyAsset ? nativeBodyAsset.data.value : '',
+            image: {
+              url: nativeImageAsset.url,
+              width: nativeImageAsset.w,
+              height: nativeImageAsset.h,
+            },
+            clickUrl: matchedBid.native.link.url,
+            impressionTrackers: matchedBid.native.imptrackers,
+          };
+        }
+
         bidResponses.push(bidResponse)
       }
     })
@@ -162,16 +183,26 @@ export const spec = {
  * @param {String} adtype
  * @returns {Boolean}
  */
-function isVideo (format, adtype) {
+function isVideo(format, adtype) {
   return deepAccess(format, 'mediaTypes.video') && adtype.toLowerCase() === 'video'
 }
 
+/**
+ * Is this a native format?
+ * @param {Object} format
+ * @param {String} adtype
+ * @returns {Boolean}
+ */
+function isNative(format, adtype) {
+  return deepAccess(format, 'mediaTypes.native') && adtype.toLowerCase() === 'native'
+}
+
 /**
  * Is this an outstream context?
  * @param {Object} format
  * @returns {Boolean}
  */
-function isOutstream (format) {
+function isOutstream(format) {
   let context = deepAccess(format, 'mediaTypes.video.context')
   return (context === 'outstream')
 }
@@ -181,7 +212,7 @@ function isOutstream (format) {
  * @param {Object} format
  * @returns {Array}
  */
-function getPlayerSize (format) {
+function getPlayerSize(format) {
   let playerSize = deepAccess(format, 'mediaTypes.video.playerSize')
   return (playerSize && isArray(playerSize[0])) ? playerSize[0] : playerSize
 }
@@ -191,7 +222,7 @@ function getPlayerSize (format) {
  * @param {String} size
  * @returns {Array}
  */
-function parseSize (size) {
+function parseSize(size) {
   return size.split('x').map(Number)
 }
 
@@ -200,7 +231,7 @@ function parseSize (size) {
  * @param {Array} eids
  * @returns {String}
  */
-function createUserIdString (eids) {
+function createUserIdString(eids) {
   let str = []
   for (let i = 0; i < eids.length; i++) {
     str.push(eids[i].source + ':' + eids[i].uids[0].id)
@@ -213,7 +244,7 @@ function createUserIdString (eids) {
  * @param {Object} obj
  * @returns {String}
  */
-function createQueryString (obj) {
+function createQueryString(obj) {
   let str = []
   for (var p in obj) {
     if (obj.hasOwnProperty(p)) {
@@ -233,7 +264,7 @@ function createQueryString (obj) {
  * @param {Object} obj
  * @returns {String}
  */
-function createTargetingString (obj) {
+function createTargetingString(obj) {
   let str = []
   for (var p in obj) {
     if (obj.hasOwnProperty(p)) {
@@ -250,7 +281,7 @@ function createTargetingString (obj) {
  * @param {Object} schain
  * @returns {String}
  */
-function createSchainString (schain) {
+function createSchainString(schain) {
   const ver = schain.ver || ''
   const complete = (schain.complete === 1 || schain.complete === 0) ? schain.complete : ''
   const keys = ['asi', 'sid', 'hp', 'rid', 'name', 'domain', 'ext']

package/modules/yieldlabBidAdapter.md

@@ -11,53 +11,96 @@ Maintainer: solutions@yieldlab.de
 Module that connects to Yieldlab's demand sources
 
 # Test Parameters
+
+```javascript
+const adUnits = [
+    {
+        code: 'banner',
+        sizes: [ [ 728, 90 ] ],
+        bids: [{
+            bidder: 'yieldlab',
+            params: {
+                adslotId: '5220336',
+                supplyId: '1381604',
+                targeting: {
+                    key1: 'value1',
+                    key2: 'value2'
+                },
+                extId: 'abc',
+                iabContent: {
+                    id: 'some_id',
+                    episode: '1',
+                    title: 'some title',
+                    series: 'some series',
+                    season: 's1',
+                    artist: 'John Doe',
+                    genre: 'some genre',
+                    isrc: 'CC-XXX-YY-NNNNN',
+                    url: 'http://foo_url.de',
+                    cat: [ 'IAB1-1', 'IAB1-2', 'IAB2-10' ],
+                    context: '7',
+                    keywords: ['k1', 'k2'],
+                    live: '0'
+                }
+            }
+        }]
+    },
+    {
+        code: 'video',
+        sizes: [ [ 640, 480 ] ],
+        mediaTypes: {
+            video: {
+                context: 'instream' // or 'outstream'
+            }
+        },
+        bids: [{
+            bidder: 'yieldlab',
+            params: {
+                adslotId: '5220339',
+                supplyId: '1381604'
+            }
+        }]
+    },
+    {
+        code: 'native',
+        mediaTypes: {
+            native: {
+                // native config
+            }
+        },
+        bids: [{
+            bidder: 'yieldlab',
+            params: {
+                adslotId: '5220339',
+                supplyId: '1381604'
+            }
+        }]
+    }
+];
 ```
-    var adUnits = [
-           {
-               code: "banner",
-               sizes: [[728, 90]],
-               bids: [{
-                   bidder: "yieldlab",
-                   params: {
-                       adslotId: "5220336",
-                       supplyId: "1381604",
-                       targeting: {
-                           key1: "value1",
-                           key2: "value2"
-                       },
-                       extId: "abc",
-                       iabContent: {
-                           id: "some_id",
-                           episode: "1",
-                           title: "some title",
-                           series: "some series",
-                           season: "s1",
-                           artist: "John Doe",
-                           genre: "some genre",
-                           isrc: "CC-XXX-YY-NNNNN",
-                           url: "http://foo_url.de",
-                           cat: ["IAB1-1", "IAB1-2", "IAB2-10"],
-                           context: "7",
-                           keywords: ["k1", "k2"],
-                           live: "0"
-                       }
-                   }
-               }]
-           }, {
-               code: "video",
-               sizes: [[640, 480]],
-               mediaTypes: {
-                   video: {
-                       context: "instream" // or "outstream"
-                   }
-               },
-               bids: [{
-                   bidder: "yieldlab",
-                   params: {
-                       adslotId: "5220339",
-                       supplyId: "1381604"
-                   }
-               }]
-           }
-       ];
+
+# Multi-Format Setup
+
+A general overview of how to set up multi-format ads can be found in the offical Prebid.js docs. See: [show multi-format ads](https://docs.prebid.org/dev-docs/show-multi-format-ads.html)
+
+When setting up multi-format ads with Yieldlab make sure to always add at least one eligible Adslot per given media type in the ad unit configuration.
+
+```javascript
+const adUnit = {
+    code: 'multi-format-adslot',
+    mediaTypes: {
+        banner: {
+            sizes: [ [ 728, 90 ] ]
+        },
+        native: {
+            // native config
+        }
+    },
+    bids: [
+        // banner Adslot
+        { bidder: 'yieldlab', params: { adslotId: '1234', supplyId: '42' } },
+        // native Adslot
+        { bidder: 'yieldlab', params: { adslotId: '2345', supplyId: '42' } }
+    ]
+};
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "6.0.0",
+  "version": "6.1.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {
@@ -11,6 +11,11 @@
     "type": "git",
     "url": "https://github.com/prebid/Prebid.js.git"
   },
+  "browserslist": [
+    "> 0.25%",
+    "not IE 11",
+    "not op_mini all"
+  ],
   "keywords": [
     "advertising",
     "auction",

package/src/adapterManager.js

@@ -262,14 +262,16 @@ adapterManager.makeBidRequests = hook('sync', function (adUnits, auctionStart, a
       }
 
       let adUnitsS2SCopy = getAdUnitCopyForPrebidServer(adUnits, s2sConfig);
-      let tid = generateUUID();
+
+      // uniquePbsTid is so we know which server to send which bids to during the callBids function
+      let uniquePbsTid = generateUUID();
       adaptersServerSide.forEach(bidderCode => {
         const bidderRequestId = getUniqueIdentifierStr();
         const bidderRequest = {
           bidderCode,
           auctionId,
           bidderRequestId,
-          tid,
+          uniquePbsTid,
           bids: hookedGetBids({bidderCode, auctionId, bidderRequestId, 'adUnits': deepClone(adUnitsS2SCopy), labels, src: CONSTANTS.S2S.SRC}),
           auctionStart: auctionStart,
           timeout: s2sConfig.timeout,
@@ -350,7 +352,7 @@ adapterManager.callBids = (adUnits, bidRequests, addBidResponse, doneCb, request
   serverBidRequests.forEach(serverBidRequest => {
     var index = -1;
     for (var i = 0; i < uniqueServerBidRequests.length; ++i) {
-      if (serverBidRequest.tid === uniqueServerBidRequests[i].tid) {
+      if (serverBidRequest.uniquePbsTid === uniqueServerBidRequests[i].uniquePbsTid) {
         index = i;
         break;
       }
@@ -360,7 +362,10 @@ adapterManager.callBids = (adUnits, bidRequests, addBidResponse, doneCb, request
     }
   });
 
-  let counter = 0
+  let counter = 0;
+
+  // $.source.tid MUST be a unique UUID and also THE SAME between all PBS Requests for a given Auction
+  const sourceTid = generateUUID();
   _s2sConfigs.forEach((s2sConfig) => {
     if (s2sConfig && uniqueServerBidRequests[counter] && includes(s2sConfig.bidders, uniqueServerBidRequests[counter].bidderCode)) {
       // s2s should get the same client side timeout as other client side requests.
@@ -370,13 +375,13 @@ adapterManager.callBids = (adUnits, bidRequests, addBidResponse, doneCb, request
       } : undefined);
       let adaptersServerSide = s2sConfig.bidders;
       const s2sAdapter = _bidderRegistry[s2sConfig.adapter];
-      let tid = uniqueServerBidRequests[counter].tid;
+      let uniquePbsTid = uniqueServerBidRequests[counter].uniquePbsTid;
       let adUnitsS2SCopy = uniqueServerBidRequests[counter].adUnitsS2SCopy;
 
-      let uniqueServerRequests = serverBidRequests.filter(serverBidRequest => serverBidRequest.tid === tid)
+      let uniqueServerRequests = serverBidRequests.filter(serverBidRequest => serverBidRequest.uniquePbsTid === uniquePbsTid);
 
       if (s2sAdapter) {
-        let s2sBidRequest = {tid, 'ad_units': adUnitsS2SCopy, s2sConfig};
+        let s2sBidRequest = {tid: sourceTid, 'ad_units': adUnitsS2SCopy, s2sConfig};
         if (s2sBidRequest.ad_units.length) {
           let doneCbs = uniqueServerRequests.map(bidRequest => {
             bidRequest.start = timestamp();
@@ -391,7 +396,8 @@ adapterManager.callBids = (adUnits, bidRequests, addBidResponse, doneCb, request
 
           // fire BID_REQUESTED event for each s2s bidRequest
           uniqueServerRequests.forEach(bidRequest => {
-            events.emit(CONSTANTS.EVENTS.BID_REQUESTED, bidRequest);
+            // add the new sourceTid
+            events.emit(CONSTANTS.EVENTS.BID_REQUESTED, {...bidRequest, tid: sourceTid});
           });
 
           // make bid requests

package/test/spec/modules/adheseBidAdapter_spec.js

@@ -1,5 +1,6 @@
 import {expect} from 'chai';
 import {spec} from 'modules/adheseBidAdapter.js';
+import {config} from 'src/config.js';
 
 const BID_ID = 456;
 const TTL = 360;
@@ -131,12 +132,21 @@ describe('AdheseAdapter', function () {
       expect(JSON.parse(req.data)).to.not.have.key('eids');
     });
 
-    it('should request vast content as url', function () {
+    it('should request vast content as url by default', function () {
       let req = spec.buildRequests([ minimalBid() ], bidderRequest);
 
       expect(JSON.parse(req.data).vastContentAsUrl).to.equal(true);
     });
 
+    it('should request vast content as markup when configured', function () {
+      sinon.stub(config, 'getConfig').withArgs('adhese').returns({ vastContentAsUrl: false });
+
+      let req = spec.buildRequests([ minimalBid() ], bidderRequest);
+
+      expect(JSON.parse(req.data).vastContentAsUrl).to.equal(false);
+      config.getConfig.restore();
+    });
+
     it('should include bids', function () {
       let bid = minimalBid();
       let req = spec.buildRequests([ bid ], bidderRequest);
@@ -155,6 +165,22 @@ describe('AdheseAdapter', function () {
 
       expect(req.url).to.equal('https://ads-demo.adhese.com/json');
     });
+
+    it('should include params specified in the config', function () {
+      sinon.stub(config, 'getConfig').withArgs('adhese').returns({ globalTargets: { 'tl': [ 'all' ] } });
+      let req = spec.buildRequests([ minimalBid() ], bidderRequest);
+
+      expect(JSON.parse(req.data).parameters).to.deep.include({ 'tl': [ 'all' ] });
+      config.getConfig.restore();
+    });
+
+    it('should give priority to bid params over config params', function () {
+      sinon.stub(config, 'getConfig').withArgs('adhese').returns({ globalTargets: { 'xt': ['CONFIG_CONSENT_STRING'] } });
+      let req = spec.buildRequests([ minimalBid() ], bidderRequest);
+
+      expect(JSON.parse(req.data).parameters).to.deep.include({ 'xt': [ 'CONSENT_STRING' ] });
+      config.getConfig.restore();
+    });
   });
 
   describe('interpretResponse', () => {

package/test/spec/modules/adomikAnalyticsAdapter_spec.js

@@ -1,5 +1,6 @@
 import adomikAnalytics from 'modules/adomikAnalyticsAdapter.js';
 import {expect} from 'chai';
+
 let events = require('src/events');
 let adapterManager = require('src/adapterManager').default;
 let constants = require('src/constants.json');
@@ -8,6 +9,7 @@ describe('Adomik Prebid Analytic', function () {
   let sendEventStub;
   let sendWonEventStub;
   let clock;
+
   before(function () {
     clock = sinon.useFakeTimers();
   });
@@ -91,7 +93,7 @@ describe('Adomik Prebid Analytic', function () {
         type: 'request',
         event: {
           bidder: 'BIDDERTEST',
-          placementCode: 'placementtest',
+          placementCode: '0000',
         }
       });