Merge pull request #178 from keen/akasprowicz-localstorage-fix

fix for #177
keen · Jul 1, 2019 · 0483814 · 0483814
2 parents a00969a + 6998b18
commit 0483814
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 2 deletions.
diff --git a/lib/browser.js b/lib/browser.js
@@ -29,6 +29,7 @@ import { deepExtend } from './utils/deepExtend';
 import { serializeForm } from './utils/serializeForm';
 import { timer } from './utils/timer';
 import { setOptOut } from './utils/optOut';
+import { isLocalStorageAvailable } from './utils/localStorage';
 
 // ------------------------
 // Methods
@@ -101,7 +102,7 @@ if (typeof webpackKeenGlobals !== 'undefined') {
   keenGlobals = webpackKeenGlobals;
 }
 
-if (localStorage && localStorage.getItem('optout')) {
+if (isLocalStorageAvailable && localStorage.getItem('optout')) {
   KeenCore.optedOut = true;
 }
 

diff --git a/lib/utils/localStorage.js b/lib/utils/localStorage.js
@@ -0,0 +1,12 @@
+function lsTest(){
+  const test = 'test';
+  try {
+      localStorage.setItem(test, test);
+      localStorage.removeItem(test);
+      return true;
+  } catch(e) {
+      return false;
+  }
+}
+
+export const isLocalStorageAvailable = lsTest();
diff --git a/lib/utils/optOut.js b/lib/utils/optOut.js
@@ -1,4 +1,8 @@
+import { isLocalStorageAvailable } from './localStorage';
+
 export function setOptOut(optOut = true) {
+    if (!isLocalStorageAvailable) return;
+
     if (optOut) {
         localStorage.setItem('optout', optOut);
         return;

diff --git a/test/demo/demo-tests.js b/test/demo/demo-tests.js
@@ -1,10 +1,30 @@
 const demoTests = (demoConfig, Keen) => {
 
-  //demoConfig.requestType = 'beaconAPI';
+  // demoConfig.requestType = 'beaconAPI';
 
   // Keen.debug = true;
   const client = new Keen(demoConfig);
 
+  client
+  .recordEvent('beacon_purchases', {
+    item: 'Avocado',
+    number_of_items: 10,
+    user: {
+      name: 'John Smith'
+    }
+  });
+  /*
+  .then((response) => {
+    console.log(response);
+    // handle successful responses
+  })
+  .catch(error => {
+    console.log(error);
+    // handle errors
+  });
+*/
+  return;
+
   client.recordEvent({
     collection: 'abc',
     event: {