merged schain support

prebid · Aug 24, 2020 · cdbe4c2 · cdbe4c2
1 parent a4e852f
commit cdbe4c2
Show file tree

Hide file tree

Showing 27 changed files with 19 additions and 35 deletions.
diff --git a/integrationExamples/gpt/hello_world.html b/integrationExamples/gpt/hello_world.html
diff --git a/modules/advangelistsBidAdapter.js b/modules/advangelistsBidAdapter.js
diff --git a/modules/advangelistsBidAdapter.md b/modules/advangelistsBidAdapter.md
diff --git a/modules/advertlyBidAdapter.js b/modules/advertlyBidAdapter.js
diff --git a/modules/advertlyBidAdapter.md b/modules/advertlyBidAdapter.md
diff --git a/modules/cpmstarBidAdapter.js b/modules/cpmstarBidAdapter.js
@@ -53,17 +53,12 @@ export const spec = {
  var mediaType = spec.getMediaType(bidRequest);
  var playerSize = spec.getPlayerSize(bidRequest);
  var videoArgs = '&fv=0' + (playerSize ? ('&w=' + playerSize[0] + '&h=' + playerSize[1]) : '');
-<<<<<<< HEAD
-=======
-
->>>>>>> 565b941bb6d1a935f9fddcb8ed2483d4591b8024
  var url = ENDPOINT + '?media=' + mediaType + (mediaType == VIDEO ? videoArgs : '') +
  '&json=c_b&mv=1&poolid=' + utils.getBidIdParameter('placementId', bidRequest.params) +
  '&reachedTop=' + encodeURIComponent(bidderRequest.refererInfo.reachedTop) +
  '&requestid=' + bidRequest.bidId +
  '&referer=' + encodeURIComponent(referer);
 
-<<<<<<< HEAD
  if (bidRequest.schain && bidRequest.schain.nodes) {
  var schain = bidRequest.schain;
  var schainString = '';
@@ -81,8 +76,6 @@ export const spec = {
  url += '&schain=' + schainString
  }
 
-=======
->>>>>>> 565b941bb6d1a935f9fddcb8ed2483d4591b8024
  if (bidderRequest.gdprConsent) {
  if (bidderRequest.gdprConsent.consentString != null) {
  url += '&gdpr_consent=' + bidderRequest.gdprConsent.consentString;

diff --git a/modules/cpmstarBidAdapter.md b/modules/cpmstarBidAdapter.md
diff --git a/modules/lunamediaBidAdapter.js b/modules/lunamediaBidAdapter.js
diff --git a/modules/lunamediaBidAdapter.md b/modules/lunamediaBidAdapter.md
diff --git a/modules/pubmaticAnalyticsAdapter.js b/modules/pubmaticAnalyticsAdapter.js
diff --git a/modules/richaudienceBidAdapter.js b/modules/richaudienceBidAdapter.js
diff --git a/modules/saambaaBidAdapter.js b/modules/saambaaBidAdapter.js
diff --git a/modules/saambaaBidAdapter.md b/modules/saambaaBidAdapter.md
diff --git a/modules/seedingAllianceBidAdapter.js b/modules/seedingAllianceBidAdapter.js
diff --git a/modules/seedingAllianceBidAdapter.md b/modules/seedingAllianceBidAdapter.md
diff --git a/modules/truereachBidAdapter.js b/modules/truereachBidAdapter.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/test/spec/api_spec.js b/test/spec/api_spec.js
diff --git a/test/spec/modules/advangelistsBidAdapter_spec.js b/test/spec/modules/advangelistsBidAdapter_spec.js
diff --git a/test/spec/modules/advertlyBidAdapter_spec.js b/test/spec/modules/advertlyBidAdapter_spec.js
diff --git a/test/spec/modules/cpmstarBidAdapter_spec.js b/test/spec/modules/cpmstarBidAdapter_spec.js
diff --git a/test/spec/modules/criteoBidAdapter_spec.js b/test/spec/modules/criteoBidAdapter_spec.js
diff --git a/test/spec/modules/lunamediaBidAdapter_spec.js b/test/spec/modules/lunamediaBidAdapter_spec.js
diff --git a/test/spec/modules/pubmaticAnalyticsAdapter_spec.js b/test/spec/modules/pubmaticAnalyticsAdapter_spec.js
diff --git a/test/spec/modules/saambaaBidAdapter_spec.js b/test/spec/modules/saambaaBidAdapter_spec.js
diff --git a/test/spec/modules/seedingAllianceAdapter_spec.js b/test/spec/modules/seedingAllianceAdapter_spec.js
diff --git a/test/spec/modules/visxBidAdapter_spec.js b/test/spec/modules/visxBidAdapter_spec.js