Merge pull request from GHSA-2xm2-xj2q-qgpj

* Test case and fixes

* Change requestTimeout default to 5s

* Document new function argument
This commit is contained in:
Antonio Davi Macedo Coelho de Castro
2020-10-21 16:32:07 -07:00
committed by GitHub
parent ef2e54c39d
commit 78b59fb26b
6 changed files with 62 additions and 12 deletions

View File

@@ -298,7 +298,8 @@ class ParseServer {
if (options.startLiveQueryServer || options.liveQueryServerOptions) {
this.liveQueryServer = ParseServer.createLiveQueryServer(
server,
options.liveQueryServerOptions
options.liveQueryServerOptions,
options
);
}
/* istanbul ignore next */
@@ -324,16 +325,21 @@ class ParseServer {
* Helper method to create a liveQuery server
* @static
* @param {Server} httpServer an optional http server to pass
* @param {LiveQueryServerOptions} config options fot he liveQueryServer
* @param {LiveQueryServerOptions} config options for the liveQueryServer
* @param {ParseServerOptions} options options for the ParseServer
* @returns {ParseLiveQueryServer} the live query server instance
*/
static createLiveQueryServer(httpServer, config: LiveQueryServerOptions) {
static createLiveQueryServer(
httpServer,
config: LiveQueryServerOptions,
options: ParseServerOptions
) {
if (!httpServer || (config && config.port)) {
var app = express();
httpServer = require('http').createServer(app);
httpServer.listen(config.port);
}
return new ParseLiveQueryServer(httpServer, config);
return new ParseLiveQueryServer(httpServer, config, options);
}
static verifyServerUrl(callback) {