Skip to content

fix: harden wallet request errors #4

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
Sikkra wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: harden wallet request errors #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions src/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,16 @@ const fetchQuery = (url, callback, fetchParams = null, errorFunc = null, callbac
let errorObj = {};
if (errorFunc) errorObj = errorFunc(responseJson);
if ( ! errorObj.title) errorObj.title = `Error in response HTTP query to: <a target="_blank" href="${url}">${url}</a>`;
if ( ! errorObj.message) errorObj.message = responseJson.error ? responseJson.error : responseJson.message;
if ( ! errorObj.message) {
const responseError = responseJson.error ? responseJson.error : responseJson.message;
errorObj.message = responseError && responseError.message ? responseError.message : responseError;
}
if ( ! errorObj.html) errorObj.html = escapeHtml(errorObj.message);
const swalParams = {
showCloseButton: true,
icon: 'error',
title: errorObj.title,
html: errorObj.message,
html: errorObj.html,
customClass: {
cancelButton: 'btn btn-danger btn-lg',
},
Expand All @@ -28,12 +32,14 @@ const fetchQuery = (url, callback, fetchParams = null, errorFunc = null, callbac
}
})
.catch((error) => {
if (error == 'TypeError: Failed to fetch') error += '<br><br>Maybe it is CORS! Check please <a class="btn btn-sm btn-info" target="_blank" href="https://github.com/epexa/bitgesell-wallet-dist/blob/master/CORS.md#cors">manual here.</a>';
if (callbackAlways) callbackAlways();
let corsHelp = '';
if (error == 'TypeError: Failed to fetch') corsHelp = '<br><br>Maybe it is CORS! Check please <a class="btn btn-sm btn-info" target="_blank" href="https://github.com/epexa/bitgesell-wallet-dist/blob/master/CORS.md#cors">manual here.</a>';
Swal.fire({
showCloseButton: true,
icon: 'error',
title: `Error on HTTP query to: <a target="_blank" href="${url}">${url}</a>`,
html: `<p class="text-danger">${error}</p>`,
html: `<p class="text-danger">${escapeHtml(error)}</p>${corsHelp}`,
customClass: {
cancelButton: 'btn btn-danger btn-lg',
},
Expand Down
3 changes: 2 additions & 1 deletion src/send/send.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,9 +219,10 @@ const send = () => {
}
});
}, fetchParams, (responseJson) => {
const errorMessage = responseJson.error && responseJson.error.message ? responseJson.error.message : 'Unknown RPC error';
return {
title: 'Error in creating a transaction!',
message: `<p class="text-danger">${responseJson.error.message}</p>Change the parameters and try again!`,
html: `<p class="text-danger">${escapeHtml(errorMessage)}</p>Change the parameters and try again!`,
};
}, () => {
$send.querySelector('fieldset').removeAttribute('disabled');
Expand Down
6 changes: 6 additions & 0 deletions src/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@ const formHandler = ($formName, callback) => {
});
};

const escapeHtml = (value) => {
const $text = document.createElement('textarea');
$text.textContent = value == null ? '' : String(value);
return $text.innerHTML;
};

const dataTableParams = {
processing: true,
renderer: 'bootstrap',
Expand Down