@dangl/angular-dangl-identity-client 4.1.2 → 4.1.3-beta0008
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2020/dangl-identity.module.mjs +17 -7
- package/esm2020/interceptors/jwt-interceptor.service.mjs +5 -5
- package/esm2020/messengers/authentication.messenger.mjs +30 -12
- package/esm2020/services/authentication.service.mjs +7 -9
- package/esm2020/services/jwt-token.service.mjs +14 -8
- package/fesm2015/dangl-angular-dangl-identity-client.mjs +61 -30
- package/fesm2015/dangl-angular-dangl-identity-client.mjs.map +1 -1
- package/fesm2020/dangl-angular-dangl-identity-client.mjs +61 -30
- package/fesm2020/dangl-angular-dangl-identity-client.mjs.map +1 -1
- package/interceptors/jwt-interceptor.service.d.ts +5 -5
- package/messengers/authentication.messenger.d.ts +5 -2
- package/package.json +1 -1
- package/services/jwt-token.service.d.ts +6 -4
|
@@ -1,19 +1,29 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
|
|
1
|
+
import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
|
|
3
2
|
import { JwtInterceptorService } from './interceptors/jwt-interceptor.service';
|
|
3
|
+
import { NgModule } from '@angular/core';
|
|
4
4
|
import * as i0 from "@angular/core";
|
|
5
5
|
export class DanglIdentityModule {
|
|
6
6
|
}
|
|
7
7
|
DanglIdentityModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.4", ngImport: i0, type: DanglIdentityModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
|
|
8
8
|
DanglIdentityModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.0.4", ngImport: i0, type: DanglIdentityModule, imports: [HttpClientModule] });
|
|
9
|
-
DanglIdentityModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.0.4", ngImport: i0, type: DanglIdentityModule, providers: [
|
|
9
|
+
DanglIdentityModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.0.4", ngImport: i0, type: DanglIdentityModule, providers: [
|
|
10
|
+
{
|
|
11
|
+
provide: HTTP_INTERCEPTORS,
|
|
12
|
+
useClass: JwtInterceptorService,
|
|
13
|
+
multi: true,
|
|
14
|
+
},
|
|
15
|
+
], imports: [HttpClientModule] });
|
|
10
16
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.4", ngImport: i0, type: DanglIdentityModule, decorators: [{
|
|
11
17
|
type: NgModule,
|
|
12
18
|
args: [{
|
|
13
|
-
imports: [
|
|
14
|
-
|
|
19
|
+
imports: [HttpClientModule],
|
|
20
|
+
providers: [
|
|
21
|
+
{
|
|
22
|
+
provide: HTTP_INTERCEPTORS,
|
|
23
|
+
useClass: JwtInterceptorService,
|
|
24
|
+
multi: true,
|
|
25
|
+
},
|
|
15
26
|
],
|
|
16
|
-
providers: [{ provide: HTTP_INTERCEPTORS, useClass: JwtInterceptorService, multi: true }]
|
|
17
27
|
}]
|
|
18
28
|
}] });
|
|
19
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
29
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGFuZ2wtaWRlbnRpdHkubW9kdWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vcHJvamVjdHMvYW5ndWxhci1kYW5nbC1pZGVudGl0eS1jbGllbnQvc3JjL2RhbmdsLWlkZW50aXR5Lm1vZHVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUUzRSxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSx3Q0FBd0MsQ0FBQztBQUMvRSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sZUFBZSxDQUFDOztBQVl6QyxNQUFNLE9BQU8sbUJBQW1COztnSEFBbkIsbUJBQW1CO2lIQUFuQixtQkFBbUIsWUFUcEIsZ0JBQWdCO2lIQVNmLG1CQUFtQixhQVJuQjtRQUNUO1lBQ0UsT0FBTyxFQUFFLGlCQUFpQjtZQUMxQixRQUFRLEVBQUUscUJBQXFCO1lBQy9CLEtBQUssRUFBRSxJQUFJO1NBQ1o7S0FDRixZQVBTLGdCQUFnQjsyRkFTZixtQkFBbUI7a0JBVi9CLFFBQVE7bUJBQUM7b0JBQ1IsT0FBTyxFQUFFLENBQUMsZ0JBQWdCLENBQUM7b0JBQzNCLFNBQVMsRUFBRTt3QkFDVDs0QkFDRSxPQUFPLEVBQUUsaUJBQWlCOzRCQUMxQixRQUFRLEVBQUUscUJBQXFCOzRCQUMvQixLQUFLLEVBQUUsSUFBSTt5QkFDWjtxQkFDRjtpQkFDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEhUVFBfSU5URVJDRVBUT1JTLCBIdHRwQ2xpZW50TW9kdWxlIH0gZnJvbSAnQGFuZ3VsYXIvY29tbW9uL2h0dHAnO1xyXG5cclxuaW1wb3J0IHsgSnd0SW50ZXJjZXB0b3JTZXJ2aWNlIH0gZnJvbSAnLi9pbnRlcmNlcHRvcnMvand0LWludGVyY2VwdG9yLnNlcnZpY2UnO1xyXG5pbXBvcnQgeyBOZ01vZHVsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xyXG5cclxuQE5nTW9kdWxlKHtcclxuICBpbXBvcnRzOiBbSHR0cENsaWVudE1vZHVsZV0sXHJcbiAgcHJvdmlkZXJzOiBbXHJcbiAgICB7XHJcbiAgICAgIHByb3ZpZGU6IEhUVFBfSU5URVJDRVBUT1JTLFxyXG4gICAgICB1c2VDbGFzczogSnd0SW50ZXJjZXB0b3JTZXJ2aWNlLFxyXG4gICAgICBtdWx0aTogdHJ1ZSxcclxuICAgIH0sXHJcbiAgXSxcclxufSlcclxuZXhwb3J0IGNsYXNzIERhbmdsSWRlbnRpdHlNb2R1bGUge31cclxuIl19
|
|
@@ -1,15 +1,15 @@
|
|
|
1
|
-
import { Inject, Injectable, InjectionToken, Optional } from
|
|
2
|
-
import { mergeMap } from
|
|
1
|
+
import { Inject, Injectable, InjectionToken, Optional } from '@angular/core';
|
|
2
|
+
import { mergeMap } from 'rxjs/operators';
|
|
3
3
|
import * as i0 from "@angular/core";
|
|
4
4
|
import * as i1 from "../services/jwt-token.service";
|
|
5
|
-
export const DANGL_IDENTITY_REQUEST_VALIDATOR = new InjectionToken(
|
|
5
|
+
export const DANGL_IDENTITY_REQUEST_VALIDATOR = new InjectionToken('Validator to decide whether to include JWT tokens in requests');
|
|
6
6
|
export class JwtInterceptorService {
|
|
7
7
|
constructor(jwtTokenService, requestValidator) {
|
|
8
8
|
this.jwtTokenService = jwtTokenService;
|
|
9
9
|
this.requestValidator = requestValidator;
|
|
10
10
|
}
|
|
11
11
|
intercept(request, next) {
|
|
12
|
-
if (request.url.startsWith(
|
|
12
|
+
if (request.url.startsWith('/identity')) {
|
|
13
13
|
// Requests to the authentication endpoint should not be intercepted
|
|
14
14
|
return next.handle(request.clone());
|
|
15
15
|
}
|
|
@@ -44,4 +44,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.4", ngImpor
|
|
|
44
44
|
type: Inject,
|
|
45
45
|
args: [DANGL_IDENTITY_REQUEST_VALIDATOR]
|
|
46
46
|
}] }]; } });
|
|
47
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
47
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiand0LWludGVyY2VwdG9yLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9wcm9qZWN0cy9hbmd1bGFyLWRhbmdsLWlkZW50aXR5LWNsaWVudC9zcmMvaW50ZXJjZXB0b3JzL2p3dC1pbnRlcmNlcHRvci5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU9BLE9BQU8sRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLGNBQWMsRUFBRSxRQUFRLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFHN0UsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGdCQUFnQixDQUFDOzs7QUFHMUMsTUFBTSxDQUFDLE1BQU0sZ0NBQWdDLEdBQzNDLElBQUksY0FBYyxDQUNoQiwrREFBK0QsQ0FDaEUsQ0FBQztBQUVKLE1BQU0sT0FBTyxxQkFBcUI7SUFDaEMsWUFDUyxlQUFnQyxFQUcvQixnQkFBZ0Q7UUFIakQsb0JBQWUsR0FBZixlQUFlLENBQWlCO1FBRy9CLHFCQUFnQixHQUFoQixnQkFBZ0IsQ0FBZ0M7SUFDdkQsQ0FBQztJQUNKLFNBQVMsQ0FDUCxPQUF5QixFQUN6QixJQUFpQjtRQUVqQixJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLFdBQVcsQ0FBQyxFQUFFO1lBQ3ZDLG9FQUFvRTtZQUNwRSxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUM7U0FDckM7UUFFRCxJQUNFLElBQUksQ0FBQyxnQkFBZ0I7WUFDckIsQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsZUFBZSxDQUFDLE9BQU8sQ0FBQyxFQUMvQztZQUNBLDBFQUEwRTtZQUMxRSwrQ0FBK0M7WUFDL0MsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1NBQzdCO1FBRUQsT0FBTyxJQUFJLENBQUMsZUFBZTthQUN4QixRQUFRLEVBQUU7YUFDVixJQUFJLENBQ0gsUUFBUSxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FDYixJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyx1QkFBdUIsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUN2RSxDQUNGLENBQUM7SUFDTixDQUFDO0lBRU8sdUJBQXVCLENBQzdCLE9BQXlCLEVBQ3pCLEtBQWM7UUFFZCxJQUFJLEtBQUssRUFBRTtZQUNULE9BQU8sT0FBTyxDQUFDLEtBQUssQ0FBQztnQkFDbkIsVUFBVSxFQUFFO29CQUNWLGFBQWEsRUFBRSxVQUFVLEtBQUssRUFBRTtpQkFDakM7YUFDRixDQUFDLENBQUM7U0FDSjtRQUNELE9BQU8sT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQ3pCLENBQUM7O2tIQTlDVSxxQkFBcUIsaURBSXRCLGdDQUFnQztzSEFKL0IscUJBQXFCOzJGQUFyQixxQkFBcUI7a0JBRGpDLFVBQVU7OzBCQUlOLFFBQVE7OzBCQUNSLE1BQU07MkJBQUMsZ0NBQWdDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcclxuICBIdHRwRXZlbnQsXHJcbiAgSHR0cEhhbmRsZXIsXHJcbiAgSHR0cEludGVyY2VwdG9yLFxyXG4gIEh0dHBSZXF1ZXN0LFxyXG59IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcclxuXHJcbmltcG9ydCB7IEluamVjdCwgSW5qZWN0YWJsZSwgSW5qZWN0aW9uVG9rZW4sIE9wdGlvbmFsIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XHJcbmltcG9ydCB7IEp3dFRva2VuU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzL2p3dC10b2tlbi5zZXJ2aWNlJztcclxuaW1wb3J0IHsgT2JzZXJ2YWJsZSB9IGZyb20gJ3J4anMnO1xyXG5pbXBvcnQgeyBtZXJnZU1hcCB9IGZyb20gJ3J4anMvb3BlcmF0b3JzJztcclxuaW1wb3J0IHsgSURhbmdsSWRlbnRpdHlSZXF1ZXN0VmFsaWRhdG9yIH0gZnJvbSAnLi9kYW5nbC1pZGVudGl0eS1yZXF1ZXN0LXZhbGlkYXRvcic7XHJcblxyXG5leHBvcnQgY29uc3QgREFOR0xfSURFTlRJVFlfUkVRVUVTVF9WQUxJREFUT1IgPVxyXG4gIG5ldyBJbmplY3Rpb25Ub2tlbjxJRGFuZ2xJZGVudGl0eVJlcXVlc3RWYWxpZGF0b3I+KFxyXG4gICAgJ1ZhbGlkYXRvciB0byBkZWNpZGUgd2hldGhlciB0byBpbmNsdWRlIEpXVCB0b2tlbnMgaW4gcmVxdWVzdHMnXHJcbiAgKTtcclxuQEluamVjdGFibGUoKVxyXG5leHBvcnQgY2xhc3MgSnd0SW50ZXJjZXB0b3JTZXJ2aWNlIGltcGxlbWVudHMgSHR0cEludGVyY2VwdG9yIHtcclxuICBjb25zdHJ1Y3RvcihcclxuICAgIHB1YmxpYyBqd3RUb2tlblNlcnZpY2U6IEp3dFRva2VuU2VydmljZSxcclxuICAgIEBPcHRpb25hbCgpXHJcbiAgICBASW5qZWN0KERBTkdMX0lERU5USVRZX1JFUVVFU1RfVkFMSURBVE9SKVxyXG4gICAgcHJpdmF0ZSByZXF1ZXN0VmFsaWRhdG9yOiBJRGFuZ2xJZGVudGl0eVJlcXVlc3RWYWxpZGF0b3JcclxuICApIHt9XHJcbiAgaW50ZXJjZXB0KFxyXG4gICAgcmVxdWVzdDogSHR0cFJlcXVlc3Q8YW55PixcclxuICAgIG5leHQ6IEh0dHBIYW5kbGVyXHJcbiAgKTogT2JzZXJ2YWJsZTxIdHRwRXZlbnQ8YW55Pj4ge1xyXG4gICAgaWYgKHJlcXVlc3QudXJsLnN0YXJ0c1dpdGgoJy9pZGVudGl0eScpKSB7XHJcbiAgICAgIC8vIFJlcXVlc3RzIHRvIHRoZSBhdXRoZW50aWNhdGlvbiBlbmRwb2ludCBzaG91bGQgbm90IGJlIGludGVyY2VwdGVkXHJcbiAgICAgIHJldHVybiBuZXh0LmhhbmRsZShyZXF1ZXN0LmNsb25lKCkpO1xyXG4gICAgfVxyXG5cclxuICAgIGlmIChcclxuICAgICAgdGhpcy5yZXF1ZXN0VmFsaWRhdG9yICYmXHJcbiAgICAgICF0aGlzLnJlcXVlc3RWYWxpZGF0b3IudmFsaWRhdGVSZXF1ZXN0KHJlcXVlc3QpXHJcbiAgICApIHtcclxuICAgICAgLy8gSW4gY2FzZSBhIHJlcXVlc3QgdmFsaWRhdG9yIGlzIHByb3ZpZGVkIGJ1dCBkb2Vzbid0IHJldHVybiB0cnVlIGZvciB0aGVcclxuICAgICAgLy8gY3VycmVudCByZXF1ZXN0LCB3ZSdyZSBub3QgYXBwZW5kaW5nIGEgdG9rZW5cclxuICAgICAgcmV0dXJuIG5leHQuaGFuZGxlKHJlcXVlc3QpO1xyXG4gICAgfVxyXG5cclxuICAgIHJldHVybiB0aGlzLmp3dFRva2VuU2VydmljZVxyXG4gICAgICAuZ2V0VG9rZW4oKVxyXG4gICAgICAucGlwZShcclxuICAgICAgICBtZXJnZU1hcCgoZikgPT5cclxuICAgICAgICAgIG5leHQuaGFuZGxlKHRoaXMuZ2V0SHR0cFJlcXVlc3RXaXRoVG9rZW4ocmVxdWVzdCwgZiAmJiBmLmFjY2Vzc1Rva2VuKSlcclxuICAgICAgICApXHJcbiAgICAgICk7XHJcbiAgfVxyXG5cclxuICBwcml2YXRlIGdldEh0dHBSZXF1ZXN0V2l0aFRva2VuKFxyXG4gICAgcmVxdWVzdDogSHR0cFJlcXVlc3Q8YW55PixcclxuICAgIHRva2VuPzogc3RyaW5nXHJcbiAgKTogSHR0cFJlcXVlc3Q8YW55PiB7XHJcbiAgICBpZiAodG9rZW4pIHtcclxuICAgICAgcmV0dXJuIHJlcXVlc3QuY2xvbmUoe1xyXG4gICAgICAgIHNldEhlYWRlcnM6IHtcclxuICAgICAgICAgIEF1dGhvcml6YXRpb246IGBCZWFyZXIgJHt0b2tlbn1gLFxyXG4gICAgICAgIH0sXHJcbiAgICAgIH0pO1xyXG4gICAgfVxyXG4gICAgcmV0dXJuIHJlcXVlc3QuY2xvbmUoKTtcclxuICB9XHJcbn1cclxuIl19
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import { Injectable } from '@angular/core';
|
|
2
2
|
import { ReplaySubject, Subject } from 'rxjs';
|
|
3
3
|
import { JwtHelperService } from '@auth0/angular-jwt';
|
|
4
|
+
import { takeUntil } from 'rxjs/operators';
|
|
4
5
|
import * as i0 from "@angular/core";
|
|
5
6
|
import * as i1 from "../services/jwt-token.service";
|
|
6
7
|
export class AuthenticationMessenger {
|
|
7
8
|
constructor(jwtTokenService) {
|
|
8
9
|
this.jwtTokenService = jwtTokenService;
|
|
9
10
|
this.jwtHelperService = new JwtHelperService();
|
|
11
|
+
this.$destroyed = new Subject();
|
|
10
12
|
this.isAuthenticated = new ReplaySubject(1);
|
|
11
13
|
this.username = new ReplaySubject(1);
|
|
12
14
|
this.email = new ReplaySubject(1);
|
|
@@ -14,15 +16,33 @@ export class AuthenticationMessenger {
|
|
|
14
16
|
this.userInfo = new ReplaySubject(1);
|
|
15
17
|
this.tokenRefreshStarted = new Subject();
|
|
16
18
|
this.tokenRefreshFinished = new Subject();
|
|
17
|
-
jwtTokenService.tokenRefreshStarted
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
jwtTokenService.
|
|
21
|
-
.
|
|
19
|
+
jwtTokenService.tokenRefreshStarted
|
|
20
|
+
.pipe(takeUntil(this.$destroyed))
|
|
21
|
+
.subscribe(() => this.tokenRefreshStarted.next());
|
|
22
|
+
jwtTokenService.tokenRefreshFinished
|
|
23
|
+
.pipe(takeUntil(this.$destroyed))
|
|
24
|
+
.subscribe((successfulRefresh) => this.tokenRefreshFinished.next(successfulRefresh));
|
|
25
|
+
jwtTokenService.tokenStored
|
|
26
|
+
.pipe(takeUntil(this.$destroyed))
|
|
27
|
+
.subscribe((jwtToken) => this.refreshAuthenticationStatus(jwtToken));
|
|
28
|
+
jwtTokenService
|
|
29
|
+
.getToken()
|
|
30
|
+
.subscribe((token) => this.refreshAuthenticationStatus(token));
|
|
31
|
+
}
|
|
32
|
+
ngOnDestroy() {
|
|
33
|
+
this.isAuthenticated.complete();
|
|
34
|
+
this.username.complete();
|
|
35
|
+
this.email.complete();
|
|
36
|
+
this.identiconId.complete();
|
|
37
|
+
this.userInfo.complete();
|
|
38
|
+
this.tokenRefreshStarted.complete();
|
|
39
|
+
this.tokenRefreshFinished.complete();
|
|
40
|
+
this.$destroyed.next();
|
|
41
|
+
this.$destroyed.complete();
|
|
22
42
|
}
|
|
23
43
|
refreshAuthenticationStatus(jwtToken) {
|
|
24
44
|
if (jwtToken) {
|
|
25
|
-
const isValidToken = jwtToken.expiresAt >
|
|
45
|
+
const isValidToken = jwtToken.expiresAt > new Date().getTime() / 1000;
|
|
26
46
|
if (this.lastBroadcastAccessToken === jwtToken.accessToken) {
|
|
27
47
|
return;
|
|
28
48
|
}
|
|
@@ -49,14 +69,12 @@ export class AuthenticationMessenger {
|
|
|
49
69
|
email: decodedToken['email'],
|
|
50
70
|
identiconId: decodedToken['identicon_id'],
|
|
51
71
|
username: decodedToken['name'],
|
|
52
|
-
roles: decodedToken['role']
|
|
72
|
+
roles: decodedToken['role'],
|
|
53
73
|
});
|
|
54
74
|
}
|
|
55
75
|
else {
|
|
56
76
|
this.isAuthenticated.next(false);
|
|
57
|
-
this.jwtTokenService
|
|
58
|
-
.refreshToken()
|
|
59
|
-
.subscribe(() => { });
|
|
77
|
+
this.jwtTokenService.refreshToken().subscribe(() => { });
|
|
60
78
|
}
|
|
61
79
|
}
|
|
62
80
|
else {
|
|
@@ -77,7 +95,7 @@ AuthenticationMessenger.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.
|
|
|
77
95
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.4", ngImport: i0, type: AuthenticationMessenger, decorators: [{
|
|
78
96
|
type: Injectable,
|
|
79
97
|
args: [{
|
|
80
|
-
providedIn: 'root'
|
|
98
|
+
providedIn: 'root',
|
|
81
99
|
}]
|
|
82
100
|
}], ctorParameters: function () { return [{ type: i1.JwtTokenService }]; } });
|
|
83
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"authentication.messenger.js","sourceRoot":"","sources":["../../../../projects/angular-dangl-identity-client/src/messengers/authentication.messenger.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\r\nimport { ReplaySubject, Subject } from 'rxjs';\r\nimport { UserInfo } from '../models/user-info';\r\nimport { JwtTokenService } from '../services/jwt-token.service';\r\nimport { JwtHelperService } from '@auth0/angular-jwt';\r\nimport { JwtStorage } from '../models/jwt-storage';\r\n\r\n@Injectable({\r\n  providedIn: 'root'\r\n})\r\nexport class AuthenticationMessenger {\r\n\r\n  private jwtHelperService = new JwtHelperService();\r\n  private lastBroadcastAccessToken: string;\r\n\r\n  readonly isAuthenticated = new ReplaySubject<boolean>(1);\r\n  readonly username = new ReplaySubject<string>(1);\r\n  readonly email = new ReplaySubject<string>(1);\r\n  readonly identiconId = new ReplaySubject<string>(1);\r\n  readonly userInfo = new ReplaySubject<UserInfo>(1);\r\n  readonly tokenRefreshStarted = new Subject();\r\n  readonly tokenRefreshFinished = new Subject<boolean>();\r\n\r\n  constructor(private jwtTokenService: JwtTokenService) {\r\n    jwtTokenService.tokenRefreshStarted.subscribe(() => this.tokenRefreshStarted.next());\r\n    jwtTokenService.tokenRefreshFinished.subscribe(successfulRefresh => this.tokenRefreshFinished.next(successfulRefresh));\r\n    jwtTokenService.tokenStored.subscribe(jwtToken => this.refreshAuthenticationStatus(jwtToken));\r\n    jwtTokenService.getToken()\r\n      .subscribe(token => this.refreshAuthenticationStatus(token));\r\n  }\r\n\r\n  private refreshAuthenticationStatus(jwtToken?: JwtStorage) {\r\n    if (jwtToken) {\r\n      const isValidToken = jwtToken.expiresAt > (new Date().getTime() / 1000);\r\n      if (this.lastBroadcastAccessToken === jwtToken.accessToken) {\r\n        return;\r\n      }\r\n      this.lastBroadcastAccessToken = jwtToken.accessToken;\r\n      if (isValidToken) {\r\n        this.isAuthenticated.next(true);\r\n        const decodedToken = this.jwtHelperService.decodeToken(jwtToken.accessToken);\r\n        this.username.next(decodedToken['name']);\r\n        this.email.next(decodedToken['email']);\r\n        this.identiconId.next(decodedToken['identicon_id']);\r\n\r\n        const tokenClaims: { [claim: string]: string } = {};\r\n        for (const tokenProp in decodedToken) {\r\n          if (decodedToken.hasOwnProperty(tokenProp)) {\r\n            const property = decodedToken[tokenProp];\r\n            if (typeof property === 'string') {\r\n              tokenClaims[tokenProp] = property;\r\n            }\r\n          }\r\n        }\r\n\r\n        this.userInfo.next({\r\n          id: decodedToken['sub'],\r\n          claims: tokenClaims,\r\n          deserializedToken: decodedToken,\r\n          email: decodedToken['email'],\r\n          identiconId: decodedToken['identicon_id'],\r\n          username: decodedToken['name'],\r\n          roles: decodedToken['role']\r\n        });\r\n      } else {\r\n        this.isAuthenticated.next(false);\r\n        this.jwtTokenService\r\n          .refreshToken()\r\n          .subscribe(() => { });\r\n      }\r\n    } else {\r\n      if (this.lastBroadcastAccessToken === null) {\r\n        return;\r\n      }\r\n      this.lastBroadcastAccessToken = null;\r\n      this.isAuthenticated.next(false);\r\n      this.username.next(null);\r\n      this.email.next(null);\r\n      this.identiconId.next(null);\r\n      this.userInfo.next(null);\r\n    }\r\n  }\r\n\r\n}\r\n"]}
|
|
101
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"authentication.messenger.js","sourceRoot":"","sources":["../../../../projects/angular-dangl-identity-client/src/messengers/authentication.messenger.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, OnDestroy } from '@angular/core';\r\nimport { ReplaySubject, Subject } from 'rxjs';\r\n\r\nimport { JwtHelperService } from '@auth0/angular-jwt';\r\nimport { JwtStorage } from '../models/jwt-storage';\r\nimport { JwtTokenService } from '../services/jwt-token.service';\r\nimport { UserInfo } from '../models/user-info';\r\nimport { takeUntil } from 'rxjs/operators';\r\n\r\n@Injectable({\r\n  providedIn: 'root',\r\n})\r\nexport class AuthenticationMessenger implements OnDestroy {\r\n  private jwtHelperService = new JwtHelperService();\r\n  private lastBroadcastAccessToken: string;\r\n  private $destroyed = new Subject();\r\n\r\n  readonly isAuthenticated = new ReplaySubject<boolean>(1);\r\n  readonly username = new ReplaySubject<string>(1);\r\n  readonly email = new ReplaySubject<string>(1);\r\n  readonly identiconId = new ReplaySubject<string>(1);\r\n  readonly userInfo = new ReplaySubject<UserInfo>(1);\r\n  readonly tokenRefreshStarted = new Subject();\r\n  readonly tokenRefreshFinished = new Subject<boolean>();\r\n\r\n  constructor(private jwtTokenService: JwtTokenService) {\r\n    jwtTokenService.tokenRefreshStarted\r\n      .pipe(takeUntil(this.$destroyed))\r\n      .subscribe(() => this.tokenRefreshStarted.next());\r\n\r\n    jwtTokenService.tokenRefreshFinished\r\n      .pipe(takeUntil(this.$destroyed))\r\n      .subscribe((successfulRefresh) =>\r\n        this.tokenRefreshFinished.next(successfulRefresh)\r\n      );\r\n\r\n    jwtTokenService.tokenStored\r\n      .pipe(takeUntil(this.$destroyed))\r\n      .subscribe((jwtToken) => this.refreshAuthenticationStatus(jwtToken));\r\n\r\n    jwtTokenService\r\n      .getToken()\r\n      .subscribe((token) => this.refreshAuthenticationStatus(token));\r\n  }\r\n\r\n  ngOnDestroy(): void {\r\n    this.isAuthenticated.complete();\r\n    this.username.complete();\r\n    this.email.complete();\r\n    this.identiconId.complete();\r\n    this.userInfo.complete();\r\n    this.tokenRefreshStarted.complete();\r\n    this.tokenRefreshFinished.complete();\r\n    this.$destroyed.next();\r\n    this.$destroyed.complete();\r\n  }\r\n\r\n  private refreshAuthenticationStatus(jwtToken?: JwtStorage) {\r\n    if (jwtToken) {\r\n      const isValidToken = jwtToken.expiresAt > new Date().getTime() / 1000;\r\n      if (this.lastBroadcastAccessToken === jwtToken.accessToken) {\r\n        return;\r\n      }\r\n      this.lastBroadcastAccessToken = jwtToken.accessToken;\r\n      if (isValidToken) {\r\n        this.isAuthenticated.next(true);\r\n        const decodedToken = this.jwtHelperService.decodeToken(\r\n          jwtToken.accessToken\r\n        );\r\n        this.username.next(decodedToken['name']);\r\n        this.email.next(decodedToken['email']);\r\n        this.identiconId.next(decodedToken['identicon_id']);\r\n\r\n        const tokenClaims: { [claim: string]: string } = {};\r\n        for (const tokenProp in decodedToken) {\r\n          if (decodedToken.hasOwnProperty(tokenProp)) {\r\n            const property = decodedToken[tokenProp];\r\n            if (typeof property === 'string') {\r\n              tokenClaims[tokenProp] = property;\r\n            }\r\n          }\r\n        }\r\n\r\n        this.userInfo.next({\r\n          id: decodedToken['sub'],\r\n          claims: tokenClaims,\r\n          deserializedToken: decodedToken,\r\n          email: decodedToken['email'],\r\n          identiconId: decodedToken['identicon_id'],\r\n          username: decodedToken['name'],\r\n          roles: decodedToken['role'],\r\n        });\r\n      } else {\r\n        this.isAuthenticated.next(false);\r\n        this.jwtTokenService.refreshToken().subscribe(() => {});\r\n      }\r\n    } else {\r\n      if (this.lastBroadcastAccessToken === null) {\r\n        return;\r\n      }\r\n      this.lastBroadcastAccessToken = null;\r\n      this.isAuthenticated.next(false);\r\n      this.username.next(null);\r\n      this.email.next(null);\r\n      this.identiconId.next(null);\r\n      this.userInfo.next(null);\r\n    }\r\n  }\r\n}\r\n"]}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Injectable } from '@angular/core';
|
|
2
1
|
import { of } from 'rxjs';
|
|
3
|
-
import {
|
|
2
|
+
import { catchError, map } from 'rxjs/operators';
|
|
3
|
+
import { Injectable } from '@angular/core';
|
|
4
4
|
import * as i0 from "@angular/core";
|
|
5
5
|
import * as i1 from "../api-client";
|
|
6
6
|
import * as i2 from "./jwt-token.service";
|
|
@@ -13,14 +13,12 @@ export class AuthenticationService {
|
|
|
13
13
|
return this.danglIdentityClient
|
|
14
14
|
.loginAndReturnToken({
|
|
15
15
|
identifier: identifier,
|
|
16
|
-
password: password
|
|
16
|
+
password: password,
|
|
17
17
|
})
|
|
18
|
-
.pipe(map(r => this.storeJwtTokenIfValid(r)), catchError(e => of(false)));
|
|
18
|
+
.pipe(map((r) => this.storeJwtTokenIfValid(r)), catchError((e) => of(false)));
|
|
19
19
|
}
|
|
20
20
|
storeJwtTokenIfValid(token) {
|
|
21
|
-
if (!token.accessToken
|
|
22
|
-
|| !token.refreshToken
|
|
23
|
-
|| !token.expiresIn) {
|
|
21
|
+
if (!token.accessToken || !token.refreshToken || !token.expiresIn) {
|
|
24
22
|
return false;
|
|
25
23
|
}
|
|
26
24
|
this.jwtTokenService.storeToken(token);
|
|
@@ -35,7 +33,7 @@ AuthenticationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0"
|
|
|
35
33
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.4", ngImport: i0, type: AuthenticationService, decorators: [{
|
|
36
34
|
type: Injectable,
|
|
37
35
|
args: [{
|
|
38
|
-
providedIn: 'root'
|
|
36
|
+
providedIn: 'root',
|
|
39
37
|
}]
|
|
40
38
|
}], ctorParameters: function () { return [{ type: i1.DanglIdentityClient }, { type: i2.JwtTokenService }]; } });
|
|
41
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
39
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aGVudGljYXRpb24uc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL2FuZ3VsYXItZGFuZ2wtaWRlbnRpdHktY2xpZW50L3NyYy9zZXJ2aWNlcy9hdXRoZW50aWNhdGlvbi5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBYyxFQUFFLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDdEMsT0FBTyxFQUFFLFVBQVUsRUFBRSxHQUFHLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUVqRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDOzs7O0FBTTNDLE1BQU0sT0FBTyxxQkFBcUI7SUFDaEMsWUFDVSxtQkFBd0MsRUFDeEMsZUFBZ0M7UUFEaEMsd0JBQW1CLEdBQW5CLG1CQUFtQixDQUFxQjtRQUN4QyxvQkFBZSxHQUFmLGVBQWUsQ0FBaUI7SUFDdkMsQ0FBQztJQUVKLGNBQWMsQ0FBQyxVQUFrQixFQUFFLFFBQWdCO1FBQ2pELE9BQU8sSUFBSSxDQUFDLG1CQUFtQjthQUM1QixtQkFBbUIsQ0FBQztZQUNuQixVQUFVLEVBQUUsVUFBVTtZQUN0QixRQUFRLEVBQUUsUUFBUTtTQUNuQixDQUFDO2FBQ0QsSUFBSSxDQUNILEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLG9CQUFvQixDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQ3hDLFVBQVUsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQzdCLENBQUM7SUFDTixDQUFDO0lBRU8sb0JBQW9CLENBQUMsS0FBdUI7UUFDbEQsSUFBSSxDQUFDLEtBQUssQ0FBQyxXQUFXLElBQUksQ0FBQyxLQUFLLENBQUMsWUFBWSxJQUFJLENBQUMsS0FBSyxDQUFDLFNBQVMsRUFBRTtZQUNqRSxPQUFPLEtBQUssQ0FBQztTQUNkO1FBQ0QsSUFBSSxDQUFDLGVBQWUsQ0FBQyxVQUFVLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDdkMsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQsTUFBTTtRQUNKLElBQUksQ0FBQyxlQUFlLENBQUMsV0FBVyxFQUFFLENBQUM7SUFDckMsQ0FBQzs7a0hBNUJVLHFCQUFxQjtzSEFBckIscUJBQXFCLGNBRnBCLE1BQU07MkZBRVAscUJBQXFCO2tCQUhqQyxVQUFVO21CQUFDO29CQUNWLFVBQVUsRUFBRSxNQUFNO2lCQUNuQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IERhbmdsSWRlbnRpdHlDbGllbnQsIFRva2VuUmVzcG9uc2VHZXQgfSBmcm9tICcuLi9hcGktY2xpZW50JztcclxuaW1wb3J0IHsgT2JzZXJ2YWJsZSwgb2YgfSBmcm9tICdyeGpzJztcclxuaW1wb3J0IHsgY2F0Y2hFcnJvciwgbWFwIH0gZnJvbSAncnhqcy9vcGVyYXRvcnMnO1xyXG5cclxuaW1wb3J0IHsgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xyXG5pbXBvcnQgeyBKd3RUb2tlblNlcnZpY2UgfSBmcm9tICcuL2p3dC10b2tlbi5zZXJ2aWNlJztcclxuXHJcbkBJbmplY3RhYmxlKHtcclxuICBwcm92aWRlZEluOiAncm9vdCcsXHJcbn0pXHJcbmV4cG9ydCBjbGFzcyBBdXRoZW50aWNhdGlvblNlcnZpY2Uge1xyXG4gIGNvbnN0cnVjdG9yKFxyXG4gICAgcHJpdmF0ZSBkYW5nbElkZW50aXR5Q2xpZW50OiBEYW5nbElkZW50aXR5Q2xpZW50LFxyXG4gICAgcHJpdmF0ZSBqd3RUb2tlblNlcnZpY2U6IEp3dFRva2VuU2VydmljZVxyXG4gICkge31cclxuXHJcbiAgbG9naW5XaXRoVG9rZW4oaWRlbnRpZmllcjogc3RyaW5nLCBwYXNzd29yZDogc3RyaW5nKTogT2JzZXJ2YWJsZTxib29sZWFuPiB7XHJcbiAgICByZXR1cm4gdGhpcy5kYW5nbElkZW50aXR5Q2xpZW50XHJcbiAgICAgIC5sb2dpbkFuZFJldHVyblRva2VuKHtcclxuICAgICAgICBpZGVudGlmaWVyOiBpZGVudGlmaWVyLFxyXG4gICAgICAgIHBhc3N3b3JkOiBwYXNzd29yZCxcclxuICAgICAgfSlcclxuICAgICAgLnBpcGUoXHJcbiAgICAgICAgbWFwKChyKSA9PiB0aGlzLnN0b3JlSnd0VG9rZW5JZlZhbGlkKHIpKSxcclxuICAgICAgICBjYXRjaEVycm9yKChlKSA9PiBvZihmYWxzZSkpXHJcbiAgICAgICk7XHJcbiAgfVxyXG5cclxuICBwcml2YXRlIHN0b3JlSnd0VG9rZW5JZlZhbGlkKHRva2VuOiBUb2tlblJlc3BvbnNlR2V0KTogYm9vbGVhbiB7XHJcbiAgICBpZiAoIXRva2VuLmFjY2Vzc1Rva2VuIHx8ICF0b2tlbi5yZWZyZXNoVG9rZW4gfHwgIXRva2VuLmV4cGlyZXNJbikge1xyXG4gICAgICByZXR1cm4gZmFsc2U7XHJcbiAgICB9XHJcbiAgICB0aGlzLmp3dFRva2VuU2VydmljZS5zdG9yZVRva2VuKHRva2VuKTtcclxuICAgIHJldHVybiB0cnVlO1xyXG4gIH1cclxuXHJcbiAgbG9nb3V0KCkge1xyXG4gICAgdGhpcy5qd3RUb2tlblNlcnZpY2UuZGVsZXRlVG9rZW4oKTtcclxuICB9XHJcbn1cclxuIl19
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import { Injectable } from
|
|
2
|
-
import { Subject, of, ReplaySubject } from
|
|
3
|
-
import { map, tap, first } from
|
|
1
|
+
import { Injectable } from '@angular/core';
|
|
2
|
+
import { Subject, of, ReplaySubject } from 'rxjs';
|
|
3
|
+
import { map, tap, first } from 'rxjs/operators';
|
|
4
4
|
import * as i0 from "@angular/core";
|
|
5
5
|
import * as i1 from "../api-client";
|
|
6
6
|
export class JwtTokenService {
|
|
7
7
|
constructor(danglIdentityClient) {
|
|
8
8
|
this.danglIdentityClient = danglIdentityClient;
|
|
9
|
-
this.storage_identifier =
|
|
9
|
+
this.storage_identifier = 'dangl_identity_integration_jwt_token';
|
|
10
10
|
this.isRefreshing = false;
|
|
11
11
|
this.refreshTokenSource = new Subject();
|
|
12
12
|
this.tokenStoredSource = new ReplaySubject(1);
|
|
@@ -16,6 +16,12 @@ export class JwtTokenService {
|
|
|
16
16
|
this.tokenRefreshFinishedSource = new Subject();
|
|
17
17
|
this.tokenRefreshFinished = this.tokenRefreshFinishedSource.asObservable();
|
|
18
18
|
}
|
|
19
|
+
ngOnDestroy() {
|
|
20
|
+
this.tokenRefreshStartedSource.complete();
|
|
21
|
+
this.tokenRefreshFinishedSource.complete();
|
|
22
|
+
this.tokenStoredSource.complete();
|
|
23
|
+
this.refreshTokenSource.complete();
|
|
24
|
+
}
|
|
19
25
|
deleteToken() {
|
|
20
26
|
localStorage.removeItem(this.storage_identifier);
|
|
21
27
|
this.tokenStoredSource.next(null);
|
|
@@ -61,7 +67,7 @@ export class JwtTokenService {
|
|
|
61
67
|
this.isRefreshing = false;
|
|
62
68
|
this.tokenRefreshFinishedSource.next(false);
|
|
63
69
|
this.refreshTokenSource.next(null);
|
|
64
|
-
console.error(
|
|
70
|
+
console.error('Internal error while refreshing Dangl.Identity token', error);
|
|
65
71
|
});
|
|
66
72
|
return this.refreshTokenSource.pipe(first());
|
|
67
73
|
}
|
|
@@ -85,11 +91,11 @@ export class JwtTokenService {
|
|
|
85
91
|
}
|
|
86
92
|
}
|
|
87
93
|
JwtTokenService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.4", ngImport: i0, type: JwtTokenService, deps: [{ token: i1.DanglIdentityClient }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
88
|
-
JwtTokenService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.0.4", ngImport: i0, type: JwtTokenService, providedIn:
|
|
94
|
+
JwtTokenService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.0.4", ngImport: i0, type: JwtTokenService, providedIn: 'root' });
|
|
89
95
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.4", ngImport: i0, type: JwtTokenService, decorators: [{
|
|
90
96
|
type: Injectable,
|
|
91
97
|
args: [{
|
|
92
|
-
providedIn:
|
|
98
|
+
providedIn: 'root',
|
|
93
99
|
}]
|
|
94
100
|
}], ctorParameters: function () { return [{ type: i1.DanglIdentityClient }]; } });
|
|
95
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"jwt-token.service.js","sourceRoot":"","sources":["../../../../projects/angular-dangl-identity-client/src/services/jwt-token.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from \"@angular/core\";\r\nimport { DanglIdentityClient, TokenResponseGet } from \"../api-client\";\r\nimport { JwtStorage } from \"../models/jwt-storage\";\r\nimport { Subject, Observable, of, ReplaySubject } from \"rxjs\";\r\nimport { map, catchError, tap, first } from \"rxjs/operators\";\r\nimport { AuthenticationMessenger } from \"../messengers/authentication.messenger\";\r\n\r\n@Injectable({\r\n  providedIn: \"root\",\r\n})\r\nexport class JwtTokenService {\r\n  private readonly storage_identifier = \"dangl_identity_integration_jwt_token\";\r\n  private isRefreshing = false;\r\n  private refreshTokenSource = new Subject<JwtStorage>();\r\n  private tokenStoredSource = new ReplaySubject<JwtStorage>(1);\r\n  tokenStored = this.tokenStoredSource.asObservable();\r\n  private tokenRefreshStartedSource = new Subject();\r\n  tokenRefreshStarted = this.tokenRefreshStartedSource.asObservable();\r\n  private tokenRefreshFinishedSource = new Subject<boolean>();\r\n  tokenRefreshFinished = this.tokenRefreshFinishedSource.asObservable();\r\n\r\n  constructor(private danglIdentityClient: DanglIdentityClient) {}\r\n\r\n  deleteToken() {\r\n    localStorage.removeItem(this.storage_identifier);\r\n    this.tokenStoredSource.next(null);\r\n  }\r\n\r\n  storeCustomToken(tokenToStore: JwtStorage) {\r\n    localStorage.setItem(this.storage_identifier, JSON.stringify(tokenToStore));\r\n    this.tokenStoredSource.next(tokenToStore);\r\n  }\r\n\r\n  storeToken(token: TokenResponseGet) {\r\n    const tokenToStore = this.transformTokenResponse(token);\r\n    localStorage.setItem(this.storage_identifier, JSON.stringify(tokenToStore));\r\n    this.tokenStoredSource.next(tokenToStore);\r\n  }\r\n\r\n  getTokenFromStorage(): JwtStorage {\r\n    const storedString = localStorage.getItem(this.storage_identifier);\r\n    if (storedString) {\r\n      const storedToken = <JwtStorage>JSON.parse(storedString);\r\n      return storedToken;\r\n    }\r\n    return null;\r\n  }\r\n\r\n  refreshToken(): Observable<JwtStorage> {\r\n    if (this.isRefreshing) {\r\n      return this.refreshTokenSource.pipe(first());\r\n    }\r\n    this.isRefreshing = true;\r\n    this.tokenRefreshStartedSource.next();\r\n    const refreshToken = this.getTokenFromStorage().refreshToken;\r\n\r\n    if (!refreshToken) {\r\n      this.isRefreshing = false;\r\n      return of<JwtStorage>(null);\r\n    }\r\n\r\n    this.danglIdentityClient\r\n      .refreshToken({\r\n        refreshToken: refreshToken,\r\n      })\r\n      .pipe(\r\n        tap((r) => this.storeToken(r)),\r\n        map((r) => this.transformTokenResponse(r))\r\n      )\r\n      .subscribe(\r\n        (refreshTokenResponse) => {\r\n          this.isRefreshing = false;\r\n          this.tokenRefreshFinishedSource.next(true);\r\n          this.refreshTokenSource.next(refreshTokenResponse);\r\n        },\r\n        (error) => {\r\n          this.isRefreshing = false;\r\n          this.tokenRefreshFinishedSource.next(false);\r\n          this.refreshTokenSource.next(null);\r\n          console.error(\r\n            \"Internal error while refreshing Dangl.Identity token\",\r\n            error\r\n          );\r\n        }\r\n      );\r\n\r\n    return this.refreshTokenSource.pipe(first());\r\n  }\r\n\r\n  getToken(): Observable<JwtStorage> {\r\n    const token = this.getTokenFromStorage();\r\n    if (!token) {\r\n      return of<JwtStorage>(null);\r\n    }\r\n    const isValidToken = token.expiresAt > new Date().getTime() / 1000;\r\n    if (isValidToken) {\r\n      return of(token);\r\n    }\r\n    return this.refreshToken();\r\n  }\r\n\r\n  private transformTokenResponse(token: TokenResponseGet): JwtStorage {\r\n    return {\r\n      accessToken: token.accessToken,\r\n      refreshToken: token.refreshToken,\r\n      expiresAt: new Date().getTime() / 1000 + token.expiresIn,\r\n    };\r\n  }\r\n}\r\n"]}
|
|
101
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"jwt-token.service.js","sourceRoot":"","sources":["../../../../projects/angular-dangl-identity-client/src/services/jwt-token.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAa,MAAM,eAAe,CAAC;AAGtD,OAAO,EAAE,OAAO,EAAc,EAAE,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAC9D,OAAO,EAAE,GAAG,EAAc,GAAG,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;;;AAM7D,MAAM,OAAO,eAAe;IAW1B,YAAoB,mBAAwC;QAAxC,wBAAmB,GAAnB,mBAAmB,CAAqB;QAV3C,uBAAkB,GAAG,sCAAsC,CAAC;QACrE,iBAAY,GAAG,KAAK,CAAC;QACrB,uBAAkB,GAAG,IAAI,OAAO,EAAc,CAAC;QAC/C,sBAAiB,GAAG,IAAI,aAAa,CAAa,CAAC,CAAC,CAAC;QAC7D,gBAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE,CAAC;QAC5C,8BAAyB,GAAG,IAAI,OAAO,EAAE,CAAC;QAClD,wBAAmB,GAAG,IAAI,CAAC,yBAAyB,CAAC,YAAY,EAAE,CAAC;QAC5D,+BAA0B,GAAG,IAAI,OAAO,EAAW,CAAC;QAC5D,yBAAoB,GAAG,IAAI,CAAC,0BAA0B,CAAC,YAAY,EAAE,CAAC;IAEP,CAAC;IAEhE,WAAW;QACT,IAAI,CAAC,yBAAyB,CAAC,QAAQ,EAAE,CAAC;QAC1C,IAAI,CAAC,0BAA0B,CAAC,QAAQ,EAAE,CAAC;QAC3C,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC;QAClC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,CAAC;IACrC,CAAC;IAED,WAAW;QACT,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACjD,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC;IAED,gBAAgB,CAAC,YAAwB;QACvC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC;QAC5E,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC5C,CAAC;IAED,UAAU,CAAC,KAAuB;QAChC,MAAM,YAAY,GAAG,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;QACxD,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC;QAC5E,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC5C,CAAC;IAED,mBAAmB;QACjB,MAAM,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACnE,IAAI,YAAY,EAAE;YAChB,MAAM,WAAW,GAAe,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YACzD,OAAO,WAAW,CAAC;SACpB;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,YAAY;QACV,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,OAAO,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;SAC9C;QACD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,IAAI,CAAC,yBAAyB,CAAC,IAAI,EAAE,CAAC;QACtC,MAAM,YAAY,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC,YAAY,CAAC;QAE7D,IAAI,CAAC,YAAY,EAAE;YACjB,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;YAC1B,OAAO,EAAE,CAAa,IAAI,CAAC,CAAC;SAC7B;QAED,IAAI,CAAC,mBAAmB;aACrB,YAAY,CAAC;YACZ,YAAY,EAAE,YAAY;SAC3B,CAAC;aACD,IAAI,CACH,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAC9B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAC3C;aACA,SAAS,CACR,CAAC,oBAAoB,EAAE,EAAE;YACvB,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;YAC1B,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC3C,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACrD,CAAC,EACD,CAAC,KAAK,EAAE,EAAE;YACR,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;YAC1B,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC5C,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACnC,OAAO,CAAC,KAAK,CACX,sDAAsD,EACtD,KAAK,CACN,CAAC;QACJ,CAAC,CACF,CAAC;QAEJ,OAAO,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;IAC/C,CAAC;IAED,QAAQ;QACN,MAAM,KAAK,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACzC,IAAI,CAAC,KAAK,EAAE;YACV,OAAO,EAAE,CAAa,IAAI,CAAC,CAAC;SAC7B;QACD,MAAM,YAAY,GAAG,KAAK,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC;QACnE,IAAI,YAAY,EAAE;YAChB,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC;SAClB;QACD,OAAO,IAAI,CAAC,YAAY,EAAE,CAAC;IAC7B,CAAC;IAEO,sBAAsB,CAAC,KAAuB;QACpD,OAAO;YACL,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,GAAG,KAAK,CAAC,SAAS;SACzD,CAAC;IACJ,CAAC;;4GAxGU,eAAe;gHAAf,eAAe,cAFd,MAAM;2FAEP,eAAe;kBAH3B,UAAU;mBAAC;oBACV,UAAU,EAAE,MAAM;iBACnB","sourcesContent":["import { Injectable, OnDestroy } from '@angular/core';\r\nimport { DanglIdentityClient, TokenResponseGet } from '../api-client';\r\nimport { JwtStorage } from '../models/jwt-storage';\r\nimport { Subject, Observable, of, ReplaySubject } from 'rxjs';\r\nimport { map, catchError, tap, first } from 'rxjs/operators';\r\nimport { AuthenticationMessenger } from '../messengers/authentication.messenger';\r\n\r\n@Injectable({\r\n  providedIn: 'root',\r\n})\r\nexport class JwtTokenService implements OnDestroy {\r\n  private readonly storage_identifier = 'dangl_identity_integration_jwt_token';\r\n  private isRefreshing = false;\r\n  private refreshTokenSource = new Subject<JwtStorage>();\r\n  private tokenStoredSource = new ReplaySubject<JwtStorage>(1);\r\n  tokenStored = this.tokenStoredSource.asObservable();\r\n  private tokenRefreshStartedSource = new Subject();\r\n  tokenRefreshStarted = this.tokenRefreshStartedSource.asObservable();\r\n  private tokenRefreshFinishedSource = new Subject<boolean>();\r\n  tokenRefreshFinished = this.tokenRefreshFinishedSource.asObservable();\r\n\r\n  constructor(private danglIdentityClient: DanglIdentityClient) {}\r\n\r\n  ngOnDestroy(): void {\r\n    this.tokenRefreshStartedSource.complete();\r\n    this.tokenRefreshFinishedSource.complete();\r\n    this.tokenStoredSource.complete();\r\n    this.refreshTokenSource.complete();\r\n  }\r\n\r\n  deleteToken() {\r\n    localStorage.removeItem(this.storage_identifier);\r\n    this.tokenStoredSource.next(null);\r\n  }\r\n\r\n  storeCustomToken(tokenToStore: JwtStorage) {\r\n    localStorage.setItem(this.storage_identifier, JSON.stringify(tokenToStore));\r\n    this.tokenStoredSource.next(tokenToStore);\r\n  }\r\n\r\n  storeToken(token: TokenResponseGet) {\r\n    const tokenToStore = this.transformTokenResponse(token);\r\n    localStorage.setItem(this.storage_identifier, JSON.stringify(tokenToStore));\r\n    this.tokenStoredSource.next(tokenToStore);\r\n  }\r\n\r\n  getTokenFromStorage(): JwtStorage {\r\n    const storedString = localStorage.getItem(this.storage_identifier);\r\n    if (storedString) {\r\n      const storedToken = <JwtStorage>JSON.parse(storedString);\r\n      return storedToken;\r\n    }\r\n    return null;\r\n  }\r\n\r\n  refreshToken(): Observable<JwtStorage> {\r\n    if (this.isRefreshing) {\r\n      return this.refreshTokenSource.pipe(first());\r\n    }\r\n    this.isRefreshing = true;\r\n    this.tokenRefreshStartedSource.next();\r\n    const refreshToken = this.getTokenFromStorage().refreshToken;\r\n\r\n    if (!refreshToken) {\r\n      this.isRefreshing = false;\r\n      return of<JwtStorage>(null);\r\n    }\r\n\r\n    this.danglIdentityClient\r\n      .refreshToken({\r\n        refreshToken: refreshToken,\r\n      })\r\n      .pipe(\r\n        tap((r) => this.storeToken(r)),\r\n        map((r) => this.transformTokenResponse(r))\r\n      )\r\n      .subscribe(\r\n        (refreshTokenResponse) => {\r\n          this.isRefreshing = false;\r\n          this.tokenRefreshFinishedSource.next(true);\r\n          this.refreshTokenSource.next(refreshTokenResponse);\r\n        },\r\n        (error) => {\r\n          this.isRefreshing = false;\r\n          this.tokenRefreshFinishedSource.next(false);\r\n          this.refreshTokenSource.next(null);\r\n          console.error(\r\n            'Internal error while refreshing Dangl.Identity token',\r\n            error\r\n          );\r\n        }\r\n      );\r\n\r\n    return this.refreshTokenSource.pipe(first());\r\n  }\r\n\r\n  getToken(): Observable<JwtStorage> {\r\n    const token = this.getTokenFromStorage();\r\n    if (!token) {\r\n      return of<JwtStorage>(null);\r\n    }\r\n    const isValidToken = token.expiresAt > new Date().getTime() / 1000;\r\n    if (isValidToken) {\r\n      return of(token);\r\n    }\r\n    return this.refreshToken();\r\n  }\r\n\r\n  private transformTokenResponse(token: TokenResponseGet): JwtStorage {\r\n    return {\r\n      accessToken: token.accessToken,\r\n      refreshToken: token.refreshToken,\r\n      expiresAt: new Date().getTime() / 1000 + token.expiresIn,\r\n    };\r\n  }\r\n}\r\n"]}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import * as i0 from '@angular/core';
|
|
2
|
-
import { InjectionToken, Injectable, Inject, Optional, NgModule } from '@angular/core';
|
|
3
1
|
import * as i1 from '@angular/common/http';
|
|
4
2
|
import { HttpHeaders, HttpResponseBase, HttpResponse, HttpClient, HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
|
|
5
|
-
import
|
|
3
|
+
import * as i0 from '@angular/core';
|
|
4
|
+
import { InjectionToken, Injectable, Inject, Optional, NgModule } from '@angular/core';
|
|
5
|
+
import { mergeMap, catchError, first, tap, map, takeUntil } from 'rxjs/operators';
|
|
6
6
|
import { throwError, Observable, of, Subject, ReplaySubject } from 'rxjs';
|
|
7
7
|
import { JwtHelperService } from '@auth0/angular-jwt';
|
|
8
8
|
|
|
@@ -480,7 +480,7 @@ function blobToText(blob) {
|
|
|
480
480
|
class JwtTokenService {
|
|
481
481
|
constructor(danglIdentityClient) {
|
|
482
482
|
this.danglIdentityClient = danglIdentityClient;
|
|
483
|
-
this.storage_identifier =
|
|
483
|
+
this.storage_identifier = 'dangl_identity_integration_jwt_token';
|
|
484
484
|
this.isRefreshing = false;
|
|
485
485
|
this.refreshTokenSource = new Subject();
|
|
486
486
|
this.tokenStoredSource = new ReplaySubject(1);
|
|
@@ -490,6 +490,12 @@ class JwtTokenService {
|
|
|
490
490
|
this.tokenRefreshFinishedSource = new Subject();
|
|
491
491
|
this.tokenRefreshFinished = this.tokenRefreshFinishedSource.asObservable();
|
|
492
492
|
}
|
|
493
|
+
ngOnDestroy() {
|
|
494
|
+
this.tokenRefreshStartedSource.complete();
|
|
495
|
+
this.tokenRefreshFinishedSource.complete();
|
|
496
|
+
this.tokenStoredSource.complete();
|
|
497
|
+
this.refreshTokenSource.complete();
|
|
498
|
+
}
|
|
493
499
|
deleteToken() {
|
|
494
500
|
localStorage.removeItem(this.storage_identifier);
|
|
495
501
|
this.tokenStoredSource.next(null);
|
|
@@ -535,7 +541,7 @@ class JwtTokenService {
|
|
|
535
541
|
this.isRefreshing = false;
|
|
536
542
|
this.tokenRefreshFinishedSource.next(false);
|
|
537
543
|
this.refreshTokenSource.next(null);
|
|
538
|
-
console.error(
|
|
544
|
+
console.error('Internal error while refreshing Dangl.Identity token', error);
|
|
539
545
|
});
|
|
540
546
|
return this.refreshTokenSource.pipe(first());
|
|
541
547
|
}
|
|
@@ -559,22 +565,22 @@ class JwtTokenService {
|
|
|
559
565
|
}
|
|
560
566
|
}
|
|
561
567
|
JwtTokenService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.4", ngImport: i0, type: JwtTokenService, deps: [{ token: DanglIdentityClient }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
562
|
-
JwtTokenService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.0.4", ngImport: i0, type: JwtTokenService, providedIn:
|
|
568
|
+
JwtTokenService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.0.4", ngImport: i0, type: JwtTokenService, providedIn: 'root' });
|
|
563
569
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.4", ngImport: i0, type: JwtTokenService, decorators: [{
|
|
564
570
|
type: Injectable,
|
|
565
571
|
args: [{
|
|
566
|
-
providedIn:
|
|
572
|
+
providedIn: 'root',
|
|
567
573
|
}]
|
|
568
574
|
}], ctorParameters: function () { return [{ type: DanglIdentityClient }]; } });
|
|
569
575
|
|
|
570
|
-
const DANGL_IDENTITY_REQUEST_VALIDATOR = new InjectionToken(
|
|
576
|
+
const DANGL_IDENTITY_REQUEST_VALIDATOR = new InjectionToken('Validator to decide whether to include JWT tokens in requests');
|
|
571
577
|
class JwtInterceptorService {
|
|
572
578
|
constructor(jwtTokenService, requestValidator) {
|
|
573
579
|
this.jwtTokenService = jwtTokenService;
|
|
574
580
|
this.requestValidator = requestValidator;
|
|
575
581
|
}
|
|
576
582
|
intercept(request, next) {
|
|
577
|
-
if (request.url.startsWith(
|
|
583
|
+
if (request.url.startsWith('/identity')) {
|
|
578
584
|
// Requests to the authentication endpoint should not be intercepted
|
|
579
585
|
return next.handle(request.clone());
|
|
580
586
|
}
|
|
@@ -616,14 +622,24 @@ class DanglIdentityModule {
|
|
|
616
622
|
}
|
|
617
623
|
DanglIdentityModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.4", ngImport: i0, type: DanglIdentityModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
|
|
618
624
|
DanglIdentityModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.0.4", ngImport: i0, type: DanglIdentityModule, imports: [HttpClientModule] });
|
|
619
|
-
DanglIdentityModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.0.4", ngImport: i0, type: DanglIdentityModule, providers: [
|
|
625
|
+
DanglIdentityModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.0.4", ngImport: i0, type: DanglIdentityModule, providers: [
|
|
626
|
+
{
|
|
627
|
+
provide: HTTP_INTERCEPTORS,
|
|
628
|
+
useClass: JwtInterceptorService,
|
|
629
|
+
multi: true,
|
|
630
|
+
},
|
|
631
|
+
], imports: [HttpClientModule] });
|
|
620
632
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.4", ngImport: i0, type: DanglIdentityModule, decorators: [{
|
|
621
633
|
type: NgModule,
|
|
622
634
|
args: [{
|
|
623
|
-
imports: [
|
|
624
|
-
|
|
635
|
+
imports: [HttpClientModule],
|
|
636
|
+
providers: [
|
|
637
|
+
{
|
|
638
|
+
provide: HTTP_INTERCEPTORS,
|
|
639
|
+
useClass: JwtInterceptorService,
|
|
640
|
+
multi: true,
|
|
641
|
+
},
|
|
625
642
|
],
|
|
626
|
-
providers: [{ provide: HTTP_INTERCEPTORS, useClass: JwtInterceptorService, multi: true }]
|
|
627
643
|
}]
|
|
628
644
|
}] });
|
|
629
645
|
|
|
@@ -636,14 +652,12 @@ class AuthenticationService {
|
|
|
636
652
|
return this.danglIdentityClient
|
|
637
653
|
.loginAndReturnToken({
|
|
638
654
|
identifier: identifier,
|
|
639
|
-
password: password
|
|
655
|
+
password: password,
|
|
640
656
|
})
|
|
641
|
-
.pipe(map(r => this.storeJwtTokenIfValid(r)), catchError(e => of(false)));
|
|
657
|
+
.pipe(map((r) => this.storeJwtTokenIfValid(r)), catchError((e) => of(false)));
|
|
642
658
|
}
|
|
643
659
|
storeJwtTokenIfValid(token) {
|
|
644
|
-
if (!token.accessToken
|
|
645
|
-
|| !token.refreshToken
|
|
646
|
-
|| !token.expiresIn) {
|
|
660
|
+
if (!token.accessToken || !token.refreshToken || !token.expiresIn) {
|
|
647
661
|
return false;
|
|
648
662
|
}
|
|
649
663
|
this.jwtTokenService.storeToken(token);
|
|
@@ -658,7 +672,7 @@ AuthenticationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0"
|
|
|
658
672
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.4", ngImport: i0, type: AuthenticationService, decorators: [{
|
|
659
673
|
type: Injectable,
|
|
660
674
|
args: [{
|
|
661
|
-
providedIn: 'root'
|
|
675
|
+
providedIn: 'root',
|
|
662
676
|
}]
|
|
663
677
|
}], ctorParameters: function () { return [{ type: DanglIdentityClient }, { type: JwtTokenService }]; } });
|
|
664
678
|
|
|
@@ -666,6 +680,7 @@ class AuthenticationMessenger {
|
|
|
666
680
|
constructor(jwtTokenService) {
|
|
667
681
|
this.jwtTokenService = jwtTokenService;
|
|
668
682
|
this.jwtHelperService = new JwtHelperService();
|
|
683
|
+
this.$destroyed = new Subject();
|
|
669
684
|
this.isAuthenticated = new ReplaySubject(1);
|
|
670
685
|
this.username = new ReplaySubject(1);
|
|
671
686
|
this.email = new ReplaySubject(1);
|
|
@@ -673,15 +688,33 @@ class AuthenticationMessenger {
|
|
|
673
688
|
this.userInfo = new ReplaySubject(1);
|
|
674
689
|
this.tokenRefreshStarted = new Subject();
|
|
675
690
|
this.tokenRefreshFinished = new Subject();
|
|
676
|
-
jwtTokenService.tokenRefreshStarted
|
|
677
|
-
|
|
678
|
-
|
|
679
|
-
jwtTokenService.
|
|
680
|
-
.
|
|
691
|
+
jwtTokenService.tokenRefreshStarted
|
|
692
|
+
.pipe(takeUntil(this.$destroyed))
|
|
693
|
+
.subscribe(() => this.tokenRefreshStarted.next());
|
|
694
|
+
jwtTokenService.tokenRefreshFinished
|
|
695
|
+
.pipe(takeUntil(this.$destroyed))
|
|
696
|
+
.subscribe((successfulRefresh) => this.tokenRefreshFinished.next(successfulRefresh));
|
|
697
|
+
jwtTokenService.tokenStored
|
|
698
|
+
.pipe(takeUntil(this.$destroyed))
|
|
699
|
+
.subscribe((jwtToken) => this.refreshAuthenticationStatus(jwtToken));
|
|
700
|
+
jwtTokenService
|
|
701
|
+
.getToken()
|
|
702
|
+
.subscribe((token) => this.refreshAuthenticationStatus(token));
|
|
703
|
+
}
|
|
704
|
+
ngOnDestroy() {
|
|
705
|
+
this.isAuthenticated.complete();
|
|
706
|
+
this.username.complete();
|
|
707
|
+
this.email.complete();
|
|
708
|
+
this.identiconId.complete();
|
|
709
|
+
this.userInfo.complete();
|
|
710
|
+
this.tokenRefreshStarted.complete();
|
|
711
|
+
this.tokenRefreshFinished.complete();
|
|
712
|
+
this.$destroyed.next();
|
|
713
|
+
this.$destroyed.complete();
|
|
681
714
|
}
|
|
682
715
|
refreshAuthenticationStatus(jwtToken) {
|
|
683
716
|
if (jwtToken) {
|
|
684
|
-
const isValidToken = jwtToken.expiresAt >
|
|
717
|
+
const isValidToken = jwtToken.expiresAt > new Date().getTime() / 1000;
|
|
685
718
|
if (this.lastBroadcastAccessToken === jwtToken.accessToken) {
|
|
686
719
|
return;
|
|
687
720
|
}
|
|
@@ -708,14 +741,12 @@ class AuthenticationMessenger {
|
|
|
708
741
|
email: decodedToken['email'],
|
|
709
742
|
identiconId: decodedToken['identicon_id'],
|
|
710
743
|
username: decodedToken['name'],
|
|
711
|
-
roles: decodedToken['role']
|
|
744
|
+
roles: decodedToken['role'],
|
|
712
745
|
});
|
|
713
746
|
}
|
|
714
747
|
else {
|
|
715
748
|
this.isAuthenticated.next(false);
|
|
716
|
-
this.jwtTokenService
|
|
717
|
-
.refreshToken()
|
|
718
|
-
.subscribe(() => { });
|
|
749
|
+
this.jwtTokenService.refreshToken().subscribe(() => { });
|
|
719
750
|
}
|
|
720
751
|
}
|
|
721
752
|
else {
|
|
@@ -736,7 +767,7 @@ AuthenticationMessenger.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.
|
|
|
736
767
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.4", ngImport: i0, type: AuthenticationMessenger, decorators: [{
|
|
737
768
|
type: Injectable,
|
|
738
769
|
args: [{
|
|
739
|
-
providedIn: 'root'
|
|
770
|
+
providedIn: 'root',
|
|
740
771
|
}]
|
|
741
772
|
}], ctorParameters: function () { return [{ type: JwtTokenService }]; } });
|
|
742
773
|
|