From 5419928300839d01071268aa286e7ec9c00bd358 Mon Sep 17 00:00:00 2001 From: Manasi Moghe Date: Mon, 1 Jul 2024 12:33:03 +0530 Subject: [PATCH 01/11] changes to support externalModuleUrl for ID5 --- src_new/constants.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src_new/constants.js b/src_new/constants.js index f5388ca2..38a43762 100644 --- a/src_new/constants.js +++ b/src_new/constants.js @@ -296,6 +296,10 @@ exports.ID_PARTNERS_CUSTOM_VALUES = { "id5Id": [{ "key": "params.provider", "value": "pubmatic-identity-hub" + }, + { + "key": "params.externalModuleUrl", + "value": "https://cdn.id5-sync.com/api/1.0/id5PrebidModule.js" } ], "identityLink": [{ From 89a247ced04ddec8ca7d06b619cfa6c3105a90ca Mon Sep 17 00:00:00 2001 From: pm-priyanka-deshmane Date: Wed, 24 Jul 2024 10:43:09 +0530 Subject: [PATCH 02/11] Updated symlink paths --- init-build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init-build.sh b/init-build.sh index 5261d76d..ef8553d3 100755 --- a/init-build.sh +++ b/init-build.sh @@ -52,14 +52,14 @@ then exit 1 fi -OpenWrapNodeModules="${GLOBAL_OPENWRAP_PKG_JSON_DIR_V8_50_0}/node_modules/" +OpenWrapNodeModules="${GLOBAL_OPENWRAP_PKG_JSON_DIR_V9_6_0}/node_modules/" function prebidNpmInstall() { echo "This is SymLinking Start" cd $1 -PrebidJSNodeModules="${GLOBAL_PREBID_PKG_JSON_DIR_V8_50_0}/node_modules/" +PrebidJSNodeModules="${GLOBAL_PREBID_PKG_JSON_DIR_V9_6_0}/node_modules/" symLinkForPrebidNodeModules=node_modules if [ -L $symLinkForPrebidNodeModules ]; then From b56fdd3e099f714b9e4d8311c2a971e6118801d4 Mon Sep 17 00:00:00 2001 From: Manasi Moghe Date: Tue, 18 Jun 2024 14:27:58 +0530 Subject: [PATCH 03/11] remove onSSOLogin function call --- src_new/util.idhub.js | 1 - src_new/util.js | 1 - 2 files changed, 2 deletions(-) diff --git a/src_new/util.idhub.js b/src_new/util.idhub.js index 35bf31ae..778a98c7 100644 --- a/src_new/util.idhub.js +++ b/src_new/util.idhub.js @@ -234,7 +234,6 @@ exports.addHookOnFunction = function (theObject, useProto, functionName, newFunc exports.getUserIdConfiguration = function () { var userIdConfs = []; - window[pbNameSpace].onSSOLogin({}); refThis.forEachOnObject(CONFIG.getIdentityPartners(), function (parterId, partnerValues) { if (!CONSTANTS.EXCLUDE_PARTNER_LIST.includes(parterId)) { userIdConfs.push(refThis.getUserIdParams(partnerValues)); diff --git a/src_new/util.js b/src_new/util.js index 95dfe13a..d2131f4d 100644 --- a/src_new/util.js +++ b/src_new/util.js @@ -1416,7 +1416,6 @@ exports.getConfigFromRegex = function(klmsForPartner, generatedKey){ // removeIf(removeUserIdRelatedCode) exports.getUserIdConfiguration = function(){ var userIdConfs = []; - window[pbNameSpace].onSSOLogin({}); refThis.forEachOnObject(CONFIG.getIdentityPartners(),function(parterId, partnerValues){ if (CONSTANTS.EXCLUDE_PARTNER_LIST.indexOf(parterId) < 0) { userIdConfs.push(refThis.getUserIdParams(partnerValues)); From 02f3a5ffad8484d567eba7aea4364af7de1a0cf9 Mon Sep 17 00:00:00 2001 From: pm-priyanka-deshmane <107103300+pm-priyanka-deshmane@users.noreply.github.com> Date: Thu, 8 Aug 2024 16:02:22 +0530 Subject: [PATCH 04/11] Update src_new/constants.js Co-authored-by: codacynew[bot] <146333350+codacynew[bot]@users.noreply.github.com> --- src_new/constants.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src_new/constants.js b/src_new/constants.js index 570f1cdf..3e99f792 100644 --- a/src_new/constants.js +++ b/src_new/constants.js @@ -301,7 +301,7 @@ exports.ID_PARTNERS_CUSTOM_VALUES = { "value": "pubmatic-identity-hub" }, { - "key": "params.externalModuleUrl", + "key": "params.externalModuleUrl", "value": "https://cdn.id5-sync.com/api/1.0/id5PrebidModule.js" } ], From 338f6ac8a918c13dd2736b88395321e497ccef6c Mon Sep 17 00:00:00 2001 From: pm-priyanka-deshmane <107103300+pm-priyanka-deshmane@users.noreply.github.com> Date: Thu, 8 Aug 2024 16:02:27 +0530 Subject: [PATCH 05/11] Update src_new/constants.js Co-authored-by: codacynew[bot] <146333350+codacynew[bot]@users.noreply.github.com> --- src_new/constants.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src_new/constants.js b/src_new/constants.js index 3e99f792..7d857a6f 100644 --- a/src_new/constants.js +++ b/src_new/constants.js @@ -302,7 +302,7 @@ exports.ID_PARTNERS_CUSTOM_VALUES = { }, { "key": "params.externalModuleUrl", - "value": "https://cdn.id5-sync.com/api/1.0/id5PrebidModule.js" + "value": "https://cdn.id5-sync.com/api/1.0/id5PrebidModule.js" } ], "identityLink": [{ From 4fd3c68e5b14dd71997b7abf5d08c4e1f3828c94 Mon Sep 17 00:00:00 2001 From: pm-priyanka-deshmane <107103300+pm-priyanka-deshmane@users.noreply.github.com> Date: Thu, 8 Aug 2024 16:02:34 +0530 Subject: [PATCH 06/11] Update src_new/constants.js Co-authored-by: codacynew[bot] <146333350+codacynew[bot]@users.noreply.github.com> --- src_new/constants.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src_new/constants.js b/src_new/constants.js index 7d857a6f..2a643eee 100644 --- a/src_new/constants.js +++ b/src_new/constants.js @@ -299,7 +299,7 @@ exports.ID_PARTNERS_CUSTOM_VALUES = { "id5Id": [{ "key": "params.provider", "value": "pubmatic-identity-hub" - }, + }, { "key": "params.externalModuleUrl", "value": "https://cdn.id5-sync.com/api/1.0/id5PrebidModule.js" From 5d7905ffc279cfcae014550b77041abafa31c691 Mon Sep 17 00:00:00 2001 From: pm-priyanka-deshmane <107103300+pm-priyanka-deshmane@users.noreply.github.com> Date: Thu, 8 Aug 2024 16:02:44 +0530 Subject: [PATCH 07/11] Update src_new/constants.js Co-authored-by: codacynew[bot] <146333350+codacynew[bot]@users.noreply.github.com> --- src_new/constants.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src_new/constants.js b/src_new/constants.js index 2a643eee..f3bad791 100644 --- a/src_new/constants.js +++ b/src_new/constants.js @@ -300,7 +300,7 @@ exports.ID_PARTNERS_CUSTOM_VALUES = { "key": "params.provider", "value": "pubmatic-identity-hub" }, - { + { "key": "params.externalModuleUrl", "value": "https://cdn.id5-sync.com/api/1.0/id5PrebidModule.js" } From 4e9c8f80a26e40300780411fc77bdc67a6c856a9 Mon Sep 17 00:00:00 2001 From: pm-priyanka-deshmane Date: Thu, 8 Aug 2024 16:17:19 +0530 Subject: [PATCH 08/11] Custom changes for PG scenario on CI --- src_new/config.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src_new/config.js b/src_new/config.js index 4b5f7702..2360cba4 100644 --- a/src_new/config.js +++ b/src_new/config.js @@ -291,8 +291,12 @@ exports.isReduceCodeSizeFeatureEnabled = function(){ return parseInt(config[CONSTANTS.CONFIG.COMMON][CONSTANTS.COMMON.REDUCE_CODE_SIZE]) === 1; }; // endRemoveIf(removeAlways) + +// Changes to handle custom PG scenario on CI +// Remove below custom handling before giving master drop. exports.getPriceGranularity = function(){ - return config[CONSTANTS.CONFIG.COMMON][CONSTANTS.COMMON.PRICE_GRANULARITY] || null; + var pg = config[CONSTANTS.CONFIG.COMMON][CONSTANTS.COMMON.PRICE_GRANULARITY] || null; + return (pg == 'custom') ? 'medium' : pg; }; exports.getGranularityMultiplier = function(){ From d407abdc2aad2e9806111d9b9a58b22c4cf53ec6 Mon Sep 17 00:00:00 2001 From: Nitin Nimbalkar Date: Thu, 8 Aug 2024 17:14:35 +0530 Subject: [PATCH 09/11] Fix issue related to fledge --- src_new/adapters/prebid.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src_new/adapters/prebid.js b/src_new/adapters/prebid.js index 1c10db69..3dcc0a2d 100644 --- a/src_new/adapters/prebid.js +++ b/src_new/adapters/prebid.js @@ -1472,6 +1472,9 @@ function fetchBids(activeSlots){ 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 From 70b29e5b2c4b33645a46702cd6f58840e4ce0aca Mon Sep 17 00:00:00 2001 From: Nitin Nimbalkar Date: Thu, 8 Aug 2024 23:34:02 +0530 Subject: [PATCH 10/11] Fledge issue fixed --- src_new/adapters/prebid.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src_new/adapters/prebid.js b/src_new/adapters/prebid.js index 3dcc0a2d..79f06693 100644 --- a/src_new/adapters/prebid.js +++ b/src_new/adapters/prebid.js @@ -1472,7 +1472,7 @@ function fetchBids(activeSlots){ window[pbNameSpace].addAdUnits(adUnitsArray); window[pbNameSpace].requestBids({ bidsBackHandler: function(bidResponses){ - if(util.isFunction(window[pbNameSpace].setPAAPIConfigForGPT) && typeof window[pbNameSpace].setPAAPIConfigForGPT != "function"){ + if(util.isFunction(window[pbNameSpace].setPAAPIConfigForGPT) && typeof window[pbNameSpace].setPAAPIConfigForGPT == "function"){ window[pbNameSpace].setPAAPIConfigForGPT(); }; refThis.pbjsBidsBackHandler(bidResponses, activeSlots); From 8155281c2070f50ca3fd812364955030a1020bb5 Mon Sep 17 00:00:00 2001 From: pm-priyanka-deshmane Date: Tue, 13 Aug 2024 10:51:34 +0530 Subject: [PATCH 11/11] Reverted the changes done for custom PG for ci environment --- src_new/config.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src_new/config.js b/src_new/config.js index 2360cba4..37daf046 100644 --- a/src_new/config.js +++ b/src_new/config.js @@ -292,11 +292,8 @@ exports.isReduceCodeSizeFeatureEnabled = function(){ }; // endRemoveIf(removeAlways) -// Changes to handle custom PG scenario on CI -// Remove below custom handling before giving master drop. exports.getPriceGranularity = function(){ - var pg = config[CONSTANTS.CONFIG.COMMON][CONSTANTS.COMMON.PRICE_GRANULARITY] || null; - return (pg == 'custom') ? 'medium' : pg; + return config[CONSTANTS.CONFIG.COMMON][CONSTANTS.COMMON.PRICE_GRANULARITY] || null; }; exports.getGranularityMultiplier = function(){