mod-build 3.7.7-beta.1 → 3.7.9-beta.1

package/CHANGELOG.md

@@ -1,8 +1,12 @@
 # Changelog
 
-## 3.7.7
+## 3.7.9
 
-- Adding `isMobile` handlebars helper to determine if screen is < 768px
+- Updated `isBranded` sites to grab the display name from HS Form Service API to add to the `brandedConsentLanguage`.
+
+## 3.7.8
+
+- removed race condition from grab-cdn task.
 
 ## 3.7.6
 

package/gulp-tasks/grab-cdn.js

@@ -1,16 +1,19 @@
+/* globals Promise */
 var request = require('request');
 var source = require('vinyl-source-stream');
 
 // helper to allow us to define an "end" event to multiple streams
-function streamToDestination(gulp, siteSettings, inputPath, destPath, fileName) {
+async function streamToDestination(gulp, siteSettings, inputPath, destPath, fileName, index) {
 	var url = `https://${siteSettings.nodeEnv}${inputPath}`;
-
-	return new Promise(resolve => { // eslint-disable-line no-undef
+	return await new Promise(async function(resolve) { // eslint-disable-line no-undef
+		console.time(`${index + 1} Finished after`);
+		console.log(`${index + 1} Starting:`, url);
 		request(url)
-			.on('response', resp => {
+			.on('response', async function(resp) {
 				if (resp.statusCode !== 200) {
 					throw new Error(`Error fetching ${url}`);
 				}
+				console.timeEnd(`${index + 1} Finished after`);
 			})
 			.pipe(source(fileName))
 			.pipe(gulp.dest(`${siteSettings.srcFolder}/${destPath}`))
@@ -19,7 +22,7 @@ function streamToDestination(gulp, siteSettings, inputPath, destPath, fileName)
 }
 
 module.exports = function(gulp, _gulpPlugins, siteSettings, siteData) {
-	return function() {
+	return async function() {
 		const { nodeEnv, isLocal } = siteSettings;
 		const { isQSPage, isWhiteLabel, domain } = siteData;
 		const isModWhiteLabel = isWhiteLabel && !isQSPage;
@@ -43,7 +46,7 @@ module.exports = function(gulp, _gulpPlugins, siteSettings, siteData) {
 		});
 
 		if (isModWhiteLabel || domainHasModernize) {
-			Object.assign(externalResources, {'/quote/resources/mod-site/templates/scripts/recaptcha.html': ['/templates/scripts/', 'recaptcha.html']});
+			Object.assign(externalResources, { '/quote/resources/mod-site/templates/scripts/recaptcha.html': ['/templates/scripts/', 'recaptcha.html'] });
 		}
 
 		// local dev files
@@ -67,13 +70,19 @@ module.exports = function(gulp, _gulpPlugins, siteSettings, siteData) {
 			]
 		});
 
-		const filesPromiseMap = Object.keys(externalResources).map(key => {
-			const destinationPath = externalResources[key][0];
-			const fileName = externalResources[key][1];
-			return streamToDestination(gulp, siteSettings, key, destinationPath, fileName);
-		});
+		const totalRequests = Object.keys(externalResources).length;
+		return await new Promise(async function(resolve) {
+			const sequentialRequests = async function(key, index) {
+				if (index === totalRequests) {
+					resolve();
+					return;
+				}
+				const destinationPath = externalResources[key][0];
+				const fileName = externalResources[key][1];
+				return await streamToDestination(gulp, siteSettings, key, destinationPath, fileName, index).then(() => sequentialRequests(Object.keys(externalResources)[index + 1], index + 1));
+			};
 
-		// when Promise.all resolves, the streams are done and we can go to the next step
-		return Promise.all(filesPromiseMap); // eslint-disable-line no-undef
+			sequentialRequests(Object.keys(externalResources)[0], 0);
+		});
 	};
 };

package/gulp-tasks/templates.js

@@ -194,17 +194,6 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 				return index;
 			}
 		},
-		// Adding helper to check if mobile (< 768px)
-		{
-			name: 'isMobile',
-			fn: function(expression, options) {
-				if (window.innerWidth < 768) {
-					return options.fn(expression);
-				} else {
-					return options.inverse(expression);
-				}
-			}
-		},
 		// Loop to go through and add each attribute defined in the attributes: {} object
 		{
 			name: 'addAttributes',
@@ -331,16 +320,62 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 	};
 
 	var getConsentCaptureLanguage = async function() {
-		await new Promise(function(resolve) {
-			request(`https://${siteSettings.nodeEnv}/quote/resources/mod-site/consent-capture/tcpa.json`, async function(_err, xhr, response) {
-				if (xhr.statusCode !== 200) {
-					throw new Error(`${xhr.statusCode}: Error while fetching Consent Capture Language`);
-				}
-				const consentCapture = await JSON.parse(response);
-				Object.assign(templatesData, consentCapture);
-				resolve();
+		const requestPromise = (url) => {
+			return new Promise((resolve, reject) => {
+				request(url, (error, xhr, response) => {
+					if (error) {
+						reject(error);
+					} else {
+						resolve({ xhr, response });
+					}
+				});
 			});
-		});
+		};
+
+		try {
+			const tcpaJson = `https://${siteSettings.nodeEnv}/quote/resources/mod-site/consent-capture/tcpa.json`;
+			const { xhr: tcpaXhr, response: tcpaResponse } = await requestPromise(tcpaJson);
+
+			if (tcpaXhr.statusCode !== 200) {
+				throw new Error(`${tcpaXhr.statusCode}: Error while fetching tcpa.json`);
+			}
+
+			let brandedDisplayName = '';
+			const responseJson = JSON.parse(tcpaResponse),
+				consentCaptureObject = responseJson;
+
+			const brandedSiteIdentifiers = `https://${siteSettings.nodeEnv}/quote/resources/mod-site/data/branded-site-identifiers.json`;
+			const { xhr: brandedXhr, response: brandedResponse } = await requestPromise(brandedSiteIdentifiers);
+
+			if (brandedXhr.statusCode !== 200) {
+				throw new Error(`${brandedXhr.statusCode}: Error while fetching branded-site-identifiers.json`);
+			}
+
+			const brandedResponseJson = JSON.parse(brandedResponse);
+
+			if (templatesData.isBranded) {
+				const websiteName = templatesData.website_name;
+				if (brandedResponseJson[websiteName] && brandedResponseJson[websiteName].vendorPublicIdentifier) {
+					const vendorPublicIdentifier = brandedResponseJson[websiteName].vendorPublicIdentifier,
+						apiDomain = 'https://form-service-hs.qnst.com/',
+						apiUrl = `${apiDomain}utils/vendor-display-name?vendorKeys=${vendorPublicIdentifier}`;
+
+					const { xhr: displayNameXhr, response: displayNameResponse } = await requestPromise(apiUrl);
+
+					if (displayNameXhr.statusCode !== 200) {
+						throw new Error(`${displayNameXhr.statusCode}: Error while getting branded display name from HS Form Service`);
+					}
+
+					const displayNameResponseJson = JSON.parse(displayNameResponse);
+					brandedDisplayName = displayNameResponseJson.data[vendorPublicIdentifier];
+					consentCaptureObject.brandedConsentCapture.tcpaStart = responseJson.brandedConsentCapture.tcpaStart.replace(/<span data-branded-consent><\/span>/g, `<span data-branded-consent>${brandedDisplayName}</span>`);
+				}
+			}
+
+			Object.assign(templatesData, consentCaptureObject);
+		} catch (error) {
+			console.error('Error fetching data:', error);
+		}
 	};
 
 	return async function() {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mod-build",
-	"version": "3.7.7-beta.1",
+	"version": "3.7.9-beta.1",
 	"description": "Share components for S3 sites.",
 	"scripts": {
 		"test": "echo \"Error: no test specified\" && exit 1",