From b9a4d568df41472be5997f0d712c9a36014bddc7 Mon Sep 17 00:00:00 2001
From: Demetrio Girardi <dgirardi@prebid.org>
Date: Wed, 18 May 2022 12:50:19 -0700
Subject: [PATCH] convert bidders: adxcg

---
 modules/adWMGBidAdapter.js                |  5 +++--
 modules/advangelistsBidAdapter.js         | 16 +++++-----------
 modules/adxcgBidAdapter.js                |  4 ++--
 test/spec/modules/adxcgBidAdapter_spec.js |  8 ++++----
 4 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/modules/adWMGBidAdapter.js b/modules/adWMGBidAdapter.js
index 7bf6c703a55..12dc36d694c 100644
--- a/modules/adWMGBidAdapter.js
+++ b/modules/adWMGBidAdapter.js
@@ -27,9 +27,10 @@ export const spec = {
   buildRequests: (validBidRequests, bidderRequest) => {
     const timeout = bidderRequest.timeout || 0;
     const debug = config.getConfig('debug') || false;
-    const referrer = bidderRequest.refererInfo.referer;
+    // TODO: is 'page' the right value here?
+    const referrer = bidderRequest.refererInfo.page;
     const locale = window.navigator.language && window.navigator.language.length > 0 ? window.navigator.language.substr(0, 2) : '';
-    const domain = config.getConfig('publisherDomain') || (window.location && window.location.host ? window.location.host : '');
+    const domain = bidderRequest.refererInfo.domain || '';
     const ua = window.navigator.userAgent.toLowerCase();
     const additional = spec.parseUserAgent(ua);
 
diff --git a/modules/advangelistsBidAdapter.js b/modules/advangelistsBidAdapter.js
index 605e19cfc66..4963150caed 100755
--- a/modules/advangelistsBidAdapter.js
+++ b/modules/advangelistsBidAdapter.js
@@ -1,5 +1,4 @@
 import {deepAccess, generateUUID, isEmpty, isFn, parseSizesInput, parseUrl} from '../src/utils.js';
-import {config} from '../src/config.js';
 import {registerBidder} from '../src/adapters/bidderFactory.js';
 import {BANNER, VIDEO} from '../src/mediaTypes.js';
 import {find, includes} from '../src/polyfill.js';
@@ -200,12 +199,8 @@ function getBannerSizes(bid) {
   return parseSizes(deepAccess(bid, 'mediaTypes.banner.sizes') || bid.sizes);
 }
 
-function getTopWindowReferrer() {
-  try {
-    return window.top.document.referrer;
-  } catch (e) {
-    return '';
-  }
+function getTopWindowReferrer(bidderRequest) {
+  return bidderRequest?.refererInfo?.ref || '';
 }
 
 function getVideoTargetingParams(bid) {
@@ -226,7 +221,7 @@ function getVideoTargetingParams(bid) {
 
 function createVideoRequestData(bid, bidderRequest) {
   let topLocation = getTopWindowLocation(bidderRequest);
-  let topReferrer = getTopWindowReferrer();
+  let topReferrer = getTopWindowReferrer(bidderRequest);
 
   let sizes = getVideoSizes(bid);
   let firstSize = getFirstSize(sizes);
@@ -309,13 +304,12 @@ function createVideoRequestData(bid, bidderRequest) {
 }
 
 function getTopWindowLocation(bidderRequest) {
-  let url = bidderRequest && bidderRequest.refererInfo && bidderRequest.refererInfo.referer;
-  return parseUrl(config.getConfig('pageUrl') || url, { decodeSearchAsString: true });
+  return parseUrl(bidderRequest?.refererInfo?.page, {decodeSearchAsString: true});
 }
 
 function createBannerRequestData(bid, bidderRequest) {
   let topLocation = getTopWindowLocation(bidderRequest);
-  let topReferrer = getTopWindowReferrer();
+  let topReferrer = getTopWindowReferrer(bidderRequest);
 
   let sizes = getBannerSizes(bid);
   let bidfloor = (getBannerBidFloor(bid) == null || typeof getBannerBidFloor(bid) == 'undefined') ? 2 : getBannerBidFloor(bid);
diff --git a/modules/adxcgBidAdapter.js b/modules/adxcgBidAdapter.js
index a4984840e01..ca11c5f0548 100644
--- a/modules/adxcgBidAdapter.js
+++ b/modules/adxcgBidAdapter.js
@@ -82,8 +82,8 @@ export const spec = {
       }
 
       if (!site.page) {
-        site.page = bidderRequest.refererInfo.referer;
-        site.domain = parseUrl(bidderRequest.refererInfo.referer).hostname;
+        site.page = bidderRequest.refererInfo.page;
+        site.domain = bidderRequest.refererInfo.domain;
       }
     }
 
diff --git a/test/spec/modules/adxcgBidAdapter_spec.js b/test/spec/modules/adxcgBidAdapter_spec.js
index 13afd3ea8e3..32e9921f0ae 100644
--- a/test/spec/modules/adxcgBidAdapter_spec.js
+++ b/test/spec/modules/adxcgBidAdapter_spec.js
@@ -52,7 +52,7 @@ describe('Adxcg adapter', function () {
           adzoneid: '19910113'
         }
       }];
-      let request = spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}});
+      let request = spec.buildRequests(validBidRequests, {refererInfo: {page: 'page', domain: 'localhost'}});
 
       assert.equal(request.method, 'POST');
       assert.equal(request.url, 'https://pbc.adxcg.net/rtb/ortb/pbc?adExchangeId=1');
@@ -180,7 +180,7 @@ describe('Adxcg adapter', function () {
         bidId: 'bidId',
         params: {adzoneid: '1000'}
       }];
-      let request = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {referer: 'page'}}).data);
+      let request = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo: {page: 'page', domain: 'localhost'}}).data);
 
       assert.equal(request.device.ua, navigator.userAgent);
       assert.equal(request.device.w, 100);
@@ -227,13 +227,13 @@ describe('Adxcg adapter', function () {
         params: {adzoneid: '1000'},
         ortb2
       }];
-      let refererInfo = {referer: 'page'};
+      let refererInfo = {page: 'page', domain: 'localhost'};
       let request = JSON.parse(spec.buildRequests(validBidRequests, {refererInfo, ortb2}).data);
 
       assert.deepEqual(request.site, {
         domain: 'localhost',
         id: '123123',
-        page: refererInfo.referer,
+        page: refererInfo.page,
         publisher: {
           domain: 'publisher.domain.com',
           id: 4441,