aboutsummaryrefslogtreecommitdiffstats
path: root/src/api/utils/auth.js
diff options
context:
space:
mode:
authorLibravatar Dominik Guzei <dominik.guzei@gmail.com>2019-03-19 11:46:30 +0100
committerLibravatar Dominik Guzei <dominik.guzei@gmail.com>2019-03-19 11:46:30 +0100
commitab9ae1829e51e463d644ff369ebc3434f2f42c81 (patch)
tree639b4dc0c0d519fbd2bf99c869b00bce1ccfb5cf /src/api/utils/auth.js
parentmerge-in webview unmounting fix (diff)
parentMerge pull request #1338 from meetfranz/chore/app-feature-helpers (diff)
downloadferdium-app-ab9ae1829e51e463d644ff369ebc3434f2f42c81.tar.gz
ferdium-app-ab9ae1829e51e463d644ff369ebc3434f2f42c81.tar.zst
ferdium-app-ab9ae1829e51e463d644ff369ebc3434f2f42c81.zip
fix conflicts with latest develop
Diffstat (limited to 'src/api/utils/auth.js')
-rw-r--r--src/api/utils/auth.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/api/utils/auth.js b/src/api/utils/auth.js
index d469853a5..6dbdeaa7f 100644
--- a/src/api/utils/auth.js
+++ b/src/api/utils/auth.js
@@ -3,7 +3,7 @@ import localStorage from 'mobx-localstorage';
3 3
4const { app } = remote; 4const { app } = remote;
5 5
6export const prepareAuthRequest = (options, auth = true) => { 6export const prepareAuthRequest = (options = { method: 'GET' }, auth = true) => {
7 const request = Object.assign(options, { 7 const request = Object.assign(options, {
8 mode: 'cors', 8 mode: 'cors',
9 headers: Object.assign({ 9 headers: Object.assign({
@@ -23,6 +23,6 @@ export const prepareAuthRequest = (options, auth = true) => {
23 return request; 23 return request;
24}; 24};
25 25
26export const sendAuthRequest = (url, options) => ( 26export const sendAuthRequest = (url, options, auth) => (
27 window.fetch(url, prepareAuthRequest(options)) 27 window.fetch(url, prepareAuthRequest(options, auth))
28); 28);