From 531513209232022867cb273d72b2035d0a84e2ce Mon Sep 17 00:00:00 2001 From: Jeremy Sik Date: Tue, 8 Mar 2016 17:19:31 +1100 Subject: [PATCH 1/2] Added logout listener functionality. --- bower.json | 2 +- dist/ngJwtAuth.d.ts | 6 +++++ dist/ngJwtAuth.js | 57 ++++++++++++++++++++++++----------------- dist/ngJwtAuth.js.map | 2 +- package.json | 2 +- src/ngJwtAuthService.ts | 13 ++++++++++ test/test.ts | 22 ++++++++++++++++ 7 files changed, 78 insertions(+), 26 deletions(-) diff --git a/bower.json b/bower.json index a826a52..c91c6f5 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "ng-jwt-auth", - "version": "3.5.1", + "version": "3.6.0", "description": "Angular JSON Web Token Authentication Module", "main": "dist/ngJwtAuth.js", "dependencies": { diff --git a/dist/ngJwtAuth.d.ts b/dist/ngJwtAuth.d.ts index 6856d2f..0cd5670 100644 --- a/dist/ngJwtAuth.d.ts +++ b/dist/ngJwtAuth.d.ts @@ -117,6 +117,7 @@ declare module NgJwtAuth { private userFactory; private loginPromptFactory; private loginListeners; + private logoutListeners; private userLoggedInPromise; private refreshTimerPromise; private tokenData; @@ -344,6 +345,11 @@ declare module NgJwtAuth { * @param loginListener */ registerLoginListener(loginListener: ILoginListener): void; + /** + * Register a logout listener function + * @param logoutListener + */ + registerLogoutListener(logoutListener: Function): void; /** * Get a user's token given their identifier * @param userIdentifier diff --git a/dist/ngJwtAuth.js b/dist/ngJwtAuth.js index 4e13ece..777d030 100644 --- a/dist/ngJwtAuth.js +++ b/dist/ngJwtAuth.js @@ -1,3 +1,8 @@ +var __extends = (this && this.__extends) || function (d, b) { + for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); +}; var NgJwtAuth; (function (NgJwtAuth) { var NgJwtAuthInterceptor = (function () { @@ -42,7 +47,7 @@ var NgJwtAuth; */ NgJwtAuthInterceptor.$inject = ['$q', '$injector']; return NgJwtAuthInterceptor; - })(); + }()); NgJwtAuth.NgJwtAuthInterceptor = NgJwtAuthInterceptor; })(NgJwtAuth || (NgJwtAuth = {})); /// @@ -71,6 +76,7 @@ var NgJwtAuth; this.$cookies = $cookies; this.$location = $location; this.loginListeners = []; + this.logoutListeners = []; this.loggedIn = false; /** * Handle token refresh timer @@ -406,22 +412,23 @@ var NgJwtAuth; throw new NgJwtAuth.NgJwtAuthException("You must set a loginPromptFactory with `ngJwtAuthService.registerLoginPromptFactory()` so the user can be prompted for their credentials"); } if (!this.userLoggedInPromise) { - var deferredCredentials = this.$q.defer(); - var loginSuccess = this.$q.defer(); - deferredCredentials.promise + var deferredCredentials_1 = this.$q.defer(); + var loginSuccess_1 = this.$q.defer(); + deferredCredentials_1.promise .then(null, null, function (credentials) { return _this.authenticateCredentials(credentials.username, credentials.password).then(function (user) { //credentials were successful; resolve the promises - deferredCredentials.resolve(user); - loginSuccess.resolve(user); + deferredCredentials_1.resolve(user); + loginSuccess_1.resolve(user); }, function (err) { - loginSuccess.notify(err); + loginSuccess_1.notify(err); }); }); - this.userLoggedInPromise = this.loginPromptFactory(deferredCredentials, loginSuccess.promise, this.user) - .then(function () { return loginSuccess.promise; }, function (err) { - deferredCredentials.reject(); //if the user aborted login, reject the credentials promise - loginSuccess.reject(); + this.userLoggedInPromise = this.loginPromptFactory(deferredCredentials_1, loginSuccess_1.promise, this.user) + .then(function () { return loginSuccess_1.promise; }, //when the user has completed the login, chain on the login success promise + function (err) { + deferredCredentials_1.reject(); //if the user aborted login, reject the credentials promise + loginSuccess_1.reject(); return _this.$q.reject(err); //and reject the login promise }); } @@ -556,6 +563,9 @@ var NgJwtAuth; this.clearJWTToken(); this.loggedIn = false; this.user = null; + _.each(this.logoutListeners, function (listener) { + listener(); + }); }; /** * Register a login listener function @@ -564,6 +574,13 @@ var NgJwtAuth; NgJwtAuthService.prototype.registerLoginListener = function (loginListener) { this.loginListeners.push(loginListener); }; + /** + * Register a logout listener function + * @param logoutListener + */ + NgJwtAuthService.prototype.registerLogoutListener = function (logoutListener) { + this.logoutListeners.push(logoutListener); + }; /** * Get a user's token given their identifier * @param userIdentifier @@ -582,15 +599,9 @@ var NgJwtAuth; return this.retrieveAndProcessToken(endpoint, authHeader); }; return NgJwtAuthService; - })(); + }()); NgJwtAuth.NgJwtAuthService = NgJwtAuthService; })(NgJwtAuth || (NgJwtAuth = {})); -var __extends = (this && this.__extends) || function (d, b) { - for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; - function __() { this.constructor = d; } - __.prototype = b.prototype; - d.prototype = new __(); -}; var NgJwtAuth; (function (NgJwtAuth) { var NgJwtAuthException = (function (_super) { @@ -606,7 +617,7 @@ var NgJwtAuth; return this.name + ': ' + this.message; }; return NgJwtAuthException; - })(Error); + }(Error)); NgJwtAuth.NgJwtAuthException = NgJwtAuthException; var NgJwtAuthTokenExpiredException = (function (_super) { __extends(NgJwtAuthTokenExpiredException, _super); @@ -614,7 +625,7 @@ var NgJwtAuth; _super.apply(this, arguments); } return NgJwtAuthTokenExpiredException; - })(NgJwtAuthException); + }(NgJwtAuthException)); NgJwtAuth.NgJwtAuthTokenExpiredException = NgJwtAuthTokenExpiredException; var NgJwtAuthCredentialsFailedException = (function (_super) { __extends(NgJwtAuthCredentialsFailedException, _super); @@ -622,7 +633,7 @@ var NgJwtAuth; _super.apply(this, arguments); } return NgJwtAuthCredentialsFailedException; - })(NgJwtAuthException); + }(NgJwtAuthException)); NgJwtAuth.NgJwtAuthCredentialsFailedException = NgJwtAuthCredentialsFailedException; var NgJwtAuthServiceProvider = (function () { /** @@ -667,7 +678,7 @@ var NgJwtAuth; return this; }; return NgJwtAuthServiceProvider; - })(); + }()); NgJwtAuth.NgJwtAuthServiceProvider = NgJwtAuthServiceProvider; angular.module('ngJwtAuth', ['ab-base64', 'ngCookies']) .provider('ngJwtAuthService', NgJwtAuthServiceProvider) @@ -677,4 +688,4 @@ var NgJwtAuth; }]); })(NgJwtAuth || (NgJwtAuth = {})); -//# sourceMappingURL=ngJwtAuth.js.map \ No newline at end of file +//# sourceMappingURL=ngJwtAuth.js.map diff --git a/dist/ngJwtAuth.js.map b/dist/ngJwtAuth.js.map index f0bb515..0c8d312 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":["NgJwtAuth","NgJwtAuth.NgJwtAuthInterceptor","NgJwtAuth.NgJwtAuthInterceptor.constructor","NgJwtAuth.NgJwtAuthService","NgJwtAuth.NgJwtAuthService.constructor","NgJwtAuth.NgJwtAuthService.getConfig","NgJwtAuth.NgJwtAuthService.defaultUserFactory","NgJwtAuth.NgJwtAuthService.init","NgJwtAuth.NgJwtAuthService.startRefreshTimer","NgJwtAuth.NgJwtAuthService.cancelRefreshTimer","NgJwtAuth.NgJwtAuthService.tokenNeedsToRefreshNow","NgJwtAuth.NgJwtAuthService.getLoginEndpoint","NgJwtAuth.NgJwtAuthService.getTokenExchangeEndpoint","NgJwtAuth.NgJwtAuthService.getLoginAsUserEndpoint","NgJwtAuth.NgJwtAuthService.getRefreshEndpoint","NgJwtAuth.NgJwtAuthService.getAuthHeader","NgJwtAuth.NgJwtAuthService.getTokenHeader","NgJwtAuth.NgJwtAuthService.getBearerHeader","NgJwtAuth.NgJwtAuthService.getRefreshHeader","NgJwtAuth.NgJwtAuthService.retrieveAndProcessToken","NgJwtAuth.NgJwtAuthService.readToken","NgJwtAuth.NgJwtAuthService.validateToken","NgJwtAuth.NgJwtAuthService.promptLogin","NgJwtAuth.NgJwtAuthService.processNewToken","NgJwtAuth.NgJwtAuthService.loadTokenFromStorage","NgJwtAuth.NgJwtAuthService.isLoginMethod","NgJwtAuth.NgJwtAuthService.getUser","NgJwtAuth.NgJwtAuthService.getPromisedUser","NgJwtAuth.NgJwtAuthService.clearJWTToken","NgJwtAuth.NgJwtAuthService.authenticateCredentials","NgJwtAuth.NgJwtAuthService.exchangeToken","NgJwtAuth.NgJwtAuthService.refreshToken","NgJwtAuth.NgJwtAuthService.requireCredentialsAndAuthenticate","NgJwtAuth.NgJwtAuthService.handleLogin","NgJwtAuth.NgJwtAuthService.getUserFromTokenData","NgJwtAuth.NgJwtAuthService.saveTokenToStorage","NgJwtAuth.NgJwtAuthService.saveCookie","NgJwtAuth.NgJwtAuthService.setJWTHeader","NgJwtAuth.NgJwtAuthService.unsetJWTHeader","NgJwtAuth.NgJwtAuthService.handleInterceptedUnauthorisedResponse","NgJwtAuth.NgJwtAuthService.registerLoginPromptFactory","NgJwtAuth.NgJwtAuthService.registerUserFactory","NgJwtAuth.NgJwtAuthService.logout","NgJwtAuth.NgJwtAuthService.registerLoginListener","NgJwtAuth.NgJwtAuthService.loginAsUser","NgJwtAuth.NgJwtAuthException","NgJwtAuth.NgJwtAuthException.constructor","NgJwtAuth.NgJwtAuthException.toString","NgJwtAuth.NgJwtAuthTokenExpiredException","NgJwtAuth.NgJwtAuthTokenExpiredException.constructor","NgJwtAuth.NgJwtAuthCredentialsFailedException","NgJwtAuth.NgJwtAuthCredentialsFailedException.constructor","NgJwtAuth.NgJwtAuthServiceProvider","NgJwtAuth.NgJwtAuthServiceProvider.constructor","NgJwtAuth.NgJwtAuthServiceProvider.constructor.NgJwtAuthServiceFactory","NgJwtAuth.NgJwtAuthServiceProvider.configure"],"mappings":"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KAAKA,GAAGA,CAACA,CAACA,GAAGA,CAACA,MAAMA,CAACA,IAAIA,EAAEA,KAAIA,CAACA,MAAMA,CAACA,aAAaA,CAACA,CAACA;oBAE1DA,EAAEA,CAACA,CAACA,CAACA,CAACA,QAAQA,CAACA,KAAKA,CAACA,CAACA,CAAAA,CAACA;wBACnBA,MAAMA,CAACA,KAAKA,CAACA;oBACjBA,CAACA;gBACLA,CAACA;gBAEDA,MAAMA,CAACA,KAAIA,CAACA,EAAEA,CAACA,MAAMA,CAACA,IAAIA,4BAAkBA,CAACA,2CAA2CA,CAACA,CAACA,CAACA;YAC/FA,CAACA,CAACA;iBACDA,IAAIA,CAACA,UAACA,KAAYA;gBAEfA,IAAIA,CAACA;oBAEDA,MAAMA,CAACA,KAAIA,CAACA,eAAeA,CAACA,KAAKA,CAACA,CAACA;gBAEvCA,CAAEA;gBAAAA,KAAKA,CAACA,CAACA,KAAKA,CAACA,CAACA,CAACA;oBACbA,MAAMA,CAACA,KAAIA,CAACA,EAAEA,CAACA,MAAMA,CAACA,KAAKA,CAACA,CAACA;gBACjCA,CAACA;YAELA,CAACA,CAACA;iBACDA,KAAKA,CAACA,UAACA,CAAKA;gBAETA,EAAEA,CAACA,CAACA,CAACA,CAACA,OAAOA,CAACA,CAACA,CAACA,IAAIA,CAACA,YAAkBA,KAAIA,CAACA,OAAQA,CAACA,KAAKA,CAACA,CAACA,CAACA;oBACzDA,MAAMA,CAACA,KAAIA,CAACA,EAAEA,CAACA,MAAMA,CAACA,IAAIA,4BAAkBA,CAACA,CAACA,CAACA,OAAOA,CAACA,CAACA,CAACA;gBAC7DA,CAACA;gBAEDA,EAAEA,CAACA,CAACA,CAACA,CAACA,MAAMA,KAAKA,GAAGA,CAACA,CAACA,CAACA;oBAEnBA,MAAMA,CAACA,KAAIA,CAACA,EAAEA,CAACA,MAAMA,CAACA,IAAIA,6CAAmCA,CAACA,8CAA8CA,CAACA,CAACA,CAACA;gBACnHA,CAACA;gBAEDA,MAAMA,CAACA,KAAIA,CAACA,EAAEA,CAACA,MAAMA,CAACA,IAAIA,4BAAkBA,CAACA,8BAA8BA,GAA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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/package.json b/package.json index 9cb8f64..e96185c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "angular-jwt-auth", - "version": "3.5.1", + "version": "3.6.0", "description": "Angular JSON Web Token Authentication Module", "main": "dist/ngJwtAuth.js", "scripts": { diff --git a/src/ngJwtAuthService.ts b/src/ngJwtAuthService.ts index 4790fd4..28a9dc8 100644 --- a/src/ngJwtAuthService.ts +++ b/src/ngJwtAuthService.ts @@ -6,6 +6,7 @@ module NgJwtAuth { private userFactory:IUserFactory; private loginPromptFactory:ILoginPromptFactory; private loginListeners:ILoginListener[] = []; + private logoutListeners:Function[] = []; private userLoggedInPromise:ng.IPromise; private refreshTimerPromise:ng.IPromise; @@ -661,6 +662,10 @@ module NgJwtAuth { this.clearJWTToken(); this.loggedIn = false; this.user = null; + + _.each(this.logoutListeners, (listener:Function) => { + listener(); + }); } @@ -672,6 +677,14 @@ module NgJwtAuth { this.loginListeners.push(loginListener); } + /** + * Register a logout listener function + * @param logoutListener + */ + public registerLogoutListener(logoutListener:Function):void { + this.logoutListeners.push(logoutListener); + } + /** * Get a user's token given their identifier * @param userIdentifier diff --git a/test/test.ts b/test/test.ts index 87f1333..d4d2f35 100644 --- a/test/test.ts +++ b/test/test.ts @@ -358,6 +358,28 @@ describe('Service tests', () => { }); + describe('Logout listening', () => { + + let mockListener = sinon.stub(); + + it('should be able to register a logout listener', () => { + + ngJwtAuthService.registerLogoutListener(mockListener); + + expect(mockListener).not.to.have.been.called; + + }); + + it('should notify the logout listener', () => { + + ngJwtAuthService.logout(); + + expect(mockListener).to.have.been.called; + + }); + + }); + describe('Failed authentication', () => { From 91f948df255a8c5d80cbb48a345cb228fcc0b9de Mon Sep 17 00:00:00 2001 From: Zak Henry Date: Tue, 8 Mar 2016 10:13:10 +0000 Subject: [PATCH 2/2] 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); }