From ff3276e3ff31846efc4be6ce98c1c84b7cafeafa Mon Sep 17 00:00:00 2001
From: OneTagDevOps <38786435+OneTagDevOps@users.noreply.github.com>
Date: Mon, 14 Dec 2020 16:36:39 +0100
Subject: [PATCH] oneTag Bid Adapter: bidRequest object adjustments (#6105)

* Propagates server data directly without members picking, extracts userIds from the the validBidRequest object

* Picks netRevenue value from received bid, defaulting to false

Co-authored-by: francesco <f.orazini@onetag.com>
---
 modules/onetagBidAdapter.js | 87 ++++++++++++++++---------------------
 1 file changed, 37 insertions(+), 50 deletions(-)

diff --git a/modules/onetagBidAdapter.js b/modules/onetagBidAdapter.js
index 1a2df023b817..16b8096646f2 100644
--- a/modules/onetagBidAdapter.js
+++ b/modules/onetagBidAdapter.js
@@ -6,6 +6,7 @@ import { Renderer } from '../src/Renderer.js';
 import find from 'core-js-pure/features/array/find.js';
 import { getStorageManager } from '../src/storageManager.js';
 import { registerBidder } from '../src/adapters/bidderFactory.js';
+import { createEidsArray } from './userId/eids.js';
 
 const ENDPOINT = 'https://onetag-sys.com/prebid-request';
 const USER_SYNC_ENDPOINT = 'https://onetag-sys.com/usync/';
@@ -63,8 +64,8 @@ function buildRequests(validBidRequests, bidderRequest) {
   if (bidderRequest && bidderRequest.uspConsent) {
     payload.usPrivacy = bidderRequest.uspConsent;
   }
-  if (bidderRequest && bidderRequest.userId) {
-    payload.userId = bidderRequest.userId;
+  if (validBidRequests && validBidRequests.length !== 0 && validBidRequests[0].userId) {
+    payload.userId = createEidsArray(validBidRequests[0].userId);
   }
   try {
     if (storage.hasLocalStorage()) {
@@ -88,47 +89,34 @@ function interpretResponse(serverResponse, bidderRequest) {
   if (!body.bids || !Array.isArray(body.bids) || body.bids.length === 0) {
     return bids;
   }
-  body.bids.forEach(({
-    requestId,
-    cpm,
-    width,
-    height,
-    creativeId,
-    dealId,
-    currency,
-    mediaType,
-    ttl,
-    rendererUrl,
-    ad,
-    vastUrl,
-    videoCacheKey
-  }) => {
+  body.bids.forEach(bid => {
     const responseBid = {
-      requestId,
-      cpm,
-      width,
-      height,
-      creativeId,
-      dealId: dealId == null ? dealId : '',
-      currency,
-      netRevenue: false,
+      requestId: bid.requestId,
+      cpm: bid.cpm,
+      width: bid.width,
+      height: bid.height,
+      creativeId: bid.creativeId,
+      dealId: bid.dealId == null ? bid.dealId : '',
+      currency: bid.currency,
+      netRevenue: bid.netRevenue || false,
+      mediaType: bid.mediaType,
       meta: {
-        mediaType
+        mediaType: bid.mediaType
       },
-      ttl: ttl || 300
+      ttl: bid.ttl || 300
     };
-    if (mediaType === BANNER) {
-      responseBid.ad = ad;
-    } else if (mediaType === VIDEO) {
-      const {context, adUnitCode} = find(requestData.bids, (item) => item.bidId === requestId);
+    if (bid.mediaType === BANNER) {
+      responseBid.ad = bid.ad;
+    } else if (bid.mediaType === VIDEO) {
+      const {context, adUnitCode} = find(requestData.bids, (item) => item.bidId === bid.requestId);
       if (context === INSTREAM) {
-        responseBid.vastUrl = vastUrl;
-        responseBid.videoCacheKey = videoCacheKey;
+        responseBid.vastUrl = bid.vastUrl;
+        responseBid.videoCacheKey = bid.videoCacheKey;
       } else if (context === OUTSTREAM) {
-        responseBid.vastXml = ad;
-        responseBid.vastUrl = vastUrl;
-        if (rendererUrl) {
-          responseBid.renderer = createRenderer({requestId, rendererUrl, adUnitCode});
+        responseBid.vastXml = bid.ad;
+        responseBid.vastUrl = bid.vastUrl;
+        if (bid.rendererUrl) {
+          responseBid.renderer = createRenderer({ ...bid, adUnitCode });
         }
       }
     }
@@ -146,25 +134,24 @@ function createRenderer(bid, rendererOptions = {}) {
     loaded: false
   });
   try {
-    renderer.setRender(onetagRenderer);
+    renderer.setRender(({renderer, width, height, vastXml, adUnitCode}) => {
+      renderer.push(() => {
+        window.onetag.Player.init({
+          ...bid,
+          width,
+          height,
+          vastXml,
+          nodeId: adUnitCode,
+          config: renderer.getConfig()
+        });
+      });
+    });
   } catch (e) {
 
   }
   return renderer;
 }
 
-function onetagRenderer({renderer, width, height, vastXml, adUnitCode}) {
-  renderer.push(() => {
-    window.onetag.Player.init({
-      width,
-      height,
-      vastXml,
-      nodeId: adUnitCode,
-      config: renderer.getConfig()
-    });
-  });
-}
-
 function getFrameNesting() {
   let topmostFrame = window;
   let parent = window.parent;