Dummy PR to review approver acces

init-build.sh

@@ -107,4 +107,4 @@ elif [ "$platform" = "$PLATFORM_AMP" ]
       ./build.sh --task=$task --mode=$mode
 else
   echo "None"
-fi
+fi

src_new/adapters/prebid.js

@@ -10,8 +10,10 @@ var BID = require("../bid.js");
 var util = require("../util.js");
 var bidManager = require("../bidManager.js");
 var CONF = require("../conf.js");
+
 var COMMON_CONFIG = require("../common.config.js");
 
+
 var parentAdapterID = CONSTANTS.COMMON.PARENT_ADAPTER_PREBID;
 
 var pbNameSpace = /*CONFIG.isIdentityOnly() ? CONSTANTS.COMMON.IH_NAMESPACE : */ CONSTANTS.COMMON.PREBID_NAMESPACE;
@@ -857,6 +859,14 @@ function assignCcpaConfigIfRequired(prebidConfig){
 
 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()){
 		// get AdServer currency from Config
@@ -1017,7 +1027,7 @@ function setPrebidConfig(){
 				url: CONSTANTS.CONFIG.CACHE_URL + CONSTANTS.CONFIG.CACHE_PATH,
 				ignoreBidderCacheKey: true
 			},
-			bidderSequence: "random",					
+			bidderSequence: CONF.pwt.bidderOrderingEnabled === "1" ? "fixed" : "random",					
 			disableAjaxTimeout: CONFIG.getDisableAjaxTimeout(),
 			enableSendAllBids: CONFIG.getSendAllBidsStatus(),
 			targetingControls: {
@@ -1042,6 +1052,7 @@ function setPrebidConfig(){
 		refThis.assignUserSyncConfig(prebidConfig);
 		refThis.assignGdprConfigIfRequired(prebidConfig);
 		refThis.assignCcpaConfigIfRequired(prebidConfig);
+		refThis.assignGppConfigIfRequired(prebidConfig);
 		refThis.assignCurrencyConfigIfRequired(prebidConfig);
 		refThis.assignSchainConfigIfRequired(prebidConfig);
 		refThis.assignSingleRequestConfigForBidders(prebidConfig);
@@ -1065,15 +1076,6 @@ function setPrebidConfig(){
 
 exports.setPrebidConfig = setPrebidConfig;
 
-function realignPubmaticAdapters(){
-	if(CONF.adapters && CONF.adapters["pubmatic"]){
-		var pubmaticAdpater = {"pubmatic": CONF.adapters["pubmatic"]};
-		CONF.adapters = Object.assign(pubmaticAdpater, CONF.adapters);
-	}
-}
-
-exports.realignPubmaticAdapters = realignPubmaticAdapters;
-
 function gets2sConfig(prebidConfig){
 	var bidderParams = {};
 	var s2sBidders = CONFIG.getServerEnabledAdaptars();
@@ -1320,6 +1322,11 @@ function getPbjsAdServerTargetingConfig(){
 			val: function(bidResponse){
 				return bidResponse.creativeId  ? bidResponse.creativeId : '';
 			}
+		}, {
+			key: 'pwtpb',
+			val: function(bidResponse){
+				return bidResponse[CONSTANTS.PRICE_GRANULARITY_KEYS[owpbjs.readConfig('priceGranularity')]] || null;
+			}
 		}
     ];
 }
@@ -1409,7 +1416,6 @@ function initPbjsConfig(){
 		return;
 	}
 	window[pbNameSpace].logging = util.isDebugLogEnabled();
-	refThis.realignPubmaticAdapters();
 	refThis.setPrebidConfig();
 	refThis.configureBidderAliasesIfAvailable();
 	refThis.enablePrebidPubMaticAnalyticIfRequired();

src_new/common.config.js

@@ -1,7 +1,21 @@
+// NOTE: This file will contains only common code/function used in OW and IDHUB.
+
 var config = require("./conf.js");
 var CONSTANTS = require("./constants.js");
 
 exports.getGdprActionTimeout = function() {
 	var gdprActionTimeout = config[CONSTANTS.CONFIG.COMMON][CONSTANTS.CONFIG.GDPR_ACTION_TIMEOUT];
 	return gdprActionTimeout ? window.parseInt(gdprActionTimeout) : 0;
+};
+
+exports.setConsentConfig = function (prebidConfig, key, cmpApi, timeout) {
+  prebidConfig = prebidConfig || {};
+  if (!prebidConfig["consentManagement"]) {
+    prebidConfig["consentManagement"] = {};
+  }
+  prebidConfig["consentManagement"][key] = {
+    cmpApi: cmpApi,
+    timeout: timeout
+  };
+  return prebidConfig;
 };

src_new/conf.js

@@ -25,9 +25,13 @@ exports.pwt = {
 	abTestEnabled:"0",
 	pubAnalyticsAdapter: "0",
 	reduceCodeSize:1,
+	gpp: "0",
+	gppCmpApi: "iab",
+	gppTimeout: "10000",
 	pbGlobalVarNamespace: "owpbjs",
 	owGlobalVarNamespace: "PWT",
-	localStorageAccess: "1" // Added new field for allow local storage feature 
+	localStorageAccess: "1", // Added new field for allow local storage feature 
+	bidderOrderingEnabled: "0"
 };
 
 // singleImpression is used to enable feature of sending single impression for multiple size ad slot earlier there were multiple impression for multiple sizes

src_new/config.idhub.js

@@ -64,6 +64,23 @@ exports.getCCPATimeout = function() {
 	return ccpaTimeout ? window.parseInt(ccpaTimeout) : CONSTANTS.CONFIG.DEFAULT_CCPA_TIMEOUT;
 };
 
+// needed
+exports.getGppConsent = function () {
+	var gpp = config[CONSTANTS.CONFIG.COMMON][CONSTANTS.CONFIG.GPP_CONSENT] || CONSTANTS.CONFIG.DEFAULT_GPP_CONSENT;
+	return gpp === "1";
+};
+
+// needed
+exports.getGppCmpApi = function () {
+	return config[CONSTANTS.CONFIG.COMMON][CONSTANTS.CONFIG.GPP_CMPAPI] || CONSTANTS.CONFIG.DEFAULT_GPP_CMPAPI;
+};
+
+// needed
+exports.getGppTimeout = function() {
+	var gppTimeout = config[CONSTANTS.CONFIG.COMMON][CONSTANTS.CONFIG.GPP_TIMEOUT];
+	return gppTimeout ? window.parseInt(gppTimeout) : CONSTANTS.CONFIG.DEFAULT_GPP_TIMEOUT;
+};
+
 exports.getProfileID = function () {
 	return config.pwt[CONSTANTS.CONFIG.PROFILE_ID] || "0";
 };

src_new/config.js

@@ -293,7 +293,32 @@ exports.isReduceCodeSizeFeatureEnabled = function(){
 // endRemoveIf(removeAlways)
 
 exports.getPriceGranularity = function(){
-	return config[CONSTANTS.CONFIG.COMMON][CONSTANTS.COMMON.PRICE_GRANULARITY] || null;
+	var priceGranularity = config[CONSTANTS.CONFIG.COMMON][CONSTANTS.COMMON.PRICE_GRANULARITY] || null;
+
+	if (priceGranularity === CONSTANTS.COMMON.PRICE_GRANULARITY_CUSTOM) {
+		var bucketsValue = refThis.getPriceGranularityBuckets();
+		if(bucketsValue !== null) {
+            return bucketsValue;
+        } else {
+            util.logWarning(CONSTANTS.MESSAGES.M36);
+            return null;
+        }
+	} 
+	else {
+		return priceGranularity;
+	}
+};
+
+exports.getPriceGranularityBuckets = function () {
+	var pgBuckets = config[CONSTANTS.CONFIG.COMMON][CONSTANTS.COMMON.PRICE_GRANULARITY_BUCKETS] || null;
+	if(pgBuckets === null)
+	return null;
+
+	// API would be providing us with ranges as keyword, we need to raplace it by buckets before processing
+	var transformedBuckets = {};
+	delete Object.assign(transformedBuckets, pgBuckets, {['buckets']: pgBuckets['ranges'] })['ranges'];
+
+	return transformedBuckets;
 };
 
 exports.getGranularityMultiplier = function(){
@@ -459,6 +484,22 @@ exports.getMarketplaceBidders = function(){
 	return config.pwt.marketplaceBidders ? config.pwt.marketplaceBidders.split(',') : false;
 }
 
+
+exports.getGppConsent = function () {
+	var gpp = config[CONSTANTS.CONFIG.COMMON][CONSTANTS.CONFIG.GPP_CONSENT] || CONSTANTS.CONFIG.DEFAULT_GPP_CONSENT;
+	return gpp === "1";
+};
+
+exports.getGppCmpApi = function () {
+	return config[CONSTANTS.CONFIG.COMMON][CONSTANTS.CONFIG.GPP_CMPAPI] || CONSTANTS.CONFIG.DEFAULT_GPP_CMPAPI;
+};
+
+exports.getGppTimeout = function () {
+	var gppTimeout = config[CONSTANTS.CONFIG.COMMON][CONSTANTS.CONFIG.GPP_TIMEOUT];
+	return gppTimeout ? window.parseInt(gppTimeout) : CONSTANTS.CONFIG.DEFAULT_GPP_TIMEOUT;
+}
+
 exports.shouldClearTargeting = function () {
 	return window.PWT.shouldClearTargeting !== undefined ? Boolean(window.PWT.shouldClearTargeting) : true;
+
 };

src_new/constants.js

@@ -46,6 +46,8 @@ exports.COMMON = {
 	"TEST_GROUP_DETAILS": "testConfigDetails",
 	"TEST_PWT": "test_pwt",
 	"PRICE_GRANULARITY" : "priceGranularity",
+	"PRICE_GRANULARITY_CUSTOM" : "custom",
+	"PRICE_GRANULARITY_BUCKETS" : "customPriceGranularityConfig",
 	"GRANULARITY_MULTIPLIER" : "granularityMultiplier",
 	"TEST_PARTNER": "test_adapters",
 	"REDUCE_CODE_SIZE": "reduceCodeSize",
@@ -112,6 +114,12 @@ exports.CONFIG = {
 	"TIMEOUT_ADJUSTMENT": 50,
 	"SSO_ENABLED": "ssoEnabled",
 	"FLOOR_SOURCE": "floorSource",
+	"GPP_CONSENT": "gpp",
+	"GPP_CMPAPI": "gppCmpApi",
+	"GPP_TIMEOUT": "gppTimeout",
+	"DEFAULT_GPP_CONSENT": "0",
+	"DEFAULT_GPP_CMPAPI": "iab",
+	"DEFAULT_GPP_TIMEOUT": 10000,
 	"GDPR_ACTION_TIMEOUT": "gdprActionTimeout",
 	"PB_GLOBAL_VAR_NAMESPACE": "pbGlobalVarNamespace",
 	"OW_GLOBAL_VAR_NAMESPACE": "owGlobalVarNamespace"
@@ -161,7 +169,8 @@ exports.WRAPPER_TARGETING_KEYS = {
 	"CACHE_PATH": "pwtcpath",
 	"ACAT": "pwtacat",
 	"CRID": "pwtcrid",
-	"DSP": "pwtdsp"
+	"DSP": "pwtdsp",
+	"PRICE_BUCKET": "pwtpb"
 };
 
 exports.IGNORE_PREBID_KEYS = {
@@ -220,6 +229,7 @@ exports.MESSAGES = {
 	"M33": "AdUnitsArray response should be an array.",
 	"M34": "Invalid HTML Element selected for ad rendering.",
 	"M35": "Winning bid not found for Div Id :",
+	"M36": "Price Buckets should be set for custom price granularity",
 	IDENTITY: {
 		M1: "Unable to get User Id from OpenIdentity",
 		M2: "Setting UserIds to EB ",
@@ -358,3 +368,12 @@ exports.REGEX_BROWSERS = [/\b(?:crmo|crios)\/([\w\.]+)/i,/edg(?:e|ios|a)?\/([\w\
 /(firefox)\/([\w\.]+)/i,/(mozilla)\/([\w\.]+) .+rv\:.+gecko\/\d+/i,/(polaris|lynx|dillo|icab|doris|amaya|w3m|netsurf|sleipnir|obigo|mosaic|(?:go|ice|up)[\. ]?browser)[-\/ ]?v?([\w\.]+)/i,/(links) \(([\w\.]+)/i];
 exports.BROWSER_MAPPING = [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,42,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,
 	65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90];
+
+exports.PRICE_GRANULARITY_KEYS = {
+	auto: "pbAg",
+	dense: "pbDg",
+	low: "pbLg",
+	medium: "pbMg",
+	high:"pbHg",
+	custom: "pbCg"
+};

src_new/controllers/custom.js

@@ -189,7 +189,7 @@ function findWinningBidAndGenerateTargeting(divId) {
 	util.forEachOnObject(keyValuePairs, function(key) {
 		// if winning bid is not pubmatic then remove buyId targeting key. Ref : UOE-5277
 		/* istanbul ignore else*/ 
-		if (util.isOwnProperty(ignoreTheseKeys, key) || util.isOwnProperty({"pwtpb":1}, key) || (winningBid && winningBid.adapterID !== "pubmatic" && util.isOwnProperty({"hb_buyid_pubmatic":1,"pwtbuyid_pubmatic":1}, key))) {
+		if (util.isOwnProperty(ignoreTheseKeys, key) || (winningBid && winningBid.adapterID !== "pubmatic" && util.isOwnProperty({"hb_buyid_pubmatic":1,"pwtbuyid_pubmatic":1}, key))) {
 			delete keyValuePairs[key];
 		}
 		else {

src_new/controllers/gpt.js

@@ -320,7 +320,7 @@ function findWinningBidAndApplyTargeting(divID, parentArgs) { // TDD, i/o : done
 			delete keyValuePairs[key];
 		}
         /* istanbul ignore else*/
-        else if (!util.isOwnProperty(ignoreTheseKeys, key) && !util.isOwnProperty({"pwtpb":1}, key)) {
+        else if (!util.isOwnProperty(ignoreTheseKeys, key)) {
             googleDefinedSlot.setTargeting(key, value);
             // adding key in wrapperTargetingKeys as every key added by OpenWrap should be removed before calling refresh on slot
             refThis.defineWrapperTargetingKey(key);

src_new/controllers/idhub.js

@@ -5,7 +5,9 @@
 var CONFIG = require("../config.idhub.js");
 var CONSTANTS = require("../constants.js");
 var util = require("../util.idhub.js");
+
 var COMMON_CONFIG = require("../common.config.js");
+
 var refThis = this;
 var pbNameSpace = CONFIG.isIdentityOnly() ? CONSTANTS.COMMON.IH_NAMESPACE : CONSTANTS.COMMON.PREBID_NAMESPACE;
 
@@ -64,6 +66,12 @@ refThis.setConfig = function(){
 					timeout: CONFIG.getCCPATimeout(),
 				};
 			}
+
+			// Set Gpp consent config
+			if (CONFIG.getGppConsent()) {
+				prebidConfig = COMMON_CONFIG.setConsentConfig(prebidConfig, "gpp", CONFIG.getGppCmpApi(), CONFIG.getGppTimeout());
+			}
+
 			window.IHPWT.ssoEnabled = CONFIG.isSSOEnabled() || false;
 			if(CONFIG.isUserIdModuleEnabled()){
 				prebidConfig["userSync"]["userIds"] = util.getUserIdConfiguration();

test/adapters/prebid.spec.js

@@ -1292,6 +1292,10 @@ describe('ADAPTER: Prebid', function() {
             sinon.spy(CONFIG, 'getCCPATimeout');
             sinon.stub(CONFIG, 'getCCPA').returns(true);
 
+            sinon.spy(CONFIG, 'getGppTimeout');
+            sinon.spy(CONFIG, 'getGppCmpApi');
+            sinon.stub(CONFIG, 'getGppConsent').returns(true);
+
             sinon.stub(BM, 'resetBid', function(){});
             sinon.stub(BM, 'setSizes', function(){});
 
@@ -1362,6 +1366,10 @@ describe('ADAPTER: Prebid', function() {
             CONFIG.getCCPA.restore();
             CONFIG.getCCPATimeout.restore();
 
+            CONFIG.getGppConsent.restore();
+            CONFIG.getGppCmpApi.restore();
+            CONFIG.getGppTimeout.restore();
+
             BM.resetBid.restore();
             BM.setSizes.restore();
 
@@ -1433,6 +1441,9 @@ describe('ADAPTER: Prebid', function() {
             CONFIG.getCCPA().should.be.true;
             CONFIG.getCCPACmpApi().should.be.called;
             CONFIG.getCCPATimeout().should.be.called;
+            CONFIG.getGppConsent().should.be.true;
+            CONFIG.getGppCmpApi().should.be.called;
+            CONFIG.getGppTimeout().should.be.called;
             done();
         });
 
@@ -2116,20 +2127,6 @@ describe('ADAPTER: Prebid', function() {
 			expect(response).to.deep.equal(outputObj);
             done();
         });
-	})
-
-	describe('realignPubmaticAdapters', function() {
-		it('should be a functiion',function(done){
-            PREBID.realignPubmaticAdapters.should.be.a('function');
-            done();
-        });
-		it('should realignPubmaticAdapters', function(done) {
-			PREBID.realignPubmaticAdapters();
-			expect(CONF.adapters['pubmatic']).should.have.object;
-			expect(CONF.adapters['pubmatic']).to.be.an('object');
-			expect(CONF.adapters['pubmatic']).to.have.property('throttle');
-			done();
-		});
 	});
 
 	describe('getPbjsAdServerTargetingConfig', function() {
@@ -2250,4 +2247,40 @@ describe('ADAPTER: Prebid', function() {
 			done();
 		});
 	})
+
+	describe('dynamicBidderOrdering', function() {
+		let originalOwPbJs;
+		let mockSetConfig;
+		beforeEach(() => {
+			// Save the original owpbjs and setConfig function
+			originalOwPbJs = window['owpbjs'];
+			mockSetConfig = sinon.spy();
+			window['owpbjs'] = {
+			  setConfig: mockSetConfig,
+			};
+		})		  
+
+		afterEach(() => {
+			// Restore the original owpbjs
+			window['owpbjs'] = originalOwPbJs;
+			CONF.pwt.bidderOrderingEnabled = '0';
+		});
+
+		it('should set bidderSequence to random when dynamic bidder ordering is disabled', function(done) {
+			PREBID.setPrebidConfig();
+			expect(mockSetConfig.calledOnce).to.be.true;
+			const configArg = mockSetConfig.getCall(0).args[0];
+			expect(configArg).to.have.property('bidderSequence', 'random');
+			done();
+		});
+
+		it('should set bidderSequence to fixed when dynamic bidder ordering is enabled', function(done) {
+			CONF.pwt.bidderOrderingEnabled = '1';
+			PREBID.setPrebidConfig();
+			expect(mockSetConfig.calledOnce).to.be.true;
+			const configArg = mockSetConfig.getCall(0).args[0];
+			expect(configArg).to.have.property('bidderSequence', 'fixed');
+			done();
+		});
+	})
 });