Merge pull request #13 from contentstack/cache_hotfix

Resolved localStorage disable Issue

Author: rohitmishra209

.DS_Store

@@ -1,4 +1,4 @@
-.DS_Store
+*.DS_Store
 examples/*
 node_modules/*
 .idea/*

.gitignore

@@ -12,11 +12,17 @@ export function get(key) {
 };
 
 export function set(key, data) {
-    if (typeof data === 'object') {
-        storage.setItem(key, JSON.stringify(data));
-    } else {
-        storage.setItem(key, data);
-    }
+    try {
+        if (typeof data === 'object') {
+            console.log("storage", storage)
+            storage.setItem(key, JSON.stringify(data));
+            //localStorage.setItem("hello", "Smith");            
+        } else {
+            console.log("else")
+            storage.setItem(key, data);
+        }
+    } catch (error) {   
+    } 
 };
 
 export function getStorage() {

src/core/cache.js

@@ -257,7 +257,7 @@ export function sendRequest(queryObject) {
                             } else if (data.assets && data.assets.length) {
                                 entries.assets = data.assets[0];
                             } else {
-                                if (cachePolicy === 2) {
+                                if (cachePolicy === 2 && self.provider !== null) {
                                     self.provider.get(hashQuery, getCacheCallback());
                                 } else {
                                     return reject({ error_code: 141, error_message: 'The requested entry doesn\'t exist.' });
@@ -276,7 +276,7 @@ export function sendRequest(queryObject) {
                             entries = data;
                         }
 
-                        if (cachePolicy !== -1) {
+                        if (cachePolicy !== -1 && self.provider !== null) {
                             self.provider.set(hashQuery, entries, function(err) {
                                 try {
                                     if (err) throw err;
@@ -304,30 +304,34 @@ export function sendRequest(queryObject) {
                     }
                 }.bind(self))
                 .catch(function(error) {
-                    if (cachePolicy === 2) {
+                    if (cachePolicy === 2 && self.provider !== null) {
                         self.provider.get(hashQuery, getCacheCallback());
                     } else {
                         return reject(error);
                     }
                 });
         }
     };
-
     switch (cachePolicy) {
         case 1:
             return new Promise(function(resolve, reject) {
-                self.provider.get(hashQuery, function(err, _data) {
-                    try {
-                        if (err || !_data) {
-                            callback(true, resolve, reject);
-                        } else {
-                            if (!tojson) _data = resultWrapper(_data);
-                            return resolve(spreadResult(_data));
+                if (self.provider !== null) {
+                    self.provider.get(hashQuery, function(err, _data) {
+                        try {
+                            if (err || !_data) {
+                                callback(true, resolve, reject);
+                            } else {
+                                if (!tojson) _data = resultWrapper(_data);
+                                return resolve(spreadResult(_data));
+                            }
+                        } catch (e) {
+                            return reject(e);
                         }
-                    } catch (e) {
-                        return reject(e);
-                    }
-                });
+                    });
+                }else {
+                    callback(true, resolve, reject);
+                }
+                
             });
             break;
         case 2:
@@ -340,67 +344,34 @@ export function sendRequest(queryObject) {
     };
 
     if (cachePolicy === 3) {
-        return {
-            cache: (function() {
-                return new Promise(function(resolve, reject) {
+
+        var promise = new Promise(function(resolve, reject) {
+                if (self.provider !== null) {
                     self.provider.get(hashQuery, function(err, _data) {
                         try {
-                            if (err) {
-                                reject(err);
+                            if (err || !_data) {
+                                 reject(err);
+                                //reject(Error("It broke"));
                             } else {
                                 if (!tojson) _data = resultWrapper(_data);
-                                resolve(spreadResult(_data));
+                                 resolve(spreadResult(_data));
                             }
                         } catch (e) {
-                            reject(e);
+                             reject(e);
                         }
                     });
-                });
-            }()),
-            network: (function() {
-                return new Promise(function(resolve, reject) {
+                }
+            });
+
+        return promise.then(function() {
+            return new Promise(function(resolve, reject) {
                     callback(true, resolve, reject);
                 });
-            }()),
-            both: function(_callback_) {
-                self.provider.get(hashQuery, function(err, entries) {
-                    if (!tojson) entries = resultWrapper(entries);
-                    _callback_(err, spreadResult(entries))
+              }).catch((error) => {
+            return new Promise(function(resolve, reject) {
+                    callback(true, resolve, reject);
                 });
-                Request(queryObject.requestParams)
-                    .then(function(data) {
-                        try {
-                            self.entry_uid = self.tojson = self.queryCachePolicy = undefined;
-                            let entries = {},
-                                error = null;
-                            if (queryObject.singleEntry) {
-                                queryObject.singleEntry = false;
-                                if (data.schema) entries.schema = data.schema;
-                                if (data.content_type) {
-                                    entries.content_type = data.content_type;
-                                    delete entries.schema
-                                }
-                                if (data.entries && data.entries.length) {
-                                    entries.entry = data.entries[0];
-                                } else if (data.assets && data.assets.length) {
-                                    entries.assets = data.assets[0];
-                                } else {
-                                    error = { error_code: 141, error_message: 'The requested entry doesn\'t exist.' };
-                                }
-                            } else {
-                                entries = data;
-                            }
-                            if (!tojson) entries = resultWrapper(entries);
-                            _callback_(error, spreadResult(entries));
-                        } catch (e) {
-                            _callback_(e);
-                        }
-                    }.bind(self))
-                    .catch(function(error) {
-                        _callback_(error);
-                    });
-            }
-
-        };
+                  console.error(error)
+              })
     }
 };

src/core/lib/utils.js

@@ -1 +1,16 @@
-export default window.localStorage;
+// export default window.localStorage;
+
+let webLocalStoreage = function (){
+    try {
+        var storage = window.localStorage
+        // x = '__storage_test__';
+        // storage.setItem(x, x);
+        // storage.removeItem(x);
+        return storage;
+    } catch(e) {
+        return null
+    }
+};
+
+export default webLocalStoreage();
+