Merge pull request #569 from PubMatic/UOE-11010

gulpfile.js

@@ -276,7 +276,8 @@ gulp.task('bundle-pwt-keys', function() {
                         "UUID": "pwtuuid",
                         "CACHE_ID": "pwtcid",
                         "CACHE_HOST": "pwtcurl",
-                        "ADOMAIN" : "pwtadomain"
+                        "ADOMAIN" : "pwtadomain",
+                        "VERSION": 'pwtver'
                     }
                     }
                 ]
@@ -303,7 +304,8 @@ gulp.task('bundle-pwt-keys', function() {
                     "ADOMAIN": "hb_adomain",
                     "ACAT": "hb_acat",
                     "CRID": "hb_crid",
-                    "DSP": "hb_dsp"
+                    "DSP": "hb_dsp",
+                    "VERSION": 'hb_ver'
                     }
                 }
             ]

init-build.sh

@@ -52,14 +52,14 @@ then
       exit 1
 fi
 
-OpenWrapNodeModules="${GLOBAL_OPENWRAP_PKG_JSON_DIR_V9_21_0}/node_modules/"
+OpenWrapNodeModules="${GLOBAL_OPENWRAP_PKG_JSON_DIR_V10_15_0}/node_modules/"
 
 function prebidNpmInstall() {
   echo "This is SymLinking Start"
   cd $1
 
 
-PrebidJSNodeModules="${GLOBAL_PREBID_PKG_JSON_DIR_V9_21_0}/node_modules/"
+PrebidJSNodeModules="${GLOBAL_PREBID_PKG_JSON_DIR_V10_15_0}/node_modules/"
 
   symLinkForPrebidNodeModules=node_modules
   if [ -L $symLinkForPrebidNodeModules ]; then

src_new/adapters/prebid.js

@@ -10,6 +10,8 @@ var BID = require("../bid.js");
 var util = require("../util.js");
 var bidManager = require("../bidManager.js");
 var CONF = require("../conf.js");
+var consentConfigResolver = require("../modules/consentConfigResolver.js");
+var commonUtil = require("../common.util.js");
 
 var COMMON_CONFIG = require("../common.config.js");
 
@@ -832,48 +834,48 @@ function assignUserSyncConfig(prebidConfig){
 
 exports.assignUserSyncConfig = assignUserSyncConfig;
 
-function assignGdprConfigIfRequired(prebidConfig){
-	if (CONFIG.getGdpr()) {
-		if(!prebidConfig["consentManagement"]){
-			prebidConfig["consentManagement"] = {};
-		}
-		prebidConfig["consentManagement"]['gdpr'] = {
-			cmpApi: CONFIG.getCmpApi(),
-			timeout: CONFIG.getGdprTimeout(),
-			allowAuctionWithoutConsent: CONFIG.getAwc(), // Auction without consent
-			defaultGdprScope: true
-		};
-		var gdprActionTimeout = COMMON_CONFIG.getGdprActionTimeout()
-		if (gdprActionTimeout) {
-			util.log("GDPR IS ENABLED, TIMEOUT: " + prebidConfig["consentManagement"]['gdpr']['timeout'] +", ACTION TIMEOUT: "+ gdprActionTimeout);
-			prebidConfig["consentManagement"]['gdpr']['actionTimeout'] = gdprActionTimeout;
-		}
-	}
-}
-
-exports.assignGdprConfigIfRequired = assignGdprConfigIfRequired;
-
-function assignCcpaConfigIfRequired(prebidConfig){
-	if (CONFIG.getCCPA()) {
-		if(!prebidConfig["consentManagement"]){
-			prebidConfig["consentManagement"] = {};
-		}
-		prebidConfig["consentManagement"]["usp"] = {
-			cmpApi: CONFIG.getCCPACmpApi(),
-			timeout: CONFIG.getCCPATimeout(),
-		};
-	}
-}
-
-exports.assignCcpaConfigIfRequired = assignCcpaConfigIfRequired;
-
-function assignGppConfigIfRequired(prebidConfig) {
-	if (CONFIG.getGppConsent()) {
-		prebidConfig = COMMON_CONFIG.setConsentConfig(prebidConfig, "gpp", CONFIG.getGppCmpApi(), CONFIG.getGppTimeout());
-	}
-}
-
-exports.assignGppConfigIfRequired = assignGppConfigIfRequired;
+// function assignGdprConfigIfRequired(prebidConfig){
+// 	if (CONFIG.getGdpr()) {
+// 		if(!prebidConfig["consentManagement"]){
+// 			prebidConfig["consentManagement"] = {};
+// 		}
+// 		prebidConfig["consentManagement"]['gdpr'] = {
+// 			cmpApi: CONFIG.getCmpApi(),
+// 			timeout: CONFIG.getGdprTimeout(),
+// 			allowAuctionWithoutConsent: CONFIG.getAwc(), // Auction without consent
+// 			defaultGdprScope: true
+// 		};
+// 		var gdprActionTimeout = COMMON_CONFIG.getGdprActionTimeout()
+// 		if (gdprActionTimeout) {
+// 			util.log("GDPR IS ENABLED, TIMEOUT: " + prebidConfig["consentManagement"]['gdpr']['timeout'] +", ACTION TIMEOUT: "+ gdprActionTimeout);
+// 			prebidConfig["consentManagement"]['gdpr']['actionTimeout'] = gdprActionTimeout;
+// 		}
+// 	}
+// }
+
+// exports.assignGdprConfigIfRequired = assignGdprConfigIfRequired;
+
+// function assignCcpaConfigIfRequired(prebidConfig){
+// 	if (CONFIG.getCCPA()) {
+// 		if(!prebidConfig["consentManagement"]){
+// 			prebidConfig["consentManagement"] = {};
+// 		}
+// 		prebidConfig["consentManagement"]["usp"] = {
+// 			cmpApi: CONFIG.getCCPACmpApi(),
+// 			timeout: CONFIG.getCCPATimeout(),
+// 		};
+// 	}
+// }
+
+// exports.assignCcpaConfigIfRequired = assignCcpaConfigIfRequired;
+
+// function assignGppConfigIfRequired(prebidConfig) {
+// 	if (CONFIG.getGppConsent()) {
+// 		prebidConfig = COMMON_CONFIG.setConsentConfig(prebidConfig, "gpp", CONFIG.getGppCmpApi(), CONFIG.getGppTimeout());
+// 	}
+// }
+
+// exports.assignGppConfigIfRequired = assignGppConfigIfRequired;
 
 function assignCurrencyConfigIfRequired(prebidConfig){
 	if(CONFIG.getAdServerCurrency()){
@@ -890,7 +892,7 @@ function assignCurrencyConfigIfRequired(prebidConfig){
 exports.assignCurrencyConfigIfRequired = assignCurrencyConfigIfRequired;
 
 function assignSchainConfigIfRequired(prebidConfig){
-	if(CONFIG.isSchainEnabled()){
+	if(CONFIG.isSchainEnabled() && CONFIG.getSchainObject()){
 		prebidConfig["schain"] = CONFIG.getSchainObject();
 	}
 }
@@ -1027,7 +1029,7 @@ function addOnBidRequestHandler(){
 exports.addOnBidRequestHandler = addOnBidRequestHandler;
 // endRemoveIf(removeLegacyAnalyticsRelatedCode)
 
-function setPrebidConfig(){
+function setPrebidConfig() {
 	if(util.isFunction(window[pbNameSpace].setConfig) || typeof window[pbNameSpace].setConfig == "function") {
 		var prebidConfig = {
 			debug: util.isDebugLogEnabled(),
@@ -1038,6 +1040,7 @@ function setPrebidConfig(){
 			bidderSequence: CONF.pwt.bidderOrderingEnabled === "1" ? "fixed" : "random",					
 			disableAjaxTimeout: CONFIG.getDisableAjaxTimeout(),
 			enableSendAllBids: CONFIG.getSendAllBidsStatus(),
+			enableTIDs: !!CONFIG.getTransactionIdStatus(),
 			targetingControls: {
 				alwaysIncludeDeals: true
 			},
@@ -1063,12 +1066,12 @@ function setPrebidConfig(){
 
 		window.PWT.ssoEnabled = CONFIG.isSSOEnabled() || false;
 
-		refThis.getFloorsConfiguration(prebidConfig);
+		refThis.getYieldOptimizerConfiguration(prebidConfig);
 		refThis.checkConfigLevelFloor(prebidConfig);
 		refThis.assignUserSyncConfig(prebidConfig);
-		refThis.assignGdprConfigIfRequired(prebidConfig);
-		refThis.assignCcpaConfigIfRequired(prebidConfig);
-		refThis.assignGppConfigIfRequired(prebidConfig);
+		//refThis.assignGdprConfigIfRequired(prebidConfig);
+		//refThis.assignCcpaConfigIfRequired(prebidConfig);
+		//refThis.assignGppConfigIfRequired(prebidConfig);
 		refThis.assignCurrencyConfigIfRequired(prebidConfig);
 		refThis.assignSchainConfigIfRequired(prebidConfig);
 		refThis.assignSingleRequestConfigForBidders(prebidConfig);
@@ -1083,8 +1086,18 @@ function setPrebidConfig(){
 		util.handleHook(CONSTANTS.HOOKS.PREBID_SET_CONFIG, [ prebidConfig ]);
 		//todo: stop supporting this hook let pubs use pbjs.requestBids hook
 		// do not set any config below this line as we are executing the hook above
-
-		window[pbNameSpace].setConfig(prebidConfig);
+		// Some OW+ IH or IH pubs use this hook to add/remove identityPartner.
+
+		consentConfigResolver.getConsentManagementConfig(function (cmConfig) {
+			if(cmConfig && !util.isEmptyObject(cmConfig)) {
+				prebidConfig.consentManagement = cmConfig;								
+			}
+
+			// Setting complete config to prebid after consent management config is set.
+			// As UserSync config required to be set with consent due to userSync modules do required the consent 
+			window[pbNameSpace].setConfig(prebidConfig);
+		});
+
 	} else {
 		util.logWarning("PreBidJS setConfig method is not available");
 	}
@@ -1167,25 +1180,24 @@ function checkConfigLevelFloor(prebidConfig){
 }
 exports.checkConfigLevelFloor = checkConfigLevelFloor;
 
-function getFloorsConfiguration(prebidConfig){
-	if(CONFIG.isFloorPriceModuleEnabled() == true && CONFIG.getFloorSource() !== CONSTANTS.COMMON.EXTERNAL_FLOOR_WO_CONFIG){
-		prebidConfig["floors"]={
-			enforcement: {
-				enforceJS: CONFIG.getFloorType()
-			},
-			auctionDelay: CONFIG.getFloorAuctionDelay(),
-			endpoint:{
-				url: CONFIG.getFloorJsonUrl()
-			},
-			additionalSchemaFields : {
-				browser : util.getBrowserDetails,
-				platform_id : util.getPltForFloor
-			}
-		}
+function getYieldOptimizerConfiguration(prebidConfig){
+	if(CONFIG.isYieldOptimizerEnabled()) {
+		prebidConfig.realTimeData = {
+			auctionDelay: 300,
+			dataProviders: [{
+				name: "pubmatic",
+				waitForIt: true,
+				params: {
+					publisherId: CONFIG.getPublisherId(),
+					profileId: CONFIG.getProfileID(),
+					versionId: CONFIG.getProfileDisplayVersionID()
+				}
+			}]
+		};
 	}
 }
 
-exports.getFloorsConfiguration = getFloorsConfiguration;
+exports.getYieldOptimizerConfiguration = getYieldOptimizerConfiguration;
 
 function checkForYahooSSPBidder(prebidConfig){
 	var isYahooAlias = false;
@@ -1432,15 +1444,51 @@ function initPbjsConfig(){
 		return;
 	}
 	window[pbNameSpace].logging = util.isDebugLogEnabled();
+	refThis.setPbjsBidderSettingsIfRequired();
 	refThis.setPrebidConfig();
 	refThis.configureBidderAliasesIfAvailable();
 	refThis.enablePrebidPubMaticAnalyticIfRequired();
-	refThis.setPbjsBidderSettingsIfRequired();
-	// util.getGeoInfo();
+
+
+	// If consent Management is enabled then do not fetch the geo info from consentConfigResolver.js(here) module will do the same.
+	if(!COMMON_CONFIG.consentManagementEnabled()){
+		commonUtil.getGeoInfo();
+	}
 }
+
 exports.initPbjsConfig = initPbjsConfig;
 
-function fetchBids(activeSlots){
+function fetchBids(activeSlots, callback) {
+	function requestBidsPostConsentProcess() {
+		// Halt execution till we found if consentManagement Config is set or not, once this flag found we will proceed with below execution
+		if(!COMMON_CONFIG.consentManagementEnabled()){
+			proceedToRequestBids();
+			return;
+		}
+
+		function proceedToRequestBids() {
+			executeRequestBids();
+		}
+
+		consentConfigResolver.getInstance().getProcessCompleted(proceedToRequestBids);	
+	}
+
+	function executeRequestBids() {
+		window[pbNameSpace].removeAdUnit();
+		window[pbNameSpace].addAdUnits(adUnitsArray);
+		window[pbNameSpace].requestBids({
+			bidsBackHandler: function (bidResponses) {
+				if (util.isFunction(window[pbNameSpace].setPAAPIConfigForGPT) && typeof window[pbNameSpace].setPAAPIConfigForGPT == "function") {
+					window[pbNameSpace].setPAAPIConfigForGPT();
+				};
+				refThis.pbjsBidsBackHandler(bidResponses, activeSlots);
+				if (util.isFunction(callback)) {
+					callback(bidResponses);
+				}
+			},
+			timeout: CONFIG.getTimeout() - CONSTANTS.CONFIG.TIMEOUT_ADJUSTMENT
+		});
+	}
 
 	var impressionID = util.generateUUID();
 	// todo: 
@@ -1489,18 +1537,7 @@ function fetchBids(activeSlots){
 					refThis.addOnAuctionEndHandler();
 				}
 				// endRemoveIf(removeLegacyAnalyticsRelatedCode)
-
-				window[pbNameSpace].removeAdUnit();
-				window[pbNameSpace].addAdUnits(adUnitsArray);
-				window[pbNameSpace].requestBids({
-					bidsBackHandler: function(bidResponses){
-						if(util.isFunction(window[pbNameSpace].setPAAPIConfigForGPT) && typeof window[pbNameSpace].setPAAPIConfigForGPT == "function"){
-							window[pbNameSpace].setPAAPIConfigForGPT();
-						};
-						refThis.pbjsBidsBackHandler(bidResponses, activeSlots);
-					},
-					timeout: CONFIG.getTimeout() - CONSTANTS.CONFIG.TIMEOUT_ADJUSTMENT
-				});
+				requestBidsPostConsentProcess();
 			} else {
 				util.log("PreBid js requestBids function is not available");
 				return;

src_new/bidManager.js

@@ -888,20 +888,35 @@ exports.setStandardKeys = function(winningBid, keyValuePairs){
 // endRemoveIf(removeLegacyAnalyticsRelatedCode)
 
 // removeIf(removeLegacyAnalyticsRelatedCode)
-exports.getBrowser = function() {
+exports.getBrowser = (function() {
 	var regExBrowsers = CONSTANTS.REGEX_BROWSERS;
-	var browserMapping = CONSTANTS.BROWSER_MAPPING;
-
-	var userAgent = navigator.userAgent;
-	var browserName = userAgent == null ? -1 : 0;
-	if(userAgent) {
-		for(var i = 0; i < regExBrowsers.length; i++) {
-			if(userAgent.match(regExBrowsers[i])) {
-				browserName = browserMapping[i];
-				break;
+
+	function matchBrowserPatterns(str) {
+		if (!str) {
+			return 0;
+		}
+		for (var i = 0; i < regExBrowsers.length; i++) {
+			if (regExBrowsers[i].regex.test(str)) {
+				return regExBrowsers[i].id;
 			}
 		}
+		return 0;
 	}
-	return browserName;
-}
+
+	return function getBrowser() {
+		var nav = (typeof window !== 'undefined' && window.navigator) || {};
+		var brands = nav.userAgentData && nav.userAgentData.brands;
+
+		if (brands && brands.length) {
+			var brandString = brands.reduce(function(a, b) {
+				return a + (b.brand || '').toLowerCase() + ' ';
+			}, '').trim();
+			var result = matchBrowserPatterns(brandString);
+			if (result) return result;
+		}
+
+		var result = matchBrowserPatterns(nav.userAgent);
+		return result;
+	};
+}());
 // endRemoveIf(removeLegacyAnalyticsRelatedCode)