From 91f948df255a8c5d80cbb48a345cb228fcc0b9de Mon Sep 17 00:00:00 2001 From: Zak Henry Date: Tue, 8 Mar 2016 10:13:10 +0000 Subject: [PATCH] Updated logout listener to take argument of the logged out user, changed the interface name to make more sense --- dist/ngJwtAuth.d.ts | 8 ++++---- dist/ngJwtAuth.js | 9 +++------ dist/ngJwtAuth.js.map | 2 +- src/ngJwtAuthInterfaces.ts | 4 ++-- src/ngJwtAuthService.ts | 19 ++++++++----------- 5 files changed, 18 insertions(+), 24 deletions(-) diff --git a/dist/ngJwtAuth.d.ts b/dist/ngJwtAuth.d.ts index 0cd5670..af9961f 100644 --- 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; } - 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 index 777d030..d17a7e1 100644 --- a/dist/ngJwtAuth.js +++ b/dist/ngJwtAuth.js @@ -447,9 +447,7 @@ var NgJwtAuth; * @param user */ NgJwtAuthService.prototype.handleLogin = function (user) { - _.each(this.loginListeners, function (listener) { - listener(user); - }); + _.invoke(this.loginListeners, _.call, null, user); }; /** * Find the user object within the path @@ -562,10 +560,9 @@ var NgJwtAuth; NgJwtAuthService.prototype.logout = function () { this.clearJWTToken(); this.loggedIn = false; + //call all logout listeners + _.invoke(this.logoutListeners, _.call, null, this.user); this.user = null; - _.each(this.logoutListeners, function (listener) { - listener(); - }); }; /** * Register a login listener function diff --git a/dist/ngJwtAuth.js.map b/dist/ngJwtAuth.js.map index 0c8d312..77d3942 100644 --- a/dist/ngJwtAuth.js.map +++ b/dist/ngJwtAuth.js.map @@ -1 +1 @@ -{"version":3,"sources":["ngJwtAuthInterceptor.ts","ngJwtAuthInterfaces.ts","ngJwtAuthService.ts","ngJwtAuthServiceProvider.ts"],"names":[],"mappings":"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","file":"ngJwtAuth.js","sourceRoot":"../src/"} \ No newline at end of file +{"version":3,"sources":["ngJwtAuthInterceptor.ts","ngJwtAuthInterfaces.ts","ngJwtAuthService.ts","ngJwtAuthServiceProvider.ts"],"names":[],"mappings":"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","file":"ngJwtAuth.js","sourceRoot":"../src/"} \ No newline at end of file diff --git a/src/ngJwtAuthInterfaces.ts b/src/ngJwtAuthInterfaces.ts index 415cf12..5a3dab9 100644 --- a/src/ngJwtAuthInterfaces.ts +++ b/src/ngJwtAuthInterfaces.ts @@ -92,8 +92,8 @@ module NgJwtAuth { (subClaim:string, tokenData:IJwtClaims): ng.IPromise; } - 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 index 28a9dc8..68ccf6c 100644 --- 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; private refreshTimerPromise:ng.IPromise; @@ -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,11 +659,10 @@ 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; } @@ -673,7 +670,7 @@ module NgJwtAuth { * Register a login listener function * @param loginListener */ - public registerLoginListener(loginListener:ILoginListener):void { + public registerLoginListener(loginListener:IUserEventListener):void { this.loginListeners.push(loginListener); } @@ -681,7 +678,7 @@ module NgJwtAuth { * Register a logout listener function * @param logoutListener */ - public registerLogoutListener(logoutListener:Function):void { + public registerLogoutListener(logoutListener:IUserEventListener):void { this.logoutListeners.push(logoutListener); }