Updated logout listener to take argument of the logged out user, chan…

…ged the interface name to make more sense
spira · Mar 8, 2016 · 91f948d · 91f948d
1 parent 3a55cbe
commit 91f948d
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 24 deletions.
diff --git a/dist/ngJwtAuth.d.ts b/dist/ngJwtAuth.d.ts
@@ -94,8 +94,8 @@ declare module NgJwtAuth {
     interface IUserFactory {
         (subClaim: string, tokenData: IJwtClaims): ng.IPromise<IUser>;
     }
-    interface ILoginListener {
-        (user: IUser): any;
+    interface IUserEventListener {
+        (user: IUser): void;
     }
     interface IBase64Service {
         encode(string: string): string;
@@ -344,12 +344,12 @@ declare module NgJwtAuth {
          * Register a login listener function
          * @param loginListener
          */
-        registerLoginListener(loginListener: ILoginListener): void;
+        registerLoginListener(loginListener: IUserEventListener): void;
         /**
          * Register a logout listener function
          * @param logoutListener
          */
-        registerLogoutListener(logoutListener: Function): void;
+        registerLogoutListener(logoutListener: IUserEventListener): void;
         /**
          * Get a user's token given their identifier
          * @param userIdentifier

diff --git a/dist/ngJwtAuth.js b/dist/ngJwtAuth.js
diff --git a/dist/ngJwtAuth.js.map b/dist/ngJwtAuth.js.map
diff --git a/src/ngJwtAuthInterfaces.ts b/src/ngJwtAuthInterfaces.ts
@@ -92,8 +92,8 @@ module NgJwtAuth {
         (subClaim:string, tokenData:IJwtClaims): ng.IPromise<IUser>;
     }
 
-    export interface ILoginListener {
-        (user:IUser):any;
+    export interface IUserEventListener {
+        (user:IUser):void;
     }
 
     export interface IBase64Service {

diff --git a/src/ngJwtAuthService.ts b/src/ngJwtAuthService.ts
@@ -5,8 +5,8 @@ module NgJwtAuth {
         //private properties
         private userFactory:IUserFactory;
         private loginPromptFactory:ILoginPromptFactory;
-        private loginListeners:ILoginListener[] = [];
-        private logoutListeners:Function[] = [];
+        private loginListeners:IUserEventListener[] = [];
+        private logoutListeners:IUserEventListener[] = [];
         private userLoggedInPromise:ng.IPromise<any>;
 
         private refreshTimerPromise:ng.IPromise<any>;
@@ -514,9 +514,7 @@ module NgJwtAuth {
          */
         private handleLogin(user:IUser):void {
 
-            _.each(this.loginListeners, (listener:ILoginListener) => {
-                listener(user);
-            });
+            _.invoke(this.loginListeners, _.call, null, user);
 
         }
 
@@ -661,27 +659,26 @@ module NgJwtAuth {
         public logout():void {
             this.clearJWTToken();
             this.loggedIn = false;
-            this.user = null;
 
-            _.each(this.logoutListeners, (listener:Function) => {
-                listener();
-            });
+            //call all logout listeners with user that is logged out
+            _.invoke(this.logoutListeners, _.call, null, this.user);
+            this.user = null;
         }
 
 
         /**
          * Register a login listener function
          * @param loginListener
          */
-        public registerLoginListener(loginListener:ILoginListener):void {
+        public registerLoginListener(loginListener:IUserEventListener):void {
             this.loginListeners.push(loginListener);
         }
 
         /**
          * Register a logout listener function
          * @param logoutListener
          */
-        public registerLogoutListener(logoutListener:Function):void {
+        public registerLogoutListener(logoutListener:IUserEventListener):void {
             this.logoutListeners.push(logoutListener);
         }