fedi/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-10 09:09:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor request function (#29187)

Browse source 
- Remove and prevent use of `body` argument, it is not used anywhere
- Remove uppercasing of method, we can require it to be uppercase

(cherry picked from commit c40ee6fb7382bc2d1398dc685f98a0277d3bfb68)
This commit is contained in:
silverwind 2024-02-16 14:27:00 +01:00 committed by Earl Warren
parent 78f6b29248
commit f35d468b43
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
web_src/js/modules/fetch.js
View file

@ -8,19 +8,17 @@ const safeMethods = new Set(['GET', 'HEAD', 'OPTIONS', 'TRACE']);
// fetch wrapper, use below method name functions and the `data` option to pass in data // fetch wrapper, use below method name functions and the `data` option to pass in data
// which will automatically set an appropriate headers. For json content, only object // which will automatically set an appropriate headers. For json content, only object
// and array types are currently supported. // and array types are currently supported.
export function request(url, {method = 'GET', headers = {}, data, body, ...other} = {}) { export function request(url, {method = 'GET', data, headers = {}, ...other} = {}) {
let contentType; let body, contentType;
if (!body) { if (data instanceof FormData || data instanceof URLSearchParams) {
if (data instanceof FormData || data instanceof URLSearchParams) { body = data;
body = data; } else if (isObject(data) || Array.isArray(data)) {
} else if (isObject(data) || Array.isArray(data)) { contentType = 'application/json';
contentType = 'application/json'; body = JSON.stringify(data);
body = JSON.stringify(data);
}
} }
const headersMerged = new Headers({ const headersMerged = new Headers({
...(!safeMethods.has(method.toUpperCase()) && {'x-csrf-token': csrfToken}), ...(!safeMethods.has(method) && {'x-csrf-token': csrfToken}),
...(contentType && {'content-type': contentType}), ...(contentType && {'content-type': contentType}),
}); });
@ -31,8 +29,8 @@ export function request(url, {method = 'GET', headers = {}, data, body, ...other
return fetch(url, { return fetch(url, {
method, method,
headers: headersMerged, headers: headersMerged,
...(body && {body}),
...other, ...other,
...(body && {body}),
}); });
} }