Strip query params from the host

Author: tonymeng

packages/database/src/core/util/libs/parser.ts

@@ -147,16 +147,17 @@ export const parseURL = function(
       domain = 'localhost';
     }
     // Support `ns` query param if subdomain not already set
-    if (subdomain === '') {
-      const queryStartIndex = host.indexOf('?');
-      if (queryStartIndex != -1) {
+    const queryStartIndex = host.indexOf('?');
+    if (queryStartIndex > 0) {
+      if (subdomain === '') {
         const queryString = host.substring(queryStartIndex, host.length);
         const match = queryString.match(/ns=([a-zA-Z0-9-]+)/);
         if (match.length > 0) {
           subdomain = match[1];
-          host = host.substring(0, queryStartIndex);
         }
       }
+      // Always remove all query params from the host
+      host = host.substring(0, queryStartIndex);
     }
   }
 

packages/database/test/database.test.ts

@@ -87,7 +87,7 @@ describe('Database Tests', function() {
     var db = defaultApp.database('http://bar.firebaseio.com?ns=foo');
     expect(db).to.be.ok;
     expect(db.repo_.repoInfo_.namespace).to.equal('bar');
-    expect(db.ref().toString()).to.equal('https://bar.firebaseio.com?ns=foo/');
+    expect(db.ref().toString()).to.equal('https://bar.firebaseio.com/');
   });
 
   it('Different instances for different URLs', function() {