Merge pull request #45 from jfturcot/token_destroy_event

Broadcast event oauth:tokenDestroy after a logout

Author: andreareginato

app/scripts/directives/oauth.js

@@ -76,6 +76,7 @@ directives.directive('oauth', function(AccessToken, Endpoint, Profile, $location
 
     scope.logout = function() {
       AccessToken.destroy(scope);
+      $rootScope.$broadcast('oauth:logout');
       loggedOut();
     };
 
@@ -92,7 +93,7 @@ directives.directive('oauth', function(AccessToken, Endpoint, Profile, $location
 
     // set the oauth directive to the logged-out status
     var loggedOut = function() {
-      $rootScope.$broadcast('oauth:logout');
+      $rootScope.$broadcast('oauth:loggedOut');
       scope.show = 'logged-out';
     };
 

dist/oauth-ng.js

@@ -371,6 +371,7 @@ directives.directive('oauth', function(AccessToken, Endpoint, Profile, $location
 
     scope.logout = function() {
       AccessToken.destroy(scope);
+      $rootScope.$broadcast('oauth:logout');
       loggedOut();
     };
 
@@ -387,7 +388,7 @@ directives.directive('oauth', function(AccessToken, Endpoint, Profile, $location
 
     // set the oauth directive to the logged-out status
     var loggedOut = function() {
-      $rootScope.$broadcast('oauth:logout');
+      $rootScope.$broadcast('oauth:loggedOut');
       scope.show = 'logged-out';
     };
 

test/spec/directives/oauth.js

@@ -141,6 +141,10 @@ describe('oauth', function() {
         $rootScope.$on('oauth:logout', callback);
       });
 
+      beforeEach(function() {
+        $rootScope.$on('oauth:loggedOut', callback);
+      });
+
       beforeEach(function() {
         element.find('.logged-in').click();
       });
@@ -150,9 +154,10 @@ describe('oauth', function() {
         expect(element.find('.logged-in').attr('class')).toMatch('ng-hide');
       });
 
-      it('fires the oauth:logout event', function() {
+      it('fires the oauth:logout and oauth:loggedOut event', function() {
         var event = jasmine.any(Object);
         expect(callback).toHaveBeenCalledWith(event);
+        expect(callback.calls.count()).toBe(2);
       });
     });
   });
@@ -165,7 +170,7 @@ describe('oauth', function() {
     });
 
     beforeEach(function() {
-      $rootScope.$on('oauth:logout', callback);
+      $rootScope.$on('oauth:loggedOut', callback);
     });
 
     beforeEach(function() {
@@ -195,10 +200,14 @@ describe('oauth', function() {
       expect(element.find('.logged-in').attr('class')).toMatch('ng-hide');
     });
 
-    it('fires the oauth:logout event', function() {
+    it('fires the oauth:loggedOut event', function() {
       var event = jasmine.any(Object);
       expect(callback).toHaveBeenCalledWith(event);
     });
+
+    it('does not fire the oauth:logout event', function() {
+      expect(callback.calls.count()).toBe(1);
+    });
   });