Merge pull request #846 from theseyi/master

update tracking header expression: adds case insensitive header, mobi…

wherehows-web/app/utils/validators/tracking-headers.js

@@ -1,8 +0,0 @@
-// Matches field identifiers starting with header, requestHeader, mobileHeader,
-//   mobile_header, request_header
-//   all optionally suffixed with a period and any non - line break characters
-const trackingHeaderFieldsRegex = /^(?:header[.|[]|request_?header[.|[]|mobile_?header[.|[]).*/i;
-
-export default candidateString => trackingHeaderFieldsRegex.test(String(candidateString));
-
-export { trackingHeaderFieldsRegex };

wherehows-web/app/utils/validators/tracking-headers.ts

@@ -0,0 +1,16 @@
+/**
+ *  Matches field identifiers starting with header, requestHeader, mobileHeader,
+ *  mobile_header, request_header
+ *  or solely those strings
+ *  optionally suffixed with a period and any non - line break characters
+ */
+const trackingHeaderFieldsRegex = /^(?:header$|header[.|[]|request_?header$|request_?header[.|[]|mobile_?header$|mobile_?header[.|[]).*/i;
+
+/**
+ * Tests if the supplied string matches any of the tracking header regex'
+ * @param {string} candidateString
+ * @return {boolean}
+ */
+export default (candidateString: string): boolean => trackingHeaderFieldsRegex.test(String(candidateString));
+
+export { trackingHeaderFieldsRegex };

wherehows-web/tests/helpers/validators/tracking-headers/constants.ts

@@ -1,6 +1,14 @@
-const headers = ['header.', 'header[field]', 'header.field', 'header[]'];
+const headers = ['header', 'HEADER', 'header.', 'header[field]', 'header.field', 'header[]'];
-const requestHeaders = ['requestheader[]', 'requestheader.', 'request_header.mockId', 'request_header.s[]'];
+const requestHeaders = [
+  'requestheader[]',
+  'requestheader.',
+  'request_header.mockId',
+  'request_header.s[]',
+  'requestheader'
+];
 const mobileHeaders = [
+  'mobileheader',
+  'MobileHeader',
   'mobileheader.',
   'MobileHeader[]',
   'mobile_header.header',
@@ -19,9 +27,7 @@ const trackingHeaderList = [...headers, ...requestHeaders, ...mobileHeaders];
  * @type {Array<string>}
  */
 const nonTrackingHeaderList = [
-  'header',
   'headers',
-  'Header',
   'headerfortrackingisinvalid',
   'HEADER_PATH',
   'HEADER_REFERER',