joe/kami-parse-server
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always use http-agent for hooks and triggers (#4800)

Browse Source
This commit is contained in:
Tyler Brock
2018-06-01 06:31:10 -07:00
committed by Florent Vilmart
parent 9bff44b446
commit c5e8470e36
4 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Controllers/HooksController.js
View File

@@ -19,13 +19,11 @@ export class HooksController {
_applicationId:string;
_webhookKey:string;
database: any;
keepAlive: boolean;
constructor(applicationId:string, databaseController, webhookKey, keepAlive) {
constructor(applicationId:string, databaseController, webhookKey) {
this._applicationId = applicationId;
this._webhookKey = webhookKey;
this.database = databaseController;
this.keepAlive = keepAlive;
}
load() {
@@ -93,7 +91,7 @@ export class HooksController {
}
addHookToTriggers(hook) {
var wrappedFunction = wrapToHTTPRequest(hook, this._webhookKey, this.keepAlive);
var wrappedFunction = wrapToHTTPRequest(hook, this._webhookKey);
wrappedFunction.url = hook.url;
if (hook.className) {
triggers.addTrigger(hook.triggerName, hook.className, wrappedFunction, this._applicationId)
@@ -167,7 +165,7 @@ export class HooksController {
}
}
function wrapToHTTPRequest(hook, key, keepAlive) {
function wrapToHTTPRequest(hook, key) {
return (req, res) => {
const jsonBody = {};
for (var i in req) {
@@ -188,10 +186,8 @@ function wrapToHTTPRequest(hook, key, keepAlive) {
body: JSON.stringify(jsonBody),
};
if (keepAlive) {
const agent = hook.url.startsWith('https') ? HTTPAgents['https'] : HTTPAgents['http'];
jsonRequest.agent = agent;
}
const agent = hook.url.startsWith('https') ? HTTPAgents['https'] : HTTPAgents['http'];
jsonRequest.agent = agent;
if (key) {
jsonRequest.headers['X-Parse-Webhook-Key'] = key;

3
src/Controllers/index.js
View File

@@ -150,9 +150,8 @@ export function getHooksController(options: ParseServerOptions, databaseControll
const {
appId,
webhookKey,
hookKeepAlive,
} = options;
return new HooksController(appId, databaseController, webhookKey, hookKeepAlive);
return new HooksController(appId, databaseController, webhookKey);
}
interface PushControlling {