Komodo / komodo-sdk

Compare View

switch
from
...
to
 
Commits (3)

Changes

Showing 2 changed files Side-by-side Diff

... ... @@ -18,8 +18,21 @@ function pullTask() {
18 18 return;
19 19 }
20 20  
  21 + let core_pull_task_url;
  22 +
  23 + if (config.core_url) {
  24 + core_pull_task_url = config.core_url + '/pull/task';
  25 + } else if (config.pull_url.task) {
  26 + core_pull_task_url = config.pull_url.task.replace('<CORE_APIKEY>', config.core_apikey);
  27 + }
  28 +
  29 + if (!core_pull_task_url) {
  30 + logger.warn('Unknown CORE task url');
  31 + return;
  32 + }
  33 +
21 34 let options = {
22   - url: config.pull_url.task.replace('<CORE_APIKEY>', config.core_apikey),
  35 + url: core_pull_task_url,
23 36 qs: {
24 37 handler: config.handler_name,
25 38 products: config.products.join(',')
... ... @@ -76,8 +89,22 @@ function report(data) {
76 89 }
77 90  
78 91 function reportUsingHttpPost(data) {
  92 +
  93 + let core_pull_report_url;
  94 +
  95 + if (config.core_url) {
  96 + core_pull_report_url = config.core_url + '/pull/report';
  97 + } else if (config.pull_url.report) {
  98 + core_pull_report_url = config.pull_url.report.replace('<CORE_APIKEY>', config.core_apikey);
  99 + }
  100 +
  101 + if (!core_pull_report_url) {
  102 + logger.warn('Unknown CORE report url');
  103 + return;
  104 + }
  105 +
79 106 let options = {
80   - url: config.pull_url.report.replace('<CORE_APIKEY>', config.core_apikey),
  107 + url: core_pull_report_url,
81 108 form: {
82 109 trx_id: data.trx_id,
83 110 rc: data.rc,
... ... @@ -85,7 +112,10 @@ function reportUsingHttpPost(data) {
85 112 handler: config.handler_name,
86 113 sn: data.sn,
87 114 amount: data.amount,
88   - raw: data.raw
  115 + raw: data.raw,
  116 + combined: {
  117 + raw: data.raw
  118 + }
89 119 }
90 120 }
91 121  
... ... @@ -104,8 +134,21 @@ function reportUsingHttpPost(data) {
104 134 }
105 135  
106 136 function reportUsingHttpGet(data) {
  137 + let core_pull_report_url;
  138 +
  139 + if (config.core_url) {
  140 + core_pull_report_url = config.core_url + '/pull/report';
  141 + } else if (config.pull_url.report) {
  142 + core_pull_report_url = config.pull_url.report.replace('<CORE_APIKEY>', config.core_apikey);
  143 + }
  144 +
  145 + if (!core_pull_report_url) {
  146 + logger.warn('Unknown CORE report url');
  147 + return;
  148 + }
  149 +
107 150 let options = {
108   - url: config.pull_url.report.replace('<CORE_APIKEY>', config.core_apikey),
  151 + url: core_pull_report_url,
109 152 qs: {
110 153 trx_id: data.trx_id,
111 154 rc: data.rc,
1 1 {
2 2 "name": "komodo-sdk",
3   - "version": "1.10.6",
  3 + "version": "1.11.0",
4 4 "description": "SDK for Komodo",
5 5 "main": "index.js",
6 6 "scripts": {