fix(params): not all marked params get deleted

Author: ovlb

__tests__/removeTrackingParamsFromLinks.spec.js

@@ -34,6 +34,24 @@ test("removes utm_content", (t) => {
   );
 });
 
+test.only("removes whole utm bunch", (t) => {
+  t.is(
+    removeTrackingParamsFromLinks(
+      "https://www.test.com/?partner=rss&utm_source=rss&utm_campaign=rss+test&utm_medium=feed&utm_content=rss"
+    ),
+    "https://www.test.com/?partner=rss"
+  );
+});
+
+test("removes whole piwik bunch", (t) => {
+  t.is(
+    removeTrackingParamsFromLinks(
+      "https://www.test.com/?piwik_kwd=rss&piwik_campaign=rss+test"
+    ),
+    "https://www.test.com/"
+  );
+});
+
 test("removes fbclid", (t) => {
   t.is(
     removeTrackingParamsFromLinks("https://www.test.com/?fbclid=something"),

index.js

@@ -3,13 +3,19 @@ const TRACKING_PARAMS = require("./data/params");
 module.exports = function removeParams($link, allowlist = []) {
   const url = new URL($link);
 
-  for (const [key] of url.searchParams) {
+  const toDelete = [];
+
+  for (const [key] of url.searchParams.entries()) {
     const matchedParam = TRACKING_PARAMS.find(({ name }) => name === key);
 
     if (matchedParam && !allowlist.includes(matchedParam.company)) {
-      url.searchParams.delete(key);
+      // don't delete immediately
+      // otherwise the loop would skip over the next entry
+      toDelete.push(key);
     }
   }
 
+  toDelete.forEach((key) => url.searchParams.delete(key));
+
   return url.toString();
 };