@meshmakers/shared-auth 0.0.0-0 → 0.0.2304-23001
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 +5 -9
- package/esm2020/lib/authorize.guard.mjs +36 -14
- package/esm2020/lib/authorize.interceptor.mjs +10 -7
- package/esm2020/lib/authorize.service.mjs +56 -32
- package/esm2020/lib/login-menu/login-menu.component.mjs +7 -7
- package/esm2020/lib/shared-auth.module.mjs +4 -4
- package/esm2020/public-api.mjs +1 -1
- package/fesm2015/meshmakers-shared-auth.mjs +132 -76
- package/fesm2015/meshmakers-shared-auth.mjs.map +1 -1
- package/fesm2020/meshmakers-shared-auth.mjs +108 -59
- package/fesm2020/meshmakers-shared-auth.mjs.map +1 -1
- package/lib/authorize.guard.d.ts +10 -5
- package/lib/authorize.interceptor.d.ts +1 -1
- package/lib/authorize.service.d.ts +22 -15
- package/lib/login-menu/login-menu.component.d.ts +2 -2
- package/package.json +9 -4
package/README.md
CHANGED
|
@@ -1,13 +1,11 @@
|
|
|
1
1
|
# SharedAuth
|
|
2
2
|
|
|
3
|
-
This library was generated with [Angular CLI](https://github.com/angular/angular-cli) version
|
|
3
|
+
This library was generated with [Angular CLI](https://github.com/angular/angular-cli) version 15.2.0.
|
|
4
4
|
|
|
5
5
|
## Code scaffolding
|
|
6
6
|
|
|
7
|
-
Run `ng generate component component-name --project shared-auth` to generate a new component. You can also
|
|
8
|
-
|
|
9
|
-
> Note: Don't forget to add `--project shared-auth` or else it will be added to the default project in
|
|
10
|
-
> your `angular.json` file.
|
|
7
|
+
Run `ng generate component component-name --project shared-auth` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module --project shared-auth`.
|
|
8
|
+
> Note: Don't forget to add `--project shared-auth` or else it will be added to the default project in your `angular.json` file.
|
|
11
9
|
|
|
12
10
|
## Build
|
|
13
11
|
|
|
@@ -15,8 +13,7 @@ Run `ng build shared-auth` to build the project. The build artifacts will be sto
|
|
|
15
13
|
|
|
16
14
|
## Publishing
|
|
17
15
|
|
|
18
|
-
After building your library with `ng build shared-auth`, go to the dist folder `cd dist/shared-auth` and
|
|
19
|
-
run `npm publish`.
|
|
16
|
+
After building your library with `ng build shared-auth`, go to the dist folder `cd dist/shared-auth` and run `npm publish`.
|
|
20
17
|
|
|
21
18
|
## Running unit tests
|
|
22
19
|
|
|
@@ -24,5 +21,4 @@ Run `ng test shared-auth` to execute the unit tests via [Karma](https://karma-ru
|
|
|
24
21
|
|
|
25
22
|
## Further help
|
|
26
23
|
|
|
27
|
-
To get more help on the Angular CLI use `ng help` or go check out
|
|
28
|
-
the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
|
|
24
|
+
To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.io/cli) page.
|
|
@@ -1,24 +1,46 @@
|
|
|
1
1
|
import { Injectable } from '@angular/core';
|
|
2
|
-
import {
|
|
2
|
+
import { firstValueFrom } from "rxjs";
|
|
3
3
|
import * as i0 from "@angular/core";
|
|
4
4
|
import * as i1 from "./authorize.service";
|
|
5
|
+
import * as i2 from "@angular/router";
|
|
5
6
|
export class AuthorizeGuard {
|
|
6
|
-
constructor(
|
|
7
|
-
this.
|
|
7
|
+
constructor(authorizeService, router) {
|
|
8
|
+
this.authorizeService = authorizeService;
|
|
9
|
+
this.router = router;
|
|
8
10
|
}
|
|
9
|
-
canActivate(
|
|
10
|
-
|
|
11
|
-
|
|
11
|
+
canActivate(next, state) {
|
|
12
|
+
let url = state.url;
|
|
13
|
+
return this.handleAuthorization(next, url);
|
|
12
14
|
}
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
15
|
+
canActivateChild(next, state) {
|
|
16
|
+
return this.canActivate(next, state);
|
|
17
|
+
}
|
|
18
|
+
canDeactivate(component, currentRoute, currentState, nextState) {
|
|
19
|
+
return true;
|
|
20
|
+
}
|
|
21
|
+
canLoad(route, segments) {
|
|
22
|
+
return true;
|
|
23
|
+
}
|
|
24
|
+
async handleAuthorization(route, url) {
|
|
25
|
+
await this.authorizeService.initialize();
|
|
26
|
+
const isAuthenticated = await firstValueFrom(this.authorizeService.getIsAuthenticated());
|
|
27
|
+
if (isAuthenticated) {
|
|
28
|
+
const userRoles = await firstValueFrom(this.authorizeService.getRoles());
|
|
29
|
+
if (route.data['roles'] && !route.data['roles'].filter((value) => userRoles.includes(value))) {
|
|
30
|
+
this.router.navigate(['']);
|
|
31
|
+
return false;
|
|
32
|
+
}
|
|
33
|
+
return true;
|
|
34
|
+
}
|
|
35
|
+
else {
|
|
36
|
+
this.authorizeService.login();
|
|
16
37
|
}
|
|
38
|
+
return false;
|
|
17
39
|
}
|
|
18
40
|
}
|
|
19
|
-
AuthorizeGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "
|
|
20
|
-
AuthorizeGuard.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "
|
|
21
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "
|
|
41
|
+
AuthorizeGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: AuthorizeGuard, deps: [{ token: i1.AuthorizeService }, { token: i2.Router }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
42
|
+
AuthorizeGuard.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: AuthorizeGuard });
|
|
43
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: AuthorizeGuard, decorators: [{
|
|
22
44
|
type: Injectable
|
|
23
|
-
}], ctorParameters: function () { return [{ type: i1.AuthorizeService }]; } });
|
|
24
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
45
|
+
}], ctorParameters: function () { return [{ type: i1.AuthorizeService }, { type: i2.Router }]; } });
|
|
46
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aG9yaXplLmd1YXJkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvbWVzaG1ha2Vycy9zaGFyZWQtYXV0aC9zcmMvbGliL2F1dGhvcml6ZS5ndWFyZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUMsVUFBVSxFQUFDLE1BQU0sZUFBZSxDQUFDO0FBWXpDLE9BQU8sRUFBQyxjQUFjLEVBQTRCLE1BQU0sTUFBTSxDQUFDOzs7O0FBRy9ELE1BQU0sT0FBTyxjQUFjO0lBQ3pCLFlBQW9CLGdCQUFrQyxFQUFVLE1BQWM7UUFBMUQscUJBQWdCLEdBQWhCLGdCQUFnQixDQUFrQjtRQUFVLFdBQU0sR0FBTixNQUFNLENBQVE7SUFDOUUsQ0FBQztJQUVELFdBQVcsQ0FDVCxJQUE0QixFQUM1QixLQUEwQjtRQUMxQixJQUFJLEdBQUcsR0FBVyxLQUFLLENBQUMsR0FBRyxDQUFDO1FBQzVCLE9BQU8sSUFBSSxDQUFDLG1CQUFtQixDQUFDLElBQUksRUFBRSxHQUFHLENBQUMsQ0FBQztJQUM3QyxDQUFDO0lBRUQsZ0JBQWdCLENBQ2QsSUFBNEIsRUFDNUIsS0FBMEI7UUFDMUIsT0FBTyxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztJQUN2QyxDQUFDO0lBRUQsYUFBYSxDQUNYLFNBQWtCLEVBQ2xCLFlBQW9DLEVBQ3BDLFlBQWlDLEVBQ2pDLFNBQStCO1FBQy9CLE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVELE9BQU8sQ0FDTCxLQUFZLEVBQ1osUUFBc0I7UUFDdEIsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRU8sS0FBSyxDQUFDLG1CQUFtQixDQUFDLEtBQTZCLEVBQUUsR0FBUTtRQUV2RSxNQUFNLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxVQUFVLEVBQUUsQ0FBQTtRQUV4QyxNQUFNLGVBQWUsR0FBRyxNQUFNLGNBQWMsQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsa0JBQWtCLEVBQUUsQ0FBQyxDQUFDO1FBQ3pGLElBQUksZUFBZSxFQUFFO1lBQ25CLE1BQU0sU0FBUyxHQUFHLE1BQU0sY0FBYyxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDO1lBQ3pFLElBQUksS0FBSyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsS0FBYSxFQUFFLEVBQUUsQ0FBQyxTQUFTLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUU7Z0JBQ3BHLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQztnQkFDM0IsT0FBTyxLQUFLLENBQUM7YUFDZDtZQUNELE9BQU8sSUFBSSxDQUFDO1NBQ2I7YUFBTTtZQUNMLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLEVBQUUsQ0FBQztTQUMvQjtRQUVELE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQzs7MkdBaERVLGNBQWM7K0dBQWQsY0FBYzsyRkFBZCxjQUFjO2tCQUQxQixVQUFVIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtJbmplY3RhYmxlfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7XG4gIEFjdGl2YXRlZFJvdXRlU25hcHNob3QsXG4gIENhbkFjdGl2YXRlLFxuICBDYW5BY3RpdmF0ZUNoaWxkLFxuICBDYW5EZWFjdGl2YXRlLFxuICBDYW5Mb2FkLCBSb3V0ZSxcbiAgUm91dGVyLFxuICBSb3V0ZXJTdGF0ZVNuYXBzaG90LCBVcmxTZWdtZW50LFxuICBVcmxUcmVlXG59IGZyb20gJ0Bhbmd1bGFyL3JvdXRlcic7XG5pbXBvcnQge0F1dGhvcml6ZVNlcnZpY2V9IGZyb20gJy4vYXV0aG9yaXplLnNlcnZpY2UnO1xuaW1wb3J0IHtmaXJzdFZhbHVlRnJvbSwgbGFzdFZhbHVlRnJvbSwgT2JzZXJ2YWJsZX0gZnJvbSBcInJ4anNcIjtcblxuQEluamVjdGFibGUoKVxuZXhwb3J0IGNsYXNzIEF1dGhvcml6ZUd1YXJkIGltcGxlbWVudHMgQ2FuQWN0aXZhdGUsIENhbkFjdGl2YXRlQ2hpbGQsIENhbkRlYWN0aXZhdGU8dW5rbm93bj4sIENhbkxvYWQge1xuICBjb25zdHJ1Y3Rvcihwcml2YXRlIGF1dGhvcml6ZVNlcnZpY2U6IEF1dGhvcml6ZVNlcnZpY2UsIHByaXZhdGUgcm91dGVyOiBSb3V0ZXIpIHtcbiAgfVxuXG4gIGNhbkFjdGl2YXRlKFxuICAgIG5leHQ6IEFjdGl2YXRlZFJvdXRlU25hcHNob3QsXG4gICAgc3RhdGU6IFJvdXRlclN0YXRlU25hcHNob3QpOiBPYnNlcnZhYmxlPGJvb2xlYW4gfCBVcmxUcmVlPiB8IFByb21pc2U8Ym9vbGVhbiB8IFVybFRyZWU+IHwgYm9vbGVhbiB8IFVybFRyZWUge1xuICAgIGxldCB1cmw6IHN0cmluZyA9IHN0YXRlLnVybDtcbiAgICByZXR1cm4gdGhpcy5oYW5kbGVBdXRob3JpemF0aW9uKG5leHQsIHVybCk7XG4gIH1cblxuICBjYW5BY3RpdmF0ZUNoaWxkKFxuICAgIG5leHQ6IEFjdGl2YXRlZFJvdXRlU25hcHNob3QsXG4gICAgc3RhdGU6IFJvdXRlclN0YXRlU25hcHNob3QpOiBPYnNlcnZhYmxlPGJvb2xlYW4gfCBVcmxUcmVlPiB8IFByb21pc2U8Ym9vbGVhbiB8IFVybFRyZWU+IHwgYm9vbGVhbiB8IFVybFRyZWUge1xuICAgIHJldHVybiB0aGlzLmNhbkFjdGl2YXRlKG5leHQsIHN0YXRlKTtcbiAgfVxuXG4gIGNhbkRlYWN0aXZhdGUoXG4gICAgY29tcG9uZW50OiB1bmtub3duLFxuICAgIGN1cnJlbnRSb3V0ZTogQWN0aXZhdGVkUm91dGVTbmFwc2hvdCxcbiAgICBjdXJyZW50U3RhdGU6IFJvdXRlclN0YXRlU25hcHNob3QsXG4gICAgbmV4dFN0YXRlPzogUm91dGVyU3RhdGVTbmFwc2hvdCk6IE9ic2VydmFibGU8Ym9vbGVhbiB8IFVybFRyZWU+IHwgUHJvbWlzZTxib29sZWFuIHwgVXJsVHJlZT4gfCBib29sZWFuIHwgVXJsVHJlZSB7XG4gICAgcmV0dXJuIHRydWU7XG4gIH1cblxuICBjYW5Mb2FkKFxuICAgIHJvdXRlOiBSb3V0ZSxcbiAgICBzZWdtZW50czogVXJsU2VnbWVudFtdKTogT2JzZXJ2YWJsZTxib29sZWFuPiB8IFByb21pc2U8Ym9vbGVhbj4gfCBib29sZWFuIHtcbiAgICByZXR1cm4gdHJ1ZTtcbiAgfVxuXG4gIHByaXZhdGUgYXN5bmMgaGFuZGxlQXV0aG9yaXphdGlvbihyb3V0ZTogQWN0aXZhdGVkUm91dGVTbmFwc2hvdCwgdXJsOiBhbnkpOiBQcm9taXNlPGJvb2xlYW4+IHtcblxuICAgIGF3YWl0IHRoaXMuYXV0aG9yaXplU2VydmljZS5pbml0aWFsaXplKClcblxuICAgIGNvbnN0IGlzQXV0aGVudGljYXRlZCA9IGF3YWl0IGZpcnN0VmFsdWVGcm9tKHRoaXMuYXV0aG9yaXplU2VydmljZS5nZXRJc0F1dGhlbnRpY2F0ZWQoKSk7XG4gICAgaWYgKGlzQXV0aGVudGljYXRlZCkge1xuICAgICAgY29uc3QgdXNlclJvbGVzID0gYXdhaXQgZmlyc3RWYWx1ZUZyb20odGhpcy5hdXRob3JpemVTZXJ2aWNlLmdldFJvbGVzKCkpO1xuICAgICAgaWYgKHJvdXRlLmRhdGFbJ3JvbGVzJ10gJiYgIXJvdXRlLmRhdGFbJ3JvbGVzJ10uZmlsdGVyKCh2YWx1ZTogc3RyaW5nKSA9PiB1c2VyUm9sZXMuaW5jbHVkZXModmFsdWUpKSkge1xuICAgICAgICB0aGlzLnJvdXRlci5uYXZpZ2F0ZShbJyddKTtcbiAgICAgICAgcmV0dXJuIGZhbHNlO1xuICAgICAgfVxuICAgICAgcmV0dXJuIHRydWU7XG4gICAgfSBlbHNlIHtcbiAgICAgIHRoaXMuYXV0aG9yaXplU2VydmljZS5sb2dpbigpO1xuICAgIH1cblxuICAgIHJldHVybiBmYWxzZTtcbiAgfVxufVxuIl19
|
|
@@ -4,6 +4,7 @@ import * as i1 from "./authorize.service";
|
|
|
4
4
|
export class AuthorizeInterceptor {
|
|
5
5
|
constructor(authorize) {
|
|
6
6
|
this.authorize = authorize;
|
|
7
|
+
this.accessToken = null;
|
|
7
8
|
authorize.getAccessToken().subscribe(value => this.accessToken = value);
|
|
8
9
|
}
|
|
9
10
|
static isSameOriginUrl(req) {
|
|
@@ -42,9 +43,11 @@ export class AuthorizeInterceptor {
|
|
|
42
43
|
}
|
|
43
44
|
isKnownServiceUri(req) {
|
|
44
45
|
const serviceUris = this.authorize.getServiceUris();
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
46
|
+
if (serviceUris) {
|
|
47
|
+
for (let i = 0; i < serviceUris.length; i++) {
|
|
48
|
+
if (req.url.startsWith(`${serviceUris[i]}`)) {
|
|
49
|
+
return true;
|
|
50
|
+
}
|
|
48
51
|
}
|
|
49
52
|
}
|
|
50
53
|
// It's an absolute or protocol relative url that
|
|
@@ -52,9 +55,9 @@ export class AuthorizeInterceptor {
|
|
|
52
55
|
return false;
|
|
53
56
|
}
|
|
54
57
|
}
|
|
55
|
-
AuthorizeInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "
|
|
56
|
-
AuthorizeInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "
|
|
57
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "
|
|
58
|
+
AuthorizeInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: AuthorizeInterceptor, deps: [{ token: i1.AuthorizeService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
59
|
+
AuthorizeInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: AuthorizeInterceptor });
|
|
60
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: AuthorizeInterceptor, decorators: [{
|
|
58
61
|
type: Injectable
|
|
59
62
|
}], ctorParameters: function () { return [{ type: i1.AuthorizeService }]; } });
|
|
60
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
63
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aG9yaXplLmludGVyY2VwdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvbWVzaG1ha2Vycy9zaGFyZWQtYXV0aC9zcmMvbGliL2F1dGhvcml6ZS5pbnRlcmNlcHRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUMsVUFBVSxFQUFDLE1BQU0sZUFBZSxDQUFDOzs7QUFNekMsTUFBTSxPQUFPLG9CQUFvQjtJQUkvQixZQUFvQixTQUEyQjtRQUEzQixjQUFTLEdBQVQsU0FBUyxDQUFrQjtRQUU3QyxJQUFJLENBQUMsV0FBVyxHQUFHLElBQUksQ0FBQztRQUN4QixTQUFTLENBQUMsY0FBYyxFQUFFLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLFdBQVcsR0FBRyxLQUFLLENBQUMsQ0FBQztJQUUxRSxDQUFDO0lBRU8sTUFBTSxDQUFDLGVBQWUsQ0FBQyxHQUFRO1FBQ3JDLDZDQUE2QztRQUM3QyxJQUFJLEdBQUcsQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFO1lBQ3BELE9BQU8sSUFBSSxDQUFDO1NBQ2I7UUFFRCxxREFBcUQ7UUFDckQsOENBQThDO1FBQzlDLElBQUksR0FBRyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsS0FBSyxNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksR0FBRyxDQUFDLEVBQUU7WUFDcEQsT0FBTyxJQUFJLENBQUM7U0FDYjtRQUVELHlDQUF5QztRQUN6QyxJQUFJLFlBQVksQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxFQUFFO1lBQzlCLE9BQU8sSUFBSSxDQUFDO1NBQ2I7UUFFRCxpREFBaUQ7UUFDakQsZ0NBQWdDO1FBQ2hDLE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQztJQUVELHdFQUF3RTtJQUN4RSw2RUFBNkU7SUFFN0UsU0FBUyxDQUFDLEdBQXFCLEVBQUUsSUFBaUI7UUFDaEQsT0FBTyxJQUFJLENBQUMsdUJBQXVCLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxHQUFHLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDbkUsQ0FBQztJQUVELDJCQUEyQjtJQUNuQix1QkFBdUIsQ0FBQyxLQUFvQixFQUFFLEdBQXFCLEVBQUUsSUFBaUI7UUFDNUYsSUFBSSxDQUFDLENBQUMsS0FBSyxJQUFJLENBQUMsb0JBQW9CLENBQUMsZUFBZSxDQUFDLEdBQUcsQ0FBQyxJQUFJLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFO1lBQ3pGLEdBQUcsR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDO2dCQUNkLFVBQVUsRUFBRTtvQkFDVixhQUFhLEVBQUUsVUFBVSxLQUFLLEVBQUU7aUJBQ2pDO2FBQ0YsQ0FBQyxDQUFDO1NBQ0o7UUFFRCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDMUIsQ0FBQztJQUVPLGlCQUFpQixDQUFDLEdBQVE7UUFFaEMsTUFBTSxXQUFXLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxjQUFjLEVBQUUsQ0FBQztRQUVwRCxJQUFJLFdBQVcsRUFBRTtZQUNmLEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxXQUFXLENBQUMsTUFBTSxFQUFFLENBQUMsRUFBRSxFQUFFO2dCQUMzQyxJQUFJLEdBQUcsQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLEdBQUcsV0FBVyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRTtvQkFDM0MsT0FBTyxJQUFJLENBQUM7aUJBQ2I7YUFDRjtTQUNGO1FBRUQsaURBQWlEO1FBQ2pELGdDQUFnQztRQUNoQyxPQUFPLEtBQUssQ0FBQztJQUNmLENBQUM7O2lIQXBFVSxvQkFBb0I7cUhBQXBCLG9CQUFvQjsyRkFBcEIsb0JBQW9CO2tCQURoQyxVQUFVIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtJbmplY3RhYmxlfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7SHR0cEV2ZW50LCBIdHRwSGFuZGxlciwgSHR0cEludGVyY2VwdG9yLCBIdHRwUmVxdWVzdH0gZnJvbSAnQGFuZ3VsYXIvY29tbW9uL2h0dHAnO1xuaW1wb3J0IHtPYnNlcnZhYmxlfSBmcm9tICdyeGpzJztcbmltcG9ydCB7QXV0aG9yaXplU2VydmljZX0gZnJvbSAnLi9hdXRob3JpemUuc2VydmljZSc7XG5cbkBJbmplY3RhYmxlKClcbmV4cG9ydCBjbGFzcyBBdXRob3JpemVJbnRlcmNlcHRvciBpbXBsZW1lbnRzIEh0dHBJbnRlcmNlcHRvciB7XG5cbiAgYWNjZXNzVG9rZW46IHN0cmluZyB8IG51bGw7XG5cbiAgY29uc3RydWN0b3IocHJpdmF0ZSBhdXRob3JpemU6IEF1dGhvcml6ZVNlcnZpY2UpIHtcblxuICAgIHRoaXMuYWNjZXNzVG9rZW4gPSBudWxsO1xuICAgIGF1dGhvcml6ZS5nZXRBY2Nlc3NUb2tlbigpLnN1YnNjcmliZSh2YWx1ZSA9PiB0aGlzLmFjY2Vzc1Rva2VuID0gdmFsdWUpO1xuXG4gIH1cblxuICBwcml2YXRlIHN0YXRpYyBpc1NhbWVPcmlnaW5VcmwocmVxOiBhbnkpIHtcbiAgICAvLyBJdCdzIGFuIGFic29sdXRlIHVybCB3aXRoIHRoZSBzYW1lIG9yaWdpbi5cbiAgICBpZiAocmVxLnVybC5zdGFydHNXaXRoKGAke3dpbmRvdy5sb2NhdGlvbi5vcmlnaW59L2ApKSB7XG4gICAgICByZXR1cm4gdHJ1ZTtcbiAgICB9XG5cbiAgICAvLyBJdCdzIGEgcHJvdG9jb2wgcmVsYXRpdmUgdXJsIHdpdGggdGhlIHNhbWUgb3JpZ2luLlxuICAgIC8vIEZvciBleGFtcGxlOiAvL3d3dy5leGFtcGxlLmNvbS9hcGkvUHJvZHVjdHNcbiAgICBpZiAocmVxLnVybC5zdGFydHNXaXRoKGAvLyR7d2luZG93LmxvY2F0aW9uLmhvc3R9L2ApKSB7XG4gICAgICByZXR1cm4gdHJ1ZTtcbiAgICB9XG5cbiAgICAvLyBJdCdzIGEgcmVsYXRpdmUgdXJsIGxpa2UgL2FwaS9Qcm9kdWN0c1xuICAgIGlmICgvXlxcL1teXFwvXS4qLy50ZXN0KHJlcS51cmwpKSB7XG4gICAgICByZXR1cm4gdHJ1ZTtcbiAgICB9XG5cbiAgICAvLyBJdCdzIGFuIGFic29sdXRlIG9yIHByb3RvY29sIHJlbGF0aXZlIHVybCB0aGF0XG4gICAgLy8gZG9lc24ndCBoYXZlIHRoZSBzYW1lIG9yaWdpbi5cbiAgICByZXR1cm4gZmFsc2U7XG4gIH1cblxuICAvLyBDaGVja3MgaWYgdGhlcmUgaXMgYW4gYWNjZXNzX3Rva2VuIGF2YWlsYWJsZSBpbiB0aGUgYXV0aG9yaXplIHNlcnZpY2VcbiAgLy8gYW5kIGFkZHMgaXQgdG8gdGhlIHJlcXVlc3QgaW4gY2FzZSBpdCdzIHRhcmdldGVkIGF0IHRoZSBzYW1lIG9yaWdpbiBhcyB0aGVcblxuICBpbnRlcmNlcHQocmVxOiBIdHRwUmVxdWVzdDxhbnk+LCBuZXh0OiBIdHRwSGFuZGxlcik6IE9ic2VydmFibGU8SHR0cEV2ZW50PGFueT4+IHtcbiAgICByZXR1cm4gdGhpcy5wcm9jZXNzUmVxdWVzdFdpdGhUb2tlbih0aGlzLmFjY2Vzc1Rva2VuLCByZXEsIG5leHQpO1xuICB9XG5cbiAgLy8gc2luZ2xlIHBhZ2UgYXBwbGljYXRpb24uXG4gIHByaXZhdGUgcHJvY2Vzc1JlcXVlc3RXaXRoVG9rZW4odG9rZW46IHN0cmluZyB8IG51bGwsIHJlcTogSHR0cFJlcXVlc3Q8YW55PiwgbmV4dDogSHR0cEhhbmRsZXIpIHtcbiAgICBpZiAoISF0b2tlbiAmJiAoQXV0aG9yaXplSW50ZXJjZXB0b3IuaXNTYW1lT3JpZ2luVXJsKHJlcSkgfHwgdGhpcy5pc0tub3duU2VydmljZVVyaShyZXEpKSkge1xuICAgICAgcmVxID0gcmVxLmNsb25lKHtcbiAgICAgICAgc2V0SGVhZGVyczoge1xuICAgICAgICAgIEF1dGhvcml6YXRpb246IGBCZWFyZXIgJHt0b2tlbn1gXG4gICAgICAgIH1cbiAgICAgIH0pO1xuICAgIH1cblxuICAgIHJldHVybiBuZXh0LmhhbmRsZShyZXEpO1xuICB9XG5cbiAgcHJpdmF0ZSBpc0tub3duU2VydmljZVVyaShyZXE6IGFueSkge1xuXG4gICAgY29uc3Qgc2VydmljZVVyaXMgPSB0aGlzLmF1dGhvcml6ZS5nZXRTZXJ2aWNlVXJpcygpO1xuXG4gICAgaWYgKHNlcnZpY2VVcmlzKSB7XG4gICAgICBmb3IgKGxldCBpID0gMDsgaSA8IHNlcnZpY2VVcmlzLmxlbmd0aDsgaSsrKSB7XG4gICAgICAgIGlmIChyZXEudXJsLnN0YXJ0c1dpdGgoYCR7c2VydmljZVVyaXNbaV19YCkpIHtcbiAgICAgICAgICByZXR1cm4gdHJ1ZTtcbiAgICAgICAgfVxuICAgICAgfVxuICAgIH1cblxuICAgIC8vIEl0J3MgYW4gYWJzb2x1dGUgb3IgcHJvdG9jb2wgcmVsYXRpdmUgdXJsIHRoYXRcbiAgICAvLyBkb2Vzbid0IGhhdmUgdGhlIHNhbWUgb3JpZ2luLlxuICAgIHJldHVybiBmYWxzZTtcbiAgfVxufVxuIl19
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Inject, Injectable } from '@angular/core';
|
|
2
|
-
import { BehaviorSubject } from 'rxjs';
|
|
3
|
-
import { filter } from 'rxjs/operators';
|
|
2
|
+
import { BehaviorSubject, firstValueFrom } from 'rxjs';
|
|
3
|
+
import { filter, map } from 'rxjs/operators';
|
|
4
4
|
import * as i0 from "@angular/core";
|
|
5
5
|
import * as i1 from "angular-oauth2-oidc";
|
|
6
6
|
export class AuthorizeOptions {
|
|
@@ -11,17 +11,47 @@ export class AuthorizeService {
|
|
|
11
11
|
this.oauthService = oauthService;
|
|
12
12
|
this.isAuthenticated = new BehaviorSubject(false);
|
|
13
13
|
this.isAdmin = new BehaviorSubject(false);
|
|
14
|
+
this.isDeveloper = new BehaviorSubject(false);
|
|
15
|
+
this.isManager = new BehaviorSubject(false);
|
|
14
16
|
this.authority = new BehaviorSubject(null);
|
|
15
17
|
this.accessToken = new BehaviorSubject(null);
|
|
16
18
|
this.user = new BehaviorSubject(null);
|
|
19
|
+
this.isInitialized = new BehaviorSubject(false);
|
|
20
|
+
this.isInitializing = new BehaviorSubject(false);
|
|
17
21
|
console.debug("AuthorizeService::created");
|
|
18
22
|
this.getUser().subscribe(s => {
|
|
19
23
|
this.isAuthenticated.next(!!s);
|
|
20
|
-
this.isAdmin.next(!!s && s.role
|
|
24
|
+
this.isAdmin.next(!!s && (s.role.includes("Administrators")));
|
|
25
|
+
this.isDeveloper.next(!!s && (s.role.includes("Developers")));
|
|
26
|
+
this.isManager.next(!!s && s.role.includes("Managers"));
|
|
21
27
|
});
|
|
28
|
+
this.oauthService.events.subscribe(e => {
|
|
29
|
+
// tslint:disable-next-line:no-console
|
|
30
|
+
console.debug('oauth/oidc event', e);
|
|
31
|
+
});
|
|
32
|
+
this.oauthService.events
|
|
33
|
+
.pipe(filter(e => e.type === 'session_terminated'))
|
|
34
|
+
.subscribe(_ => {
|
|
35
|
+
// tslint:disable-next-line:no-console
|
|
36
|
+
console.debug('Your session has been terminated!');
|
|
37
|
+
});
|
|
38
|
+
this.oauthService.events
|
|
39
|
+
.pipe(filter(e => e.type === 'token_received'))
|
|
40
|
+
.subscribe(_ => {
|
|
41
|
+
this.loadUser();
|
|
42
|
+
});
|
|
43
|
+
this.oauthService.events
|
|
44
|
+
.pipe(filter(e => e.type === 'logout'))
|
|
45
|
+
.subscribe(_ => {
|
|
46
|
+
this.accessToken.next(null);
|
|
47
|
+
this.user.next(null);
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
getRoles() {
|
|
51
|
+
return this.getUser().pipe(map(u => u != null ? u.role : new Array()));
|
|
22
52
|
}
|
|
23
53
|
getServiceUris() {
|
|
24
|
-
return this.authorizeOptions.wellKnownServiceUris;
|
|
54
|
+
return this.authorizeOptions.wellKnownServiceUris ?? null;
|
|
25
55
|
}
|
|
26
56
|
getAuthority() {
|
|
27
57
|
return this.authority;
|
|
@@ -32,6 +62,12 @@ export class AuthorizeService {
|
|
|
32
62
|
getIsAdmin() {
|
|
33
63
|
return this.isAdmin;
|
|
34
64
|
}
|
|
65
|
+
getIsDeveloper() {
|
|
66
|
+
return this.isDeveloper;
|
|
67
|
+
}
|
|
68
|
+
getIsManager() {
|
|
69
|
+
return this.isManager;
|
|
70
|
+
}
|
|
35
71
|
getAccessToken() {
|
|
36
72
|
return this.accessToken;
|
|
37
73
|
}
|
|
@@ -44,8 +80,15 @@ export class AuthorizeService {
|
|
|
44
80
|
logout() {
|
|
45
81
|
this.oauthService.logOut(false);
|
|
46
82
|
}
|
|
47
|
-
initialize() {
|
|
83
|
+
async initialize() {
|
|
48
84
|
console.debug("AuthorizeService::initialize::started");
|
|
85
|
+
if (await firstValueFrom(this.isInitializing)) {
|
|
86
|
+
return;
|
|
87
|
+
}
|
|
88
|
+
if (await firstValueFrom(this.isInitialized)) {
|
|
89
|
+
return;
|
|
90
|
+
}
|
|
91
|
+
this.isInitializing.next(true);
|
|
49
92
|
const config = {
|
|
50
93
|
responseType: 'code',
|
|
51
94
|
issuer: this.authorizeOptions.issuer,
|
|
@@ -58,33 +101,14 @@ export class AuthorizeService {
|
|
|
58
101
|
};
|
|
59
102
|
this.oauthService.configure(config);
|
|
60
103
|
this.oauthService.setStorage(localStorage);
|
|
61
|
-
this.oauthService.loadDiscoveryDocumentAndTryLogin();
|
|
104
|
+
await this.oauthService.loadDiscoveryDocumentAndTryLogin();
|
|
62
105
|
this.oauthService.setupAutomaticSilentRefresh();
|
|
63
|
-
this.oauthService.events.subscribe(e => {
|
|
64
|
-
// tslint:disable-next-line:no-console
|
|
65
|
-
console.debug('oauth/oidc event', e);
|
|
66
|
-
});
|
|
67
|
-
this.oauthService.events
|
|
68
|
-
.pipe(filter(e => e.type === 'session_terminated'))
|
|
69
|
-
.subscribe(e => {
|
|
70
|
-
// tslint:disable-next-line:no-console
|
|
71
|
-
console.debug('Your session has been terminated!');
|
|
72
|
-
});
|
|
73
|
-
this.oauthService.events
|
|
74
|
-
.pipe(filter(e => e.type === 'token_received'))
|
|
75
|
-
.subscribe(e => {
|
|
76
|
-
this.loadUser();
|
|
77
|
-
});
|
|
78
|
-
this.oauthService.events
|
|
79
|
-
.pipe(filter(e => e.type === 'logout'))
|
|
80
|
-
.subscribe(e => {
|
|
81
|
-
this.accessToken.next(null);
|
|
82
|
-
this.user.next(null);
|
|
83
|
-
});
|
|
84
106
|
if (this.oauthService.hasValidAccessToken()) {
|
|
85
107
|
this.loadUser();
|
|
86
108
|
}
|
|
87
|
-
this.authority.next(this.authorizeOptions.issuer);
|
|
109
|
+
this.authority.next(this.authorizeOptions.issuer ?? null);
|
|
110
|
+
this.isInitializing.next(false);
|
|
111
|
+
this.isInitialized.next(true);
|
|
88
112
|
console.debug("AuthorizeService::initialize::done");
|
|
89
113
|
}
|
|
90
114
|
loadUser() {
|
|
@@ -99,12 +123,12 @@ export class AuthorizeService {
|
|
|
99
123
|
this.accessToken.next(accessToken);
|
|
100
124
|
}
|
|
101
125
|
}
|
|
102
|
-
AuthorizeService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "
|
|
103
|
-
AuthorizeService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "
|
|
104
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "
|
|
126
|
+
AuthorizeService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: AuthorizeService, deps: [{ token: AuthorizeOptions }, { token: i1.OAuthService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
127
|
+
AuthorizeService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: AuthorizeService });
|
|
128
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: AuthorizeService, decorators: [{
|
|
105
129
|
type: Injectable
|
|
106
130
|
}], ctorParameters: function () { return [{ type: AuthorizeOptions, decorators: [{
|
|
107
131
|
type: Inject,
|
|
108
132
|
args: [AuthorizeOptions]
|
|
109
133
|
}] }, { type: i1.OAuthService }]; } });
|
|
110
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"authorize.service.js","sourceRoot":"","sources":["../../../../../projects/meshmakers/shared-auth/src/lib/authorize.service.ts"],"names":[],"mappings":"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","sourcesContent":["import {Inject, Injectable} from '@angular/core';\nimport {BehaviorSubject} from 'rxjs';\nimport {filter} from 'rxjs/operators';\nimport {AuthConfig, OAuthService} from \"angular-oauth2-oidc\";\n\nexport interface IUser {\n  name: string;\n  role: string;\n}\n\nexport class AuthorizeOptions {\n  wellKnownServiceUris: string[];\n  // Url of the Identity Provider\n  issuer: string;\n  // URL of the SPA to redirect the user to after login\n  redirectUri: string;\n  postLogoutRedirectUri: string;\n  // The SPA's id. The SPA is registered with this id at the auth-server\n  clientId: string;\n  // set the scope for the permissions the client should request\n  // The first three are defined by OIDC. The 4th is a use case-specific one\n  scope: string;\n  showDebugInformation: boolean;\n  sessionChecksEnabled: boolean;\n}\n\n@Injectable()\nexport class AuthorizeService {\n  private isAuthenticated: BehaviorSubject<boolean> = new BehaviorSubject(false);\n  private isAdmin: BehaviorSubject<boolean> = new BehaviorSubject(false);\n  private authority: BehaviorSubject<string> = new BehaviorSubject(null);\n  private accessToken: BehaviorSubject<string> = new BehaviorSubject(null);\n  private user: BehaviorSubject<IUser> = new BehaviorSubject(null);\n\n  constructor(@Inject(AuthorizeOptions) private authorizeOptions: AuthorizeOptions, private oauthService: OAuthService) {\n    console.debug(\"AuthorizeService::created\");\n    this.getUser().subscribe(s => {\n      this.isAuthenticated.next(!!s);\n      this.isAdmin.next(!!s && s.role === \"Administrators\");\n    });\n  }\n\n  public getServiceUris(): Array<string> {\n    return this.authorizeOptions.wellKnownServiceUris;\n  }\n\n  public getAuthority(): BehaviorSubject<string> {\n    return this.authority;\n  }\n\n  public getIsAuthenticated(): BehaviorSubject<boolean> {\n    return this.isAuthenticated;\n  }\n\n  public getIsAdmin(): BehaviorSubject<boolean> {\n    return this.isAdmin;\n  }\n\n  public getAccessToken(): BehaviorSubject<string> {\n    return this.accessToken;\n  }\n\n  public getUser(): BehaviorSubject<IUser> {\n    return this.user;\n  }\n\n  public login() {\n    this.oauthService.initImplicitFlow();\n  }\n\n  public logout() {\n    this.oauthService.logOut(false);\n  }\n\n\n  public initialize() {\n\n    console.debug(\"AuthorizeService::initialize::started\");\n\n    const config: AuthConfig = {\n      responseType: 'code',\n      issuer: this.authorizeOptions.issuer,\n      redirectUri: this.authorizeOptions.redirectUri,\n      postLogoutRedirectUri: this.authorizeOptions.postLogoutRedirectUri,\n      clientId: this.authorizeOptions.clientId,\n      scope: this.authorizeOptions.scope,\n      showDebugInformation: this.authorizeOptions.showDebugInformation,\n      sessionChecksEnabled: this.authorizeOptions.sessionChecksEnabled\n    };\n\n    this.oauthService.configure(config);\n    this.oauthService.setStorage(localStorage);\n    this.oauthService.loadDiscoveryDocumentAndTryLogin();\n\n    this.oauthService.setupAutomaticSilentRefresh();\n\n    this.oauthService.events.subscribe(e => {\n      // tslint:disable-next-line:no-console\n      console.debug('oauth/oidc event', e);\n    });\n\n    this.oauthService.events\n      .pipe(filter(e => e.type === 'session_terminated'))\n      .subscribe(e => {\n        // tslint:disable-next-line:no-console\n        console.debug('Your session has been terminated!');\n      });\n\n    this.oauthService.events\n      .pipe(filter(e => e.type === 'token_received'))\n      .subscribe(e => {\n        this.loadUser();\n      });\n\n    this.oauthService.events\n      .pipe(filter(e => e.type === 'logout'))\n      .subscribe(e => {\n        this.accessToken.next(null);\n        this.user.next(null);\n      });\n\n    if (this.oauthService.hasValidAccessToken()) {\n      this.loadUser();\n    }\n\n    this.authority.next(this.authorizeOptions.issuer);\n\n    console.debug(\"AuthorizeService::initialize::done\");\n\n  }\n\n  private loadUser() {\n    const claims = this.oauthService.getIdentityClaims();\n    if (!claims) {\n      console.error(\"claims where null when loading identity claims\");\n      return;\n    }\n\n    const user = <IUser>claims;\n    const accessToken = this.oauthService.getAccessToken();\n    this.user.next(user);\n    this.accessToken.next(accessToken);\n  }\n}\n"]}
|
|
134
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"authorize.service.js","sourceRoot":"","sources":["../../../../../projects/meshmakers/shared-auth/src/lib/authorize.service.ts"],"names":[],"mappings":"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","sourcesContent":["import {Inject, Injectable} from '@angular/core';\nimport {BehaviorSubject, firstValueFrom, Observable} from 'rxjs';\nimport {filter, map} from 'rxjs/operators';\nimport {AuthConfig, OAuthService} from \"angular-oauth2-oidc\";\n\nexport interface IUser {\n  name: string;\n  role: string[];\n}\n\nexport class AuthorizeOptions {\n  wellKnownServiceUris?: string[];\n  // Url of the Identity Provider\n  issuer?: string;\n  // URL of the SPA to redirect the user to after login\n  redirectUri?: string;\n  postLogoutRedirectUri?: string;\n  // The SPA's id. The SPA is registered with this id at the auth-server\n  clientId?: string;\n  // set the scope for the permissions the client should request\n  // The first three are defined by OIDC. The 4th is a use case-specific one\n  scope?: string;\n  showDebugInformation?: boolean;\n  sessionChecksEnabled?: boolean;\n}\n\n@Injectable()\nexport class AuthorizeService {\n  private isAuthenticated: BehaviorSubject<boolean> = new BehaviorSubject(false);\n  private isAdmin: BehaviorSubject<boolean> = new BehaviorSubject(false);\n  private isDeveloper: BehaviorSubject<boolean> = new BehaviorSubject(false);\n  private isManager: BehaviorSubject<boolean> = new BehaviorSubject(false);\n  private authority: BehaviorSubject<string | null> = new BehaviorSubject<string | null>(null);\n  private accessToken: BehaviorSubject<string | null> = new BehaviorSubject<string | null>(null);\n  private user: BehaviorSubject<IUser | null> = new BehaviorSubject<IUser | null>(null);\n  private isInitialized : BehaviorSubject<boolean> = new BehaviorSubject(false);\n  private isInitializing : BehaviorSubject<boolean> = new BehaviorSubject(false);\n\n  constructor(@Inject(AuthorizeOptions) private authorizeOptions: AuthorizeOptions, private oauthService: OAuthService) {\n    console.debug(\"AuthorizeService::created\");\n\n    this.getUser().subscribe(s => {\n      this.isAuthenticated.next(!!s);\n      this.isAdmin.next(!!s && (s.role.includes(\"Administrators\")));\n      this.isDeveloper.next(!!s && (s.role.includes(\"Developers\")));\n      this.isManager.next(!!s && s.role.includes(\"Managers\"));\n    });\n\n    this.oauthService.events.subscribe(e => {\n      // tslint:disable-next-line:no-console\n      console.debug('oauth/oidc event', e);\n    });\n\n    this.oauthService.events\n      .pipe(filter(e => e.type === 'session_terminated'))\n      .subscribe(_ => {\n        // tslint:disable-next-line:no-console\n        console.debug('Your session has been terminated!');\n      });\n\n    this.oauthService.events\n      .pipe(filter(e => e.type === 'token_received'))\n      .subscribe(_ => {\n        this.loadUser();\n      });\n\n    this.oauthService.events\n      .pipe(filter(e => e.type === 'logout'))\n      .subscribe(_ => {\n        this.accessToken.next(null);\n        this.user.next(null);\n      });\n\n  }\n\n  public getRoles(): Observable<Array<string>>{\n    return this.getUser().pipe(\n      map(u=> u != null ? u.role : new Array<string>())\n    );\n  }\n\n  public getServiceUris(): Array<string> | null {\n    return this.authorizeOptions.wellKnownServiceUris ?? null;\n  }\n\n  public getAuthority(): BehaviorSubject<string | null> {\n    return this.authority;\n  }\n\n  public getIsAuthenticated(): BehaviorSubject<boolean> {\n    return this.isAuthenticated;\n  }\n\n  public getIsAdmin(): BehaviorSubject<boolean> {\n    return this.isAdmin;\n  }\n\n  public getIsDeveloper(): BehaviorSubject<boolean> {\n    return this.isDeveloper;\n  }\n\n  public getIsManager(): BehaviorSubject<boolean> {\n    return this.isManager;\n  }\n\n  public getAccessToken(): BehaviorSubject<string | null> {\n    return this.accessToken;\n  }\n\n  public getUser(): BehaviorSubject<IUser | null> {\n    return this.user;\n  }\n\n  public login() {\n    this.oauthService.initImplicitFlow();\n  }\n\n  public logout() {\n    this.oauthService.logOut(false);\n  }\n\n\n  public async initialize() {\n\n    console.debug(\"AuthorizeService::initialize::started\");\n\n    if (await firstValueFrom(this.isInitializing)) {\n      return\n    }\n    if (await firstValueFrom(this.isInitialized)) {\n      return;\n    }\n    this.isInitializing.next(true);\n\n    const config: AuthConfig = {\n      responseType: 'code',\n      issuer: this.authorizeOptions.issuer,\n      redirectUri: this.authorizeOptions.redirectUri,\n      postLogoutRedirectUri: this.authorizeOptions.postLogoutRedirectUri,\n      clientId: this.authorizeOptions.clientId,\n      scope: this.authorizeOptions.scope,\n      showDebugInformation: this.authorizeOptions.showDebugInformation,\n      sessionChecksEnabled: this.authorizeOptions.sessionChecksEnabled\n    };\n\n    this.oauthService.configure(config);\n    this.oauthService.setStorage(localStorage);\n    await this.oauthService.loadDiscoveryDocumentAndTryLogin();\n\n    this.oauthService.setupAutomaticSilentRefresh();\n\n    if (this.oauthService.hasValidAccessToken()) {\n      this.loadUser();\n    }\n\n    this.authority.next(this.authorizeOptions.issuer ?? null);\n    this.isInitializing.next(false);\n    this.isInitialized.next(true);\n\n    console.debug(\"AuthorizeService::initialize::done\");\n  }\n\n  private loadUser() {\n    const claims = this.oauthService.getIdentityClaims();\n    if (!claims) {\n      console.error(\"claims where null when loading identity claims\");\n      return;\n    }\n\n    const user = <IUser>claims;\n    const accessToken = this.oauthService.getAccessToken();\n    this.user.next(user);\n    this.accessToken.next(accessToken);\n  }\n}\n"]}
|
|
@@ -6,13 +6,13 @@ import * as i2 from "@angular/common";
|
|
|
6
6
|
export class LoginMenuComponent {
|
|
7
7
|
constructor(authorizeService) {
|
|
8
8
|
this.authorizeService = authorizeService;
|
|
9
|
+
this.isAuthenticated = this.authorizeService.getIsAuthenticated();
|
|
10
|
+
this.userName = this.authorizeService.getUser().pipe(map(u => u && u.name));
|
|
11
|
+
this.isAdmin = this.authorizeService.getIsAdmin();
|
|
9
12
|
}
|
|
10
13
|
ngOnInit() {
|
|
11
14
|
const isIFrame = window.self !== window.top;
|
|
12
15
|
console.log("app-login-menu::created");
|
|
13
|
-
this.isAuthenticated = this.authorizeService.getIsAuthenticated();
|
|
14
|
-
this.userName = this.authorizeService.getUser().pipe(map(u => u && u.name));
|
|
15
|
-
this.isAdmin = this.authorizeService.getIsAdmin();
|
|
16
16
|
this.isAuthenticated.subscribe(x => {
|
|
17
17
|
console.log(`isAuthenticated changed to ${x} (iframe ${isIFrame})`);
|
|
18
18
|
});
|
|
@@ -26,10 +26,10 @@ export class LoginMenuComponent {
|
|
|
26
26
|
register() {
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
|
-
LoginMenuComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "
|
|
30
|
-
LoginMenuComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "
|
|
31
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "
|
|
29
|
+
LoginMenuComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: LoginMenuComponent, deps: [{ token: i1.AuthorizeService }], target: i0.ɵɵFactoryTarget.Component });
|
|
30
|
+
LoginMenuComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.8", type: LoginMenuComponent, selector: "app-login-menu", ngImport: i0, template: "<ul *ngIf=\"isAuthenticated | async\" class=\"navbar-nav\">\n <li class=\"nav-item dropdown\">\n <a aria-expanded=\"false\" aria-haspopup=\"true\" class=\"nav-link dropdown-toggle\" data-toggle=\"dropdown\" href=\"#\"\n id=\"navbarDropdownLogin\" role=\"button\">\n {{ userName | async }} <b class=\"caret\"></b>\n </a>\n <div aria-labelledby=\"navbarDropdown\" class=\"dropdown-menu\">\n <!--<a class=\"dropdown-item\" asp-action=\"Index\" asp-area=\"Authentication\" asp-controller=\"Grants\">Client Application Access</a>-->\n <!--<a class=\"dropdown-item\" [routerLink]='[\"/authentication/profile\"]' title=\"Manage\">Manage</a>-->\n <!--<a class=\"dropdown-item\" asp-action=\"Index\" asp-area=\"Authentication\" asp-controller=\"Diagnostics\">Diagnostics</a>-->\n <div class=\"dropdown-divider\"></div>\n <a (click)='logout()' class=\"dropdown-item\" routerLink=\"\" title=\"Logout\">Logout</a>\n </div>\n </li>\n</ul>\n<ul *ngIf=\"!(isAuthenticated | async)\" class=\"navbar-nav\">\n <li class=\"nav-item\">\n <a (click)='register()' class=\"nav-link\" routerLink=\"\">Register</a>\n </li>\n <li class=\"nav-item\">\n <a (click)='login()' class=\"nav-link\" routerLink=\"\">Login</a>\n </li>\n</ul>\n", styles: [""], dependencies: [{ kind: "directive", type: i2.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "pipe", type: i2.AsyncPipe, name: "async" }] });
|
|
31
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: LoginMenuComponent, decorators: [{
|
|
32
32
|
type: Component,
|
|
33
33
|
args: [{ selector: 'app-login-menu', template: "<ul *ngIf=\"isAuthenticated | async\" class=\"navbar-nav\">\n <li class=\"nav-item dropdown\">\n <a aria-expanded=\"false\" aria-haspopup=\"true\" class=\"nav-link dropdown-toggle\" data-toggle=\"dropdown\" href=\"#\"\n id=\"navbarDropdownLogin\" role=\"button\">\n {{ userName | async }} <b class=\"caret\"></b>\n </a>\n <div aria-labelledby=\"navbarDropdown\" class=\"dropdown-menu\">\n <!--<a class=\"dropdown-item\" asp-action=\"Index\" asp-area=\"Authentication\" asp-controller=\"Grants\">Client Application Access</a>-->\n <!--<a class=\"dropdown-item\" [routerLink]='[\"/authentication/profile\"]' title=\"Manage\">Manage</a>-->\n <!--<a class=\"dropdown-item\" asp-action=\"Index\" asp-area=\"Authentication\" asp-controller=\"Diagnostics\">Diagnostics</a>-->\n <div class=\"dropdown-divider\"></div>\n <a (click)='logout()' class=\"dropdown-item\" routerLink=\"\" title=\"Logout\">Logout</a>\n </div>\n </li>\n</ul>\n<ul *ngIf=\"!(isAuthenticated | async)\" class=\"navbar-nav\">\n <li class=\"nav-item\">\n <a (click)='register()' class=\"nav-link\" routerLink=\"\">Register</a>\n </li>\n <li class=\"nav-item\">\n <a (click)='login()' class=\"nav-link\" routerLink=\"\">Login</a>\n </li>\n</ul>\n" }]
|
|
34
34
|
}], ctorParameters: function () { return [{ type: i1.AuthorizeService }]; } });
|
|
35
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
35
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9naW4tbWVudS5jb21wb25lbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9tZXNobWFrZXJzL3NoYXJlZC1hdXRoL3NyYy9saWIvbG9naW4tbWVudS9sb2dpbi1tZW51LmNvbXBvbmVudC50cyIsIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL21lc2htYWtlcnMvc2hhcmVkLWF1dGgvc3JjL2xpYi9sb2dpbi1tZW51L2xvZ2luLW1lbnUuY29tcG9uZW50Lmh0bWwiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFDLFNBQVMsRUFBUyxNQUFNLGVBQWUsQ0FBQztBQUdoRCxPQUFPLEVBQUMsR0FBRyxFQUFDLE1BQU0sZ0JBQWdCLENBQUM7Ozs7QUFPbkMsTUFBTSxPQUFPLGtCQUFrQjtJQUs3QixZQUFvQixnQkFBa0M7UUFBbEMscUJBQWdCLEdBQWhCLGdCQUFnQixDQUFrQjtRQUNwRCxJQUFJLENBQUMsZUFBZSxHQUFHLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxrQkFBa0IsRUFBRSxDQUFDO1FBQ2xFLElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE9BQU8sRUFBRSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7UUFDNUUsSUFBSSxDQUFDLE9BQU8sR0FBRyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsVUFBVSxFQUFFLENBQUM7SUFDcEQsQ0FBQztJQUVELFFBQVE7UUFDTixNQUFNLFFBQVEsR0FBRyxNQUFNLENBQUMsSUFBSSxLQUFLLE1BQU0sQ0FBQyxHQUFHLENBQUM7UUFFNUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyx5QkFBeUIsQ0FBQyxDQUFDO1FBRXZDLElBQUksQ0FBQyxlQUFlLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxFQUFFO1lBRWpDLE9BQU8sQ0FBQyxHQUFHLENBQUMsOEJBQThCLENBQUMsWUFBWSxRQUFRLEdBQUcsQ0FBQyxDQUFDO1FBQ3RFLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVNLEtBQUs7UUFDVixJQUFJLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDaEMsQ0FBQztJQUVNLE1BQU07UUFDWCxJQUFJLENBQUMsZ0JBQWdCLENBQUMsTUFBTSxFQUFFLENBQUM7SUFDakMsQ0FBQztJQUVNLFFBQVE7SUFFZixDQUFDOzsrR0FoQ1Usa0JBQWtCO21HQUFsQixrQkFBa0Isc0RDVi9CLHN2Q0F1QkE7MkZEYmEsa0JBQWtCO2tCQUw5QixTQUFTOytCQUNFLGdCQUFnQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7Q29tcG9uZW50LCBPbkluaXR9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHtBdXRob3JpemVTZXJ2aWNlfSBmcm9tICcuLi9hdXRob3JpemUuc2VydmljZSc7XG5pbXBvcnQge0JlaGF2aW9yU3ViamVjdCwgT2JzZXJ2YWJsZX0gZnJvbSAncnhqcyc7XG5pbXBvcnQge21hcH0gZnJvbSAncnhqcy9vcGVyYXRvcnMnO1xuXG5AQ29tcG9uZW50KHtcbiAgc2VsZWN0b3I6ICdhcHAtbG9naW4tbWVudScsXG4gIHRlbXBsYXRlVXJsOiAnLi9sb2dpbi1tZW51LmNvbXBvbmVudC5odG1sJyxcbiAgc3R5bGVVcmxzOiBbJy4vbG9naW4tbWVudS5jb21wb25lbnQuY3NzJ11cbn0pXG5leHBvcnQgY2xhc3MgTG9naW5NZW51Q29tcG9uZW50IGltcGxlbWVudHMgT25Jbml0IHtcbiAgcHVibGljIGlzQXV0aGVudGljYXRlZDogQmVoYXZpb3JTdWJqZWN0PGJvb2xlYW4+O1xuICBwdWJsaWMgdXNlck5hbWU6IE9ic2VydmFibGU8c3RyaW5nIHwgbnVsbD47XG4gIHB1YmxpYyBpc0FkbWluOiBPYnNlcnZhYmxlPGJvb2xlYW4+O1xuXG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgYXV0aG9yaXplU2VydmljZTogQXV0aG9yaXplU2VydmljZSkge1xuICAgIHRoaXMuaXNBdXRoZW50aWNhdGVkID0gdGhpcy5hdXRob3JpemVTZXJ2aWNlLmdldElzQXV0aGVudGljYXRlZCgpO1xuICAgIHRoaXMudXNlck5hbWUgPSB0aGlzLmF1dGhvcml6ZVNlcnZpY2UuZ2V0VXNlcigpLnBpcGUobWFwKHUgPT4gdSAmJiB1Lm5hbWUpKTtcbiAgICB0aGlzLmlzQWRtaW4gPSB0aGlzLmF1dGhvcml6ZVNlcnZpY2UuZ2V0SXNBZG1pbigpO1xuICB9XG5cbiAgbmdPbkluaXQoKSB7XG4gICAgY29uc3QgaXNJRnJhbWUgPSB3aW5kb3cuc2VsZiAhPT0gd2luZG93LnRvcDtcblxuICAgIGNvbnNvbGUubG9nKFwiYXBwLWxvZ2luLW1lbnU6OmNyZWF0ZWRcIik7XG5cbiAgICB0aGlzLmlzQXV0aGVudGljYXRlZC5zdWJzY3JpYmUoeCA9PiB7XG5cbiAgICAgIGNvbnNvbGUubG9nKGBpc0F1dGhlbnRpY2F0ZWQgY2hhbmdlZCB0byAke3h9IChpZnJhbWUgJHtpc0lGcmFtZX0pYCk7XG4gICAgfSk7XG4gIH1cblxuICBwdWJsaWMgbG9naW4oKSB7XG4gICAgdGhpcy5hdXRob3JpemVTZXJ2aWNlLmxvZ2luKCk7XG4gIH1cblxuICBwdWJsaWMgbG9nb3V0KCkge1xuICAgIHRoaXMuYXV0aG9yaXplU2VydmljZS5sb2dvdXQoKTtcbiAgfVxuXG4gIHB1YmxpYyByZWdpc3RlcigpIHtcblxuICB9XG59XG4iLCI8dWwgKm5nSWY9XCJpc0F1dGhlbnRpY2F0ZWQgfCBhc3luY1wiIGNsYXNzPVwibmF2YmFyLW5hdlwiPlxuICA8bGkgY2xhc3M9XCJuYXYtaXRlbSBkcm9wZG93blwiPlxuICAgIDxhIGFyaWEtZXhwYW5kZWQ9XCJmYWxzZVwiIGFyaWEtaGFzcG9wdXA9XCJ0cnVlXCIgY2xhc3M9XCJuYXYtbGluayBkcm9wZG93bi10b2dnbGVcIiBkYXRhLXRvZ2dsZT1cImRyb3Bkb3duXCIgaHJlZj1cIiNcIlxuICAgICAgIGlkPVwibmF2YmFyRHJvcGRvd25Mb2dpblwiIHJvbGU9XCJidXR0b25cIj5cbiAgICAgIHt7IHVzZXJOYW1lIHwgYXN5bmMgfX0gPGIgY2xhc3M9XCJjYXJldFwiPjwvYj5cbiAgICA8L2E+XG4gICAgPGRpdiBhcmlhLWxhYmVsbGVkYnk9XCJuYXZiYXJEcm9wZG93blwiIGNsYXNzPVwiZHJvcGRvd24tbWVudVwiPlxuICAgICAgPCEtLTxhIGNsYXNzPVwiZHJvcGRvd24taXRlbVwiIGFzcC1hY3Rpb249XCJJbmRleFwiIGFzcC1hcmVhPVwiQXV0aGVudGljYXRpb25cIiBhc3AtY29udHJvbGxlcj1cIkdyYW50c1wiPkNsaWVudCBBcHBsaWNhdGlvbiBBY2Nlc3M8L2E+LS0+XG4gICAgICA8IS0tPGEgY2xhc3M9XCJkcm9wZG93bi1pdGVtXCIgW3JvdXRlckxpbmtdPSdbXCIvYXV0aGVudGljYXRpb24vcHJvZmlsZVwiXScgdGl0bGU9XCJNYW5hZ2VcIj5NYW5hZ2U8L2E+LS0+XG4gICAgICA8IS0tPGEgY2xhc3M9XCJkcm9wZG93bi1pdGVtXCIgYXNwLWFjdGlvbj1cIkluZGV4XCIgYXNwLWFyZWE9XCJBdXRoZW50aWNhdGlvblwiIGFzcC1jb250cm9sbGVyPVwiRGlhZ25vc3RpY3NcIj5EaWFnbm9zdGljczwvYT4tLT5cbiAgICAgIDxkaXYgY2xhc3M9XCJkcm9wZG93bi1kaXZpZGVyXCI+PC9kaXY+XG4gICAgICA8YSAoY2xpY2spPSdsb2dvdXQoKScgY2xhc3M9XCJkcm9wZG93bi1pdGVtXCIgcm91dGVyTGluaz1cIlwiIHRpdGxlPVwiTG9nb3V0XCI+TG9nb3V0PC9hPlxuICAgIDwvZGl2PlxuICA8L2xpPlxuPC91bD5cbjx1bCAqbmdJZj1cIiEoaXNBdXRoZW50aWNhdGVkIHwgYXN5bmMpXCIgY2xhc3M9XCJuYXZiYXItbmF2XCI+XG4gIDxsaSBjbGFzcz1cIm5hdi1pdGVtXCI+XG4gICAgPGEgKGNsaWNrKT0ncmVnaXN0ZXIoKScgY2xhc3M9XCJuYXYtbGlua1wiIHJvdXRlckxpbms9XCJcIj5SZWdpc3RlcjwvYT5cbiAgPC9saT5cbiAgPGxpIGNsYXNzPVwibmF2LWl0ZW1cIj5cbiAgICA8YSAoY2xpY2spPSdsb2dpbigpJyBjbGFzcz1cIm5hdi1saW5rXCIgcm91dGVyTGluaz1cIlwiPkxvZ2luPC9hPlxuICA8L2xpPlxuPC91bD5cbiJdfQ==
|
|
@@ -22,13 +22,13 @@ export class SharedAuthModule {
|
|
|
22
22
|
};
|
|
23
23
|
}
|
|
24
24
|
}
|
|
25
|
-
SharedAuthModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "
|
|
26
|
-
SharedAuthModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "
|
|
25
|
+
SharedAuthModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: SharedAuthModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
|
|
26
|
+
SharedAuthModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "15.2.8", ngImport: i0, type: SharedAuthModule, declarations: [LoginMenuComponent], imports: [CommonModule,
|
|
27
27
|
HttpClientModule, i1.OAuthModule], exports: [LoginMenuComponent] });
|
|
28
|
-
SharedAuthModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "
|
|
28
|
+
SharedAuthModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: SharedAuthModule, imports: [CommonModule,
|
|
29
29
|
HttpClientModule,
|
|
30
30
|
OAuthModule.forRoot()] });
|
|
31
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "
|
|
31
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: SharedAuthModule, decorators: [{
|
|
32
32
|
type: NgModule,
|
|
33
33
|
args: [{
|
|
34
34
|
declarations: [LoginMenuComponent],
|
package/esm2020/public-api.mjs
CHANGED
|
@@ -6,4 +6,4 @@ export * from './lib/login-menu/login-menu.component';
|
|
|
6
6
|
export * from './lib/shared-auth.module';
|
|
7
7
|
export * from './lib/authorize.interceptor';
|
|
8
8
|
export * from './lib/authorize.guard';
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
9
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljLWFwaS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL21lc2htYWtlcnMvc2hhcmVkLWF1dGgvc3JjL3B1YmxpYy1hcGkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7O0dBRUc7QUFFSCxjQUFjLHlCQUF5QixDQUFDO0FBQ3hDLGNBQWMsdUNBQXVDLENBQUM7QUFDdEQsY0FBYywwQkFBMEIsQ0FBQztBQUN6QyxjQUFjLDZCQUE2QixDQUFDO0FBQzVDLGNBQWMsdUJBQXVCLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKlxuICogUHVibGljIEFQSSBTdXJmYWNlIG9mIHNoYXJlZC1hdXRoXG4gKi9cblxuZXhwb3J0ICogZnJvbSAnLi9saWIvYXV0aG9yaXplLnNlcnZpY2UnO1xuZXhwb3J0ICogZnJvbSAnLi9saWIvbG9naW4tbWVudS9sb2dpbi1tZW51LmNvbXBvbmVudCc7XG5leHBvcnQgKiBmcm9tICcuL2xpYi9zaGFyZWQtYXV0aC5tb2R1bGUnO1xuZXhwb3J0ICogZnJvbSAnLi9saWIvYXV0aG9yaXplLmludGVyY2VwdG9yJztcbmV4cG9ydCAqIGZyb20gJy4vbGliL2F1dGhvcml6ZS5ndWFyZCc7XG5cbiJdfQ==
|