fix: bugfix when last() with null value throws exception

grbsk · Feb 9, 2017 · 5b3d175 · 5b3d175
1 parent 708aa9f
commit 5b3d175
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/modules/core/src/localstorageexpiry.spec.ts b/modules/core/src/localstorageexpiry.spec.ts
@@ -21,6 +21,12 @@ describe('core/LocalStorageExpiry', () => {
     expect(service.last()).toEqual(expected);
   }));
 
+  it('last() remove value and return null if param is null', inject([LocalStorageExpiry], (service: LocalStorageExpiry) => {
+    let expected = null;
+    expect(service.last(expected)).toEqual(expected);
+    expect(service.last()).toEqual(expected);
+  }));
+
   it('setExpiryKey() sets the key name of expiry', inject([LocalStorageExpiry], (service: LocalStorageExpiry) => {
     expect(service.getExpiryKey()).toBe('expiry');
     service.setExpiryKey('name');

diff --git a/modules/core/src/localstorageexpiry.ts b/modules/core/src/localstorageexpiry.ts
@@ -56,7 +56,11 @@ export class LocalStorageExpiry extends IdleExpiry {
   }
 
   private setExpiry(value: Date) {
-    this.localStorage.setItem(this.expiryKey, value.getTime().toString());
+    if (value) {
+      this.localStorage.setItem(this.expiryKey, value.getTime().toString());
+    } else {
+      this.localStorage.removeItem(this.expiryKey);
+    }
   }
 
 }