@dangl/angular-dangl-identity-client 4.0.0-pullrequest0003-0010 → 4.0.1-beta0003
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 +1 -1
- package/api-client.d.ts +3 -0
- package/dangl-angular-dangl-identity-client.d.ts +1 -0
- package/dangl-identity.module.d.ts +5 -0
- package/esm2020/api-client.mjs +482 -0
- package/{esm2015/dangl-angular-dangl-identity-client.js → esm2020/dangl-angular-dangl-identity-client.mjs} +0 -0
- package/esm2020/dangl-identity.module.mjs +21 -0
- package/{esm2015/interceptors/dangl-identity-request-validator.js → esm2020/interceptors/dangl-identity-request-validator.mjs} +0 -0
- package/esm2020/interceptors/jwt-interceptor.service.mjs +47 -0
- package/esm2020/messengers/authentication.messenger.mjs +83 -0
- package/{esm2015/models/jwt-storage.js → esm2020/models/jwt-storage.mjs} +0 -0
- package/{esm2015/models/user-info.js → esm2020/models/user-info.mjs} +0 -0
- package/{esm2015/public_api.js → esm2020/public_api.mjs} +0 -0
- package/esm2020/services/authentication.service.mjs +41 -0
- package/esm2020/services/jwt-token.service.mjs +95 -0
- package/fesm2015/dangl-angular-dangl-identity-client.mjs +754 -0
- package/fesm2015/dangl-angular-dangl-identity-client.mjs.map +1 -0
- package/{fesm2015/dangl-angular-dangl-identity-client.js → fesm2020/dangl-angular-dangl-identity-client.mjs} +66 -55
- package/fesm2020/dangl-angular-dangl-identity-client.mjs.map +1 -0
- package/interceptors/jwt-interceptor.service.d.ts +3 -0
- package/messengers/authentication.messenger.d.ts +3 -0
- package/package.json +21 -9
- package/services/authentication.service.d.ts +3 -0
- package/services/jwt-token.service.d.ts +3 -0
- package/bundles/dangl-angular-dangl-identity-client.umd.js +0 -1179
- package/bundles/dangl-angular-dangl-identity-client.umd.js.map +0 -1
- package/dangl-angular-dangl-identity-client.metadata.json +0 -1
- package/esm2015/api-client.js +0 -476
- package/esm2015/dangl-identity.module.js +0 -14
- package/esm2015/interceptors/jwt-interceptor.service.js +0 -43
- package/esm2015/messengers/authentication.messenger.js +0 -85
- package/esm2015/services/authentication.service.js +0 -45
- package/esm2015/services/jwt-token.service.js +0 -97
- package/fesm2015/dangl-angular-dangl-identity-client.js.map +0 -1
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { NgModule } from '@angular/core';
|
|
2
|
+
import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
|
|
3
|
+
import { JwtInterceptorService } from './interceptors/jwt-interceptor.service';
|
|
4
|
+
import * as i0 from "@angular/core";
|
|
5
|
+
export class DanglIdentityModule {
|
|
6
|
+
}
|
|
7
|
+
DanglIdentityModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.6", ngImport: i0, type: DanglIdentityModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
|
|
8
|
+
DanglIdentityModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "13.2.6", ngImport: i0, type: DanglIdentityModule, imports: [HttpClientModule] });
|
|
9
|
+
DanglIdentityModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "13.2.6", ngImport: i0, type: DanglIdentityModule, providers: [{ provide: HTTP_INTERCEPTORS, useClass: JwtInterceptorService, multi: true }], imports: [[
|
|
10
|
+
HttpClientModule
|
|
11
|
+
]] });
|
|
12
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.6", ngImport: i0, type: DanglIdentityModule, decorators: [{
|
|
13
|
+
type: NgModule,
|
|
14
|
+
args: [{
|
|
15
|
+
imports: [
|
|
16
|
+
HttpClientModule
|
|
17
|
+
],
|
|
18
|
+
providers: [{ provide: HTTP_INTERCEPTORS, useClass: JwtInterceptorService, multi: true }]
|
|
19
|
+
}]
|
|
20
|
+
}] });
|
|
21
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGFuZ2wtaWRlbnRpdHkubW9kdWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vcHJvamVjdHMvYW5ndWxhci1kYW5nbC1pZGVudGl0eS1jbGllbnQvc3JjL2RhbmdsLWlkZW50aXR5Lm1vZHVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ3pDLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQzNFLE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLHdDQUF3QyxDQUFDOztBQVEvRSxNQUFNLE9BQU8sbUJBQW1COztnSEFBbkIsbUJBQW1CO2lIQUFuQixtQkFBbUIsWUFKNUIsZ0JBQWdCO2lIQUlQLG1CQUFtQixhQUZuQixDQUFDLEVBQUUsT0FBTyxFQUFFLGlCQUFpQixFQUFFLFFBQVEsRUFBRSxxQkFBcUIsRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLENBQUMsWUFIaEY7WUFDUCxnQkFBZ0I7U0FDakI7MkZBR1UsbUJBQW1CO2tCQU4vQixRQUFRO21CQUFDO29CQUNSLE9BQU8sRUFBRTt3QkFDUCxnQkFBZ0I7cUJBQ2pCO29CQUNELFNBQVMsRUFBRSxDQUFDLEVBQUUsT0FBTyxFQUFFLGlCQUFpQixFQUFFLFFBQVEsRUFBRSxxQkFBcUIsRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLENBQUM7aUJBQzFGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgTmdNb2R1bGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcclxuaW1wb3J0IHsgSHR0cENsaWVudE1vZHVsZSwgSFRUUF9JTlRFUkNFUFRPUlMgfSBmcm9tICdAYW5ndWxhci9jb21tb24vaHR0cCc7XHJcbmltcG9ydCB7IEp3dEludGVyY2VwdG9yU2VydmljZSB9IGZyb20gJy4vaW50ZXJjZXB0b3JzL2p3dC1pbnRlcmNlcHRvci5zZXJ2aWNlJztcclxuXHJcbkBOZ01vZHVsZSh7XHJcbiAgaW1wb3J0czogW1xyXG4gICAgSHR0cENsaWVudE1vZHVsZVxyXG4gIF0sXHJcbiAgcHJvdmlkZXJzOiBbeyBwcm92aWRlOiBIVFRQX0lOVEVSQ0VQVE9SUywgdXNlQ2xhc3M6IEp3dEludGVyY2VwdG9yU2VydmljZSwgbXVsdGk6IHRydWUgfV1cclxufSlcclxuZXhwb3J0IGNsYXNzIERhbmdsSWRlbnRpdHlNb2R1bGUgeyB9XHJcbiJdfQ==
|
|
File without changes
|
|
@@ -0,0 +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
|
+
JwtInterceptorService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.6", ngImport: i0, type: JwtInterceptorService, deps: [{ token: i1.JwtTokenService }, { token: DANGL_IDENTITY_REQUEST_VALIDATOR, optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
38
|
+
JwtInterceptorService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.2.6", ngImport: i0, type: JwtInterceptorService });
|
|
39
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.6", ngImport: i0, type: JwtInterceptorService, decorators: [{
|
|
40
|
+
type: Injectable
|
|
41
|
+
}], ctorParameters: function () { return [{ 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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiand0LWludGVyY2VwdG9yLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9wcm9qZWN0cy9hbmd1bGFyLWRhbmdsLWlkZW50aXR5LWNsaWVudC9zcmMvaW50ZXJjZXB0b3JzL2p3dC1pbnRlcmNlcHRvci5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU9BLE9BQU8sRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLGNBQWMsRUFBRSxRQUFRLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFHN0UsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGdCQUFnQixDQUFDOzs7QUFHMUMsTUFBTSxDQUFDLE1BQU0sZ0NBQWdDLEdBQzNDLElBQUksY0FBYyxDQUNoQiwrREFBK0QsQ0FDaEUsQ0FBQztBQUVKLE1BQU0sT0FBTyxxQkFBcUI7SUFDaEMsWUFDUyxlQUFnQyxFQUcvQixnQkFBZ0Q7UUFIakQsb0JBQWUsR0FBZixlQUFlLENBQWlCO1FBRy9CLHFCQUFnQixHQUFoQixnQkFBZ0IsQ0FBZ0M7SUFDdkQsQ0FBQztJQUNKLFNBQVMsQ0FDUCxPQUF5QixFQUN6QixJQUFpQjtRQUVqQixJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLFdBQVcsQ0FBQyxFQUFFO1lBQ3ZDLG9FQUFvRTtZQUNwRSxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUM7U0FDckM7UUFFRCxJQUNFLElBQUksQ0FBQyxnQkFBZ0I7WUFDckIsQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsZUFBZSxDQUFDLE9BQU8sQ0FBQyxFQUMvQztZQUNBLDBFQUEwRTtZQUMxRSwrQ0FBK0M7WUFDL0MsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1NBQzdCO1FBRUQsT0FBTyxJQUFJLENBQUMsZUFBZTthQUN4QixRQUFRLEVBQUU7YUFDVixJQUFJLENBQ0gsUUFBUSxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FDYixJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyx1QkFBdUIsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUN2RSxDQUNGLENBQUM7SUFDTixDQUFDO0lBRU8sdUJBQXVCLENBQzdCLE9BQXlCLEVBQ3pCLEtBQWM7UUFFZCxJQUFJLEtBQUssRUFBRTtZQUNULE9BQU8sT0FBTyxDQUFDLEtBQUssQ0FBQztnQkFDbkIsVUFBVSxFQUFFO29CQUNWLGFBQWEsRUFBRSxVQUFVLEtBQUssRUFBRTtpQkFDakM7YUFDRixDQUFDLENBQUM7U0FDSjtRQUNELE9BQU8sT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQ3pCLENBQUM7O2tIQTlDVSxxQkFBcUIsaURBSXRCLGdDQUFnQztzSEFKL0IscUJBQXFCOzJGQUFyQixxQkFBcUI7a0JBRGpDLFVBQVU7OzBCQUlOLFFBQVE7OzBCQUNSLE1BQU07MkJBQUMsZ0NBQWdDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcclxuICBIdHRwRXZlbnQsXHJcbiAgSHR0cEhhbmRsZXIsXHJcbiAgSHR0cEludGVyY2VwdG9yLFxyXG4gIEh0dHBSZXF1ZXN0LFxyXG59IGZyb20gXCJAYW5ndWxhci9jb21tb24vaHR0cFwiO1xyXG5cclxuaW1wb3J0IHsgSW5qZWN0LCBJbmplY3RhYmxlLCBJbmplY3Rpb25Ub2tlbiwgT3B0aW9uYWwgfSBmcm9tIFwiQGFuZ3VsYXIvY29yZVwiO1xyXG5pbXBvcnQgeyBKd3RUb2tlblNlcnZpY2UgfSBmcm9tIFwiLi4vc2VydmljZXMvand0LXRva2VuLnNlcnZpY2VcIjtcclxuaW1wb3J0IHsgT2JzZXJ2YWJsZSB9IGZyb20gXCJyeGpzXCI7XHJcbmltcG9ydCB7IG1lcmdlTWFwIH0gZnJvbSBcInJ4anMvb3BlcmF0b3JzXCI7XHJcbmltcG9ydCB7IElEYW5nbElkZW50aXR5UmVxdWVzdFZhbGlkYXRvciB9IGZyb20gXCIuL2RhbmdsLWlkZW50aXR5LXJlcXVlc3QtdmFsaWRhdG9yXCI7XHJcblxyXG5leHBvcnQgY29uc3QgREFOR0xfSURFTlRJVFlfUkVRVUVTVF9WQUxJREFUT1IgPVxyXG4gIG5ldyBJbmplY3Rpb25Ub2tlbjxJRGFuZ2xJZGVudGl0eVJlcXVlc3RWYWxpZGF0b3I+KFxyXG4gICAgXCJWYWxpZGF0b3IgdG8gZGVjaWRlIHdoZXRoZXIgdG8gaW5jbHVkZSBKV1QgdG9rZW5zIGluIHJlcXVlc3RzXCJcclxuICApO1xyXG5ASW5qZWN0YWJsZSgpXHJcbmV4cG9ydCBjbGFzcyBKd3RJbnRlcmNlcHRvclNlcnZpY2UgaW1wbGVtZW50cyBIdHRwSW50ZXJjZXB0b3Ige1xyXG4gIGNvbnN0cnVjdG9yKFxyXG4gICAgcHVibGljIGp3dFRva2VuU2VydmljZTogSnd0VG9rZW5TZXJ2aWNlLFxyXG4gICAgQE9wdGlvbmFsKClcclxuICAgIEBJbmplY3QoREFOR0xfSURFTlRJVFlfUkVRVUVTVF9WQUxJREFUT1IpXHJcbiAgICBwcml2YXRlIHJlcXVlc3RWYWxpZGF0b3I6IElEYW5nbElkZW50aXR5UmVxdWVzdFZhbGlkYXRvclxyXG4gICkge31cclxuICBpbnRlcmNlcHQoXHJcbiAgICByZXF1ZXN0OiBIdHRwUmVxdWVzdDxhbnk+LFxyXG4gICAgbmV4dDogSHR0cEhhbmRsZXJcclxuICApOiBPYnNlcnZhYmxlPEh0dHBFdmVudDxhbnk+PiB7XHJcbiAgICBpZiAocmVxdWVzdC51cmwuc3RhcnRzV2l0aChcIi9pZGVudGl0eVwiKSkge1xyXG4gICAgICAvLyBSZXF1ZXN0cyB0byB0aGUgYXV0aGVudGljYXRpb24gZW5kcG9pbnQgc2hvdWxkIG5vdCBiZSBpbnRlcmNlcHRlZFxyXG4gICAgICByZXR1cm4gbmV4dC5oYW5kbGUocmVxdWVzdC5jbG9uZSgpKTtcclxuICAgIH1cclxuXHJcbiAgICBpZiAoXHJcbiAgICAgIHRoaXMucmVxdWVzdFZhbGlkYXRvciAmJlxyXG4gICAgICAhdGhpcy5yZXF1ZXN0VmFsaWRhdG9yLnZhbGlkYXRlUmVxdWVzdChyZXF1ZXN0KVxyXG4gICAgKSB7XHJcbiAgICAgIC8vIEluIGNhc2UgYSByZXF1ZXN0IHZhbGlkYXRvciBpcyBwcm92aWRlZCBidXQgZG9lc24ndCByZXR1cm4gdHJ1ZSBmb3IgdGhlXHJcbiAgICAgIC8vIGN1cnJlbnQgcmVxdWVzdCwgd2UncmUgbm90IGFwcGVuZGluZyBhIHRva2VuXHJcbiAgICAgIHJldHVybiBuZXh0LmhhbmRsZShyZXF1ZXN0KTtcclxuICAgIH1cclxuXHJcbiAgICByZXR1cm4gdGhpcy5qd3RUb2tlblNlcnZpY2VcclxuICAgICAgLmdldFRva2VuKClcclxuICAgICAgLnBpcGUoXHJcbiAgICAgICAgbWVyZ2VNYXAoKGYpID0+XHJcbiAgICAgICAgICBuZXh0LmhhbmRsZSh0aGlzLmdldEh0dHBSZXF1ZXN0V2l0aFRva2VuKHJlcXVlc3QsIGYgJiYgZi5hY2Nlc3NUb2tlbikpXHJcbiAgICAgICAgKVxyXG4gICAgICApO1xyXG4gIH1cclxuXHJcbiAgcHJpdmF0ZSBnZXRIdHRwUmVxdWVzdFdpdGhUb2tlbihcclxuICAgIHJlcXVlc3Q6IEh0dHBSZXF1ZXN0PGFueT4sXHJcbiAgICB0b2tlbj86IHN0cmluZ1xyXG4gICk6IEh0dHBSZXF1ZXN0PGFueT4ge1xyXG4gICAgaWYgKHRva2VuKSB7XHJcbiAgICAgIHJldHVybiByZXF1ZXN0LmNsb25lKHtcclxuICAgICAgICBzZXRIZWFkZXJzOiB7XHJcbiAgICAgICAgICBBdXRob3JpemF0aW9uOiBgQmVhcmVyICR7dG9rZW59YCxcclxuICAgICAgICB9LFxyXG4gICAgICB9KTtcclxuICAgIH1cclxuICAgIHJldHVybiByZXF1ZXN0LmNsb25lKCk7XHJcbiAgfVxyXG59XHJcbiJdfQ==
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
import { Injectable } from '@angular/core';
|
|
2
|
+
import { ReplaySubject, Subject } from 'rxjs';
|
|
3
|
+
import { JwtHelperService } from '@auth0/angular-jwt';
|
|
4
|
+
import * as i0 from "@angular/core";
|
|
5
|
+
import * as i1 from "../services/jwt-token.service";
|
|
6
|
+
export class AuthenticationMessenger {
|
|
7
|
+
constructor(jwtTokenService) {
|
|
8
|
+
this.jwtTokenService = jwtTokenService;
|
|
9
|
+
this.jwtHelperService = new JwtHelperService();
|
|
10
|
+
this.isAuthenticated = new ReplaySubject(1);
|
|
11
|
+
this.username = new ReplaySubject(1);
|
|
12
|
+
this.email = new ReplaySubject(1);
|
|
13
|
+
this.identiconId = new ReplaySubject(1);
|
|
14
|
+
this.userInfo = new ReplaySubject(1);
|
|
15
|
+
this.tokenRefreshStarted = new Subject();
|
|
16
|
+
this.tokenRefreshFinished = new Subject();
|
|
17
|
+
jwtTokenService.tokenRefreshStarted.subscribe(() => this.tokenRefreshStarted.next());
|
|
18
|
+
jwtTokenService.tokenRefreshFinished.subscribe(successfulRefresh => this.tokenRefreshFinished.next(successfulRefresh));
|
|
19
|
+
jwtTokenService.tokenStored.subscribe(jwtToken => this.refreshAuthenticationStatus(jwtToken));
|
|
20
|
+
jwtTokenService.getToken()
|
|
21
|
+
.subscribe(token => this.refreshAuthenticationStatus(token));
|
|
22
|
+
}
|
|
23
|
+
refreshAuthenticationStatus(jwtToken) {
|
|
24
|
+
if (jwtToken) {
|
|
25
|
+
const isValidToken = jwtToken.expiresAt > (new Date().getTime() / 1000);
|
|
26
|
+
if (this.lastBroadcastAccessToken === jwtToken.accessToken) {
|
|
27
|
+
return;
|
|
28
|
+
}
|
|
29
|
+
this.lastBroadcastAccessToken = jwtToken.accessToken;
|
|
30
|
+
if (isValidToken) {
|
|
31
|
+
this.isAuthenticated.next(true);
|
|
32
|
+
const decodedToken = this.jwtHelperService.decodeToken(jwtToken.accessToken);
|
|
33
|
+
this.username.next(decodedToken['name']);
|
|
34
|
+
this.email.next(decodedToken['email']);
|
|
35
|
+
this.identiconId.next(decodedToken['identicon_id']);
|
|
36
|
+
const tokenClaims = {};
|
|
37
|
+
for (const tokenProp in decodedToken) {
|
|
38
|
+
if (decodedToken.hasOwnProperty(tokenProp)) {
|
|
39
|
+
const property = decodedToken[tokenProp];
|
|
40
|
+
if (typeof property === 'string') {
|
|
41
|
+
tokenClaims[tokenProp] = property;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
this.userInfo.next({
|
|
46
|
+
id: decodedToken['sub'],
|
|
47
|
+
claims: tokenClaims,
|
|
48
|
+
deserializedToken: decodedToken,
|
|
49
|
+
email: decodedToken['email'],
|
|
50
|
+
identiconId: decodedToken['identicon_id'],
|
|
51
|
+
username: decodedToken['name'],
|
|
52
|
+
roles: decodedToken['role']
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
else {
|
|
56
|
+
this.isAuthenticated.next(false);
|
|
57
|
+
this.jwtTokenService
|
|
58
|
+
.refreshToken()
|
|
59
|
+
.subscribe(() => { });
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
else {
|
|
63
|
+
if (this.lastBroadcastAccessToken === null) {
|
|
64
|
+
return;
|
|
65
|
+
}
|
|
66
|
+
this.lastBroadcastAccessToken = null;
|
|
67
|
+
this.isAuthenticated.next(false);
|
|
68
|
+
this.username.next(null);
|
|
69
|
+
this.email.next(null);
|
|
70
|
+
this.identiconId.next(null);
|
|
71
|
+
this.userInfo.next(null);
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
AuthenticationMessenger.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.6", ngImport: i0, type: AuthenticationMessenger, deps: [{ token: i1.JwtTokenService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
76
|
+
AuthenticationMessenger.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.2.6", ngImport: i0, type: AuthenticationMessenger, providedIn: 'root' });
|
|
77
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.6", ngImport: i0, type: AuthenticationMessenger, decorators: [{
|
|
78
|
+
type: Injectable,
|
|
79
|
+
args: [{
|
|
80
|
+
providedIn: 'root'
|
|
81
|
+
}]
|
|
82
|
+
}], 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":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAG9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;;;AAMtD,MAAM,OAAO,uBAAuB;IAalC,YAAoB,eAAgC;QAAhC,oBAAe,GAAf,eAAe,CAAiB;QAX5C,qBAAgB,GAAG,IAAI,gBAAgB,EAAE,CAAC;QAGzC,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;QAGrD,eAAe,CAAC,mBAAmB,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC,CAAC;QACrF,eAAe,CAAC,oBAAoB,CAAC,SAAS,CAAC,iBAAiB,CAAC,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC;QACvH,eAAe,CAAC,WAAW,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,2BAA2B,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC9F,eAAe,CAAC,QAAQ,EAAE;aACvB,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC,CAAC;IACjE,CAAC;IAEO,2BAA2B,CAAC,QAAqB;QACvD,IAAI,QAAQ,EAAE;YACZ,MAAM,YAAY,GAAG,QAAQ,CAAC,SAAS,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;YACxE,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,MAAM,YAAY,GAAG,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;gBAC7E,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,GAAgC,EAAE,CAAC;gBACpD,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,WAAW,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC;yBACnC;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;qBACjB,YAAY,EAAE;qBACd,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;aACzB;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;;oHAvEU,uBAAuB;wHAAvB,uBAAuB,cAFtB,MAAM;2FAEP,uBAAuB;kBAHnC,UAAU;mBAAC;oBACV,UAAU,EAAE,MAAM;iBACnB","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"]}
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import { Injectable } from '@angular/core';
|
|
2
|
+
import { of } from 'rxjs';
|
|
3
|
+
import { map, catchError } from 'rxjs/operators';
|
|
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
|
|
22
|
+
|| !token.refreshToken
|
|
23
|
+
|| !token.expiresIn) {
|
|
24
|
+
return false;
|
|
25
|
+
}
|
|
26
|
+
this.jwtTokenService.storeToken(token);
|
|
27
|
+
return true;
|
|
28
|
+
}
|
|
29
|
+
logout() {
|
|
30
|
+
this.jwtTokenService.deleteToken();
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
AuthenticationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.6", ngImport: i0, type: AuthenticationService, deps: [{ token: i1.DanglIdentityClient }, { token: i2.JwtTokenService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
34
|
+
AuthenticationService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.2.6", ngImport: i0, type: AuthenticationService, providedIn: 'root' });
|
|
35
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.6", ngImport: i0, type: AuthenticationService, decorators: [{
|
|
36
|
+
type: Injectable,
|
|
37
|
+
args: [{
|
|
38
|
+
providedIn: 'root'
|
|
39
|
+
}]
|
|
40
|
+
}], ctorParameters: function () { return [{ type: i1.DanglIdentityClient }, { type: i2.JwtTokenService }]; } });
|
|
41
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aGVudGljYXRpb24uc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL2FuZ3VsYXItZGFuZ2wtaWRlbnRpdHktY2xpZW50L3NyYy9zZXJ2aWNlcy9hdXRoZW50aWNhdGlvbi5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFM0MsT0FBTyxFQUFjLEVBQUUsRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUN0QyxPQUFPLEVBQUUsR0FBRyxFQUFFLFVBQVUsRUFBRSxNQUFNLGdCQUFnQixDQUFDOzs7O0FBTWpELE1BQU0sT0FBTyxxQkFBcUI7SUFFaEMsWUFBb0IsbUJBQXdDLEVBQ2xELGVBQWdDO1FBRHRCLHdCQUFtQixHQUFuQixtQkFBbUIsQ0FBcUI7UUFDbEQsb0JBQWUsR0FBZixlQUFlLENBQWlCO0lBQUksQ0FBQztJQUUvQyxjQUFjLENBQUMsVUFBa0IsRUFBRSxRQUFnQjtRQUNqRCxPQUFPLElBQUksQ0FBQyxtQkFBbUI7YUFDNUIsbUJBQW1CLENBQUM7WUFDbkIsVUFBVSxFQUFFLFVBQVU7WUFDdEIsUUFBUSxFQUFFLFFBQVE7U0FDbkIsQ0FBQzthQUNELElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsb0JBQW9CLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFDMUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNsQyxDQUFDO0lBRU8sb0JBQW9CLENBQUMsS0FBdUI7UUFDbEQsSUFBSSxDQUFDLEtBQUssQ0FBQyxXQUFXO2VBQ2pCLENBQUMsS0FBSyxDQUFDLFlBQVk7ZUFDbkIsQ0FBQyxLQUFLLENBQUMsU0FBUyxFQUFFO1lBQ3JCLE9BQU8sS0FBSyxDQUFDO1NBQ2Q7UUFDRCxJQUFJLENBQUMsZUFBZSxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUN2QyxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRCxNQUFNO1FBQ0osSUFBSSxDQUFDLGVBQWUsQ0FBQyxXQUFXLEVBQUUsQ0FBQztJQUNyQyxDQUFDOztrSEEzQlUscUJBQXFCO3NIQUFyQixxQkFBcUIsY0FGcEIsTUFBTTsyRkFFUCxxQkFBcUI7a0JBSGpDLFVBQVU7bUJBQUM7b0JBQ1YsVUFBVSxFQUFFLE1BQU07aUJBQ25CIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xyXG5pbXBvcnQgeyBEYW5nbElkZW50aXR5Q2xpZW50LCBUb2tlblJlc3BvbnNlR2V0IH0gZnJvbSAnLi4vYXBpLWNsaWVudCc7XHJcbmltcG9ydCB7IE9ic2VydmFibGUsIG9mIH0gZnJvbSAncnhqcyc7XHJcbmltcG9ydCB7IG1hcCwgY2F0Y2hFcnJvciB9IGZyb20gJ3J4anMvb3BlcmF0b3JzJztcclxuaW1wb3J0IHsgSnd0VG9rZW5TZXJ2aWNlIH0gZnJvbSAnLi9qd3QtdG9rZW4uc2VydmljZSc7XHJcblxyXG5ASW5qZWN0YWJsZSh7XHJcbiAgcHJvdmlkZWRJbjogJ3Jvb3QnXHJcbn0pXHJcbmV4cG9ydCBjbGFzcyBBdXRoZW50aWNhdGlvblNlcnZpY2Uge1xyXG5cclxuICBjb25zdHJ1Y3Rvcihwcml2YXRlIGRhbmdsSWRlbnRpdHlDbGllbnQ6IERhbmdsSWRlbnRpdHlDbGllbnQsXHJcbiAgICBwcml2YXRlIGp3dFRva2VuU2VydmljZTogSnd0VG9rZW5TZXJ2aWNlKSB7IH1cclxuXHJcbiAgbG9naW5XaXRoVG9rZW4oaWRlbnRpZmllcjogc3RyaW5nLCBwYXNzd29yZDogc3RyaW5nKTogT2JzZXJ2YWJsZTxib29sZWFuPiB7XHJcbiAgICByZXR1cm4gdGhpcy5kYW5nbElkZW50aXR5Q2xpZW50XHJcbiAgICAgIC5sb2dpbkFuZFJldHVyblRva2VuKHtcclxuICAgICAgICBpZGVudGlmaWVyOiBpZGVudGlmaWVyLFxyXG4gICAgICAgIHBhc3N3b3JkOiBwYXNzd29yZFxyXG4gICAgICB9KVxyXG4gICAgICAucGlwZShtYXAociA9PiB0aGlzLnN0b3JlSnd0VG9rZW5JZlZhbGlkKHIpKSxcclxuICAgICAgICBjYXRjaEVycm9yKGUgPT4gb2YoZmFsc2UpKSk7XHJcbiAgfVxyXG5cclxuICBwcml2YXRlIHN0b3JlSnd0VG9rZW5JZlZhbGlkKHRva2VuOiBUb2tlblJlc3BvbnNlR2V0KTogYm9vbGVhbiB7XHJcbiAgICBpZiAoIXRva2VuLmFjY2Vzc1Rva2VuXHJcbiAgICAgIHx8ICF0b2tlbi5yZWZyZXNoVG9rZW5cclxuICAgICAgfHwgIXRva2VuLmV4cGlyZXNJbikge1xyXG4gICAgICByZXR1cm4gZmFsc2U7XHJcbiAgICB9XHJcbiAgICB0aGlzLmp3dFRva2VuU2VydmljZS5zdG9yZVRva2VuKHRva2VuKTtcclxuICAgIHJldHVybiB0cnVlO1xyXG4gIH1cclxuXHJcbiAgbG9nb3V0KCkge1xyXG4gICAgdGhpcy5qd3RUb2tlblNlcnZpY2UuZGVsZXRlVG9rZW4oKTtcclxuICB9XHJcbn1cclxuIl19
|
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
import { Injectable } from "@angular/core";
|
|
2
|
+
import { Subject, of, ReplaySubject } from "rxjs";
|
|
3
|
+
import { map, tap, first } from "rxjs/operators";
|
|
4
|
+
import * as i0 from "@angular/core";
|
|
5
|
+
import * as i1 from "../api-client";
|
|
6
|
+
export class JwtTokenService {
|
|
7
|
+
constructor(danglIdentityClient) {
|
|
8
|
+
this.danglIdentityClient = danglIdentityClient;
|
|
9
|
+
this.storage_identifier = "dangl_identity_integration_jwt_token";
|
|
10
|
+
this.isRefreshing = false;
|
|
11
|
+
this.refreshTokenSource = new Subject();
|
|
12
|
+
this.tokenStoredSource = new ReplaySubject(1);
|
|
13
|
+
this.tokenStored = this.tokenStoredSource.asObservable();
|
|
14
|
+
this.tokenRefreshStartedSource = new Subject();
|
|
15
|
+
this.tokenRefreshStarted = this.tokenRefreshStartedSource.asObservable();
|
|
16
|
+
this.tokenRefreshFinishedSource = new Subject();
|
|
17
|
+
this.tokenRefreshFinished = this.tokenRefreshFinishedSource.asObservable();
|
|
18
|
+
}
|
|
19
|
+
deleteToken() {
|
|
20
|
+
localStorage.removeItem(this.storage_identifier);
|
|
21
|
+
this.tokenStoredSource.next(null);
|
|
22
|
+
}
|
|
23
|
+
storeCustomToken(tokenToStore) {
|
|
24
|
+
localStorage.setItem(this.storage_identifier, JSON.stringify(tokenToStore));
|
|
25
|
+
this.tokenStoredSource.next(tokenToStore);
|
|
26
|
+
}
|
|
27
|
+
storeToken(token) {
|
|
28
|
+
const tokenToStore = this.transformTokenResponse(token);
|
|
29
|
+
localStorage.setItem(this.storage_identifier, JSON.stringify(tokenToStore));
|
|
30
|
+
this.tokenStoredSource.next(tokenToStore);
|
|
31
|
+
}
|
|
32
|
+
getTokenFromStorage() {
|
|
33
|
+
const storedString = localStorage.getItem(this.storage_identifier);
|
|
34
|
+
if (storedString) {
|
|
35
|
+
const storedToken = JSON.parse(storedString);
|
|
36
|
+
return storedToken;
|
|
37
|
+
}
|
|
38
|
+
return null;
|
|
39
|
+
}
|
|
40
|
+
refreshToken() {
|
|
41
|
+
if (this.isRefreshing) {
|
|
42
|
+
return this.refreshTokenSource.pipe(first());
|
|
43
|
+
}
|
|
44
|
+
this.isRefreshing = true;
|
|
45
|
+
this.tokenRefreshStartedSource.next();
|
|
46
|
+
const refreshToken = this.getTokenFromStorage().refreshToken;
|
|
47
|
+
if (!refreshToken) {
|
|
48
|
+
this.isRefreshing = false;
|
|
49
|
+
return of(null);
|
|
50
|
+
}
|
|
51
|
+
this.danglIdentityClient
|
|
52
|
+
.refreshToken({
|
|
53
|
+
refreshToken: refreshToken,
|
|
54
|
+
})
|
|
55
|
+
.pipe(tap((r) => this.storeToken(r)), map((r) => this.transformTokenResponse(r)))
|
|
56
|
+
.subscribe((refreshTokenResponse) => {
|
|
57
|
+
this.isRefreshing = false;
|
|
58
|
+
this.tokenRefreshFinishedSource.next(true);
|
|
59
|
+
this.refreshTokenSource.next(refreshTokenResponse);
|
|
60
|
+
}, (error) => {
|
|
61
|
+
this.isRefreshing = false;
|
|
62
|
+
this.tokenRefreshFinishedSource.next(false);
|
|
63
|
+
this.refreshTokenSource.next(null);
|
|
64
|
+
console.error("Internal error while refreshing Dangl.Identity token", error);
|
|
65
|
+
});
|
|
66
|
+
return this.refreshTokenSource.pipe(first());
|
|
67
|
+
}
|
|
68
|
+
getToken() {
|
|
69
|
+
const token = this.getTokenFromStorage();
|
|
70
|
+
if (!token) {
|
|
71
|
+
return of(null);
|
|
72
|
+
}
|
|
73
|
+
const isValidToken = token.expiresAt > new Date().getTime() / 1000;
|
|
74
|
+
if (isValidToken) {
|
|
75
|
+
return of(token);
|
|
76
|
+
}
|
|
77
|
+
return this.refreshToken();
|
|
78
|
+
}
|
|
79
|
+
transformTokenResponse(token) {
|
|
80
|
+
return {
|
|
81
|
+
accessToken: token.accessToken,
|
|
82
|
+
refreshToken: token.refreshToken,
|
|
83
|
+
expiresAt: new Date().getTime() / 1000 + token.expiresIn,
|
|
84
|
+
};
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
JwtTokenService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.6", ngImport: i0, type: JwtTokenService, deps: [{ token: i1.DanglIdentityClient }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
88
|
+
JwtTokenService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.2.6", ngImport: i0, type: JwtTokenService, providedIn: "root" });
|
|
89
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.6", ngImport: i0, type: JwtTokenService, decorators: [{
|
|
90
|
+
type: Injectable,
|
|
91
|
+
args: [{
|
|
92
|
+
providedIn: "root",
|
|
93
|
+
}]
|
|
94
|
+
}], 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"]}
|