Merge pull request #129 from cwmrowe/feature/Always_allow_interrupt_f…

…rom_another_tab Always allow interrupt when initiated by a change in session expiry date from another tab
moribvndvs · Dec 8, 2015 · f11caba · f11caba
2 parents f8fab28 + 61aee73
commit f11caba
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/src/idle/idle.js b/src/idle/idle.js
@@ -189,7 +189,7 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
 
             stopKeepalive();
           },
-          interrupt: function(noExpiryUpdate) {
+          interrupt: function(anotherTab) {
             if (!state.running) return;
 
             if (options.timeout && this.isExpired()) {
@@ -198,7 +198,7 @@ angular.module('ngIdle.idle', ['ngIdle.keepalive', 'ngIdle.localStorage'])
             }
 
             // note: you can no longer auto resume once we exceed the expiry; you will reset state by calling watch() manually
-            if (options.autoResume === 'idle' || (options.autoResume === 'notIdle' && !state.idling)) this.watch(noExpiryUpdate);
+            if (anotherTab || options.autoResume === 'idle' || (options.autoResume === 'notIdle' && !state.idling)) this.watch(anotherTab);
           }
         };
 

diff --git a/src/idle/idle.spec.js b/src/idle/idle.spec.js
@@ -461,6 +461,23 @@ describe('ngIdle', function() {
         Idle.interrupt();
         expect(Idle.watch).not.toHaveBeenCalled();
       });
+
+      it ('interrupt(true) should call watch() if idle and autoResume is notIdle', function() {
+        IdleProvider.autoResume('notIdle');
+        Idle = create();
+
+        spyOn(Idle, 'watch').andCallThrough();
+
+        // arrange
+        Idle.watch(); // start watching
+        Idle.watch.reset(); // reset watch spy to ignore the prior setup call
+
+        $interval.flush(DEFAULTIDLEDURATION);
+
+        Idle.interrupt(true);
+        expect(Idle.watch).toHaveBeenCalled();
+      });
+
     });
 
     describe('Idle with timeout disabled', function() {