From 72af994b2cd4af1a56577749708aa2598eaf8d48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=E2=84=93e=20Hensel?= <k-yle@users.noreply.github.com>
Date: Sat, 12 Feb 2022 08:00:05 +1300
Subject: [PATCH] remove other token formats from imagery_used (#8976)

---
 modules/renderer/background_source.js   | 5 +++--
 test/spec/renderer/background_source.js | 4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/renderer/background_source.js b/modules/renderer/background_source.js
index 1e5adce1f..8546082ba 100644
--- a/modules/renderer/background_source.js
+++ b/modules/renderer/background_source.js
@@ -577,8 +577,9 @@ rendererBackgroundSource.Custom = function(template) {
         }
 
         // from wms/wmts api path parameters
-        cleaned = cleaned.replace(/token\/(\w+)/, 'token/{apikey}');
-
+        cleaned = cleaned
+            .replace(/token\/(\w+)/, 'token/{apikey}')
+            .replace(/key=(\w+)/, 'key={apikey}');
         return 'Custom (' + cleaned + ' )';
     };
 
diff --git a/test/spec/renderer/background_source.js b/test/spec/renderer/background_source.js
index 502f42887..7f3980295 100644
--- a/test/spec/renderer/background_source.js
+++ b/test/spec/renderer/background_source.js
@@ -96,6 +96,10 @@ describe('iD.rendererBackgroundSource.Custom', function() {
             var source = iD.rendererBackgroundSource.Custom('http://example.com/wms/v1/token/MYTOKEN/1.0.0/layer');
             expect(source.imageryUsed()).to.eql('Custom (http://example.com/wms/v1/token/{apikey}/1.0.0/layer )');
         });
+        it('sanitizes `key` in the URL path', function() {
+            var source = iD.rendererBackgroundSource.Custom('http://example.com/services;key=MYTOKEN/layer');
+            expect(source.imageryUsed()).to.eql('Custom (http://example.com/services;key={apikey}/layer )');
+        });
     });
 
 });