@dangl/angular-dangl-identity-client 6.2.0-beta0010 → 6.2.1-beta0010
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/README.md +25 -0
- package/api-client.d.ts +178 -178
- package/dangl-identity.module.d.ts +6 -7
- package/{esm2020 → esm2022}/api-client.mjs +551 -551
- package/{esm2020 → esm2022}/dangl-angular-dangl-identity-client.mjs +4 -4
- package/esm2022/dangl-identity.module.mjs +30 -0
- package/{esm2020 → esm2022}/interceptors/dangl-identity-request-validator.mjs +1 -1
- package/{esm2020 → esm2022}/interceptors/jwt-interceptor.service.mjs +47 -47
- package/esm2022/messengers/authentication.messenger.mjs +170 -0
- package/{esm2020 → esm2022}/models/jwt-storage.mjs +1 -1
- package/{esm2020 → esm2022}/models/user-info.mjs +1 -1
- package/{esm2020 → esm2022}/public_api.mjs +11 -11
- package/{esm2020 → esm2022}/services/authentication.service.mjs +39 -39
- package/{esm2020 → esm2022}/services/jwt-token.service.mjs +101 -101
- package/{fesm2020 → fesm2022}/dangl-angular-dangl-identity-client.mjs +905 -873
- package/fesm2022/dangl-angular-dangl-identity-client.mjs.map +1 -0
- package/index.d.ts +5 -5
- package/interceptors/dangl-identity-request-validator.d.ts +4 -4
- package/interceptors/jwt-interceptor.service.d.ts +16 -16
- package/messengers/authentication.messenger.d.ts +28 -26
- package/models/jwt-storage.d.ts +5 -5
- package/models/user-info.d.ts +11 -11
- package/package.json +7 -13
- package/public_api.d.ts +8 -8
- package/services/authentication.service.d.ts +14 -14
- package/services/jwt-token.service.d.ts +28 -28
- package/esm2020/dangl-identity.module.mjs +0 -29
- package/esm2020/messengers/authentication.messenger.mjs +0 -146
- package/fesm2015/dangl-angular-dangl-identity-client.mjs +0 -896
- package/fesm2015/dangl-angular-dangl-identity-client.mjs.map +0 -1
- package/fesm2020/dangl-angular-dangl-identity-client.mjs.map +0 -1
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Generated bundle index. Do not edit.
|
|
3
|
-
*/
|
|
4
|
-
export * from './public_api';
|
|
1
|
+
/**
|
|
2
|
+
* Generated bundle index. Do not edit.
|
|
3
|
+
*/
|
|
4
|
+
export * from './public_api';
|
|
5
5
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGFuZ2wtYW5ndWxhci1kYW5nbC1pZGVudGl0eS1jbGllbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9wcm9qZWN0cy9hbmd1bGFyLWRhbmdsLWlkZW50aXR5LWNsaWVudC9zcmMvZGFuZ2wtYW5ndWxhci1kYW5nbC1pZGVudGl0eS1jbGllbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7O0dBRUc7QUFFSCxjQUFjLGNBQWMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogR2VuZXJhdGVkIGJ1bmRsZSBpbmRleC4gRG8gbm90IGVkaXQuXG4gKi9cblxuZXhwb3J0ICogZnJvbSAnLi9wdWJsaWNfYXBpJztcbiJdfQ==
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
|
|
2
|
+
import { JwtInterceptorService } from './interceptors/jwt-interceptor.service';
|
|
3
|
+
import { NgModule } from '@angular/core';
|
|
4
|
+
import * as i0 from "@angular/core";
|
|
5
|
+
export class DanglIdentityModule {
|
|
6
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.9", ngImport: i0, type: DanglIdentityModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
|
|
7
|
+
static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "17.0.9", ngImport: i0, type: DanglIdentityModule }); }
|
|
8
|
+
static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "17.0.9", ngImport: i0, type: DanglIdentityModule, providers: [
|
|
9
|
+
provideHttpClient(withInterceptorsFromDi()),
|
|
10
|
+
{
|
|
11
|
+
provide: HTTP_INTERCEPTORS,
|
|
12
|
+
useClass: JwtInterceptorService,
|
|
13
|
+
multi: true,
|
|
14
|
+
},
|
|
15
|
+
] }); }
|
|
16
|
+
}
|
|
17
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.9", ngImport: i0, type: DanglIdentityModule, decorators: [{
|
|
18
|
+
type: NgModule,
|
|
19
|
+
args: [{
|
|
20
|
+
providers: [
|
|
21
|
+
provideHttpClient(withInterceptorsFromDi()),
|
|
22
|
+
{
|
|
23
|
+
provide: HTTP_INTERCEPTORS,
|
|
24
|
+
useClass: JwtInterceptorService,
|
|
25
|
+
multi: true,
|
|
26
|
+
},
|
|
27
|
+
],
|
|
28
|
+
}]
|
|
29
|
+
}] });
|
|
30
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGFuZ2wtaWRlbnRpdHkubW9kdWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vcHJvamVjdHMvYW5ndWxhci1kYW5nbC1pZGVudGl0eS1jbGllbnQvc3JjL2RhbmdsLWlkZW50aXR5Lm1vZHVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsaUJBQWlCLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUVwRyxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSx3Q0FBd0MsQ0FBQztBQUMvRSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sZUFBZSxDQUFDOztBQVl6QyxNQUFNLE9BQU8sbUJBQW1COzhHQUFuQixtQkFBbUI7K0dBQW5CLG1CQUFtQjsrR0FBbkIsbUJBQW1CLGFBVG5CO1lBQ1QsaUJBQWlCLENBQUMsc0JBQXNCLEVBQUUsQ0FBQztZQUMzQztnQkFDRSxPQUFPLEVBQUUsaUJBQWlCO2dCQUMxQixRQUFRLEVBQUUscUJBQXFCO2dCQUMvQixLQUFLLEVBQUUsSUFBSTthQUNaO1NBQ0Y7OzJGQUVVLG1CQUFtQjtrQkFWL0IsUUFBUTttQkFBQztvQkFDUixTQUFTLEVBQUU7d0JBQ1QsaUJBQWlCLENBQUMsc0JBQXNCLEVBQUUsQ0FBQzt3QkFDM0M7NEJBQ0UsT0FBTyxFQUFFLGlCQUFpQjs0QkFDMUIsUUFBUSxFQUFFLHFCQUFxQjs0QkFDL0IsS0FBSyxFQUFFLElBQUk7eUJBQ1o7cUJBQ0Y7aUJBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBIVFRQX0lOVEVSQ0VQVE9SUywgcHJvdmlkZUh0dHBDbGllbnQsIHdpdGhJbnRlcmNlcHRvcnNGcm9tRGkgfSBmcm9tICdAYW5ndWxhci9jb21tb24vaHR0cCc7XHJcblxyXG5pbXBvcnQgeyBKd3RJbnRlcmNlcHRvclNlcnZpY2UgfSBmcm9tICcuL2ludGVyY2VwdG9ycy9qd3QtaW50ZXJjZXB0b3Iuc2VydmljZSc7XHJcbmltcG9ydCB7IE5nTW9kdWxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XHJcblxyXG5ATmdNb2R1bGUoe1xyXG4gIHByb3ZpZGVyczogW1xyXG4gICAgcHJvdmlkZUh0dHBDbGllbnQod2l0aEludGVyY2VwdG9yc0Zyb21EaSgpKSxcclxuICAgIHtcclxuICAgICAgcHJvdmlkZTogSFRUUF9JTlRFUkNFUFRPUlMsXHJcbiAgICAgIHVzZUNsYXNzOiBKd3RJbnRlcmNlcHRvclNlcnZpY2UsXHJcbiAgICAgIG11bHRpOiB0cnVlLFxyXG4gICAgfSxcclxuICBdLFxyXG59KVxyXG5leHBvcnQgY2xhc3MgRGFuZ2xJZGVudGl0eU1vZHVsZSB7fVxyXG4iXX0=
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export {};
|
|
1
|
+
export {};
|
|
2
2
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGFuZ2wtaWRlbnRpdHktcmVxdWVzdC12YWxpZGF0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9wcm9qZWN0cy9hbmd1bGFyLWRhbmdsLWlkZW50aXR5LWNsaWVudC9zcmMvaW50ZXJjZXB0b3JzL2RhbmdsLWlkZW50aXR5LXJlcXVlc3QtdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBIdHRwUmVxdWVzdCB9IGZyb20gXCJAYW5ndWxhci9jb21tb24vaHR0cFwiO1xyXG5cclxuZXhwb3J0IGludGVyZmFjZSBJRGFuZ2xJZGVudGl0eVJlcXVlc3RWYWxpZGF0b3Ige1xyXG4gIHZhbGlkYXRlUmVxdWVzdChodHRwUmVxdWVzdDogSHR0cFJlcXVlc3Q8YW55Pik6IGJvb2xlYW47XHJcbn1cclxuIl19
|
|
@@ -1,47 +1,47 @@
|
|
|
1
|
-
import { Inject, Injectable, InjectionToken, Optional } from '@angular/core';
|
|
2
|
-
import { mergeMap } from 'rxjs/operators';
|
|
3
|
-
import * as i0 from "@angular/core";
|
|
4
|
-
import * as i1 from "../services/jwt-token.service";
|
|
5
|
-
export const DANGL_IDENTITY_REQUEST_VALIDATOR = new InjectionToken('Validator to decide whether to include JWT tokens in requests');
|
|
6
|
-
export class JwtInterceptorService {
|
|
7
|
-
constructor(jwtTokenService, requestValidator) {
|
|
8
|
-
this.jwtTokenService = jwtTokenService;
|
|
9
|
-
this.requestValidator = requestValidator;
|
|
10
|
-
}
|
|
11
|
-
intercept(request, next) {
|
|
12
|
-
if (request.url.startsWith('/identity')) {
|
|
13
|
-
// Requests to the authentication endpoint should not be intercepted
|
|
14
|
-
return next.handle(request.clone());
|
|
15
|
-
}
|
|
16
|
-
if (this.requestValidator &&
|
|
17
|
-
!this.requestValidator.validateRequest(request)) {
|
|
18
|
-
// In case a request validator is provided but doesn't return true for the
|
|
19
|
-
// current request, we're not appending a token
|
|
20
|
-
return next.handle(request);
|
|
21
|
-
}
|
|
22
|
-
return this.jwtTokenService
|
|
23
|
-
.getToken()
|
|
24
|
-
.pipe(mergeMap((f) => next.handle(this.getHttpRequestWithToken(request, f && f.accessToken))));
|
|
25
|
-
}
|
|
26
|
-
getHttpRequestWithToken(request, token) {
|
|
27
|
-
if (token) {
|
|
28
|
-
return request.clone({
|
|
29
|
-
setHeaders: {
|
|
30
|
-
Authorization: `Bearer ${token}`,
|
|
31
|
-
},
|
|
32
|
-
});
|
|
33
|
-
}
|
|
34
|
-
return request.clone();
|
|
35
|
-
}
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "
|
|
40
|
-
type: Injectable
|
|
41
|
-
}], ctorParameters:
|
|
42
|
-
type: Optional
|
|
43
|
-
}, {
|
|
44
|
-
type: Inject,
|
|
45
|
-
args: [DANGL_IDENTITY_REQUEST_VALIDATOR]
|
|
46
|
-
}] }]
|
|
47
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
1
|
+
import { Inject, Injectable, InjectionToken, Optional } from '@angular/core';
|
|
2
|
+
import { mergeMap } from 'rxjs/operators';
|
|
3
|
+
import * as i0 from "@angular/core";
|
|
4
|
+
import * as i1 from "../services/jwt-token.service";
|
|
5
|
+
export const DANGL_IDENTITY_REQUEST_VALIDATOR = new InjectionToken('Validator to decide whether to include JWT tokens in requests');
|
|
6
|
+
export class JwtInterceptorService {
|
|
7
|
+
constructor(jwtTokenService, requestValidator) {
|
|
8
|
+
this.jwtTokenService = jwtTokenService;
|
|
9
|
+
this.requestValidator = requestValidator;
|
|
10
|
+
}
|
|
11
|
+
intercept(request, next) {
|
|
12
|
+
if (request.url.startsWith('/identity')) {
|
|
13
|
+
// Requests to the authentication endpoint should not be intercepted
|
|
14
|
+
return next.handle(request.clone());
|
|
15
|
+
}
|
|
16
|
+
if (this.requestValidator &&
|
|
17
|
+
!this.requestValidator.validateRequest(request)) {
|
|
18
|
+
// In case a request validator is provided but doesn't return true for the
|
|
19
|
+
// current request, we're not appending a token
|
|
20
|
+
return next.handle(request);
|
|
21
|
+
}
|
|
22
|
+
return this.jwtTokenService
|
|
23
|
+
.getToken()
|
|
24
|
+
.pipe(mergeMap((f) => next.handle(this.getHttpRequestWithToken(request, f && f.accessToken))));
|
|
25
|
+
}
|
|
26
|
+
getHttpRequestWithToken(request, token) {
|
|
27
|
+
if (token) {
|
|
28
|
+
return request.clone({
|
|
29
|
+
setHeaders: {
|
|
30
|
+
Authorization: `Bearer ${token}`,
|
|
31
|
+
},
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
return request.clone();
|
|
35
|
+
}
|
|
36
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.9", ngImport: i0, type: JwtInterceptorService, deps: [{ token: i1.JwtTokenService }, { token: DANGL_IDENTITY_REQUEST_VALIDATOR, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
37
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.0.9", ngImport: i0, type: JwtInterceptorService }); }
|
|
38
|
+
}
|
|
39
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.9", ngImport: i0, type: JwtInterceptorService, decorators: [{
|
|
40
|
+
type: Injectable
|
|
41
|
+
}], ctorParameters: () => [{ type: i1.JwtTokenService }, { type: undefined, decorators: [{
|
|
42
|
+
type: Optional
|
|
43
|
+
}, {
|
|
44
|
+
type: Inject,
|
|
45
|
+
args: [DANGL_IDENTITY_REQUEST_VALIDATOR]
|
|
46
|
+
}] }] });
|
|
47
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiand0LWludGVyY2VwdG9yLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9wcm9qZWN0cy9hbmd1bGFyLWRhbmdsLWlkZW50aXR5LWNsaWVudC9zcmMvaW50ZXJjZXB0b3JzL2p3dC1pbnRlcmNlcHRvci5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU9BLE9BQU8sRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLGNBQWMsRUFBRSxRQUFRLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFHN0UsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGdCQUFnQixDQUFDOzs7QUFHMUMsTUFBTSxDQUFDLE1BQU0sZ0NBQWdDLEdBQzNDLElBQUksY0FBYyxDQUNoQiwrREFBK0QsQ0FDaEUsQ0FBQztBQUVKLE1BQU0sT0FBTyxxQkFBcUI7SUFDaEMsWUFDUyxlQUFnQyxFQUcvQixnQkFBZ0Q7UUFIakQsb0JBQWUsR0FBZixlQUFlLENBQWlCO1FBRy9CLHFCQUFnQixHQUFoQixnQkFBZ0IsQ0FBZ0M7SUFDdkQsQ0FBQztJQUNKLFNBQVMsQ0FDUCxPQUF5QixFQUN6QixJQUFpQjtRQUVqQixJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLFdBQVcsQ0FBQyxFQUFFO1lBQ3ZDLG9FQUFvRTtZQUNwRSxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUM7U0FDckM7UUFFRCxJQUNFLElBQUksQ0FBQyxnQkFBZ0I7WUFDckIsQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsZUFBZSxDQUFDLE9BQU8sQ0FBQyxFQUMvQztZQUNBLDBFQUEwRTtZQUMxRSwrQ0FBK0M7WUFDL0MsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1NBQzdCO1FBRUQsT0FBTyxJQUFJLENBQUMsZUFBZTthQUN4QixRQUFRLEVBQUU7YUFDVixJQUFJLENBQ0gsUUFBUSxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FDYixJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyx1QkFBdUIsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUN2RSxDQUNGLENBQUM7SUFDTixDQUFDO0lBRU8sdUJBQXVCLENBQzdCLE9BQXlCLEVBQ3pCLEtBQWM7UUFFZCxJQUFJLEtBQUssRUFBRTtZQUNULE9BQU8sT0FBTyxDQUFDLEtBQUssQ0FBQztnQkFDbkIsVUFBVSxFQUFFO29CQUNWLGFBQWEsRUFBRSxVQUFVLEtBQUssRUFBRTtpQkFDakM7YUFDRixDQUFDLENBQUM7U0FDSjtRQUNELE9BQU8sT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQ3pCLENBQUM7OEdBOUNVLHFCQUFxQixpREFJdEIsZ0NBQWdDO2tIQUovQixxQkFBcUI7OzJGQUFyQixxQkFBcUI7a0JBRGpDLFVBQVU7OzBCQUlOLFFBQVE7OzBCQUNSLE1BQU07MkJBQUMsZ0NBQWdDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcclxuICBIdHRwRXZlbnQsXHJcbiAgSHR0cEhhbmRsZXIsXHJcbiAgSHR0cEludGVyY2VwdG9yLFxyXG4gIEh0dHBSZXF1ZXN0LFxyXG59IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcclxuXHJcbmltcG9ydCB7IEluamVjdCwgSW5qZWN0YWJsZSwgSW5qZWN0aW9uVG9rZW4sIE9wdGlvbmFsIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XHJcbmltcG9ydCB7IEp3dFRva2VuU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzL2p3dC10b2tlbi5zZXJ2aWNlJztcclxuaW1wb3J0IHsgT2JzZXJ2YWJsZSB9IGZyb20gJ3J4anMnO1xyXG5pbXBvcnQgeyBtZXJnZU1hcCB9IGZyb20gJ3J4anMvb3BlcmF0b3JzJztcclxuaW1wb3J0IHsgSURhbmdsSWRlbnRpdHlSZXF1ZXN0VmFsaWRhdG9yIH0gZnJvbSAnLi9kYW5nbC1pZGVudGl0eS1yZXF1ZXN0LXZhbGlkYXRvcic7XHJcblxyXG5leHBvcnQgY29uc3QgREFOR0xfSURFTlRJVFlfUkVRVUVTVF9WQUxJREFUT1IgPVxyXG4gIG5ldyBJbmplY3Rpb25Ub2tlbjxJRGFuZ2xJZGVudGl0eVJlcXVlc3RWYWxpZGF0b3I+KFxyXG4gICAgJ1ZhbGlkYXRvciB0byBkZWNpZGUgd2hldGhlciB0byBpbmNsdWRlIEpXVCB0b2tlbnMgaW4gcmVxdWVzdHMnXHJcbiAgKTtcclxuQEluamVjdGFibGUoKVxyXG5leHBvcnQgY2xhc3MgSnd0SW50ZXJjZXB0b3JTZXJ2aWNlIGltcGxlbWVudHMgSHR0cEludGVyY2VwdG9yIHtcclxuICBjb25zdHJ1Y3RvcihcclxuICAgIHB1YmxpYyBqd3RUb2tlblNlcnZpY2U6IEp3dFRva2VuU2VydmljZSxcclxuICAgIEBPcHRpb25hbCgpXHJcbiAgICBASW5qZWN0KERBTkdMX0lERU5USVRZX1JFUVVFU1RfVkFMSURBVE9SKVxyXG4gICAgcHJpdmF0ZSByZXF1ZXN0VmFsaWRhdG9yOiBJRGFuZ2xJZGVudGl0eVJlcXVlc3RWYWxpZGF0b3JcclxuICApIHt9XHJcbiAgaW50ZXJjZXB0KFxyXG4gICAgcmVxdWVzdDogSHR0cFJlcXVlc3Q8YW55PixcclxuICAgIG5leHQ6IEh0dHBIYW5kbGVyXHJcbiAgKTogT2JzZXJ2YWJsZTxIdHRwRXZlbnQ8YW55Pj4ge1xyXG4gICAgaWYgKHJlcXVlc3QudXJsLnN0YXJ0c1dpdGgoJy9pZGVudGl0eScpKSB7XHJcbiAgICAgIC8vIFJlcXVlc3RzIHRvIHRoZSBhdXRoZW50aWNhdGlvbiBlbmRwb2ludCBzaG91bGQgbm90IGJlIGludGVyY2VwdGVkXHJcbiAgICAgIHJldHVybiBuZXh0LmhhbmRsZShyZXF1ZXN0LmNsb25lKCkpO1xyXG4gICAgfVxyXG5cclxuICAgIGlmIChcclxuICAgICAgdGhpcy5yZXF1ZXN0VmFsaWRhdG9yICYmXHJcbiAgICAgICF0aGlzLnJlcXVlc3RWYWxpZGF0b3IudmFsaWRhdGVSZXF1ZXN0KHJlcXVlc3QpXHJcbiAgICApIHtcclxuICAgICAgLy8gSW4gY2FzZSBhIHJlcXVlc3QgdmFsaWRhdG9yIGlzIHByb3ZpZGVkIGJ1dCBkb2Vzbid0IHJldHVybiB0cnVlIGZvciB0aGVcclxuICAgICAgLy8gY3VycmVudCByZXF1ZXN0LCB3ZSdyZSBub3QgYXBwZW5kaW5nIGEgdG9rZW5cclxuICAgICAgcmV0dXJuIG5leHQuaGFuZGxlKHJlcXVlc3QpO1xyXG4gICAgfVxyXG5cclxuICAgIHJldHVybiB0aGlzLmp3dFRva2VuU2VydmljZVxyXG4gICAgICAuZ2V0VG9rZW4oKVxyXG4gICAgICAucGlwZShcclxuICAgICAgICBtZXJnZU1hcCgoZikgPT5cclxuICAgICAgICAgIG5leHQuaGFuZGxlKHRoaXMuZ2V0SHR0cFJlcXVlc3RXaXRoVG9rZW4ocmVxdWVzdCwgZiAmJiBmLmFjY2Vzc1Rva2VuKSlcclxuICAgICAgICApXHJcbiAgICAgICk7XHJcbiAgfVxyXG5cclxuICBwcml2YXRlIGdldEh0dHBSZXF1ZXN0V2l0aFRva2VuKFxyXG4gICAgcmVxdWVzdDogSHR0cFJlcXVlc3Q8YW55PixcclxuICAgIHRva2VuPzogc3RyaW5nXHJcbiAgKTogSHR0cFJlcXVlc3Q8YW55PiB7XHJcbiAgICBpZiAodG9rZW4pIHtcclxuICAgICAgcmV0dXJuIHJlcXVlc3QuY2xvbmUoe1xyXG4gICAgICAgIHNldEhlYWRlcnM6IHtcclxuICAgICAgICAgIEF1dGhvcml6YXRpb246IGBCZWFyZXIgJHt0b2tlbn1gLFxyXG4gICAgICAgIH0sXHJcbiAgICAgIH0pO1xyXG4gICAgfVxyXG4gICAgcmV0dXJuIHJlcXVlc3QuY2xvbmUoKTtcclxuICB9XHJcbn1cclxuIl19
|
|
@@ -0,0 +1,170 @@
|
|
|
1
|
+
import { inject, Injectable } from '@angular/core';
|
|
2
|
+
import { ReplaySubject, Subject, timer } from 'rxjs';
|
|
3
|
+
import { DanglIdentityClient } from '../api-client';
|
|
4
|
+
import { JwtHelperService } from '@auth0/angular-jwt';
|
|
5
|
+
import { JwtTokenService } from '../services/jwt-token.service';
|
|
6
|
+
import { takeUntil } from 'rxjs/operators';
|
|
7
|
+
import * as i0 from "@angular/core";
|
|
8
|
+
export class AuthenticationMessenger {
|
|
9
|
+
constructor() {
|
|
10
|
+
this.jwtHelperService = new JwtHelperService();
|
|
11
|
+
this.$destroyed = new Subject();
|
|
12
|
+
this.isAuthenticated = new ReplaySubject(1);
|
|
13
|
+
this.username = new ReplaySubject(1);
|
|
14
|
+
this.email = new ReplaySubject(1);
|
|
15
|
+
this.identiconId = new ReplaySubject(1);
|
|
16
|
+
this.userInfo = new ReplaySubject(1);
|
|
17
|
+
this.tokenRefreshStarted = new Subject();
|
|
18
|
+
this.tokenRefreshFinished = new Subject();
|
|
19
|
+
this.jwtTokenService = inject(JwtTokenService);
|
|
20
|
+
this.danglIdentityClient = inject(DanglIdentityClient);
|
|
21
|
+
}
|
|
22
|
+
ngOnInit() {
|
|
23
|
+
this.jwtTokenService.tokenRefreshStarted
|
|
24
|
+
.pipe(takeUntil(this.$destroyed))
|
|
25
|
+
.subscribe(() => this.tokenRefreshStarted.next());
|
|
26
|
+
this.jwtTokenService.tokenRefreshFinished
|
|
27
|
+
.pipe(takeUntil(this.$destroyed))
|
|
28
|
+
.subscribe((successfulRefresh) => this.tokenRefreshFinished.next(successfulRefresh));
|
|
29
|
+
this.jwtTokenService.tokenStored
|
|
30
|
+
.pipe(takeUntil(this.$destroyed))
|
|
31
|
+
.subscribe((jwtToken) => this.refreshAuthenticationStatus(jwtToken));
|
|
32
|
+
this.jwtTokenService
|
|
33
|
+
.getToken()
|
|
34
|
+
.subscribe((token) => this.refreshAuthenticationStatus(token));
|
|
35
|
+
}
|
|
36
|
+
ngOnDestroy() {
|
|
37
|
+
this.isAuthenticated.complete();
|
|
38
|
+
this.username.complete();
|
|
39
|
+
this.email.complete();
|
|
40
|
+
this.identiconId.complete();
|
|
41
|
+
this.userInfo.complete();
|
|
42
|
+
this.tokenRefreshStarted.complete();
|
|
43
|
+
this.tokenRefreshFinished.complete();
|
|
44
|
+
this.$destroyed.next();
|
|
45
|
+
this.$destroyed.complete();
|
|
46
|
+
this.clearLogoutTimer();
|
|
47
|
+
}
|
|
48
|
+
refreshUserInfoFromServer() {
|
|
49
|
+
this.danglIdentityClient.getUserInfo().subscribe({
|
|
50
|
+
next: (serverUserInfo) => {
|
|
51
|
+
if (serverUserInfo.userIsAuthenticated) {
|
|
52
|
+
const userInfo = {
|
|
53
|
+
deserializedToken: null,
|
|
54
|
+
email: serverUserInfo.currentUserEmail,
|
|
55
|
+
id: serverUserInfo.currentUserId,
|
|
56
|
+
identiconId: serverUserInfo.currentUserIdenticonId,
|
|
57
|
+
roles: [],
|
|
58
|
+
claims: {},
|
|
59
|
+
username: serverUserInfo.currentUserName,
|
|
60
|
+
};
|
|
61
|
+
serverUserInfo.userClaims.forEach((claim) => {
|
|
62
|
+
if (claim.type === 'role') {
|
|
63
|
+
userInfo.roles.push(claim.value);
|
|
64
|
+
}
|
|
65
|
+
else if (userInfo.claims[claim.type] === undefined) {
|
|
66
|
+
userInfo.claims[claim.type] = [claim.value];
|
|
67
|
+
}
|
|
68
|
+
else {
|
|
69
|
+
userInfo.claims[claim.type].push(claim.value);
|
|
70
|
+
}
|
|
71
|
+
});
|
|
72
|
+
this.isAuthenticated.next(true);
|
|
73
|
+
this.username.next(serverUserInfo.currentUserName);
|
|
74
|
+
this.email.next(serverUserInfo.currentUserEmail);
|
|
75
|
+
this.identiconId.next(serverUserInfo.currentUserIdenticonId);
|
|
76
|
+
this.userInfo.next(userInfo);
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
this.isAuthenticated.next(false);
|
|
80
|
+
this.username.next(null);
|
|
81
|
+
this.email.next(null);
|
|
82
|
+
this.identiconId.next(null);
|
|
83
|
+
this.userInfo.next(null);
|
|
84
|
+
}
|
|
85
|
+
},
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
refreshAuthenticationStatus(jwtToken) {
|
|
89
|
+
if (jwtToken) {
|
|
90
|
+
const isValidToken = jwtToken.expiresAt > new Date().getTime() / 1000;
|
|
91
|
+
if (this.lastBroadcastAccessToken === jwtToken.accessToken) {
|
|
92
|
+
return;
|
|
93
|
+
}
|
|
94
|
+
this.lastBroadcastAccessToken = jwtToken.accessToken;
|
|
95
|
+
if (isValidToken) {
|
|
96
|
+
this.isAuthenticated.next(true);
|
|
97
|
+
this.startTokenExpirationWatcher(jwtToken);
|
|
98
|
+
const decodedToken = this.jwtHelperService.decodeToken(jwtToken.accessToken);
|
|
99
|
+
this.username.next(decodedToken['name']);
|
|
100
|
+
this.email.next(decodedToken['email']);
|
|
101
|
+
this.identiconId.next(decodedToken['identicon_id']);
|
|
102
|
+
const tokenClaims = {};
|
|
103
|
+
for (const tokenProp in decodedToken) {
|
|
104
|
+
if (decodedToken.hasOwnProperty(tokenProp)) {
|
|
105
|
+
const property = decodedToken[tokenProp];
|
|
106
|
+
if (typeof property === 'string') {
|
|
107
|
+
if (tokenClaims[tokenProp] === undefined) {
|
|
108
|
+
tokenClaims[tokenProp] = [];
|
|
109
|
+
}
|
|
110
|
+
tokenClaims[tokenProp].push(property);
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
this.userInfo.next({
|
|
115
|
+
id: decodedToken['sub'],
|
|
116
|
+
claims: tokenClaims,
|
|
117
|
+
deserializedToken: decodedToken,
|
|
118
|
+
email: decodedToken['email'],
|
|
119
|
+
identiconId: decodedToken['identicon_id'],
|
|
120
|
+
username: decodedToken['name'],
|
|
121
|
+
roles: decodedToken['role'],
|
|
122
|
+
});
|
|
123
|
+
}
|
|
124
|
+
else {
|
|
125
|
+
this.isAuthenticated.next(false);
|
|
126
|
+
this.jwtTokenService.refreshToken().subscribe(() => { });
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
else {
|
|
130
|
+
if (this.lastBroadcastAccessToken === null) {
|
|
131
|
+
return;
|
|
132
|
+
}
|
|
133
|
+
this.lastBroadcastAccessToken = null;
|
|
134
|
+
this.isAuthenticated.next(false);
|
|
135
|
+
this.username.next(null);
|
|
136
|
+
this.email.next(null);
|
|
137
|
+
this.identiconId.next(null);
|
|
138
|
+
this.userInfo.next(null);
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
startTokenExpirationWatcher(jwtToken) {
|
|
142
|
+
const expirationTime = jwtToken.expiresAt * 1000;
|
|
143
|
+
const currentTime = Date.now();
|
|
144
|
+
const timeUntilExpiration = expirationTime - currentTime;
|
|
145
|
+
this.clearLogoutTimer();
|
|
146
|
+
if (timeUntilExpiration > 0) {
|
|
147
|
+
this.expirationSubscription = timer(timeUntilExpiration).subscribe(() => {
|
|
148
|
+
this.isAuthenticated.next(false);
|
|
149
|
+
});
|
|
150
|
+
}
|
|
151
|
+
else {
|
|
152
|
+
this.isAuthenticated.next(false);
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
clearLogoutTimer() {
|
|
156
|
+
if (this.expirationSubscription) {
|
|
157
|
+
this.expirationSubscription.unsubscribe();
|
|
158
|
+
this.expirationSubscription = undefined;
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.9", ngImport: i0, type: AuthenticationMessenger, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
162
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.0.9", ngImport: i0, type: AuthenticationMessenger, providedIn: 'root' }); }
|
|
163
|
+
}
|
|
164
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.9", ngImport: i0, type: AuthenticationMessenger, decorators: [{
|
|
165
|
+
type: Injectable,
|
|
166
|
+
args: [{
|
|
167
|
+
providedIn: 'root',
|
|
168
|
+
}]
|
|
169
|
+
}], ctorParameters: () => [] });
|
|
170
|
+
//# 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":"AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAqB,MAAM,eAAe,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,OAAO,EAAgB,KAAK,EAAE,MAAM,MAAM,CAAC;AAEnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;;AAK3C,MAAM,OAAO,uBAAuB;IAelC;QAdQ,qBAAgB,GAAG,IAAI,gBAAgB,EAAE,CAAC;QAE1C,eAAU,GAAG,IAAI,OAAO,EAAE,CAAC;QAG1B,oBAAe,GAAG,IAAI,aAAa,CAAU,CAAC,CAAC,CAAC;QAChD,aAAQ,GAAG,IAAI,aAAa,CAAS,CAAC,CAAC,CAAC;QACxC,UAAK,GAAG,IAAI,aAAa,CAAS,CAAC,CAAC,CAAC;QACrC,gBAAW,GAAG,IAAI,aAAa,CAAS,CAAC,CAAC,CAAC;QAC3C,aAAQ,GAAG,IAAI,aAAa,CAAW,CAAC,CAAC,CAAC;QAC1C,wBAAmB,GAAG,IAAI,OAAO,EAAE,CAAC;QACpC,yBAAoB,GAAG,IAAI,OAAO,EAAW,CAAC;QAIrD,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;QAC/C,IAAI,CAAC,mBAAmB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;IACzD,CAAC;IAED,QAAQ;QACN,IAAI,CAAC,eAAe,CAAC,mBAAmB;aACrC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;aAChC,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC,CAAC;QAEpD,IAAI,CAAC,eAAe,CAAC,oBAAoB;aACtC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;aAChC,SAAS,CAAC,CAAC,iBAAiB,EAAE,EAAE,CAC/B,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAClD,CAAC;QAEJ,IAAI,CAAC,eAAe,CAAC,WAAW;aAC7B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;aAChC,SAAS,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,2BAA2B,CAAC,QAAQ,CAAC,CAAC,CAAC;QAEvE,IAAI,CAAC,eAAe;aACjB,QAAQ,EAAE;aACV,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC,CAAC;IACnE,CAAC;IAED,WAAW;QACT,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC;QAChC,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;QACzB,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;QACtB,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;QAC5B,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;QACzB,IAAI,CAAC,mBAAmB,CAAC,QAAQ,EAAE,CAAC;QACpC,IAAI,CAAC,oBAAoB,CAAC,QAAQ,EAAE,CAAC;QACrC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QACvB,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;QAC3B,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC1B,CAAC;IAED,yBAAyB;QACvB,IAAI,CAAC,mBAAmB,CAAC,WAAW,EAAE,CAAC,SAAS,CAAC;YAC/C,IAAI,EAAE,CAAC,cAAc,EAAE,EAAE;gBACvB,IAAI,cAAc,CAAC,mBAAmB,EAAE;oBACtC,MAAM,QAAQ,GAAa;wBACzB,iBAAiB,EAAE,IAAI;wBACvB,KAAK,EAAE,cAAc,CAAC,gBAAgB;wBACtC,EAAE,EAAE,cAAc,CAAC,aAAa;wBAChC,WAAW,EAAE,cAAc,CAAC,sBAAsB;wBAClD,KAAK,EAAE,EAAE;wBACT,MAAM,EAAE,EAAE;wBACV,QAAQ,EAAE,cAAc,CAAC,eAAe;qBACzC,CAAC;oBAEF,cAAc,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;wBAC1C,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE;4BACzB,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;yBAClC;6BAAM,IAAI,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,SAAS,EAAE;4BACpD,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;yBAC7C;6BAAM;4BACL,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;yBAC/C;oBACH,CAAC,CAAC,CAAC;oBACH,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAChC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;oBACnD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC;oBACjD,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC,CAAC;oBAC7D,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;iBAC9B;qBAAM;oBACL,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBACjC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBACzB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBACtB,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAC5B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBAC1B;YACH,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IAEO,2BAA2B,CAAC,QAAqB;QACvD,IAAI,QAAQ,EAAE;YACZ,MAAM,YAAY,GAAG,QAAQ,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC;YACtE,IAAI,IAAI,CAAC,wBAAwB,KAAK,QAAQ,CAAC,WAAW,EAAE;gBAC1D,OAAO;aACR;YACD,IAAI,CAAC,wBAAwB,GAAG,QAAQ,CAAC,WAAW,CAAC;YACrD,IAAI,YAAY,EAAE;gBAChB,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAChC,IAAI,CAAC,2BAA2B,CAAC,QAAQ,CAAC,CAAC;gBAC3C,MAAM,YAAY,GAAG,IAAI,CAAC,gBAAgB,CAAC,WAAW,CACpD,QAAQ,CAAC,WAAW,CACrB,CAAC;gBACF,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC;gBACzC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;gBACvC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,CAAC;gBAEpD,MAAM,WAAW,GAAkC,EAAE,CAAC;gBACtD,KAAK,MAAM,SAAS,IAAI,YAAY,EAAE;oBACpC,IAAI,YAAY,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE;wBAC1C,MAAM,QAAQ,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC;wBACzC,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;4BAChC,IAAI,WAAW,CAAC,SAAS,CAAC,KAAK,SAAS,EAAE;gCACxC,WAAW,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;6BAC7B;4BAED,WAAW,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;yBACvC;qBACF;iBACF;gBAED,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;oBACjB,EAAE,EAAE,YAAY,CAAC,KAAK,CAAC;oBACvB,MAAM,EAAE,WAAW;oBACnB,iBAAiB,EAAE,YAAY;oBAC/B,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC;oBAC5B,WAAW,EAAE,YAAY,CAAC,cAAc,CAAC;oBACzC,QAAQ,EAAE,YAAY,CAAC,MAAM,CAAC;oBAC9B,KAAK,EAAE,YAAY,CAAC,MAAM,CAAC;iBAC5B,CAAC,CAAC;aACJ;iBAAM;gBACL,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACjC,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;aACzD;SACF;aAAM;YACL,IAAI,IAAI,CAAC,wBAAwB,KAAK,IAAI,EAAE;gBAC1C,OAAO;aACR;YACD,IAAI,CAAC,wBAAwB,GAAG,IAAI,CAAC;YACrC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACjC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACtB,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC5B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC1B;IACH,CAAC;IAEO,2BAA2B,CAAC,QAAqB;QACvD,MAAM,cAAc,GAAG,QAAQ,CAAC,SAAS,GAAG,IAAI,CAAC;QACjD,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC/B,MAAM,mBAAmB,GAAG,cAAc,GAAG,WAAW,CAAC;QAEzD,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAExB,IAAI,mBAAmB,GAAG,CAAC,EAAE;YAC3B,IAAI,CAAC,sBAAsB,GAAG,KAAK,CAAC,mBAAmB,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE;gBACtE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SAClC;IACH,CAAC;IAEO,gBAAgB;QACtB,IAAI,IAAI,CAAC,sBAAsB,EAAE;YAC/B,IAAI,CAAC,sBAAsB,CAAC,WAAW,EAAE,CAAC;YAC1C,IAAI,CAAC,sBAAsB,GAAG,SAAS,CAAC;SACzC;IACH,CAAC;8GA1KU,uBAAuB;kHAAvB,uBAAuB,cAFtB,MAAM;;2FAEP,uBAAuB;kBAHnC,UAAU;mBAAC;oBACV,UAAU,EAAE,MAAM;iBACnB","sourcesContent":["import { inject, Injectable, OnDestroy, OnInit } from '@angular/core';\r\nimport { ReplaySubject, Subject, Subscription, timer } from 'rxjs';\r\n\r\nimport { DanglIdentityClient } from '../api-client';\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, OnInit {\r\n  private jwtHelperService = new JwtHelperService();\r\n  private lastBroadcastAccessToken: string;\r\n  private $destroyed = new Subject();\r\n  private expirationSubscription?: Subscription;\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  private jwtTokenService: JwtTokenService | undefined;\r\n  private danglIdentityClient: DanglIdentityClient | undefined;\r\n  constructor() {\r\n    this.jwtTokenService = inject(JwtTokenService);\r\n    this.danglIdentityClient = inject(DanglIdentityClient);\r\n  }\r\n\r\n  ngOnInit(): void {\r\n    this.jwtTokenService.tokenRefreshStarted\r\n      .pipe(takeUntil(this.$destroyed))\r\n      .subscribe(() => this.tokenRefreshStarted.next());\r\n\r\n    this.jwtTokenService.tokenRefreshFinished\r\n      .pipe(takeUntil(this.$destroyed))\r\n      .subscribe((successfulRefresh) =>\r\n        this.tokenRefreshFinished.next(successfulRefresh)\r\n      );\r\n\r\n    this.jwtTokenService.tokenStored\r\n      .pipe(takeUntil(this.$destroyed))\r\n      .subscribe((jwtToken) => this.refreshAuthenticationStatus(jwtToken));\r\n\r\n    this.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    this.clearLogoutTimer();\r\n  }\r\n\r\n  refreshUserInfoFromServer(): void {\r\n    this.danglIdentityClient.getUserInfo().subscribe({\r\n      next: (serverUserInfo) => {\r\n        if (serverUserInfo.userIsAuthenticated) {\r\n          const userInfo: UserInfo = {\r\n            deserializedToken: null,\r\n            email: serverUserInfo.currentUserEmail,\r\n            id: serverUserInfo.currentUserId,\r\n            identiconId: serverUserInfo.currentUserIdenticonId,\r\n            roles: [],\r\n            claims: {},\r\n            username: serverUserInfo.currentUserName,\r\n          };\r\n\r\n          serverUserInfo.userClaims.forEach((claim) => {\r\n            if (claim.type === 'role') {\r\n              userInfo.roles.push(claim.value);\r\n            } else if (userInfo.claims[claim.type] === undefined) {\r\n              userInfo.claims[claim.type] = [claim.value];\r\n            } else {\r\n              userInfo.claims[claim.type].push(claim.value);\r\n            }\r\n          });\r\n          this.isAuthenticated.next(true);\r\n          this.username.next(serverUserInfo.currentUserName);\r\n          this.email.next(serverUserInfo.currentUserEmail);\r\n          this.identiconId.next(serverUserInfo.currentUserIdenticonId);\r\n          this.userInfo.next(userInfo);\r\n        } else {\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\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        this.startTokenExpirationWatcher(jwtToken);\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              if (tokenClaims[tokenProp] === undefined) {\r\n                tokenClaims[tokenProp] = [];\r\n              }\r\n\r\n              tokenClaims[tokenProp].push(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  private startTokenExpirationWatcher(jwtToken?: JwtStorage): void {\r\n    const expirationTime = jwtToken.expiresAt * 1000;\r\n    const currentTime = Date.now();\r\n    const timeUntilExpiration = expirationTime - currentTime;\r\n\r\n    this.clearLogoutTimer();\r\n\r\n    if (timeUntilExpiration > 0) {\r\n      this.expirationSubscription = timer(timeUntilExpiration).subscribe(() => {\r\n        this.isAuthenticated.next(false);\r\n      });\r\n    } else {\r\n      this.isAuthenticated.next(false);\r\n    }\r\n  }\r\n\r\n  private clearLogoutTimer(): void {\r\n    if (this.expirationSubscription) {\r\n      this.expirationSubscription.unsubscribe();\r\n      this.expirationSubscription = undefined;\r\n    }\r\n  }\r\n}\r\n"]}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export {};
|
|
1
|
+
export {};
|
|
2
2
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiand0LXN0b3JhZ2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9wcm9qZWN0cy9hbmd1bGFyLWRhbmdsLWlkZW50aXR5LWNsaWVudC9zcmMvbW9kZWxzL2p3dC1zdG9yYWdlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgaW50ZXJmYWNlIEp3dFN0b3JhZ2Uge1xyXG4gIGFjY2Vzc1Rva2VuOiBzdHJpbmc7XHJcbiAgcmVmcmVzaFRva2VuPzogc3RyaW5nO1xyXG4gIGV4cGlyZXNBdDogbnVtYmVyO1xyXG59XHJcbiJdfQ==
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export {};
|
|
1
|
+
export {};
|
|
2
2
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXNlci1pbmZvLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vcHJvamVjdHMvYW5ndWxhci1kYW5nbC1pZGVudGl0eS1jbGllbnQvc3JjL21vZGVscy91c2VyLWluZm8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBpbnRlcmZhY2UgVXNlckluZm8ge1xyXG4gICAgaWQ6IHN0cmluZztcclxuICAgIHVzZXJuYW1lOiBzdHJpbmc7XHJcbiAgICBlbWFpbDogc3RyaW5nO1xyXG4gICAgaWRlbnRpY29uSWQ6IHN0cmluZztcclxuICAgIHJvbGVzOiBzdHJpbmdbXTtcclxuICAgIGNsYWltczoge1tjbGFpbTogc3RyaW5nXTogc3RyaW5nW119O1xyXG4gICAgZGVzZXJpYWxpemVkVG9rZW46IGFueTtcclxufVxyXG4iXX0=
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
/*
|
|
2
|
-
* Public API Surface of angular-dangl-identity-client
|
|
3
|
-
*/
|
|
4
|
-
export * from "./dangl-identity.module";
|
|
5
|
-
export * from "./api-client";
|
|
6
|
-
export * from "./interceptors/jwt-interceptor.service";
|
|
7
|
-
export * from "./interceptors/dangl-identity-request-validator";
|
|
8
|
-
export * from "./models/jwt-storage";
|
|
9
|
-
export * from "./services/authentication.service";
|
|
10
|
-
export * from "./services/jwt-token.service";
|
|
11
|
-
export * from "./messengers/authentication.messenger";
|
|
1
|
+
/*
|
|
2
|
+
* Public API Surface of angular-dangl-identity-client
|
|
3
|
+
*/
|
|
4
|
+
export * from "./dangl-identity.module";
|
|
5
|
+
export * from "./api-client";
|
|
6
|
+
export * from "./interceptors/jwt-interceptor.service";
|
|
7
|
+
export * from "./interceptors/dangl-identity-request-validator";
|
|
8
|
+
export * from "./models/jwt-storage";
|
|
9
|
+
export * from "./services/authentication.service";
|
|
10
|
+
export * from "./services/jwt-token.service";
|
|
11
|
+
export * from "./messengers/authentication.messenger";
|
|
12
12
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX2FwaS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3Byb2plY3RzL2FuZ3VsYXItZGFuZ2wtaWRlbnRpdHktY2xpZW50L3NyYy9wdWJsaWNfYXBpLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBRUgsY0FBYyx5QkFBeUIsQ0FBQztBQUN4QyxjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLHdDQUF3QyxDQUFDO0FBQ3ZELGNBQWMsaURBQWlELENBQUM7QUFDaEUsY0FBYyxzQkFBc0IsQ0FBQztBQUNyQyxjQUFjLG1DQUFtQyxDQUFDO0FBQ2xELGNBQWMsOEJBQThCLENBQUM7QUFDN0MsY0FBYyx1Q0FBdUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qXHJcbiAqIFB1YmxpYyBBUEkgU3VyZmFjZSBvZiBhbmd1bGFyLWRhbmdsLWlkZW50aXR5LWNsaWVudFxyXG4gKi9cclxuXHJcbmV4cG9ydCAqIGZyb20gXCIuL2RhbmdsLWlkZW50aXR5Lm1vZHVsZVwiO1xyXG5leHBvcnQgKiBmcm9tIFwiLi9hcGktY2xpZW50XCI7XHJcbmV4cG9ydCAqIGZyb20gXCIuL2ludGVyY2VwdG9ycy9qd3QtaW50ZXJjZXB0b3Iuc2VydmljZVwiO1xyXG5leHBvcnQgKiBmcm9tIFwiLi9pbnRlcmNlcHRvcnMvZGFuZ2wtaWRlbnRpdHktcmVxdWVzdC12YWxpZGF0b3JcIjtcclxuZXhwb3J0ICogZnJvbSBcIi4vbW9kZWxzL2p3dC1zdG9yYWdlXCI7XHJcbmV4cG9ydCAqIGZyb20gXCIuL3NlcnZpY2VzL2F1dGhlbnRpY2F0aW9uLnNlcnZpY2VcIjtcclxuZXhwb3J0ICogZnJvbSBcIi4vc2VydmljZXMvand0LXRva2VuLnNlcnZpY2VcIjtcclxuZXhwb3J0ICogZnJvbSBcIi4vbWVzc2VuZ2Vycy9hdXRoZW50aWNhdGlvbi5tZXNzZW5nZXJcIjtcclxuIl19
|
|
@@ -1,39 +1,39 @@
|
|
|
1
|
-
import { of } from 'rxjs';
|
|
2
|
-
import { catchError, map } from 'rxjs/operators';
|
|
3
|
-
import { Injectable } from '@angular/core';
|
|
4
|
-
import * as i0 from "@angular/core";
|
|
5
|
-
import * as i1 from "../api-client";
|
|
6
|
-
import * as i2 from "./jwt-token.service";
|
|
7
|
-
export class AuthenticationService {
|
|
8
|
-
constructor(danglIdentityClient, jwtTokenService) {
|
|
9
|
-
this.danglIdentityClient = danglIdentityClient;
|
|
10
|
-
this.jwtTokenService = jwtTokenService;
|
|
11
|
-
}
|
|
12
|
-
loginWithToken(identifier, password) {
|
|
13
|
-
return this.danglIdentityClient
|
|
14
|
-
.loginAndReturnToken({
|
|
15
|
-
identifier: identifier,
|
|
16
|
-
password: password,
|
|
17
|
-
})
|
|
18
|
-
.pipe(map((r) => this.storeJwtTokenIfValid(r)), catchError((e) => of(false)));
|
|
19
|
-
}
|
|
20
|
-
storeJwtTokenIfValid(token) {
|
|
21
|
-
if (!token.accessToken || !token.refreshToken || !token.expiresIn) {
|
|
22
|
-
return false;
|
|
23
|
-
}
|
|
24
|
-
this.jwtTokenService.storeToken(token);
|
|
25
|
-
return true;
|
|
26
|
-
}
|
|
27
|
-
logout() {
|
|
28
|
-
this.jwtTokenService.deleteToken();
|
|
29
|
-
}
|
|
30
|
-
}
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "
|
|
34
|
-
type: Injectable,
|
|
35
|
-
args: [{
|
|
36
|
-
providedIn: 'root',
|
|
37
|
-
}]
|
|
38
|
-
}], ctorParameters:
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
1
|
+
import { of } from 'rxjs';
|
|
2
|
+
import { catchError, map } from 'rxjs/operators';
|
|
3
|
+
import { Injectable } from '@angular/core';
|
|
4
|
+
import * as i0 from "@angular/core";
|
|
5
|
+
import * as i1 from "../api-client";
|
|
6
|
+
import * as i2 from "./jwt-token.service";
|
|
7
|
+
export class AuthenticationService {
|
|
8
|
+
constructor(danglIdentityClient, jwtTokenService) {
|
|
9
|
+
this.danglIdentityClient = danglIdentityClient;
|
|
10
|
+
this.jwtTokenService = jwtTokenService;
|
|
11
|
+
}
|
|
12
|
+
loginWithToken(identifier, password) {
|
|
13
|
+
return this.danglIdentityClient
|
|
14
|
+
.loginAndReturnToken({
|
|
15
|
+
identifier: identifier,
|
|
16
|
+
password: password,
|
|
17
|
+
})
|
|
18
|
+
.pipe(map((r) => this.storeJwtTokenIfValid(r)), catchError((e) => of(false)));
|
|
19
|
+
}
|
|
20
|
+
storeJwtTokenIfValid(token) {
|
|
21
|
+
if (!token.accessToken || !token.refreshToken || !token.expiresIn) {
|
|
22
|
+
return false;
|
|
23
|
+
}
|
|
24
|
+
this.jwtTokenService.storeToken(token);
|
|
25
|
+
return true;
|
|
26
|
+
}
|
|
27
|
+
logout() {
|
|
28
|
+
this.jwtTokenService.deleteToken();
|
|
29
|
+
}
|
|
30
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.9", ngImport: i0, type: AuthenticationService, deps: [{ token: i1.DanglIdentityClient }, { token: i2.JwtTokenService }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
31
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.0.9", ngImport: i0, type: AuthenticationService, providedIn: 'root' }); }
|
|
32
|
+
}
|
|
33
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.9", ngImport: i0, type: AuthenticationService, decorators: [{
|
|
34
|
+
type: Injectable,
|
|
35
|
+
args: [{
|
|
36
|
+
providedIn: 'root',
|
|
37
|
+
}]
|
|
38
|
+
}], ctorParameters: () => [{ type: i1.DanglIdentityClient }, { type: i2.JwtTokenService }] });
|
|
39
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aGVudGljYXRpb24uc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL2FuZ3VsYXItZGFuZ2wtaWRlbnRpdHktY2xpZW50L3NyYy9zZXJ2aWNlcy9hdXRoZW50aWNhdGlvbi5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBYyxFQUFFLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDdEMsT0FBTyxFQUFFLFVBQVUsRUFBRSxHQUFHLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUVqRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDOzs7O0FBTTNDLE1BQU0sT0FBTyxxQkFBcUI7SUFDaEMsWUFDVSxtQkFBd0MsRUFDeEMsZUFBZ0M7UUFEaEMsd0JBQW1CLEdBQW5CLG1CQUFtQixDQUFxQjtRQUN4QyxvQkFBZSxHQUFmLGVBQWUsQ0FBaUI7SUFDdkMsQ0FBQztJQUVKLGNBQWMsQ0FBQyxVQUFrQixFQUFFLFFBQWdCO1FBQ2pELE9BQU8sSUFBSSxDQUFDLG1CQUFtQjthQUM1QixtQkFBbUIsQ0FBQztZQUNuQixVQUFVLEVBQUUsVUFBVTtZQUN0QixRQUFRLEVBQUUsUUFBUTtTQUNuQixDQUFDO2FBQ0QsSUFBSSxDQUNILEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLG9CQUFvQixDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQ3hDLFVBQVUsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQzdCLENBQUM7SUFDTixDQUFDO0lBRU8sb0JBQW9CLENBQUMsS0FBdUI7UUFDbEQsSUFBSSxDQUFDLEtBQUssQ0FBQyxXQUFXLElBQUksQ0FBQyxLQUFLLENBQUMsWUFBWSxJQUFJLENBQUMsS0FBSyxDQUFDLFNBQVMsRUFBRTtZQUNqRSxPQUFPLEtBQUssQ0FBQztTQUNkO1FBQ0QsSUFBSSxDQUFDLGVBQWUsQ0FBQyxVQUFVLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDdkMsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQsTUFBTTtRQUNKLElBQUksQ0FBQyxlQUFlLENBQUMsV0FBVyxFQUFFLENBQUM7SUFDckMsQ0FBQzs4R0E1QlUscUJBQXFCO2tIQUFyQixxQkFBcUIsY0FGcEIsTUFBTTs7MkZBRVAscUJBQXFCO2tCQUhqQyxVQUFVO21CQUFDO29CQUNWLFVBQVUsRUFBRSxNQUFNO2lCQUNuQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IERhbmdsSWRlbnRpdHlDbGllbnQsIFRva2VuUmVzcG9uc2VHZXQgfSBmcm9tICcuLi9hcGktY2xpZW50JztcclxuaW1wb3J0IHsgT2JzZXJ2YWJsZSwgb2YgfSBmcm9tICdyeGpzJztcclxuaW1wb3J0IHsgY2F0Y2hFcnJvciwgbWFwIH0gZnJvbSAncnhqcy9vcGVyYXRvcnMnO1xyXG5cclxuaW1wb3J0IHsgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xyXG5pbXBvcnQgeyBKd3RUb2tlblNlcnZpY2UgfSBmcm9tICcuL2p3dC10b2tlbi5zZXJ2aWNlJztcclxuXHJcbkBJbmplY3RhYmxlKHtcclxuICBwcm92aWRlZEluOiAncm9vdCcsXHJcbn0pXHJcbmV4cG9ydCBjbGFzcyBBdXRoZW50aWNhdGlvblNlcnZpY2Uge1xyXG4gIGNvbnN0cnVjdG9yKFxyXG4gICAgcHJpdmF0ZSBkYW5nbElkZW50aXR5Q2xpZW50OiBEYW5nbElkZW50aXR5Q2xpZW50LFxyXG4gICAgcHJpdmF0ZSBqd3RUb2tlblNlcnZpY2U6IEp3dFRva2VuU2VydmljZVxyXG4gICkge31cclxuXHJcbiAgbG9naW5XaXRoVG9rZW4oaWRlbnRpZmllcjogc3RyaW5nLCBwYXNzd29yZDogc3RyaW5nKTogT2JzZXJ2YWJsZTxib29sZWFuPiB7XHJcbiAgICByZXR1cm4gdGhpcy5kYW5nbElkZW50aXR5Q2xpZW50XHJcbiAgICAgIC5sb2dpbkFuZFJldHVyblRva2VuKHtcclxuICAgICAgICBpZGVudGlmaWVyOiBpZGVudGlmaWVyLFxyXG4gICAgICAgIHBhc3N3b3JkOiBwYXNzd29yZCxcclxuICAgICAgfSlcclxuICAgICAgLnBpcGUoXHJcbiAgICAgICAgbWFwKChyKSA9PiB0aGlzLnN0b3JlSnd0VG9rZW5JZlZhbGlkKHIpKSxcclxuICAgICAgICBjYXRjaEVycm9yKChlKSA9PiBvZihmYWxzZSkpXHJcbiAgICAgICk7XHJcbiAgfVxyXG5cclxuICBwcml2YXRlIHN0b3JlSnd0VG9rZW5JZlZhbGlkKHRva2VuOiBUb2tlblJlc3BvbnNlR2V0KTogYm9vbGVhbiB7XHJcbiAgICBpZiAoIXRva2VuLmFjY2Vzc1Rva2VuIHx8ICF0b2tlbi5yZWZyZXNoVG9rZW4gfHwgIXRva2VuLmV4cGlyZXNJbikge1xyXG4gICAgICByZXR1cm4gZmFsc2U7XHJcbiAgICB9XHJcbiAgICB0aGlzLmp3dFRva2VuU2VydmljZS5zdG9yZVRva2VuKHRva2VuKTtcclxuICAgIHJldHVybiB0cnVlO1xyXG4gIH1cclxuXHJcbiAgbG9nb3V0KCkge1xyXG4gICAgdGhpcy5qd3RUb2tlblNlcnZpY2UuZGVsZXRlVG9rZW4oKTtcclxuICB9XHJcbn1cclxuIl19
|