only apply fix to cors requests with credentials=include

screencloud · Oct 31, 2017 · 05f78a8 · 05f78a8
1 parent fd4b48f
commit 05f78a8
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/lib/helpers.js b/lib/helpers.js
@@ -44,8 +44,11 @@ function fetchAndCache (request, options) {
   var clonedRequest = request.clone()
   if (navigator.userAgent.indexOf('Crosswalk') !== -1) {
     // HACK: fix for annoying bug in crosswalk where the credentials flag is incorrectly set
-    if (clonedRequest.credentials === 'include') {
-      clonedRequest.credentials = 'omit'
+    // console.log('crosswalk sw fetch credentials before fix', clonedRequest)
+    if (clonedRequest.mode === 'cors' && clonedRequest.credentials === 'include') {
+      clonedRequest = new Request(clonedRequest, {credentials: 'omit'})
+      // console.log('crosswalk sw fetch credentials after fix', clonedRequest)
+      // clonedRequest.credentials = 'omit'
     }
   }
   return fetch(clonedRequest).then(function (response) {