update to cover some validation and unit tests as requested by harpere

prebid · Oct 1, 2020 · 0ced255 · 0ced255
1 parent c521bbb
commit 0ced255
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/prebid.js b/src/prebid.js
@@ -356,9 +356,11 @@ $$PREBID_GLOBAL$$.renderAd = function (doc, id, options) {
         bid.adUrl = utils.replaceAuctionPrice(bid.adUrl, bid.cpm);
 
         // replacing clickthrough if submitted
-        const { clickThrough } = options;
-        bid.ad = utils.replaceClickThrough(bid.ad, clickThrough);
-        bid.adUrl = utils.replaceClickThrough(bid.adUrl, clickThrough);
+        if (options && options.clickThrough) {
+          const { clickThrough } = options;
+          bid.ad = utils.replaceClickThrough(bid.ad, clickThrough);
+          bid.adUrl = utils.replaceClickThrough(bid.adUrl, clickThrough);
+        }
 
         // save winning bids
         auctionManager.addWinningBid(bid);

diff --git a/src/utils.js b/src/utils.js
@@ -719,8 +719,8 @@ export function replaceAuctionPrice(str, cpm) {
 }
 
 export function replaceClickThrough(str, clicktag) {
-  if (!str) return;
-  return str.replace(/\$\{CLICKTHROUGH\}/g, clicktag);
+  if (!str || !clicktag || typeof clicktag  !== 'string') return;
+  return str.replace(/\${CLICKTHROUGH}/g, clicktag);
 }
 
 export function timestamp() {