Merge branch 'master' into firestore-multi-tab

Author: schmidt-sebastian

packages/database/src/core/RepoInfo.ts

@@ -49,7 +49,7 @@ export class RepoInfo {
   }
 
   needsQueryParam(): boolean {
-    return this.host !== this.internalHost;
+    return this.host !== this.internalHost || this.isCustomHost();
   }
 
   isCacheableHost(): boolean {

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

@@ -16,7 +16,7 @@
 
 import { Path } from '../Path';
 import { RepoInfo } from '../../RepoInfo';
-import { warnIfPageIsSecure, fatal } from '../util';
+import { warnIfPageIsSecure, warn, fatal } from '../util';
 
 /**
  * @param {!string} pathString
@@ -37,6 +37,26 @@ function decodePath(pathString: string): string {
   return pathStringDecoded;
 }
 
+/**
+ * @param {!string} queryString
+ * @return {!{[key:string]:string}} key value hash
+ */
+function decodeQuery(queryString: string): { [key: string]: string } {
+  let results = {};
+  if (queryString.startsWith('?')) {
+    queryString = queryString.substring(1);
+  }
+  for (const segment of queryString.split('&')) {
+    const kv = segment.split('=');
+    if (kv.length === 2) {
+      results[decodeURIComponent(kv[0])] = decodeURIComponent(kv[1]);
+    } else {
+      warn('Invalid query string segment: ' + segment);
+    }
+  }
+  return results;
+}
+
 /**
  *
  * @param {!string} dataURL
@@ -119,13 +139,23 @@ export const parseURL = function(
       dataURL = dataURL.substring(colonInd + 2);
     }
 
-    // Parse host and path.
+    // Parse host, path, and query string.
     let slashInd = dataURL.indexOf('/');
     if (slashInd === -1) {
       slashInd = dataURL.length;
     }
-    host = dataURL.substring(0, slashInd);
-    pathString = decodePath(dataURL.substring(slashInd));
+    let questionMarkInd = dataURL.indexOf('?');
+    if (questionMarkInd === -1) {
+      questionMarkInd = dataURL.length;
+    }
+    host = dataURL.substring(0, Math.min(slashInd, questionMarkInd));
+    if (slashInd < questionMarkInd) {
+      // For pathString, questionMarkInd will always come after slashInd
+      pathString = decodePath(dataURL.substring(slashInd, questionMarkInd));
+    }
+    let queryParams = decodeQuery(
+      dataURL.substring(Math.min(dataURL.length, questionMarkInd))
+    );
 
     // If we have a port, use scheme for determining if it's secure.
     colonInd = host.indexOf(':');
@@ -146,6 +176,10 @@ export const parseURL = function(
     } else if (parts[0].slice(0, colonInd).toLowerCase() === 'localhost') {
       domain = 'localhost';
     }
+    // Support `ns` query param if subdomain not already set
+    if (subdomain === '' && 'ns' in queryParams) {
+      subdomain = queryParams['ns'];
+    }
   }
 
   return {

packages/database/test/database.test.ts

@@ -76,6 +76,20 @@ describe('Database Tests', function() {
     expect(db.ref().toString()).to.equal('https://localhost/');
   });
 
+  it('Can read ns query param', function() {
+    var db = defaultApp.database('http://localhost:80/?ns=foo&unused=true');
+    expect(db).to.be.ok;
+    expect(db.repo_.repoInfo_.namespace).to.equal('foo');
+    expect(db.ref().toString()).to.equal('http://localhost:80/');
+  });
+
+  it('Only reads ns query param when subdomain not set', 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/');
+  });
+
   it('Different instances for different URLs', function() {
     var db1 = defaultApp.database('http://foo1.bar.com');
     var db2 = defaultApp.database('http://foo2.bar.com');