Fixed #3 added restheartProvider.onNetworkError(callback)

SoftInstigate · Mar 23, 2016 · 26a824d · 26a824d
1 parent 80da042
commit 26a824d
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 1 deletion.
diff --git a/angular-restheart.module.js b/angular-restheart.module.js
@@ -38,6 +38,10 @@
             this.onUnauthenticated = f;
         };
 
+        this.onNetworkError = function (f) {
+            this.onNetworkError = f;
+        };
+
         this.$get = function () {
             return this;
         };

diff --git a/services/rh.factory.js b/services/rh.factory.js
@@ -39,7 +39,8 @@
                 // check if session expired
                 var te = handleTokenExpiration(response);
                 var f = handleForbidden(response);
-                return !(te || f); // if handled --> false
+                var ne = handleNetworkError(response);
+                return !(te || f || ne); // if handled --> false
             });
 
             RestangularConfigurer.setRequestInterceptor(function (elem, operation) {
@@ -111,6 +112,24 @@
 
                 return false; // not handled
             }
+
+            function handleNetworkError(response) {
+                if (response.status === -1) {
+                    localStorageService.set('rh_networkError', {
+                        'why': 'network_error',
+                        "path": $location.path(),
+                        "state": $state.current.name,
+                        "params": $stateParams
+                    });
+                    // call configured call back, if any
+                    if (angular.isFunction(restheart.onNetworkError)) {
+                        restheart.onNetworkError($location, $state);
+                    }
+                    return true; // handled
+                }
+
+                //return true; // not handled
+            }
         });
     }
 })();
diff --git a/services/rhlogic.factory.js b/services/rhlogic.factory.js
@@ -26,6 +26,8 @@
             RestangularConfigurer.setErrorInterceptor(function (response, deferred, responseHandler) {
                 // check if session expired
                 var f = handleUnauthenticated(response);
+                var ne = handleNetworkError(response);
+                return !(ne || f); // if handled --> false
                 return f; // if handled --> false
             });
 
@@ -44,6 +46,24 @@
 
                 //return true; // not handled
             }
+
+            function handleNetworkError(response) {
+                if (response.status === -1) {
+                    localStorageService.set('rh_networkError', {
+                        'why': 'network_error',
+                        "path": $location.path(),
+                        "state": $state.current.name,
+                        "params": $stateParams
+                    });
+                    // call configured call back, if any
+                    if (angular.isFunction(restheart.onNetworkError)) {
+                        restheart.onNetworkError($location, $state);
+                    }
+                    return true; // handled
+                }
+
+                //return true; // not handled
+            }
         });
     }
 })();