update to copy site.page and site.publisher.id if not defined in conf…

…ig site object
prebid · Jun 4, 2020 · 44640e3 · 44640e3
1 parent bc46220
commit 44640e3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
@@ -269,11 +269,17 @@ function _appendSiteAppDevice(request, pageUrl) {
     request.app.publisher = {id: _s2sConfig.accountId}
   } else {
     request.site = {};
-    if (typeof config.getConfig('site') === 'object') {
+    if (utils.isPlainObject(config.getConfig('site'))) {
       request.site = config.getConfig('site');
     }
-    utils.deepSetValue(request.site, 'publisher.id', _s2sConfig.accountId);
-    request.site.page = pageUrl;
+    // set publisher.id if not already defined
+    if (!utils.deepAccess(request.site, 'publisher.id')) {
+      utils.deepSetValue(request.site, 'publisher.id', _s2sConfig.accountId);
+    }
+    // set site.page if not already defined
+    if (!request.site.page) {
+      request.site.page = pageUrl;
+    }
   }
   if (typeof config.getConfig('device') === 'object') {
     request.device = config.getConfig('device');

diff --git a/src/config.js b/src/config.js
@@ -199,14 +199,6 @@ export function newConfig() {
       set disableAjaxTimeout(val) {
         this._disableAjaxTimeout = val;
       },
-
-      _site: undefined,
-      get site() {
-        return this._site;
-      },
-      set site(val) {
-        this._site = val;
-      }
     };
 
     if (config) {

diff --git a/test/spec/modules/prebidServerBidAdapter_spec.js b/test/spec/modules/prebidServerBidAdapter_spec.js
@@ -922,7 +922,7 @@ describe('S2S Adapter', function () {
       expect(requestBid.site.content.language).to.exist.and.to.be.a('string');
       expect(requestBid.site).to.deep.equal({
         publisher: {
-          id: '1',
+          id: '1234',
           domain: 'test.com'
         },
         content: {