Skip to content

Fix/rules parsing #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jzellman wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix/rules parsing #51

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fdca33
fix: use constructed JSON parser on rules responses to properly parse…
Sep 17, 2021
18fe6dd
refactor: pull up headers to an instance variable
Sep 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 29 additions & 16 deletions lib/rules.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ var JSONBigInt = require('json-bigint');
var LiveRules = function (endPoint, user, password, parser) {
this._api = endPoint;
this._auth = "Basic " + new Buffer(user + ':' + password).toString('base64');
this._headers = {
'Authorization': this._auth,
'Content-Type': 'application/json',
'Accept': 'application/json'
};
this.parser = parser;
};

Expand All @@ -30,23 +35,26 @@ function formatFailedRules (body) {
* @param cb Function callback
*/
LiveRules.prototype.add = function (rules, cb) {
var json = {
var self = this;
var body = {
rules: rules.map(function (rule) {
return (typeof rule == 'string') ? { value: rule } : rule;
})
};
request.post({
url: this._api,
json: json,
headers: { 'Authorization': this._auth }
body: self.parser.stringify(body),
json: false,
headers: this._headers,
}, function (err, response, body) {
if (err) cb(err);
else if (response.statusCode >= 200 && response.statusCode < 300) cb(null, body);
else if (response.statusCode >= 200 && response.statusCode < 300) cb(null, self.parser.parse(body));
else {
var parsedBody = self.parser.parse(body);
var errStr = 'Unable to add rules. Request failed with status code: ' + response.statusCode;
var ruleErrors = formatFailedRules(body);
var ruleErrors = formatFailedRules(parsedBody);
if (ruleErrors) errStr += '\n' + ruleErrors;
if (body && body.error) errStr += '\n' + body.error.message;
if (parsedBody && parsedBody.error) errStr += '\n' + parsedBody.error.message;
cb(new Error(errStr));
}
});
Expand All @@ -58,21 +66,24 @@ LiveRules.prototype.add = function (rules, cb) {
* @param cb Function callback
*/
LiveRules.prototype.remove = function (rules, cb) {
var json = {
var self = this;
var body = {
rules: rules.map(function (rule) {
return (typeof rule == 'string') ? { value: rule } : rule;
})
};
request.post({
url: this._api + '?_method=delete',
json: json,
headers: { 'Authorization': this._auth }
body: self.parser.stringify(body),
json: false,
headers: this._headers,
}, function (err, response, body) {
if (err) cb(err);
else if (response.statusCode >= 200 && response.statusCode < 300) cb(null, body);
else if (response.statusCode >= 200 && response.statusCode < 300) cb(null, self.parser.parse(body));
else {
var parsedBody = self.parser.parse(body);
var errStr = 'Unable to delete rules. Request failed with status code: ' + response.statusCode;
if (body && body.error) errStr += '\n' + body.error.message;
if (parsedBody && parsedBody.error) errStr += '\n' + parsedBody.error.message;
cb(new Error(errStr));
}
});
Expand All @@ -99,7 +110,8 @@ LiveRules.prototype.getAll = function (cb) {
var self = this;
request({
url: self._api,
headers: { 'Authorization': self._auth }
json: false,
headers: this._headers
}, function (err, response, body) {
if (err) cb(err);
else if (response.statusCode >= 200 && response.statusCode < 300) {
Expand All @@ -123,17 +135,18 @@ LiveRules.prototype.getAll = function (cb) {
*/
LiveRules.prototype.getByIds = function (ids, cb) {
var self = this;
var json = {
var body = {
rule_ids: ids
};
request.post({
url: self._api + '?_method=get',
json: json,
headers: { 'Authorization': self._auth }
body: self.parser.stringify(body),
json: false,
headers: this._headers,
}, function (err, response, body) {
if (err) cb(err);
else if (response.statusCode >= 200 && response.statusCode < 300) {
cb(null, body.rules);
cb(null, self.parser.parse(body).rules);
}
else {
cb(new Error('Unable to fetch rules. Request failed with status code: ' + response.statusCode));
Expand Down