marc
/
CiviProxy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleaned up logging and typos

This commit is contained in:
B. Endres 2020-09-16 09:14:32 +02:00
parent b82c633663
commit bbf5c3c9e9
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
proxy/webhook2api.php
View File

@ -32,7 +32,6 @@ if (!empty($_REQUEST['id']) && isset($webhook2api['configurations'][$_REQUEST['i
// read some input // read some input
$post_input = @file_get_contents('php://input'); $post_input = @file_get_contents('php://input');
error_log("DEBUG: " . json_encode($post_input));
// MAIN: iterate through all (eligible) configurations // MAIN: iterate through all (eligible) configurations
$last_error = ["No handler found", 501]; $last_error = ["No handler found", 501];
@ -85,12 +84,10 @@ function webhook2api_processConfiguration($configuration, $post_input) {
// gather source data // gather source data
$data = []; $data = [];
if (!empty($configuration['data_sources']) && is_array($configuration['data_sources'])) { if (!empty($configuration['data_sources']) && is_array($configuration['data_sources'])) {
error_log(json_encode($configuration));
foreach ($configuration['data_sources'] as $data_source) { foreach ($configuration['data_sources'] as $data_source) {
switch ($data_source) { switch ($data_source) {
case 'POST/json': # JSON data in POST field case 'POST/json': # JSON data in POST field
$more_data = json_decode($post_input, TRUE); $more_data = json_decode($post_input, TRUE);
error_log(json_encode($more_data));
$data = array_merge_recursive($data, $more_data); $data = array_merge_recursive($data, $more_data);
break; break;
case 'REQUEST': # simple request parameters case 'REQUEST': # simple request parameters
@ -109,8 +106,8 @@ function webhook2api_processConfiguration($configuration, $post_input) {
foreach ($data as $d) { foreach ($data as $d) {
$result = webhook2api_callCiviApi($configuration, $d); $result = webhook2api_callCiviApi($configuration, $d);
if(isset($result['internal_error'])) { if(isset($result['internal_error'])) {
// internal communication Error occured. Aborting process // internal communication Error occurred. Aborting process
civiproxy_log("Webhook2API[{$configuration['name']}]: internal error occured: " . json_encode($result['internal_error'])); civiproxy_log("Webhook2API[{$configuration['name']}]: internal error occurred: " . json_encode($result['internal_error']));
return $result['internal_error']; return $result['internal_error'];
} }
if (!empty($result['values']['http_code'])) { if (!empty($result['values']['http_code'])) {
@ -123,8 +120,8 @@ function webhook2api_processConfiguration($configuration, $post_input) {
} else { } else {
$result = webhook2api_callCiviApi($configuration, $data); $result = webhook2api_callCiviApi($configuration, $data);
if(isset($result['internal_error'])) { if(isset($result['internal_error'])) {
// internal communication Error occured. Aborting process // internal communication Error occurred. Aborting process
civiproxy_log("Webhook2API[{$configuration['name']}]: internal error occured: " . json_encode($result['internal_error'])); civiproxy_log("Webhook2API[{$configuration['name']}]: internal error occurred: " . json_encode($result['internal_error']));
return $result['internal_error']; return $result['internal_error'];
} }
if (!empty($result['values']['http_code'])) { if (!empty($result['values']['http_code'])) {
@ -134,20 +131,19 @@ function webhook2api_processConfiguration($configuration, $post_input) {
} }
} }
if ($http_code != '200') { if ($http_code != '200') {
// we received and parsed the webhook event successfully, but an error occured with civicrm: // we received and parsed the webhook event successfully, but an error occurred with civicrm:
civiproxy_log("Webhook2API[{$configuration['name']}]: Internal CiviCRM Error. Error Code: {$http_code}. Full Message: " . json_encode($result)); civiproxy_log("Webhook2API[{$configuration['name']}]: Internal CiviCRM Error. Error Code: {$http_code}. Full Message: " . json_encode($result));
} }
// process result // process result
if (!empty($configuration['response_mapping']) && is_array($configuration['response_mapping'])) { if (!empty($configuration['response_mapping']) && is_array($configuration['response_mapping'])) {
// TODO: implement // TODO: implement
//error_log("Webhook2API.response_mapping: not implemented!");
http_response_code('200'); http_response_code('200');
civiproxy_log("Webhook successfull, response mapped."); civiproxy_log("Webhook successful, response mapped.");
} else { } else {
// default behaviour: // default behaviour:
http_response_code('200'); http_response_code('200');
civiproxy_log("Webhook successfull."); civiproxy_log("Webhook successful.");
} }
// all done // all done
exit(); exit();
@ -178,7 +174,7 @@ function webhook2api_callCiviApi($configuration, $data) {
} else { } else {
echo "Error"; echo "Error";
// unknown instruction // unknown instruction
// //error_log("Webhook2API[{$configuration['name']}]: don't understad sentinel '{$check}'. Ignored."); civiproxy_log("Webhook2API[{$configuration['name']}]: don't understand sentinel '{$check}'. Ignored.");
} }
} }
} }
@ -197,7 +193,8 @@ function webhook2api_callCiviApi($configuration, $data) {
// run modifiers // run modifiers
foreach ($modifiers as $modifier) { foreach ($modifiers as $modifier) {
// TODO: implement // TODO: implement
//error_log("Webhook2API.modifiers: not implemented!");
civiproxy_log("Webhook2API.modifiers: not implemented!");
} }
// set to target // set to target
@ -210,16 +207,16 @@ function webhook2api_callCiviApi($configuration, $data) {
// sanitise data // sanitise data
if (!empty($configuration['parameter_sanitation']) && is_array($configuration['parameter_sanitation'])) { if (!empty($configuration['parameter_sanitation']) && is_array($configuration['parameter_sanitation'])) {
// TODO: implement // TODO: implement
//error_log("Webhook2API.sanitation: not implemented!"); civiproxy_log("Webhook2API.sanitation: not implemented!");
} }
// send to target REST API // send to target REST API
if (empty($configuration['entity']) || empty($configuration['action'])) { if (empty($configuration['entity']) || empty($configuration['action'])) {
//error_log("Webhook2API[{$configuration['name']}]: Missing entity/action."); civiproxy_log("Webhook2API[{$configuration['name']}]: Missing entity/action.");
return ["internal_error" => "Configuration error", 403]; return ["internal_error" => "Configuration error", 403];
} }
if (empty($configuration['api_key'])) { if (empty($configuration['api_key'])) {
//error_log("Webhook2API[{$configuration['name']}]: Missing api_key."); civiproxy_log("Webhook2API[{$configuration['name']}]: Missing api_key.");
return ["internal_error" => "Configuration error", 403]; return ["internal_error" => "Configuration error", 403];
} }
$params['api_key'] = $configuration['api_key']; $params['api_key'] = $configuration['api_key'];