Fixes grbsk#76 by safely handing missing expiries in localstorage

agentmerlin · Apr 29, 2015 · e7272c0 · e7272c0
1 parent b0a5f66
commit e7272c0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/idle/idle.js b/src/idle/idle.js
@@ -119,7 +119,7 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
         function getExpiry() {
           var obj = LocalStorage.get('expiry');
 
-          return new Date(obj.time);
+          return obj && obj.time ? new Date(obj.time) : null;
         }
 
         function setExpiry(date) {
@@ -148,7 +148,7 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
           },
           isExpired: function() {
             var expiry = getExpiry();
-            return expiry && expiry <= this._getNow();
+            return expiry !== null && expiry <= this._getNow();
           },
           running: function() {
             return state.running;

diff --git a/src/idle/idle.spec.js b/src/idle/idle.spec.js
@@ -342,6 +342,10 @@ describe('ngIdle', function() {
         expect(Idle.isExpired()).toBe(true);
       });
 
+      it ('isExpired() should return false if there is no expiry yet', function() {
+        expect(Idle.isExpired()).toBe(false);
+      });
+
       it ('interrupt() should broadcast $timeout if running and past expiry', function() {
         spyOn($rootScope, '$broadcast');