@ -1,4 +1,5 @@
let csrfToken : string
let csrfToken : string
let unraidCsrfToken : string | undefined // required for unraid POST requests (#8062)
// apiFetch wraps the standard JS fetch function with csrf header
// apiFetch wraps the standard JS fetch function with csrf header
// management and param additions specific to the web client.
// management and param additions specific to the web client.
@ -8,11 +9,12 @@ let csrfToken: string
// (i.e. provide `/data` rather than `api/data`).
// (i.e. provide `/data` rather than `api/data`).
export function apiFetch (
export function apiFetch (
endpoint : string ,
endpoint : string ,
init? : RequestInit | undefined ,
method : "GET" | "POST" ,
addURLParams? : Record < string , string >
body? : any ,
params? : Record < string , string >
) : Promise < Response > {
) : Promise < Response > {
const urlParams = new URLSearchParams ( window . location . search )
const urlParams = new URLSearchParams ( window . location . search )
const nextParams = new URLSearchParams ( addURLP arams)
const nextParams = new URLSearchParams ( p arams)
const token = urlParams . get ( "SynoToken" )
const token = urlParams . get ( "SynoToken" )
if ( token ) {
if ( token ) {
nextParams . set ( "SynoToken" , token )
nextParams . set ( "SynoToken" , token )
@ -20,9 +22,28 @@ export function apiFetch(
const search = nextParams . toString ( )
const search = nextParams . toString ( )
const url = ` api ${ endpoint } ${ search ? ` ? ${ search } ` : "" } `
const url = ` api ${ endpoint } ${ search ? ` ? ${ search } ` : "" } `
var contentType : string
if ( unraidCsrfToken ) {
const params = new URLSearchParams ( )
params . append ( "csrf_token" , unraidCsrfToken )
if ( body ) {
params . append ( "ts_data" , JSON . stringify ( body ) )
}
body = params . toString ( )
contentType = "application/x-www-form-urlencoded;charset=UTF-8"
} else {
body = body ? JSON . stringify ( body ) : undefined
contentType = "application/json"
}
return fetch ( url , {
return fetch ( url , {
. . . init ,
method : method ,
headers : withCsrfToken ( init ? . headers ) ,
headers : {
Accept : "application/json" ,
"Content-Type" : contentType ,
"X-CSRF-Token" : csrfToken ,
} ,
body ,
} ) . then ( ( r ) = > {
} ) . then ( ( r ) = > {
updateCsrfToken ( r )
updateCsrfToken ( r )
if ( ! r . ok ) {
if ( ! r . ok ) {
@ -34,13 +55,13 @@ export function apiFetch(
} )
} )
}
}
function withCsrfToken ( h? : HeadersInit ) : HeadersInit {
return { . . . h , "X-CSRF-Token" : csrfToken }
}
function updateCsrfToken ( r : Response ) {
function updateCsrfToken ( r : Response ) {
const tok = r . headers . get ( "X-CSRF-Token" )
const tok = r . headers . get ( "X-CSRF-Token" )
if ( tok ) {
if ( tok ) {
csrfToken = tok
csrfToken = tok
}
}
}
}
export function setUnraidCsrfToken ( token? : string ) {
unraidCsrfToken = token
}