@@ -52,27 +52,24 @@ export default {
5252 if ( utm ) {
5353 const validationResult = validateUtmParams ( utm ) ;
5454
55- if ( validationResult . isValid ) {
56- // All UTM parameters are valid
57- sanitizedUtm = sanitizeUtmParams ( utm , validationResult ) ;
58- } else if ( validationResult . validKeys . length > 0 ) {
59- // Some UTM parameters are valid, save only those
55+ // Always try to sanitize valid keys (if any)
56+ if ( validationResult . validKeys . length > 0 ) {
6057 sanitizedUtm = sanitizeUtmParams ( utm , validationResult ) ;
58+ }
6159
62- // Log the invalid keys for monitoring
63- HawkCatcher . send ( new Error ( 'Some UTM parameters are invalid' ) , {
60+ // Log invalid keys for monitoring (if any)
61+ if ( validationResult . invalidKeys . length > 0 ) {
62+ const errorMessage =
63+ validationResult . validKeys . length > 0
64+ ? 'Some UTM parameters are invalid'
65+ : 'All UTM parameters are invalid' ;
66+
67+ HawkCatcher . send ( new Error ( errorMessage ) , {
6468 email,
6569 utm,
6670 invalidKeys : JSON . stringify ( validationResult . invalidKeys ) ,
6771 validKeys : JSON . stringify ( validationResult . validKeys ) ,
6872 } ) ;
69- } else {
70- // No valid UTM parameters
71- HawkCatcher . send ( new Error ( 'All UTM parameters are invalid' ) , {
72- email,
73- utm,
74- invalidKeys : JSON . stringify ( validationResult . invalidKeys ) ,
75- } ) ;
7673 }
7774 }
7875
0 commit comments