From f0ab966d7589ccac1aff87432c67bfa96a4aa72b Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Fri, 13 Oct 2017 14:31:19 +0200 Subject: fix header override in requests --- src/api/server/ServerApi.js | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'src/api/server') diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js index b369796e8..86f4c99e7 100644 --- a/src/api/server/ServerApi.js +++ b/src/api/server/ServerApi.js @@ -512,30 +512,16 @@ export default class ServerApi { _prepareAuthRequest(options, auth = true) { const request = Object.assign(options, { mode: 'cors', - headers: { + headers: Object.assign({ 'Content-Type': 'application/json', 'X-Franz-Source': 'desktop', 'X-Franz-Version': app.getVersion(), 'X-Franz-platform': process.platform, 'X-Franz-Timezone-Offset': new Date().getTimezoneOffset(), 'X-Franz-System-Locale': app.getLocale(), - }, + }, options.headers), }); - // const headers = new window.Headers(); - // headers.append('foo', 'bar'); - // console.log(headers, request.headers); - // - // - // // request.headers.map((value, header) => headers.append(header, value)); - // Object.keys(request.headers).map((key) => { - // console.log(key); - // return headers.append(key, request.headers[key]); - // }); - // request.headers = headers; - - // console.log(request); - if (auth) { request.headers.Authorization = `Bearer ${localStorage.getItem('authToken')}`; } -- cgit v1.2.3-70-g09d2