valitydev/wazuh-kibana-app
14
0
Fork 0
mirror of https://github.com/valitydev/wazuh-kibana-app.git synced 2024-11-07 10:18:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed prep-error module since it's no longer needed

Browse Source
This commit is contained in:
Jesús Ángel González 2018-04-30 17:51:29 +02:00
parent 7c1e2092bb
commit 282a8513b2
2 changed files with 3 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
public/services/generic-request.js
View File

@ -9,7 +9,6 @@
*
* Find more information about this on the LICENSE file.
*/
import prepError from 'plugins/wazuh/services/prep-error';
import chrome from 'ui/chrome';
import * as modules from 'ui/modules'
@ -53,13 +52,7 @@ modules.get('app/wazuh', [])
defered.resolve(data);
}
})
.catch(error => {
if(error.status && error.status === -1){
defered.reject({data: 'request_timeout_genericreq', url });
}else {
defered.reject(error);
}
});
.catch(defered.reject);
return defered.promise;
};
@ -77,14 +70,8 @@ modules.get('app/wazuh', [])
}
_request(method, path, payload)
.then((data) => defered.resolve(data))
.catch(error => {
if(error.status && error.status === 401){
defered.reject(error);
} else {
defered.reject(prepError(error));
}
});
.then(defered.resolve)
.catch(defered.reject);
return defered.promise;
}

48
public/services/prep-error.js
View File

@ -1,48 +0,0 @@
/*
* Wazuh app - Module for error messages
* Copyright (C) 2018 Wazuh, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* Find more information about this on the LICENSE file.
*/
export default err => {
if (err.data && err.data === 'request_timeout_genericreq' && err.url) {
err['html'] = `The request to ${err.url} took too long and was aborted.`;
err.message = `The request to ${err.url} took too long and was aborted.`;
} else if (parseInt(err.error) < 0) {
err['html'] = `Unexpected error located on controller. Error: <b>${err.message} (code ${err.error})</b>.`;
err.message = `Unexpected error located on controller. Error: ${err.message} (code ${err.error}).`;
} else if (parseInt(err.error) === 1) {
err['html'] = "<b>Error getting credentials</b> for Wazuh API. Please, check credentials at settings tab.";
err.message = "Error getting credentials for Wazuh API. Please, check credentials at settings tab.";
} else if (parseInt(err.error) === 2) {
err['html'] = "<b>Error getting credentials</b> for Wazuh API. Could not connect with Elasticsearch.";
err.message = "Error getting credentials for Wazuh API. Could not connect with Elasticsearch.";
} else if (parseInt(err.error) < 5) {
err['html'] = `Unexpected error located on Kibana server. Error: <b>${err.message} (code ${err.error})</b>.`;
err.message = `Unexpected error located on Kibana server. Error: ${err.message} (code ${err.error}).`;
} else if (parseInt(err.error) === 5) {
err['html'] = `Could not connect with Wazuh API. Error: ${err.errorMessage}.</br> Please, check the URL at settings tab.`;
err.message = `Could not connect with Wazuh API. Error: ${err.errorMessage}. Please, check the URL at settings tab.`;
} else if (parseInt(err.error) === 6) {
if (err.errorData.statusCode && err.errorData.statusCode === '404') {
err['html'] = "Wazuh API URL could not be found on elasticsearch. Please, configure the application properly.";
err.message = "Wazuh API URL could not be found on elasticsearch. Please, configure the application properly.";
} else {
err['html'] = `Wazuh API returned an error message. Error: <b>${err.errorData.message}</b>`;
err.message = `Wazuh API returned an error message. Error: ${err.errorData.message}`;
}
} else if (parseInt(err.error) === 7) {
err['html'] = `Unexpected error filtering the data. Error <b>${err.message}</b>.`;
err.message = `Unexpected error filtering the data. Error ${err.message}.`;
} else if (err.message) {
err['html'] = err.message;
}
return err;
};