Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-02 19:45:51 +01:00
Code Issues Packages Projects Releases Activity

Do not overwrite existing headers in applyFetchOptions

Browse Source
This commit is contained in:
Rene Pfeuffer
2019-11-20 11:12:22 +01:00
parent a2474896cc
commit cf17e07cea
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scm-ui/ui-components/src/apiclient.ts
View File

@@ -27,13 +27,17 @@ const extractXsrfToken = () => {
};
const applyFetchOptions: (p: RequestInit) => RequestInit = o => {
const headers: { [key: string]: string } = {
Cache: "no-cache",
// identify the request as ajax request
"X-Requested-With": "XMLHttpRequest",
// identify the web interface
"X-SCM-Client": "WUI"
};
if (!o.headers) {
o.headers = {};
}
// @ts-ignore We are sure that here we only get headers of type Record<string, string>
const headers: Record<string, string> = o.headers;
headers["Cache"] = "no-cache";
// identify the request as ajax request
headers["X-Requested-With"] = "XMLHttpRequest";
// identify the web interface
headers["X-SCM-Client"] = "WUI";
const xsrf = extractXsrfToken();
if (xsrf) {
@@ -159,7 +163,7 @@ class ApiClient {
options = applyFetchOptions(options);
if (contentType) {
if (!options.headers) {
options.headers = new Headers();
options.headers = {};
}
// @ts-ignore We are sure that here we only get headers of type Record<string, string>
options.headers["Content-Type"] = contentType;