Merge pull request #41 from stape-io/rewrite-normalize-phone-number

normalize phone number
stape-io · Feb 28, 2024 · 0395190 · 0395190
2 parents 3a10a3c + 52f3414
commit 0395190
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/template.js b/template.js
@@ -19,6 +19,8 @@ const makeString = require('makeString');
 const makeNumber = require('makeNumber');
 const toBase64 = require('toBase64');
 const fromBase64 = require('fromBase64');
+const createRegex = require('createRegex');
+const testRegex = require('testRegex');
 
 const isLoggingEnabled = determinateIsLoggingEnabled();
 const traceId = isLoggingEnabled ? getRequestHeader('trace-id') : undefined;
@@ -257,17 +259,7 @@ function hashData(key, value) {
   value = makeString(value).trim().toLowerCase();
 
   if (key === 'ph') {
-    value = value
-      .split(' ')
-      .join('')
-      .split('-')
-      .join('')
-      .split('(')
-      .join('')
-      .split(')')
-      .join('')
-      .split('+')
-      .join('');
+    value = normalizePhoneNumber(value);
   } else if (key === 'ct') {
     value = value.split(' ').join('');
   }
@@ -601,6 +593,14 @@ function enhanceEventData(userData) {
   return userData;
 }
 
+function normalizePhoneNumber(phoneNumber) {
+  if (!phoneNumber) return phoneNumber;
+  const itemRegex = createRegex('^[0-9]$');
+  return phoneNumber.split('')
+    .filter((item) => testRegex(itemRegex, item))
+    .join('');
+}
+
 function determinateIsLoggingEnabled() {
   const containerVersion = getContainerVersion();
   const isDebug = !!(

diff --git a/template.tpl b/template.tpl
@@ -678,6 +678,8 @@ const makeString = require('makeString');
 const makeNumber = require('makeNumber');
 const toBase64 = require('toBase64');
 const fromBase64 = require('fromBase64');
+const createRegex = require('createRegex');
+const testRegex = require('testRegex');
 
 const isLoggingEnabled = determinateIsLoggingEnabled();
 const traceId = isLoggingEnabled ? getRequestHeader('trace-id') : undefined;
@@ -916,17 +918,7 @@ function hashData(key, value) {
   value = makeString(value).trim().toLowerCase();
 
   if (key === 'ph') {
-    value = value
-      .split(' ')
-      .join('')
-      .split('-')
-      .join('')
-      .split('(')
-      .join('')
-      .split(')')
-      .join('')
-      .split('+')
-      .join('');
+    value = normalizePhoneNumber(value);
   } else if (key === 'ct') {
     value = value.split(' ').join('');
   }
@@ -1260,6 +1252,14 @@ function enhanceEventData(userData) {
   return userData;
 }
 
+function normalizePhoneNumber(phoneNumber) {
+  if (!phoneNumber) return phoneNumber;
+  const itemRegex = createRegex('^[0-9]$');
+  return phoneNumber.split('')
+    .filter((item) => testRegex(itemRegex, item))
+    .join('');
+}
+
 function determinateIsLoggingEnabled() {
   const containerVersion = getContainerVersion();
   const isDebug = !!(