From ab1858616be21bc8b84734786a99cff0bda68237 Mon Sep 17 00:00:00 2001
From: Florent Vilmart <florentvilmart@me.com>
Date: Wed, 30 Mar 2016 19:50:08 -0400
Subject: [PATCH] Adds ability to override mount with publicServerURL for
 production uses

---
 spec/index.spec.js | 34 ++++++++++++++++++++++++++++++++++
 src/Config.js      | 31 +++++++++++++++++++++++++++++--
 2 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/spec/index.spec.js b/spec/index.spec.js
index 821f5d1685..b4ca4a8cf0 100644
--- a/spec/index.spec.js
+++ b/spec/index.spec.js
@@ -2,6 +2,7 @@ var request = require('request');
 var parseServerPackage = require('../package.json');
 var MockEmailAdapterWithOptions = require('./MockEmailAdapterWithOptions');
 var ParseServer = require("../src/index");
+var Config = require('../src/Config');
 var express = require('express');
 
 describe('server', () => {
@@ -246,4 +247,37 @@ describe('server', () => {
     expect(ParseServer.FileSystemAdapter).toThrow();
     done();
   });
+
+  it('properly gives publicServerURL when set', done => {
+    setServerConfiguration({
+      serverURL: 'http://localhost:8378/1',
+      appId: 'test',
+      masterKey: 'test',
+      publicServerURL: 'https://myserver.com/1'
+    });
+    var config = new Config('test', 'http://localhost:8378/1');
+    expect(config.mount).toEqual('https://myserver.com/1');
+    done();
+  });
+
+  it('properly removes trailing slash in mount', done => {
+    setServerConfiguration({
+      serverURL: 'http://localhost:8378/1',
+      appId: 'test',
+      masterKey: 'test'
+    });
+    var config = new Config('test', 'http://localhost:8378/1/');
+    expect(config.mount).toEqual('http://localhost:8378/1');
+    done();
+  });
+
+  it('should throw when getting invalid mount', done => {
+    expect(() => setServerConfiguration({
+      serverURL: 'http://localhost:8378/1',
+      appId: 'test',
+      masterKey: 'test',
+      publicServerURL: 'blabla:/some'
+    }) ).toThrow("publicServerURL should be a valid HTTPS URL starting with https://");
+    done();
+  });
 });
diff --git a/src/Config.js b/src/Config.js
index 4e599bde39..b9f0d007c5 100644
--- a/src/Config.js
+++ b/src/Config.js
@@ -4,6 +4,16 @@
 
 import cache from './cache';
 
+function removeTrailingSlash(str) {
+  if (!str) {
+    return str;
+  }
+  if (str.endsWith("/")) {
+    str = str.substr(0, str.length-1);
+  }
+  return str;
+}
+
 export class Config {
   constructor(applicationId: string, mount: string) {
     let DatabaseAdapter = require('./DatabaseAdapter');
@@ -24,7 +34,7 @@ export class Config {
     this.database = DatabaseAdapter.getDatabaseConnection(applicationId, cacheInfo.collectionPrefix);
 
     this.serverURL = cacheInfo.serverURL;
-    this.publicServerURL = cacheInfo.publicServerURL;
+    this.publicServerURL = removeTrailingSlash(cacheInfo.publicServerURL);
     this.verifyUserEmails = cacheInfo.verifyUserEmails;
     this.appName = cacheInfo.appName;
 
@@ -35,7 +45,7 @@ export class Config {
     this.userController = cacheInfo.userController;
     this.authDataManager = cacheInfo.authDataManager;
     this.customPages = cacheInfo.customPages || {};
-    this.mount = mount;
+    this.mount = removeTrailingSlash(mount);
     this.liveQueryController = cacheInfo.liveQueryController;
   }
 
@@ -43,6 +53,11 @@ export class Config {
     this.validateEmailConfiguration({verifyUserEmails: options.verifyUserEmails,
                                 appName: options.appName,
                                 publicServerURL: options.publicServerURL})
+    if (options.publicServerURL) {
+      if (!options.publicServerURL.startsWith("http://") && !options.publicServerURL.startsWith("https://")) {
+        throw "publicServerURL should be a valid HTTPS URL starting with https://"
+      }
+    }
   }
 
   static validateEmailConfiguration({verifyUserEmails, appName, publicServerURL}) {
@@ -56,6 +71,18 @@ export class Config {
     }
   }
 
+  get mount() {
+    var mount = this._mount;
+    if (this.publicServerURL) {
+      mount = this.publicServerURL;
+    }
+    return mount;
+  }
+
+  set mount(newValue) {
+    this._mount = newValue;
+  }
+
   get invalidLinkURL() {
     return this.customPages.invalidLink || `${this.publicServerURL}/apps/invalid_link.html`;
   }