From 522110c0bc4af263366f48655d0431b7bf0b170d Mon Sep 17 00:00:00 2001 From: eal Date: Thu, 31 Aug 2017 11:23:17 +0300 Subject: [PATCH 1/4] Set cookies on fetch --- src/services/api/api.service.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js index d2aa5d58..91a8b248 100644 --- a/src/services/api/api.service.js +++ b/src/services/api/api.service.js @@ -35,6 +35,7 @@ const oldfetch = window.fetch let fetch = (url, options) => { const baseUrl = '' const fullUrl = baseUrl + url + options.credentials = 'same-origin' return oldfetch(fullUrl, options) } From 2b0811dddc99325d551d06604595c9060e6b039e Mon Sep 17 00:00:00 2001 From: eal Date: Sat, 2 Sep 2017 19:29:16 +0300 Subject: [PATCH 2/4] Make sure options exists every time on fetch() --- src/services/api/api.service.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js index 91a8b248..aad3b40e 100644 --- a/src/services/api/api.service.js +++ b/src/services/api/api.service.js @@ -33,6 +33,7 @@ import 'whatwg-fetch' const oldfetch = window.fetch let fetch = (url, options) => { + options = options || {} const baseUrl = '' const fullUrl = baseUrl + url options.credentials = 'same-origin' From 00589a9af153bad4d8e7f14669c1497443f5221b Mon Sep 17 00:00:00 2001 From: eal Date: Sat, 2 Sep 2017 19:29:45 +0300 Subject: [PATCH 3/4] Include cookie in every request --- src/services/api/api.service.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js index aad3b40e..b0e40518 100644 --- a/src/services/api/api.service.js +++ b/src/services/api/api.service.js @@ -36,7 +36,7 @@ let fetch = (url, options) => { options = options || {} const baseUrl = '' const fullUrl = baseUrl + url - options.credentials = 'same-origin' + options.credentials = 'include' return oldfetch(fullUrl, options) } From 298bf5cfca181a1c70bffeddb6ba620908464363 Mon Sep 17 00:00:00 2001 From: eal Date: Sat, 2 Sep 2017 21:12:42 +0300 Subject: [PATCH 4/4] Revert "Include cookie in every request" This reverts commit 00589a9af153bad4d8e7f14669c1497443f5221b. Changing same-origin to the unsafer include did not fix the bug it was supposed to. --- src/services/api/api.service.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js index b0e40518..aad3b40e 100644 --- a/src/services/api/api.service.js +++ b/src/services/api/api.service.js @@ -36,7 +36,7 @@ let fetch = (url, options) => { options = options || {} const baseUrl = '' const fullUrl = baseUrl + url - options.credentials = 'include' + options.credentials = 'same-origin' return oldfetch(fullUrl, options) }