apply promise catch to request function

This commit is contained in:
Arthur Lu 2022-12-12 16:00:11 -08:00
parent 0553c3056b
commit 739c591dda

View File

@ -1,6 +1,7 @@
export async function requestTicket (username, password) { export async function requestTicket (username, password) {
let prms = new URLSearchParams({username: `${username}@pve`, password: password}); let prms = new URLSearchParams({username: `${username}@pve`, password: password});
let response = await fetch("https://pve.tronnet.net/api2/json/access/ticket", {
let content = {
method: "POST", method: "POST",
mode: "cors", mode: "cors",
credentials: "include", credentials: "include",
@ -8,7 +9,9 @@ export async function requestTicket (username, password) {
"Content-Type": "application/x-www-form-urlencoded" "Content-Type": "application/x-www-form-urlencoded"
}, },
body: prms.toString() body: prms.toString()
}) }
let response = await fetch("https://pve.tronnet.net/api2/json/access/ticket", content)
.then((response) => { .then((response) => {
if (!response.ok) { if (!response.ok) {
throw new Error('Network response was not OK'); throw new Error('Network response was not OK');
@ -18,6 +21,7 @@ export async function requestTicket (username, password) {
.catch((error) => { .catch((error) => {
console.error('There has been a problem with your fetch operation:', error); console.error('There has been a problem with your fetch operation:', error);
}); });
let data = await response.json(); let data = await response.json();
return data; return data;
} }
@ -30,7 +34,8 @@ export function setTicket (ticket) {
export async function request (path, method, body) { export async function request (path, method, body) {
let prms = new URLSearchParams(body); let prms = new URLSearchParams(body);
let response = await fetch(`https://pve.tronnet.net/api2/json${path}`, {
let content = {
method: method, method: method,
mode: "cors", mode: "cors",
credentials: "include", credentials: "include",
@ -38,10 +43,22 @@ export async function request (path, method, body) {
"Content-Type": "application/x-www-form-urlencoded", "Content-Type": "application/x-www-form-urlencoded",
"Cookie": document.cookie "Cookie": document.cookie
} }
});
if(method == "POST") {
response.body = prms.toString();
} }
if(method == "POST") {
content.body = prms.toString();
}
let response = await fetch(`https://pve.tronnet.net/api2/json${path}`, content)
.then((response) => {
if (!response.ok) {
throw new Error('Network response was not OK');
}
return response;
})
.catch((error) => {
console.error('There has been a problem with your fetch operation:', error);
});
let data = await response.json(); let data = await response.json();
return data; return data;
} }