Skip to content

armgit / Vvveb

Public Imported from GitHub
0

Powerful and easy to use cms to build websites, blogs or ecommerce stores.

Added csrf for fetch post requests

givanz245bd71ccd34
diff --git a/public/js/admin/controller/backup.js b/public/js/admin/controller/backup.js
index 9fc1bad..f1cee28 100755
--- a/public/js/admin/controller/backup.js
+++ b/public/js/admin/controller/backup.js
@@ -19,18 +19,22 @@ class BackupController {
let request = function () {
return fetch(next, {method: "POST", headers: {
"X-Requested-With": "XMLHttpRequest",
- }})
+ "Content-Type": "application/x-www-form-urlencoded",
+ }, body: new URLSearchParams({csrf: document.querySelector('[name=csrf]')?.value})})
.then((response) => {
next = false;
if (!response.ok) {
- return Promise.reject(response);
- }
+ return Promise.resolve(response.text()).then((responseInText) => {
+ return Promise.reject([response, responseInText]);
+ });
+ }
if (!response.ok) {
let message = response.statusText + " " + response.body();
throw new Error(message);
}
return response.json()
})
+
.then((json) => {
document.getElementById('progress-status').innerHTML = '';
@@ -95,7 +99,9 @@ class BackupController {
}
})*/
.catch(error => {
- let message = error.statusText ?? error;
+ let [response, responseInText] = error;
+ let message = response.statusText ?? "Error!";
+ let progessSuccess, progressStatus;
if (typeof error.json === "function") {
error.json().then(jsonError => {
@@ -105,9 +111,9 @@ class BackupController {
});
}
- console.log(error);
- document.getElementById('progress-success').innerHTML = '';
- document.getElementById('progress-message').innerHTML = '<div class="text-danger">' + message + '</div>';
+ displayToast("danger", "Error", message);
+ if (progessSuccess = document.getElementById('progress-success')) progessSuccess.innerHTML = '';
+ if (progressStatus = document.getElementById('progress-status')) progressStatus.innerHTML = '<div class="text-danger">' + message + '</div>';
//console.log(thrownError + "\r\n" + xhr.statusText + "\r\n" + xhr.responseText);
document.getElementById('progress-bar').classList.add('bg-danger');
enableBtn();
diff --git a/public/js/admin/controller/update.js b/public/js/admin/controller/update.js
index 81f2a39..13d6938 100755
--- a/public/js/admin/controller/update.js
+++ b/public/js/admin/controller/update.js
@@ -19,12 +19,15 @@ class UpdateController {
let request = function () {
return fetch(next, {method: "POST", headers: {
"X-Requested-With": "XMLHttpRequest",
- }})
+ "Content-Type": "application/x-www-form-urlencoded",
+ }, body: new URLSearchParams({csrf: document.querySelector('[name=csrf]')?.value})})
.then((response) => {
next = false;
if (!response.ok) {
- return Promise.reject(response);
- }
+ return Promise.resolve(response.text()).then((responseInText) => {
+ return Promise.reject([response, responseInText]);
+ });
+ }
if (!response.ok) {
let message = response.statusText + " " + response.body();
throw new Error(message);
@@ -87,7 +90,8 @@ class UpdateController {
}
})*/
.catch(error => {
- let message = error?.statusText ?? "Error updating!";
+ let [response, responseInText] = error;
+ let message = response.statusText ?? "Error!";
displayToast("danger", "Error", message);
if (error.hasOwnProperty('text')) error.text().then( errorMessage => {