strip off extra # or ? from base url pathname before adding /

Author: eviljeff

src/util/submit-addon.js

@@ -90,8 +90,9 @@ export default class Client {
     userAgentString,
   }: ClientConstructorParams) {
     this.apiAuth = apiAuth;
-    if (!baseUrl.href.endsWith('/')) {
-      baseUrl = new URL(`${baseUrl.href}/`);
+    if (!baseUrl.pathname.endsWith('/')) {
+      baseUrl = new URL(baseUrl.href);
+      baseUrl.pathname += '/';
     }
     this.apiUrl = new URL('addons/', baseUrl);
     this.validationCheckInterval = validationCheckInterval;

tests/unit/test-util/test.submit-addon.js

@@ -250,6 +250,13 @@ describe('util.submit-addon', () => {
       );
     });
 
+    it('drops extra characters on baseUrl before setting apiUrl', () => {
+      const cleanUrl = 'http://url.with/extra';
+      const extraBaseUrl = new URL(`${cleanUrl}#?`);
+      const client = new Client({ ...clientDefaults, baseUrl: extraBaseUrl });
+      assert.equal(client.apiUrl.href, new URL(`${cleanUrl}/addons/`).href);
+    });
+
     describe('doUploadSubmit', () => {
       it('submits the xpi', async () => {
         const client = new Client(clientDefaults);