Handle case - Do not replace namespace if default namespaces are set in the config.

Author: pm-nitin-shirsat

gulpfile.js

@@ -437,15 +437,15 @@ function addPattern(patterns, match, replacement) {
 }
 
 function getPatternsToReplace() {
-    const { COMMON } = require('./src_new/constants.js');
+    const { COMMON, CONFIG } = require('./src_new/constants.js');
     var patterns = [];
     if (isIdentityOnly) {
-        addPattern(patterns, /ihowpbjs|owpbjs/g, config.getPbGloabalVarNamespace(COMMON.IH_NAMESPACE));
-        addPattern(patterns, /IHPWT/g, config.getOwGloabalVarNamespace(null));
+        addPattern(patterns, /ihowpbjs|owpbjs/g, config.getOverrideNamespace(CONFIG.PB_GLOBAL_VAR_NAMESPACE, COMMON.IH_NAMESPACE, COMMON.IH_NAMESPACE));
+        addPattern(patterns, /IHPWT/g, config.getOverrideNamespace(CONFIG.OW_GLOBAL_VAR_NAMESPACE, COMMON.IH_OW_NAMESPACE, null));
     } else {
         // Passing null as we don't want to replace the used value(i.e. PWT) with default value(i.e. PWT) as both are same,
-        addPattern(patterns, /owpbjs/g, config.getPbGloabalVarNamespace(null));
-        addPattern(patterns, /PWT/g, config.getOwGloabalVarNamespace(null));
+        addPattern(patterns, /owpbjs/g, config.getOverrideNamespace(CONFIG.PB_GLOBAL_VAR_NAMESPACE, COMMON.PREBID_NAMESPACE, null));
+        addPattern(patterns, /PWT/g, config.getOverrideNamespace(CONFIG.OW_GLOBAL_VAR_NAMESPACE, COMMON.OPENWRAP_NAMESPACE, null));
     }
     return patterns;
 }

src_new/config.js

@@ -144,12 +144,13 @@ exports.getAwc = function () {
 	return awc === "1";
 };
 
-exports.getPbGloabalVarNamespace = function(defaultName) {
-	return config[CONSTANTS.CONFIG.COMMON][CONSTANTS.CONFIG.PB_GLOBAL_VAR_NAMESPACE] || defaultName;
-}
-
-exports.getOwGloabalVarNamespace = function(defaultName) {
-	return config[CONSTANTS.CONFIG.COMMON][CONSTANTS.CONFIG.OW_GLOBAL_VAR_NAMESPACE] || defaultName;
+exports.getOverrideNamespace = function(configKey, defaultName, returnValueInCaseMissingNamespace) {
+	var pbNamespace = config[CONSTANTS.CONFIG.COMMON][configKey];
+	if (pbNamespace) {
+		return pbNamespace === defaultName ? returnValueInCaseMissingNamespace : pbNamespace;
+	} else {
+		return returnValueInCaseMissingNamespace;
+	}
 }
 
 /* start-test-block */

src_new/constants.js

@@ -25,6 +25,7 @@ exports.COMMON = {
 	"AD_SERVER_CURRENCY": "adServerCurrency",
 	"SINGLE_IMPRESSION": "singleImpression",
 	"OPENWRAP_NAMESPACE": "PWT",
+	"IH_OW_NAMESPACE": "IHPWT",
 	"PREBID_NAMESPACE": "owpbjs",
 	"IH_NAMESPACE": "ihowpbjs",
 	"ENABLE_USER_ID": "identityEnabled",