0xb00b5/firegex-traffic-viewer
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: better error messages

Browse Source
This commit is contained in:
Domingo Dirutigliano
2023-09-26 21:16:03 +02:00
parent 67f563cb43
commit 0b0357bdaf
2 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
frontend/src/js/utils.tsx
View File

@@ -35,7 +35,10 @@ export async function getapi(path:string):Promise<any>{
headers: { "Authorization" : "Bearer " + window.localStorage.getItem("access_token")}
}).then(res => {
if(res.status === 401) window.location.reload()
if(!res.ok) reject(res.statusText)
if(!res.ok){
const errorDefault = res.statusText
return res.json().then( res => reject(getErrorMessageFromServerResponse(res, errorDefault)) ).catch( _err => reject(errorDefault))
}
res.json().then( res => resolve(res) ).catch( err => reject(err))
})
.catch(err => {
@@ -58,6 +61,24 @@ export function getErrorMessage(e: any) {
return error;
}
export function getErrorMessageFromServerResponse(e: any, def:string = "Unknown error") {
if (e.status){
return e.status
}
if (e.detail){
if (typeof e.detail == "string")
return e.detail
if (e.detail[0] && e.detail[0].msg)
return e.detail[0].msg
}
if (e.error){
return e.error
}
return def
}
export async function postapi(path:string,data:any,is_form:boolean=false):Promise<any>{
return await new Promise((resolve, reject) => {
fetch(`${IS_DEV?`http://${DEV_IP_BACKEND}`:""}/api/${path}`, {
@@ -72,7 +93,10 @@ export async function postapi(path:string,data:any,is_form:boolean=false):Promis
}).then(res => {
if(res.status === 401) window.location.reload()
if(res.status === 406) resolve({status:"Wrong Password"})
if(!res.ok) reject(res.statusText)
if(!res.ok){
const errorDefault = res.statusText
return res.json().then( res => reject(getErrorMessageFromServerResponse(res, errorDefault)) ).catch( _err => reject(errorDefault))
}
res.json().then( res => resolve(res) ).catch( err => reject(err))
})
.catch(err => {