npm - @meshmakers/shared-auth - Versions diffs - 2.0.2303-3003 → 2.0.2304-13002 - Mend

@meshmakers/shared-auth 2.0.2303-3003 → 2.0.2304-13002

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.

Files changed (13) hide show

package/esm2020/lib/authorize.guard.mjs +10 -9
package/esm2020/lib/authorize.interceptor.mjs +3 -3
package/esm2020/lib/authorize.service.mjs +39 -28
package/esm2020/lib/login-menu/login-menu.component.mjs +3 -3
package/esm2020/lib/shared-auth.module.mjs +4 -4
package/fesm2015/meshmakers-shared-auth.mjs +77 -63
package/fesm2015/meshmakers-shared-auth.mjs.map +1 -1
package/fesm2020/meshmakers-shared-auth.mjs +57 -45
package/fesm2020/meshmakers-shared-auth.mjs.map +1 -1
package/lib/authorize.guard.d.ts +2 -2
package/lib/authorize.service.d.ts +3 -1
package/lib/login-menu/login-menu.component.d.ts +1 -1
package/package.json +2 -2

package/esm2020/lib/authorize.guard.mjs CHANGED Viewed

@@ -4,8 +4,8 @@ import * as i0 from "@angular/core";
 import * as i1 from "./authorize.service";
 import * as i2 from "@angular/router";
 export class AuthorizeGuard {
-    constructor(authorize, router) {
-        this.authorize = authorize;
+    constructor(authorizeService, router) {
+        this.authorizeService = authorizeService;
         this.router = router;
     }
     canActivate(next, state) {
@@ -22,9 +22,10 @@ export class AuthorizeGuard {
         return true;
     }
     async handleAuthorization(route, url) {
-        const isAuthenticated = await firstValueFrom(this.authorize.getIsAuthenticated());
+        await this.authorizeService.initialize();
+        const isAuthenticated = await firstValueFrom(this.authorizeService.getIsAuthenticated());
         if (isAuthenticated) {
-            const userRoles = await firstValueFrom(this.authorize.getRoles());
+            const userRoles = await firstValueFrom(this.authorizeService.getRoles());
             if (route.data.roles && !route.data.roles.filter(value => userRoles.includes(value))) {
                 this.router.navigate(['']);
                 return false;
@@ -32,14 +33,14 @@ export class AuthorizeGuard {
             return true;
         }
         else {
-            this.authorize.login();
+            this.authorizeService.login();
         }
         return false;
     }
 }
-AuthorizeGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: AuthorizeGuard, deps: [{ token: i1.AuthorizeService }, { token: i2.Router }], target: i0.ɵɵFactoryTarget.Injectable });
-AuthorizeGuard.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: AuthorizeGuard });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: AuthorizeGuard, decorators: [{
+AuthorizeGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: AuthorizeGuard, deps: [{ token: i1.AuthorizeService }, { token: i2.Router }], target: i0.ɵɵFactoryTarget.Injectable });
+AuthorizeGuard.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: AuthorizeGuard });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: AuthorizeGuard, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: i1.AuthorizeService }, { type: i2.Router }]; } });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aG9yaXplLmd1YXJkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvbWVzaG1ha2Vycy9zaGFyZWQtYXV0aC9zcmMvbGliL2F1dGhvcml6ZS5ndWFyZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUMsVUFBVSxFQUFDLE1BQU0sZUFBZSxDQUFDO0FBWXpDLE9BQU8sRUFBQyxjQUFjLEVBQTRCLE1BQU0sTUFBTSxDQUFDOzs7O0FBRy9ELE1BQU0sT0FBTyxjQUFjO0lBQ3pCLFlBQW9CLFNBQTJCLEVBQVUsTUFBYztRQUFuRCxjQUFTLEdBQVQsU0FBUyxDQUFrQjtRQUFVLFdBQU0sR0FBTixNQUFNLENBQVE7SUFDdkUsQ0FBQztJQUVELFdBQVcsQ0FDVCxJQUE0QixFQUM1QixLQUEwQjtRQUMxQixJQUFJLEdBQUcsR0FBVyxLQUFLLENBQUMsR0FBRyxDQUFDO1FBQzVCLE9BQU8sSUFBSSxDQUFDLG1CQUFtQixDQUFDLElBQUksRUFBRSxHQUFHLENBQUMsQ0FBQztJQUM3QyxDQUFDO0lBRUQsZ0JBQWdCLENBQ2QsSUFBNEIsRUFDNUIsS0FBMEI7UUFDMUIsT0FBTyxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztJQUN2QyxDQUFDO0lBRUQsYUFBYSxDQUNYLFNBQWtCLEVBQ2xCLFlBQW9DLEVBQ3BDLFlBQWlDLEVBQ2pDLFNBQStCO1FBQy9CLE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVELE9BQU8sQ0FDTCxLQUFZLEVBQ1osUUFBc0I7UUFDdEIsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRU8sS0FBSyxDQUFDLG1CQUFtQixDQUFDLEtBQTZCLEVBQUUsR0FBUTtRQUN2RSxNQUFNLGVBQWUsR0FBRyxNQUFNLGNBQWMsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLGtCQUFrQixFQUFFLENBQUMsQ0FBQztRQUNsRixJQUFJLGVBQWUsRUFBRTtZQUNuQixNQUFNLFNBQVMsR0FBRyxNQUFNLGNBQWMsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7WUFDbEUsSUFBSSxLQUFLLENBQUMsSUFBSSxDQUFDLEtBQUssSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRTtnQkFDcEYsSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO2dCQUMzQixPQUFPLEtBQUssQ0FBQzthQUNkO1lBQ0QsT0FBTyxJQUFJLENBQUM7U0FDYjthQUFNO1lBQ0wsSUFBSSxDQUFDLFNBQVMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztTQUN4QjtRQUVELE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQzs7MkdBN0NVLGNBQWM7K0dBQWQsY0FBYzsyRkFBZCxjQUFjO2tCQUQxQixVQUFVIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtJbmplY3RhYmxlfSBmcm9tICdAYW5ndWxhci9jb3JlJztcclxuaW1wb3J0IHtcclxuICBBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90LFxyXG4gIENhbkFjdGl2YXRlLFxyXG4gIENhbkFjdGl2YXRlQ2hpbGQsXHJcbiAgQ2FuRGVhY3RpdmF0ZSxcclxuICBDYW5Mb2FkLCBSb3V0ZSxcclxuICBSb3V0ZXIsXHJcbiAgUm91dGVyU3RhdGVTbmFwc2hvdCwgVXJsU2VnbWVudCxcclxuICBVcmxUcmVlXHJcbn0gZnJvbSAnQGFuZ3VsYXIvcm91dGVyJztcclxuaW1wb3J0IHtBdXRob3JpemVTZXJ2aWNlfSBmcm9tICcuL2F1dGhvcml6ZS5zZXJ2aWNlJztcclxuaW1wb3J0IHtmaXJzdFZhbHVlRnJvbSwgbGFzdFZhbHVlRnJvbSwgT2JzZXJ2YWJsZX0gZnJvbSBcInJ4anNcIjtcclxuXHJcbkBJbmplY3RhYmxlKClcclxuZXhwb3J0IGNsYXNzIEF1dGhvcml6ZUd1YXJkIGltcGxlbWVudHMgQ2FuQWN0aXZhdGUsIENhbkFjdGl2YXRlQ2hpbGQsIENhbkRlYWN0aXZhdGU8dW5rbm93bj4sIENhbkxvYWQge1xyXG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgYXV0aG9yaXplOiBBdXRob3JpemVTZXJ2aWNlLCBwcml2YXRlIHJvdXRlcjogUm91dGVyKSB7XHJcbiAgfVxyXG5cclxuICBjYW5BY3RpdmF0ZShcclxuICAgIG5leHQ6IEFjdGl2YXRlZFJvdXRlU25hcHNob3QsXHJcbiAgICBzdGF0ZTogUm91dGVyU3RhdGVTbmFwc2hvdCk6IE9ic2VydmFibGU8Ym9vbGVhbiB8IFVybFRyZWU+IHwgUHJvbWlzZTxib29sZWFuIHwgVXJsVHJlZT4gfCBib29sZWFuIHwgVXJsVHJlZSB7XHJcbiAgICBsZXQgdXJsOiBzdHJpbmcgPSBzdGF0ZS51cmw7XHJcbiAgICByZXR1cm4gdGhpcy5oYW5kbGVBdXRob3JpemF0aW9uKG5leHQsIHVybCk7XHJcbiAgfVxyXG5cclxuICBjYW5BY3RpdmF0ZUNoaWxkKFxyXG4gICAgbmV4dDogQWN0aXZhdGVkUm91dGVTbmFwc2hvdCxcclxuICAgIHN0YXRlOiBSb3V0ZXJTdGF0ZVNuYXBzaG90KTogT2JzZXJ2YWJsZTxib29sZWFuIHwgVXJsVHJlZT4gfCBQcm9taXNlPGJvb2xlYW4gfCBVcmxUcmVlPiB8IGJvb2xlYW4gfCBVcmxUcmVlIHtcclxuICAgIHJldHVybiB0aGlzLmNhbkFjdGl2YXRlKG5leHQsIHN0YXRlKTtcclxuICB9XHJcblxyXG4gIGNhbkRlYWN0aXZhdGUoXHJcbiAgICBjb21wb25lbnQ6IHVua25vd24sXHJcbiAgICBjdXJyZW50Um91dGU6IEFjdGl2YXRlZFJvdXRlU25hcHNob3QsXHJcbiAgICBjdXJyZW50U3RhdGU6IFJvdXRlclN0YXRlU25hcHNob3QsXHJcbiAgICBuZXh0U3RhdGU/OiBSb3V0ZXJTdGF0ZVNuYXBzaG90KTogT2JzZXJ2YWJsZTxib29sZWFuIHwgVXJsVHJlZT4gfCBQcm9taXNlPGJvb2xlYW4gfCBVcmxUcmVlPiB8IGJvb2xlYW4gfCBVcmxUcmVlIHtcclxuICAgIHJldHVybiB0cnVlO1xyXG4gIH1cclxuXHJcbiAgY2FuTG9hZChcclxuICAgIHJvdXRlOiBSb3V0ZSxcclxuICAgIHNlZ21lbnRzOiBVcmxTZWdtZW50W10pOiBPYnNlcnZhYmxlPGJvb2xlYW4+IHwgUHJvbWlzZTxib29sZWFuPiB8IGJvb2xlYW4ge1xyXG4gICAgcmV0dXJuIHRydWU7XHJcbiAgfVxyXG5cclxuICBwcml2YXRlIGFzeW5jIGhhbmRsZUF1dGhvcml6YXRpb24ocm91dGU6IEFjdGl2YXRlZFJvdXRlU25hcHNob3QsIHVybDogYW55KTogUHJvbWlzZTxib29sZWFuPiB7XHJcbiAgICBjb25zdCBpc0F1dGhlbnRpY2F0ZWQgPSBhd2FpdCBmaXJzdFZhbHVlRnJvbSh0aGlzLmF1dGhvcml6ZS5nZXRJc0F1dGhlbnRpY2F0ZWQoKSk7XHJcbiAgICBpZiAoaXNBdXRoZW50aWNhdGVkKSB7XHJcbiAgICAgIGNvbnN0IHVzZXJSb2xlcyA9IGF3YWl0IGZpcnN0VmFsdWVGcm9tKHRoaXMuYXV0aG9yaXplLmdldFJvbGVzKCkpO1xyXG4gICAgICBpZiAocm91dGUuZGF0YS5yb2xlcyAmJiAhcm91dGUuZGF0YS5yb2xlcy5maWx0ZXIodmFsdWUgPT4gdXNlclJvbGVzLmluY2x1ZGVzKHZhbHVlKSkpIHtcclxuICAgICAgICB0aGlzLnJvdXRlci5uYXZpZ2F0ZShbJyddKTtcclxuICAgICAgICByZXR1cm4gZmFsc2U7XHJcbiAgICAgIH1cclxuICAgICAgcmV0dXJuIHRydWU7XHJcbiAgICB9IGVsc2Uge1xyXG4gICAgICB0aGlzLmF1dGhvcml6ZS5sb2dpbigpO1xyXG4gICAgfVxyXG5cclxuICAgIHJldHVybiBmYWxzZTtcclxuICB9XHJcbn1cclxuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aG9yaXplLmd1YXJkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvbWVzaG1ha2Vycy9zaGFyZWQtYXV0aC9zcmMvbGliL2F1dGhvcml6ZS5ndWFyZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUMsVUFBVSxFQUFDLE1BQU0sZUFBZSxDQUFDO0FBWXpDLE9BQU8sRUFBQyxjQUFjLEVBQTRCLE1BQU0sTUFBTSxDQUFDOzs7O0FBRy9ELE1BQU0sT0FBTyxjQUFjO0lBQ3pCLFlBQW9CLGdCQUFrQyxFQUFVLE1BQWM7UUFBMUQscUJBQWdCLEdBQWhCLGdCQUFnQixDQUFrQjtRQUFVLFdBQU0sR0FBTixNQUFNLENBQVE7SUFDOUUsQ0FBQztJQUVELFdBQVcsQ0FDVCxJQUE0QixFQUM1QixLQUEwQjtRQUMxQixJQUFJLEdBQUcsR0FBVyxLQUFLLENBQUMsR0FBRyxDQUFDO1FBQzVCLE9BQU8sSUFBSSxDQUFDLG1CQUFtQixDQUFDLElBQUksRUFBRSxHQUFHLENBQUMsQ0FBQztJQUM3QyxDQUFDO0lBRUQsZ0JBQWdCLENBQ2QsSUFBNEIsRUFDNUIsS0FBMEI7UUFDMUIsT0FBTyxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztJQUN2QyxDQUFDO0lBRUQsYUFBYSxDQUNYLFNBQWtCLEVBQ2xCLFlBQW9DLEVBQ3BDLFlBQWlDLEVBQ2pDLFNBQStCO1FBQy9CLE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVELE9BQU8sQ0FDTCxLQUFZLEVBQ1osUUFBc0I7UUFDdEIsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRU8sS0FBSyxDQUFDLG1CQUFtQixDQUFDLEtBQTZCLEVBQUUsR0FBUTtRQUV2RSxNQUFNLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxVQUFVLEVBQUUsQ0FBQTtRQUV4QyxNQUFNLGVBQWUsR0FBRyxNQUFNLGNBQWMsQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsa0JBQWtCLEVBQUUsQ0FBQyxDQUFDO1FBQ3pGLElBQUksZUFBZSxFQUFFO1lBQ25CLE1BQU0sU0FBUyxHQUFHLE1BQU0sY0FBYyxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDO1lBQ3pFLElBQUksS0FBSyxDQUFDLElBQUksQ0FBQyxLQUFLLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxTQUFTLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUU7Z0JBQ3BGLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQztnQkFDM0IsT0FBTyxLQUFLLENBQUM7YUFDZDtZQUNELE9BQU8sSUFBSSxDQUFDO1NBQ2I7YUFBTTtZQUNMLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLEVBQUUsQ0FBQztTQUMvQjtRQUVELE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQzs7MkdBaERVLGNBQWM7K0dBQWQsY0FBYzsyRkFBZCxjQUFjO2tCQUQxQixVQUFVIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtJbmplY3RhYmxlfSBmcm9tICdAYW5ndWxhci9jb3JlJztcclxuaW1wb3J0IHtcclxuICBBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90LFxyXG4gIENhbkFjdGl2YXRlLFxyXG4gIENhbkFjdGl2YXRlQ2hpbGQsXHJcbiAgQ2FuRGVhY3RpdmF0ZSxcclxuICBDYW5Mb2FkLCBSb3V0ZSxcclxuICBSb3V0ZXIsXHJcbiAgUm91dGVyU3RhdGVTbmFwc2hvdCwgVXJsU2VnbWVudCxcclxuICBVcmxUcmVlXHJcbn0gZnJvbSAnQGFuZ3VsYXIvcm91dGVyJztcclxuaW1wb3J0IHtBdXRob3JpemVTZXJ2aWNlfSBmcm9tICcuL2F1dGhvcml6ZS5zZXJ2aWNlJztcclxuaW1wb3J0IHtmaXJzdFZhbHVlRnJvbSwgbGFzdFZhbHVlRnJvbSwgT2JzZXJ2YWJsZX0gZnJvbSBcInJ4anNcIjtcclxuXHJcbkBJbmplY3RhYmxlKClcclxuZXhwb3J0IGNsYXNzIEF1dGhvcml6ZUd1YXJkIGltcGxlbWVudHMgQ2FuQWN0aXZhdGUsIENhbkFjdGl2YXRlQ2hpbGQsIENhbkRlYWN0aXZhdGU8dW5rbm93bj4sIENhbkxvYWQge1xyXG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgYXV0aG9yaXplU2VydmljZTogQXV0aG9yaXplU2VydmljZSwgcHJpdmF0ZSByb3V0ZXI6IFJvdXRlcikge1xyXG4gIH1cclxuXHJcbiAgY2FuQWN0aXZhdGUoXHJcbiAgICBuZXh0OiBBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90LFxyXG4gICAgc3RhdGU6IFJvdXRlclN0YXRlU25hcHNob3QpOiBPYnNlcnZhYmxlPGJvb2xlYW4gfCBVcmxUcmVlPiB8IFByb21pc2U8Ym9vbGVhbiB8IFVybFRyZWU+IHwgYm9vbGVhbiB8IFVybFRyZWUge1xyXG4gICAgbGV0IHVybDogc3RyaW5nID0gc3RhdGUudXJsO1xyXG4gICAgcmV0dXJuIHRoaXMuaGFuZGxlQXV0aG9yaXphdGlvbihuZXh0LCB1cmwpO1xyXG4gIH1cclxuXHJcbiAgY2FuQWN0aXZhdGVDaGlsZChcclxuICAgIG5leHQ6IEFjdGl2YXRlZFJvdXRlU25hcHNob3QsXHJcbiAgICBzdGF0ZTogUm91dGVyU3RhdGVTbmFwc2hvdCk6IE9ic2VydmFibGU8Ym9vbGVhbiB8IFVybFRyZWU+IHwgUHJvbWlzZTxib29sZWFuIHwgVXJsVHJlZT4gfCBib29sZWFuIHwgVXJsVHJlZSB7XHJcbiAgICByZXR1cm4gdGhpcy5jYW5BY3RpdmF0ZShuZXh0LCBzdGF0ZSk7XHJcbiAgfVxyXG5cclxuICBjYW5EZWFjdGl2YXRlKFxyXG4gICAgY29tcG9uZW50OiB1bmtub3duLFxyXG4gICAgY3VycmVudFJvdXRlOiBBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90LFxyXG4gICAgY3VycmVudFN0YXRlOiBSb3V0ZXJTdGF0ZVNuYXBzaG90LFxyXG4gICAgbmV4dFN0YXRlPzogUm91dGVyU3RhdGVTbmFwc2hvdCk6IE9ic2VydmFibGU8Ym9vbGVhbiB8IFVybFRyZWU+IHwgUHJvbWlzZTxib29sZWFuIHwgVXJsVHJlZT4gfCBib29sZWFuIHwgVXJsVHJlZSB7XHJcbiAgICByZXR1cm4gdHJ1ZTtcclxuICB9XHJcblxyXG4gIGNhbkxvYWQoXHJcbiAgICByb3V0ZTogUm91dGUsXHJcbiAgICBzZWdtZW50czogVXJsU2VnbWVudFtdKTogT2JzZXJ2YWJsZTxib29sZWFuPiB8IFByb21pc2U8Ym9vbGVhbj4gfCBib29sZWFuIHtcclxuICAgIHJldHVybiB0cnVlO1xyXG4gIH1cclxuXHJcbiAgcHJpdmF0ZSBhc3luYyBoYW5kbGVBdXRob3JpemF0aW9uKHJvdXRlOiBBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90LCB1cmw6IGFueSk6IFByb21pc2U8Ym9vbGVhbj4ge1xyXG5cclxuICAgIGF3YWl0IHRoaXMuYXV0aG9yaXplU2VydmljZS5pbml0aWFsaXplKClcclxuXHJcbiAgICBjb25zdCBpc0F1dGhlbnRpY2F0ZWQgPSBhd2FpdCBmaXJzdFZhbHVlRnJvbSh0aGlzLmF1dGhvcml6ZVNlcnZpY2UuZ2V0SXNBdXRoZW50aWNhdGVkKCkpO1xyXG4gICAgaWYgKGlzQXV0aGVudGljYXRlZCkge1xyXG4gICAgICBjb25zdCB1c2VyUm9sZXMgPSBhd2FpdCBmaXJzdFZhbHVlRnJvbSh0aGlzLmF1dGhvcml6ZVNlcnZpY2UuZ2V0Um9sZXMoKSk7XHJcbiAgICAgIGlmIChyb3V0ZS5kYXRhLnJvbGVzICYmICFyb3V0ZS5kYXRhLnJvbGVzLmZpbHRlcih2YWx1ZSA9PiB1c2VyUm9sZXMuaW5jbHVkZXModmFsdWUpKSkge1xyXG4gICAgICAgIHRoaXMucm91dGVyLm5hdmlnYXRlKFsnJ10pO1xyXG4gICAgICAgIHJldHVybiBmYWxzZTtcclxuICAgICAgfVxyXG4gICAgICByZXR1cm4gdHJ1ZTtcclxuICAgIH0gZWxzZSB7XHJcbiAgICAgIHRoaXMuYXV0aG9yaXplU2VydmljZS5sb2dpbigpO1xyXG4gICAgfVxyXG5cclxuICAgIHJldHVybiBmYWxzZTtcclxuICB9XHJcbn1cclxuIl19

package/esm2020/lib/authorize.interceptor.mjs CHANGED Viewed

@@ -52,9 +52,9 @@ export class AuthorizeInterceptor {
         return false;
     }
 }
-AuthorizeInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: AuthorizeInterceptor, deps: [{ token: i1.AuthorizeService }], target: i0.ɵɵFactoryTarget.Injectable });
-AuthorizeInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: AuthorizeInterceptor });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: AuthorizeInterceptor, decorators: [{
+AuthorizeInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: AuthorizeInterceptor, deps: [{ token: i1.AuthorizeService }], target: i0.ɵɵFactoryTarget.Injectable });
+AuthorizeInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: AuthorizeInterceptor });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: AuthorizeInterceptor, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: i1.AuthorizeService }]; } });
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aG9yaXplLmludGVyY2VwdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvbWVzaG1ha2Vycy9zaGFyZWQtYXV0aC9zcmMvbGliL2F1dGhvcml6ZS5pbnRlcmNlcHRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUMsVUFBVSxFQUFDLE1BQU0sZUFBZSxDQUFDOzs7QUFNekMsTUFBTSxPQUFPLG9CQUFvQjtJQUkvQixZQUFvQixTQUEyQjtRQUEzQixjQUFTLEdBQVQsU0FBUyxDQUFrQjtRQUU3QyxTQUFTLENBQUMsY0FBYyxFQUFFLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLFdBQVcsR0FBRyxLQUFLLENBQUMsQ0FBQztJQUUxRSxDQUFDO0lBRU8sTUFBTSxDQUFDLGVBQWUsQ0FBQyxHQUFRO1FBQ3JDLDZDQUE2QztRQUM3QyxJQUFJLEdBQUcsQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFO1lBQ3BELE9BQU8sSUFBSSxDQUFDO1NBQ2I7UUFFRCxxREFBcUQ7UUFDckQsOENBQThDO1FBQzlDLElBQUksR0FBRyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsS0FBSyxNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksR0FBRyxDQUFDLEVBQUU7WUFDcEQsT0FBTyxJQUFJLENBQUM7U0FDYjtRQUVELHlDQUF5QztRQUN6QyxJQUFJLFlBQVksQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxFQUFFO1lBQzlCLE9BQU8sSUFBSSxDQUFDO1NBQ2I7UUFFRCxpREFBaUQ7UUFDakQsZ0NBQWdDO1FBQ2hDLE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQztJQUVELHdFQUF3RTtJQUN4RSw2RUFBNkU7SUFFN0UsU0FBUyxDQUFDLEdBQXFCLEVBQUUsSUFBaUI7UUFDaEQsT0FBTyxJQUFJLENBQUMsdUJBQXVCLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxHQUFHLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDbkUsQ0FBQztJQUVELDJCQUEyQjtJQUNuQix1QkFBdUIsQ0FBQyxLQUFhLEVBQUUsR0FBcUIsRUFBRSxJQUFpQjtRQUNyRixJQUFJLENBQUMsQ0FBQyxLQUFLLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxlQUFlLENBQUMsR0FBRyxDQUFDLElBQUksSUFBSSxDQUFDLGlCQUFpQixDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUU7WUFDekYsR0FBRyxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUM7Z0JBQ2QsVUFBVSxFQUFFO29CQUNWLGFBQWEsRUFBRSxVQUFVLEtBQUssRUFBRTtpQkFDakM7YUFDRixDQUFDLENBQUM7U0FDSjtRQUVELE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUMxQixDQUFDO0lBRU8saUJBQWlCLENBQUMsR0FBUTtRQUVoQyxNQUFNLFdBQVcsR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLGNBQWMsRUFBRSxDQUFDO1FBRXBELEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxXQUFXLENBQUMsTUFBTSxFQUFFLENBQUMsRUFBRSxFQUFFO1lBQzNDLElBQUksR0FBRyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsR0FBRyxXQUFXLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFO2dCQUMzQyxPQUFPLElBQUksQ0FBQzthQUNiO1NBQ0Y7UUFFRCxpREFBaUQ7UUFDakQsZ0NBQWdDO1FBQ2hDLE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQzs7aUhBakVVLG9CQUFvQjtxSEFBcEIsb0JBQW9COzJGQUFwQixvQkFBb0I7a0JBRGhDLFVBQVUiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge0luamVjdGFibGV9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xyXG5pbXBvcnQge0h0dHBFdmVudCwgSHR0cEhhbmRsZXIsIEh0dHBJbnRlcmNlcHRvciwgSHR0cFJlcXVlc3R9IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcclxuaW1wb3J0IHtPYnNlcnZhYmxlfSBmcm9tICdyeGpzJztcclxuaW1wb3J0IHtBdXRob3JpemVTZXJ2aWNlfSBmcm9tICcuL2F1dGhvcml6ZS5zZXJ2aWNlJztcclxuXHJcbkBJbmplY3RhYmxlKClcclxuZXhwb3J0IGNsYXNzIEF1dGhvcml6ZUludGVyY2VwdG9yIGltcGxlbWVudHMgSHR0cEludGVyY2VwdG9yIHtcclxuXHJcbiAgYWNjZXNzVG9rZW46IHN0cmluZztcclxuXHJcbiAgY29uc3RydWN0b3IocHJpdmF0ZSBhdXRob3JpemU6IEF1dGhvcml6ZVNlcnZpY2UpIHtcclxuXHJcbiAgICBhdXRob3JpemUuZ2V0QWNjZXNzVG9rZW4oKS5zdWJzY3JpYmUodmFsdWUgPT4gdGhpcy5hY2Nlc3NUb2tlbiA9IHZhbHVlKTtcclxuXHJcbiAgfVxyXG5cclxuICBwcml2YXRlIHN0YXRpYyBpc1NhbWVPcmlnaW5VcmwocmVxOiBhbnkpIHtcclxuICAgIC8vIEl0J3MgYW4gYWJzb2x1dGUgdXJsIHdpdGggdGhlIHNhbWUgb3JpZ2luLlxyXG4gICAgaWYgKHJlcS51cmwuc3RhcnRzV2l0aChgJHt3aW5kb3cubG9jYXRpb24ub3JpZ2lufS9gKSkge1xyXG4gICAgICByZXR1cm4gdHJ1ZTtcclxuICAgIH1cclxuXHJcbiAgICAvLyBJdCdzIGEgcHJvdG9jb2wgcmVsYXRpdmUgdXJsIHdpdGggdGhlIHNhbWUgb3JpZ2luLlxyXG4gICAgLy8gRm9yIGV4YW1wbGU6IC8vd3d3LmV4YW1wbGUuY29tL2FwaS9Qcm9kdWN0c1xyXG4gICAgaWYgKHJlcS51cmwuc3RhcnRzV2l0aChgLy8ke3dpbmRvdy5sb2NhdGlvbi5ob3N0fS9gKSkge1xyXG4gICAgICByZXR1cm4gdHJ1ZTtcclxuICAgIH1cclxuXHJcbiAgICAvLyBJdCdzIGEgcmVsYXRpdmUgdXJsIGxpa2UgL2FwaS9Qcm9kdWN0c1xyXG4gICAgaWYgKC9eXFwvW15cXC9dLiovLnRlc3QocmVxLnVybCkpIHtcclxuICAgICAgcmV0dXJuIHRydWU7XHJcbiAgICB9XHJcblxyXG4gICAgLy8gSXQncyBhbiBhYnNvbHV0ZSBvciBwcm90b2NvbCByZWxhdGl2ZSB1cmwgdGhhdFxyXG4gICAgLy8gZG9lc24ndCBoYXZlIHRoZSBzYW1lIG9yaWdpbi5cclxuICAgIHJldHVybiBmYWxzZTtcclxuICB9XHJcblxyXG4gIC8vIENoZWNrcyBpZiB0aGVyZSBpcyBhbiBhY2Nlc3NfdG9rZW4gYXZhaWxhYmxlIGluIHRoZSBhdXRob3JpemUgc2VydmljZVxyXG4gIC8vIGFuZCBhZGRzIGl0IHRvIHRoZSByZXF1ZXN0IGluIGNhc2UgaXQncyB0YXJnZXRlZCBhdCB0aGUgc2FtZSBvcmlnaW4gYXMgdGhlXHJcblxyXG4gIGludGVyY2VwdChyZXE6IEh0dHBSZXF1ZXN0PGFueT4sIG5leHQ6IEh0dHBIYW5kbGVyKTogT2JzZXJ2YWJsZTxIdHRwRXZlbnQ8YW55Pj4ge1xyXG4gICAgcmV0dXJuIHRoaXMucHJvY2Vzc1JlcXVlc3RXaXRoVG9rZW4odGhpcy5hY2Nlc3NUb2tlbiwgcmVxLCBuZXh0KTtcclxuICB9XHJcblxyXG4gIC8vIHNpbmdsZSBwYWdlIGFwcGxpY2F0aW9uLlxyXG4gIHByaXZhdGUgcHJvY2Vzc1JlcXVlc3RXaXRoVG9rZW4odG9rZW46IHN0cmluZywgcmVxOiBIdHRwUmVxdWVzdDxhbnk+LCBuZXh0OiBIdHRwSGFuZGxlcikge1xyXG4gICAgaWYgKCEhdG9rZW4gJiYgKEF1dGhvcml6ZUludGVyY2VwdG9yLmlzU2FtZU9yaWdpblVybChyZXEpIHx8IHRoaXMuaXNLbm93blNlcnZpY2VVcmkocmVxKSkpIHtcclxuICAgICAgcmVxID0gcmVxLmNsb25lKHtcclxuICAgICAgICBzZXRIZWFkZXJzOiB7XHJcbiAgICAgICAgICBBdXRob3JpemF0aW9uOiBgQmVhcmVyICR7dG9rZW59YFxyXG4gICAgICAgIH1cclxuICAgICAgfSk7XHJcbiAgICB9XHJcblxyXG4gICAgcmV0dXJuIG5leHQuaGFuZGxlKHJlcSk7XHJcbiAgfVxyXG5cclxuICBwcml2YXRlIGlzS25vd25TZXJ2aWNlVXJpKHJlcTogYW55KSB7XHJcblxyXG4gICAgY29uc3Qgc2VydmljZVVyaXMgPSB0aGlzLmF1dGhvcml6ZS5nZXRTZXJ2aWNlVXJpcygpO1xyXG5cclxuICAgIGZvciAobGV0IGkgPSAwOyBpIDwgc2VydmljZVVyaXMubGVuZ3RoOyBpKyspIHtcclxuICAgICAgaWYgKHJlcS51cmwuc3RhcnRzV2l0aChgJHtzZXJ2aWNlVXJpc1tpXX1gKSkge1xyXG4gICAgICAgIHJldHVybiB0cnVlO1xyXG4gICAgICB9XHJcbiAgICB9XHJcblxyXG4gICAgLy8gSXQncyBhbiBhYnNvbHV0ZSBvciBwcm90b2NvbCByZWxhdGl2ZSB1cmwgdGhhdFxyXG4gICAgLy8gZG9lc24ndCBoYXZlIHRoZSBzYW1lIG9yaWdpbi5cclxuICAgIHJldHVybiBmYWxzZTtcclxuICB9XHJcbn1cclxuIl19

package/esm2020/lib/authorize.service.mjs CHANGED Viewed

@@ -1,5 +1,5 @@
 import { Inject, Injectable } from '@angular/core';
-import { BehaviorSubject } from 'rxjs';
+import { BehaviorSubject, firstValueFrom } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 import * as i0 from "@angular/core";
 import * as i1 from "angular-oauth2-oidc";
@@ -16,6 +16,8 @@ export class AuthorizeService {
         this.authority = new BehaviorSubject(null);
         this.accessToken = new BehaviorSubject(null);
         this.user = new BehaviorSubject(null);
+        this.isInitialized = new BehaviorSubject(false);
+        this.isInitializing = new BehaviorSubject(false);
         console.debug("AuthorizeService::created");
         this.getUser().subscribe(s => {
             this.isAuthenticated.next(!!s);
@@ -23,6 +25,27 @@ export class AuthorizeService {
             this.isDeveloper.next(!!s && (s.role.includes("Developers")));
             this.isManager.next(!!s && s.role.includes("Managers"));
         });
+        this.oauthService.events.subscribe(e => {
+            // tslint:disable-next-line:no-console
+            console.debug('oauth/oidc event', e);
+        });
+        this.oauthService.events
+            .pipe(filter(e => e.type === 'session_terminated'))
+            .subscribe(_ => {
+            // tslint:disable-next-line:no-console
+            console.debug('Your session has been terminated!');
+        });
+        this.oauthService.events
+            .pipe(filter(e => e.type === 'token_received'))
+            .subscribe(_ => {
+            this.loadUser();
+        });
+        this.oauthService.events
+            .pipe(filter(e => e.type === 'logout'))
+            .subscribe(_ => {
+            this.accessToken.next(null);
+            this.user.next(null);
+        });
     }
     getRoles() {
         return this.getUser().pipe(map(u => u.role));
@@ -57,8 +80,15 @@ export class AuthorizeService {
     logout() {
         this.oauthService.logOut(false);
     }
-    initialize() {
+    async initialize() {
         console.debug("AuthorizeService::initialize::started");
+        if (await firstValueFrom(this.isInitializing)) {
+            return;
+        }
+        if (await firstValueFrom(this.isInitialized)) {
+            return;
+        }
+        this.isInitializing.next(true);
         const config = {
             responseType: 'code',
             issuer: this.authorizeOptions.issuer,
@@ -71,33 +101,14 @@ export class AuthorizeService {
         };
         this.oauthService.configure(config);
         this.oauthService.setStorage(localStorage);
-        this.oauthService.loadDiscoveryDocumentAndTryLogin();
+        await this.oauthService.loadDiscoveryDocumentAndTryLogin();
         this.oauthService.setupAutomaticSilentRefresh();
-        this.oauthService.events.subscribe(e => {
-            // tslint:disable-next-line:no-console
-            console.debug('oauth/oidc event', e);
-        });
-        this.oauthService.events
-            .pipe(filter(e => e.type === 'session_terminated'))
-            .subscribe(_ => {
-            // tslint:disable-next-line:no-console
-            console.debug('Your session has been terminated!');
-        });
-        this.oauthService.events
-            .pipe(filter(e => e.type === 'token_received'))
-            .subscribe(_ => {
-            this.loadUser();
-        });
-        this.oauthService.events
-            .pipe(filter(e => e.type === 'logout'))
-            .subscribe(_ => {
-            this.accessToken.next(null);
-            this.user.next(null);
-        });
         if (this.oauthService.hasValidAccessToken()) {
             this.loadUser();
         }
         this.authority.next(this.authorizeOptions.issuer);
+        this.isInitializing.next(false);
+        this.isInitialized.next(true);
         console.debug("AuthorizeService::initialize::done");
     }
     loadUser() {
@@ -112,12 +123,12 @@ export class AuthorizeService {
         this.accessToken.next(accessToken);
     }
 }
-AuthorizeService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: AuthorizeService, deps: [{ token: AuthorizeOptions }, { token: i1.OAuthService }], target: i0.ɵɵFactoryTarget.Injectable });
-AuthorizeService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: AuthorizeService });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: AuthorizeService, decorators: [{
+AuthorizeService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: AuthorizeService, deps: [{ token: AuthorizeOptions }, { token: i1.OAuthService }], target: i0.ɵɵFactoryTarget.Injectable });
+AuthorizeService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: AuthorizeService });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: AuthorizeService, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: AuthorizeOptions, decorators: [{
                     type: Inject,
                     args: [AuthorizeOptions]
                 }] }, { type: i1.OAuthService }]; } });
-//# 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';\r\nimport {BehaviorSubject, Observable} from 'rxjs';\r\nimport {filter, map} from 'rxjs/operators';\r\nimport {AuthConfig, OAuthService} from \"angular-oauth2-oidc\";\r\n\r\nexport interface IUser {\r\n  name: string;\r\n  role: string[];\r\n}\r\n\r\nexport class AuthorizeOptions {\r\n  wellKnownServiceUris: string[];\r\n  // Url of the Identity Provider\r\n  issuer: string;\r\n  // URL of the SPA to redirect the user to after login\r\n  redirectUri: string;\r\n  postLogoutRedirectUri: string;\r\n  // The SPA's id. The SPA is registered with this id at the auth-server\r\n  clientId: string;\r\n  // set the scope for the permissions the client should request\r\n  // The first three are defined by OIDC. The 4th is a use case-specific one\r\n  scope: string;\r\n  showDebugInformation: boolean;\r\n  sessionChecksEnabled: boolean;\r\n}\r\n\r\n@Injectable()\r\nexport class AuthorizeService {\r\n  private isAuthenticated: BehaviorSubject<boolean> = new BehaviorSubject(false);\r\n  private isAdmin: BehaviorSubject<boolean> = new BehaviorSubject(false);\r\n  private isDeveloper: BehaviorSubject<boolean> = new BehaviorSubject(false);\r\n  private isManager: BehaviorSubject<boolean> = new BehaviorSubject(false);\r\n  private authority: BehaviorSubject<string> = new BehaviorSubject(null);\r\n  private accessToken: BehaviorSubject<string> = new BehaviorSubject(null);\r\n  private user: BehaviorSubject<IUser> = new BehaviorSubject(null);\r\n\r\n  constructor(@Inject(AuthorizeOptions) private authorizeOptions: AuthorizeOptions, private oauthService: OAuthService) {\r\n    console.debug(\"AuthorizeService::created\");\r\n    this.getUser().subscribe(s => {\r\n      this.isAuthenticated.next(!!s);\r\n      this.isAdmin.next(!!s && (s.role.includes(\"Administrators\")));\r\n      this.isDeveloper.next(!!s && (s.role.includes(\"Developers\")));\r\n      this.isManager.next(!!s && s.role.includes(\"Managers\"));\r\n    });\r\n  }\r\n\r\n  public getRoles(): Observable<Array<string>>{\r\n    return this.getUser().pipe(\r\n      map(u=> u.role)\r\n    );\r\n  }\r\n\r\n  public getServiceUris(): Array<string> {\r\n    return this.authorizeOptions.wellKnownServiceUris;\r\n  }\r\n\r\n  public getAuthority(): BehaviorSubject<string> {\r\n    return this.authority;\r\n  }\r\n\r\n  public getIsAuthenticated(): BehaviorSubject<boolean> {\r\n    return this.isAuthenticated;\r\n  }\r\n\r\n  public getIsAdmin(): BehaviorSubject<boolean> {\r\n    return this.isAdmin;\r\n  }\r\n\r\n  public getIsDeveloper(): BehaviorSubject<boolean> {\r\n    return this.isDeveloper;\r\n  }\r\n\r\n  public getIsManager(): BehaviorSubject<boolean> {\r\n    return this.isManager;\r\n  }\r\n\r\n  public getAccessToken(): BehaviorSubject<string> {\r\n    return this.accessToken;\r\n  }\r\n\r\n  public getUser(): BehaviorSubject<IUser> {\r\n    return this.user;\r\n  }\r\n\r\n  public login() {\r\n    this.oauthService.initImplicitFlow();\r\n  }\r\n\r\n  public logout() {\r\n    this.oauthService.logOut(false);\r\n  }\r\n\r\n\r\n  public initialize() {\r\n\r\n    console.debug(\"AuthorizeService::initialize::started\");\r\n\r\n    const config: AuthConfig = {\r\n      responseType: 'code',\r\n      issuer: this.authorizeOptions.issuer,\r\n      redirectUri: this.authorizeOptions.redirectUri,\r\n      postLogoutRedirectUri: this.authorizeOptions.postLogoutRedirectUri,\r\n      clientId: this.authorizeOptions.clientId,\r\n      scope: this.authorizeOptions.scope,\r\n      showDebugInformation: this.authorizeOptions.showDebugInformation,\r\n      sessionChecksEnabled: this.authorizeOptions.sessionChecksEnabled\r\n    };\r\n\r\n    this.oauthService.configure(config);\r\n    this.oauthService.setStorage(localStorage);\r\n    this.oauthService.loadDiscoveryDocumentAndTryLogin();\r\n\r\n    this.oauthService.setupAutomaticSilentRefresh();\r\n\r\n    this.oauthService.events.subscribe(e => {\r\n      // tslint:disable-next-line:no-console\r\n      console.debug('oauth/oidc event', e);\r\n    });\r\n\r\n    this.oauthService.events\r\n      .pipe(filter(e => e.type === 'session_terminated'))\r\n      .subscribe(_ => {\r\n        // tslint:disable-next-line:no-console\r\n        console.debug('Your session has been terminated!');\r\n      });\r\n\r\n    this.oauthService.events\r\n      .pipe(filter(e => e.type === 'token_received'))\r\n      .subscribe(_ => {\r\n        this.loadUser();\r\n      });\r\n\r\n    this.oauthService.events\r\n      .pipe(filter(e => e.type === 'logout'))\r\n      .subscribe(_ => {\r\n        this.accessToken.next(null);\r\n        this.user.next(null);\r\n      });\r\n\r\n    if (this.oauthService.hasValidAccessToken()) {\r\n      this.loadUser();\r\n    }\r\n\r\n    this.authority.next(this.authorizeOptions.issuer);\r\n\r\n    console.debug(\"AuthorizeService::initialize::done\");\r\n\r\n  }\r\n\r\n  private loadUser() {\r\n    const claims = this.oauthService.getIdentityClaims();\r\n    if (!claims) {\r\n      console.error(\"claims where null when loading identity claims\");\r\n      return;\r\n    }\r\n\r\n    const user = <IUser>claims;\r\n    const accessToken = this.oauthService.getAccessToken();\r\n    this.user.next(user);\r\n    this.accessToken.next(accessToken);\r\n  }\r\n}\r\n"]}
+//# 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';\r\nimport {BehaviorSubject, firstValueFrom, Observable} from 'rxjs';\r\nimport {filter, map} from 'rxjs/operators';\r\nimport {AuthConfig, OAuthService} from \"angular-oauth2-oidc\";\r\n\r\nexport interface IUser {\r\n  name: string;\r\n  role: string[];\r\n}\r\n\r\nexport class AuthorizeOptions {\r\n  wellKnownServiceUris: string[];\r\n  // Url of the Identity Provider\r\n  issuer: string;\r\n  // URL of the SPA to redirect the user to after login\r\n  redirectUri: string;\r\n  postLogoutRedirectUri: string;\r\n  // The SPA's id. The SPA is registered with this id at the auth-server\r\n  clientId: string;\r\n  // set the scope for the permissions the client should request\r\n  // The first three are defined by OIDC. The 4th is a use case-specific one\r\n  scope: string;\r\n  showDebugInformation: boolean;\r\n  sessionChecksEnabled: boolean;\r\n}\r\n\r\n@Injectable()\r\nexport class AuthorizeService {\r\n  private isAuthenticated: BehaviorSubject<boolean> = new BehaviorSubject(false);\r\n  private isAdmin: BehaviorSubject<boolean> = new BehaviorSubject(false);\r\n  private isDeveloper: BehaviorSubject<boolean> = new BehaviorSubject(false);\r\n  private isManager: BehaviorSubject<boolean> = new BehaviorSubject(false);\r\n  private authority: BehaviorSubject<string> = new BehaviorSubject(null);\r\n  private accessToken: BehaviorSubject<string> = new BehaviorSubject(null);\r\n  private user: BehaviorSubject<IUser> = new BehaviorSubject(null);\r\n  private isInitialized : BehaviorSubject<boolean> = new BehaviorSubject(false);\r\n  private isInitializing : BehaviorSubject<boolean> = new BehaviorSubject(false);\r\n\r\n  constructor(@Inject(AuthorizeOptions) private authorizeOptions: AuthorizeOptions, private oauthService: OAuthService) {\r\n    console.debug(\"AuthorizeService::created\");\r\n\r\n    this.getUser().subscribe(s => {\r\n      this.isAuthenticated.next(!!s);\r\n      this.isAdmin.next(!!s && (s.role.includes(\"Administrators\")));\r\n      this.isDeveloper.next(!!s && (s.role.includes(\"Developers\")));\r\n      this.isManager.next(!!s && s.role.includes(\"Managers\"));\r\n    });\r\n\r\n    this.oauthService.events.subscribe(e => {\r\n      // tslint:disable-next-line:no-console\r\n      console.debug('oauth/oidc event', e);\r\n    });\r\n\r\n    this.oauthService.events\r\n      .pipe(filter(e => e.type === 'session_terminated'))\r\n      .subscribe(_ => {\r\n        // tslint:disable-next-line:no-console\r\n        console.debug('Your session has been terminated!');\r\n      });\r\n\r\n    this.oauthService.events\r\n      .pipe(filter(e => e.type === 'token_received'))\r\n      .subscribe(_ => {\r\n        this.loadUser();\r\n      });\r\n\r\n    this.oauthService.events\r\n      .pipe(filter(e => e.type === 'logout'))\r\n      .subscribe(_ => {\r\n        this.accessToken.next(null);\r\n        this.user.next(null);\r\n      });\r\n\r\n  }\r\n\r\n  public getRoles(): Observable<Array<string>>{\r\n    return this.getUser().pipe(\r\n      map(u=> u.role)\r\n    );\r\n  }\r\n\r\n  public getServiceUris(): Array<string> {\r\n    return this.authorizeOptions.wellKnownServiceUris;\r\n  }\r\n\r\n  public getAuthority(): BehaviorSubject<string> {\r\n    return this.authority;\r\n  }\r\n\r\n  public getIsAuthenticated(): BehaviorSubject<boolean> {\r\n    return this.isAuthenticated;\r\n  }\r\n\r\n  public getIsAdmin(): BehaviorSubject<boolean> {\r\n    return this.isAdmin;\r\n  }\r\n\r\n  public getIsDeveloper(): BehaviorSubject<boolean> {\r\n    return this.isDeveloper;\r\n  }\r\n\r\n  public getIsManager(): BehaviorSubject<boolean> {\r\n    return this.isManager;\r\n  }\r\n\r\n  public getAccessToken(): BehaviorSubject<string> {\r\n    return this.accessToken;\r\n  }\r\n\r\n  public getUser(): BehaviorSubject<IUser> {\r\n    return this.user;\r\n  }\r\n\r\n  public login() {\r\n    this.oauthService.initImplicitFlow();\r\n  }\r\n\r\n  public logout() {\r\n    this.oauthService.logOut(false);\r\n  }\r\n\r\n\r\n  public async initialize() {\r\n\r\n    console.debug(\"AuthorizeService::initialize::started\");\r\n\r\n    if (await firstValueFrom(this.isInitializing)) {\r\n      return\r\n    }\r\n    if (await firstValueFrom(this.isInitialized)) {\r\n      return;\r\n    }\r\n    this.isInitializing.next(true);\r\n\r\n    const config: AuthConfig = {\r\n      responseType: 'code',\r\n      issuer: this.authorizeOptions.issuer,\r\n      redirectUri: this.authorizeOptions.redirectUri,\r\n      postLogoutRedirectUri: this.authorizeOptions.postLogoutRedirectUri,\r\n      clientId: this.authorizeOptions.clientId,\r\n      scope: this.authorizeOptions.scope,\r\n      showDebugInformation: this.authorizeOptions.showDebugInformation,\r\n      sessionChecksEnabled: this.authorizeOptions.sessionChecksEnabled\r\n    };\r\n\r\n    this.oauthService.configure(config);\r\n    this.oauthService.setStorage(localStorage);\r\n    await this.oauthService.loadDiscoveryDocumentAndTryLogin();\r\n\r\n    this.oauthService.setupAutomaticSilentRefresh();\r\n\r\n    if (this.oauthService.hasValidAccessToken()) {\r\n      this.loadUser();\r\n    }\r\n\r\n    this.authority.next(this.authorizeOptions.issuer);\r\n    this.isInitializing.next(false);\r\n    this.isInitialized.next(true);\r\n\r\n    console.debug(\"AuthorizeService::initialize::done\");\r\n  }\r\n\r\n  private loadUser() {\r\n    const claims = this.oauthService.getIdentityClaims();\r\n    if (!claims) {\r\n      console.error(\"claims where null when loading identity claims\");\r\n      return;\r\n    }\r\n\r\n    const user = <IUser>claims;\r\n    const accessToken = this.oauthService.getAccessToken();\r\n    this.user.next(user);\r\n    this.accessToken.next(accessToken);\r\n  }\r\n}\r\n"]}

package/esm2020/lib/login-menu/login-menu.component.mjs CHANGED Viewed

@@ -26,9 +26,9 @@ export class LoginMenuComponent {
     register() {
     }
 }
-LoginMenuComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: LoginMenuComponent, deps: [{ token: i1.AuthorizeService }], target: i0.ɵɵFactoryTarget.Component });
-LoginMenuComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.2.2", type: LoginMenuComponent, selector: "app-login-menu", ngImport: i0, template: "<ul *ngIf=\"isAuthenticated | async\" class=\"navbar-nav\">\r\n  <li class=\"nav-item dropdown\">\r\n    <a aria-expanded=\"false\" aria-haspopup=\"true\" class=\"nav-link dropdown-toggle\" data-toggle=\"dropdown\" href=\"#\"\r\n       id=\"navbarDropdownLogin\" role=\"button\">\r\n      {{ userName | async }} <b class=\"caret\"></b>\r\n    </a>\r\n    <div aria-labelledby=\"navbarDropdown\" class=\"dropdown-menu\">\r\n      <!--<a class=\"dropdown-item\" asp-action=\"Index\" asp-area=\"Authentication\" asp-controller=\"Grants\">Client Application Access</a>-->\r\n      <!--<a class=\"dropdown-item\" [routerLink]='[\"/authentication/profile\"]' title=\"Manage\">Manage</a>-->\r\n      <!--<a class=\"dropdown-item\" asp-action=\"Index\" asp-area=\"Authentication\" asp-controller=\"Diagnostics\">Diagnostics</a>-->\r\n      <div class=\"dropdown-divider\"></div>\r\n      <a (click)='logout()' class=\"dropdown-item\" routerLink=\"\" title=\"Logout\">Logout</a>\r\n    </div>\r\n  </li>\r\n</ul>\r\n<ul *ngIf=\"!(isAuthenticated | async)\" class=\"navbar-nav\">\r\n  <li class=\"nav-item\">\r\n    <a (click)='register()' class=\"nav-link\" routerLink=\"\">Register</a>\r\n  </li>\r\n  <li class=\"nav-item\">\r\n    <a (click)='login()' class=\"nav-link\" routerLink=\"\">Login</a>\r\n  </li>\r\n</ul>\r\n", styles: [""], dependencies: [{ kind: "directive", type: i2.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "pipe", type: i2.AsyncPipe, name: "async" }] });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: LoginMenuComponent, decorators: [{
+LoginMenuComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: LoginMenuComponent, deps: [{ token: i1.AuthorizeService }], target: i0.ɵɵFactoryTarget.Component });
+LoginMenuComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.3", type: LoginMenuComponent, selector: "app-login-menu", ngImport: i0, template: "<ul *ngIf=\"isAuthenticated | async\" class=\"navbar-nav\">\r\n  <li class=\"nav-item dropdown\">\r\n    <a aria-expanded=\"false\" aria-haspopup=\"true\" class=\"nav-link dropdown-toggle\" data-toggle=\"dropdown\" href=\"#\"\r\n       id=\"navbarDropdownLogin\" role=\"button\">\r\n      {{ userName | async }} <b class=\"caret\"></b>\r\n    </a>\r\n    <div aria-labelledby=\"navbarDropdown\" class=\"dropdown-menu\">\r\n      <!--<a class=\"dropdown-item\" asp-action=\"Index\" asp-area=\"Authentication\" asp-controller=\"Grants\">Client Application Access</a>-->\r\n      <!--<a class=\"dropdown-item\" [routerLink]='[\"/authentication/profile\"]' title=\"Manage\">Manage</a>-->\r\n      <!--<a class=\"dropdown-item\" asp-action=\"Index\" asp-area=\"Authentication\" asp-controller=\"Diagnostics\">Diagnostics</a>-->\r\n      <div class=\"dropdown-divider\"></div>\r\n      <a (click)='logout()' class=\"dropdown-item\" routerLink=\"\" title=\"Logout\">Logout</a>\r\n    </div>\r\n  </li>\r\n</ul>\r\n<ul *ngIf=\"!(isAuthenticated | async)\" class=\"navbar-nav\">\r\n  <li class=\"nav-item\">\r\n    <a (click)='register()' class=\"nav-link\" routerLink=\"\">Register</a>\r\n  </li>\r\n  <li class=\"nav-item\">\r\n    <a (click)='login()' class=\"nav-link\" routerLink=\"\">Login</a>\r\n  </li>\r\n</ul>\r\n", styles: [""], dependencies: [{ kind: "directive", type: i2.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "pipe", type: i2.AsyncPipe, name: "async" }] });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: LoginMenuComponent, decorators: [{
             type: Component,
             args: [{ selector: 'app-login-menu', template: "<ul *ngIf=\"isAuthenticated | async\" class=\"navbar-nav\">\r\n  <li class=\"nav-item dropdown\">\r\n    <a aria-expanded=\"false\" aria-haspopup=\"true\" class=\"nav-link dropdown-toggle\" data-toggle=\"dropdown\" href=\"#\"\r\n       id=\"navbarDropdownLogin\" role=\"button\">\r\n      {{ userName | async }} <b class=\"caret\"></b>\r\n    </a>\r\n    <div aria-labelledby=\"navbarDropdown\" class=\"dropdown-menu\">\r\n      <!--<a class=\"dropdown-item\" asp-action=\"Index\" asp-area=\"Authentication\" asp-controller=\"Grants\">Client Application Access</a>-->\r\n      <!--<a class=\"dropdown-item\" [routerLink]='[\"/authentication/profile\"]' title=\"Manage\">Manage</a>-->\r\n      <!--<a class=\"dropdown-item\" asp-action=\"Index\" asp-area=\"Authentication\" asp-controller=\"Diagnostics\">Diagnostics</a>-->\r\n      <div class=\"dropdown-divider\"></div>\r\n      <a (click)='logout()' class=\"dropdown-item\" routerLink=\"\" title=\"Logout\">Logout</a>\r\n    </div>\r\n  </li>\r\n</ul>\r\n<ul *ngIf=\"!(isAuthenticated | async)\" class=\"navbar-nav\">\r\n  <li class=\"nav-item\">\r\n    <a (click)='register()' class=\"nav-link\" routerLink=\"\">Register</a>\r\n  </li>\r\n  <li class=\"nav-item\">\r\n    <a (click)='login()' class=\"nav-link\" routerLink=\"\">Login</a>\r\n  </li>\r\n</ul>\r\n" }]
         }], ctorParameters: function () { return [{ type: i1.AuthorizeService }]; } });

package/esm2020/lib/shared-auth.module.mjs CHANGED Viewed

@@ -22,13 +22,13 @@ export class SharedAuthModule {
         };
     }
 }
-SharedAuthModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: SharedAuthModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-SharedAuthModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.2.2", ngImport: i0, type: SharedAuthModule, declarations: [LoginMenuComponent], imports: [CommonModule,
+SharedAuthModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: SharedAuthModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+SharedAuthModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "15.2.3", ngImport: i0, type: SharedAuthModule, declarations: [LoginMenuComponent], imports: [CommonModule,
         HttpClientModule, i1.OAuthModule], exports: [LoginMenuComponent] });
-SharedAuthModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: SharedAuthModule, imports: [CommonModule,
+SharedAuthModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: SharedAuthModule, imports: [CommonModule,
         HttpClientModule,
         OAuthModule.forRoot()] });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: SharedAuthModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: SharedAuthModule, decorators: [{
             type: NgModule,
             args: [{
                     declarations: [LoginMenuComponent],

package/fesm2015/meshmakers-shared-auth.mjs CHANGED Viewed

@@ -1,13 +1,13 @@
+import { __awaiter } from 'tslib';
 import * as i0 from '@angular/core';
 import { Injectable, Inject, Component, NgModule } from '@angular/core';
 import { BehaviorSubject, firstValueFrom } from 'rxjs';
-import { map, filter } from 'rxjs/operators';
+import { filter, map } from 'rxjs/operators';
 import * as i1 from 'angular-oauth2-oidc';
 import { OAuthModule } from 'angular-oauth2-oidc';
 import * as i2 from '@angular/common';
 import { CommonModule } from '@angular/common';
 import { HttpClientModule } from '@angular/common/http';
-import { __awaiter } from 'tslib';
 import * as i2$1 from '@angular/router';
 class AuthorizeOptions {
@@ -23,6 +23,8 @@ class AuthorizeService {
         this.authority = new BehaviorSubject(null);
         this.accessToken = new BehaviorSubject(null);
         this.user = new BehaviorSubject(null);
+        this.isInitialized = new BehaviorSubject(false);
+        this.isInitializing = new BehaviorSubject(false);
         console.debug("AuthorizeService::created");
         this.getUser().subscribe(s => {
             this.isAuthenticated.next(!!s);
@@ -30,6 +32,27 @@ class AuthorizeService {
             this.isDeveloper.next(!!s && (s.role.includes("Developers")));
             this.isManager.next(!!s && s.role.includes("Managers"));
         });
+        this.oauthService.events.subscribe(e => {
+            // tslint:disable-next-line:no-console
+            console.debug('oauth/oidc event', e);
+        });
+        this.oauthService.events
+            .pipe(filter(e => e.type === 'session_terminated'))
+            .subscribe(_ => {
+            // tslint:disable-next-line:no-console
+            console.debug('Your session has been terminated!');
+        });
+        this.oauthService.events
+            .pipe(filter(e => e.type === 'token_received'))
+            .subscribe(_ => {
+            this.loadUser();
+        });
+        this.oauthService.events
+            .pipe(filter(e => e.type === 'logout'))
+            .subscribe(_ => {
+            this.accessToken.next(null);
+            this.user.next(null);
+        });
     }
     getRoles() {
         return this.getUser().pipe(map(u => u.role));
@@ -65,47 +88,37 @@ class AuthorizeService {
         this.oauthService.logOut(false);
     }
     initialize() {
-        console.debug("AuthorizeService::initialize::started");
-        const config = {
-            responseType: 'code',
-            issuer: this.authorizeOptions.issuer,
-            redirectUri: this.authorizeOptions.redirectUri,
-            postLogoutRedirectUri: this.authorizeOptions.postLogoutRedirectUri,
-            clientId: this.authorizeOptions.clientId,
-            scope: this.authorizeOptions.scope,
-            showDebugInformation: this.authorizeOptions.showDebugInformation,
-            sessionChecksEnabled: this.authorizeOptions.sessionChecksEnabled
-        };
-        this.oauthService.configure(config);
-        this.oauthService.setStorage(localStorage);
-        this.oauthService.loadDiscoveryDocumentAndTryLogin();
-        this.oauthService.setupAutomaticSilentRefresh();
-        this.oauthService.events.subscribe(e => {
-            // tslint:disable-next-line:no-console
-            console.debug('oauth/oidc event', e);
-        });
-        this.oauthService.events
-            .pipe(filter(e => e.type === 'session_terminated'))
-            .subscribe(_ => {
-            // tslint:disable-next-line:no-console
-            console.debug('Your session has been terminated!');
-        });
-        this.oauthService.events
-            .pipe(filter(e => e.type === 'token_received'))
-            .subscribe(_ => {
-            this.loadUser();
-        });
-        this.oauthService.events
-            .pipe(filter(e => e.type === 'logout'))
-            .subscribe(_ => {
-            this.accessToken.next(null);
-            this.user.next(null);
+        return __awaiter(this, void 0, void 0, function* () {
+            console.debug("AuthorizeService::initialize::started");
+            if (yield firstValueFrom(this.isInitializing)) {
+                return;
+            }
+            if (yield firstValueFrom(this.isInitialized)) {
+                return;
+            }
+            this.isInitializing.next(true);
+            const config = {
+                responseType: 'code',
+                issuer: this.authorizeOptions.issuer,
+                redirectUri: this.authorizeOptions.redirectUri,
+                postLogoutRedirectUri: this.authorizeOptions.postLogoutRedirectUri,
+                clientId: this.authorizeOptions.clientId,
+                scope: this.authorizeOptions.scope,
+                showDebugInformation: this.authorizeOptions.showDebugInformation,
+                sessionChecksEnabled: this.authorizeOptions.sessionChecksEnabled
+            };
+            this.oauthService.configure(config);
+            this.oauthService.setStorage(localStorage);
+            yield this.oauthService.loadDiscoveryDocumentAndTryLogin();
+            this.oauthService.setupAutomaticSilentRefresh();
+            if (this.oauthService.hasValidAccessToken()) {
+                this.loadUser();
+            }
+            this.authority.next(this.authorizeOptions.issuer);
+            this.isInitializing.next(false);
+            this.isInitialized.next(true);
+            console.debug("AuthorizeService::initialize::done");
         });
-        if (this.oauthService.hasValidAccessToken()) {
-            this.loadUser();
-        }
-        this.authority.next(this.authorizeOptions.issuer);
-        console.debug("AuthorizeService::initialize::done");
     }
     loadUser() {
         const claims = this.oauthService.getIdentityClaims();
@@ -119,9 +132,9 @@ class AuthorizeService {
         this.accessToken.next(accessToken);
     }
 }
-AuthorizeService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: AuthorizeService, deps: [{ token: AuthorizeOptions }, { token: i1.OAuthService }], target: i0.ɵɵFactoryTarget.Injectable });
-AuthorizeService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: AuthorizeService });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: AuthorizeService, decorators: [{
+AuthorizeService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: AuthorizeService, deps: [{ token: AuthorizeOptions }, { token: i1.OAuthService }], target: i0.ɵɵFactoryTarget.Injectable });
+AuthorizeService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: AuthorizeService });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: AuthorizeService, decorators: [{
             type: Injectable
         }], ctorParameters: function () {
         return [{ type: AuthorizeOptions, decorators: [{
@@ -153,16 +166,16 @@ class LoginMenuComponent {
     register() {
     }
 }
-LoginMenuComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: LoginMenuComponent, deps: [{ token: AuthorizeService }], target: i0.ɵɵFactoryTarget.Component });
-LoginMenuComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.2.2", type: LoginMenuComponent, selector: "app-login-menu", ngImport: i0, template: "<ul *ngIf=\"isAuthenticated | async\" class=\"navbar-nav\">\r\n  <li class=\"nav-item dropdown\">\r\n    <a aria-expanded=\"false\" aria-haspopup=\"true\" class=\"nav-link dropdown-toggle\" data-toggle=\"dropdown\" href=\"#\"\r\n       id=\"navbarDropdownLogin\" role=\"button\">\r\n      {{ userName | async }} <b class=\"caret\"></b>\r\n    </a>\r\n    <div aria-labelledby=\"navbarDropdown\" class=\"dropdown-menu\">\r\n      <!--<a class=\"dropdown-item\" asp-action=\"Index\" asp-area=\"Authentication\" asp-controller=\"Grants\">Client Application Access</a>-->\r\n      <!--<a class=\"dropdown-item\" [routerLink]='[\"/authentication/profile\"]' title=\"Manage\">Manage</a>-->\r\n      <!--<a class=\"dropdown-item\" asp-action=\"Index\" asp-area=\"Authentication\" asp-controller=\"Diagnostics\">Diagnostics</a>-->\r\n      <div class=\"dropdown-divider\"></div>\r\n      <a (click)='logout()' class=\"dropdown-item\" routerLink=\"\" title=\"Logout\">Logout</a>\r\n    </div>\r\n  </li>\r\n</ul>\r\n<ul *ngIf=\"!(isAuthenticated | async)\" class=\"navbar-nav\">\r\n  <li class=\"nav-item\">\r\n    <a (click)='register()' class=\"nav-link\" routerLink=\"\">Register</a>\r\n  </li>\r\n  <li class=\"nav-item\">\r\n    <a (click)='login()' class=\"nav-link\" routerLink=\"\">Login</a>\r\n  </li>\r\n</ul>\r\n", styles: [""], dependencies: [{ kind: "directive", type: i2.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "pipe", type: i2.AsyncPipe, name: "async" }] });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: LoginMenuComponent, decorators: [{
+LoginMenuComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: LoginMenuComponent, deps: [{ token: AuthorizeService }], target: i0.ɵɵFactoryTarget.Component });
+LoginMenuComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.3", type: LoginMenuComponent, selector: "app-login-menu", ngImport: i0, template: "<ul *ngIf=\"isAuthenticated | async\" class=\"navbar-nav\">\r\n  <li class=\"nav-item dropdown\">\r\n    <a aria-expanded=\"false\" aria-haspopup=\"true\" class=\"nav-link dropdown-toggle\" data-toggle=\"dropdown\" href=\"#\"\r\n       id=\"navbarDropdownLogin\" role=\"button\">\r\n      {{ userName | async }} <b class=\"caret\"></b>\r\n    </a>\r\n    <div aria-labelledby=\"navbarDropdown\" class=\"dropdown-menu\">\r\n      <!--<a class=\"dropdown-item\" asp-action=\"Index\" asp-area=\"Authentication\" asp-controller=\"Grants\">Client Application Access</a>-->\r\n      <!--<a class=\"dropdown-item\" [routerLink]='[\"/authentication/profile\"]' title=\"Manage\">Manage</a>-->\r\n      <!--<a class=\"dropdown-item\" asp-action=\"Index\" asp-area=\"Authentication\" asp-controller=\"Diagnostics\">Diagnostics</a>-->\r\n      <div class=\"dropdown-divider\"></div>\r\n      <a (click)='logout()' class=\"dropdown-item\" routerLink=\"\" title=\"Logout\">Logout</a>\r\n    </div>\r\n  </li>\r\n</ul>\r\n<ul *ngIf=\"!(isAuthenticated | async)\" class=\"navbar-nav\">\r\n  <li class=\"nav-item\">\r\n    <a (click)='register()' class=\"nav-link\" routerLink=\"\">Register</a>\r\n  </li>\r\n  <li class=\"nav-item\">\r\n    <a (click)='login()' class=\"nav-link\" routerLink=\"\">Login</a>\r\n  </li>\r\n</ul>\r\n", styles: [""], dependencies: [{ kind: "directive", type: i2.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "pipe", type: i2.AsyncPipe, name: "async" }] });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: LoginMenuComponent, decorators: [{
             type: Component,
             args: [{ selector: 'app-login-menu', template: "<ul *ngIf=\"isAuthenticated | async\" class=\"navbar-nav\">\r\n  <li class=\"nav-item dropdown\">\r\n    <a aria-expanded=\"false\" aria-haspopup=\"true\" class=\"nav-link dropdown-toggle\" data-toggle=\"dropdown\" href=\"#\"\r\n       id=\"navbarDropdownLogin\" role=\"button\">\r\n      {{ userName | async }} <b class=\"caret\"></b>\r\n    </a>\r\n    <div aria-labelledby=\"navbarDropdown\" class=\"dropdown-menu\">\r\n      <!--<a class=\"dropdown-item\" asp-action=\"Index\" asp-area=\"Authentication\" asp-controller=\"Grants\">Client Application Access</a>-->\r\n      <!--<a class=\"dropdown-item\" [routerLink]='[\"/authentication/profile\"]' title=\"Manage\">Manage</a>-->\r\n      <!--<a class=\"dropdown-item\" asp-action=\"Index\" asp-area=\"Authentication\" asp-controller=\"Diagnostics\">Diagnostics</a>-->\r\n      <div class=\"dropdown-divider\"></div>\r\n      <a (click)='logout()' class=\"dropdown-item\" routerLink=\"\" title=\"Logout\">Logout</a>\r\n    </div>\r\n  </li>\r\n</ul>\r\n<ul *ngIf=\"!(isAuthenticated | async)\" class=\"navbar-nav\">\r\n  <li class=\"nav-item\">\r\n    <a (click)='register()' class=\"nav-link\" routerLink=\"\">Register</a>\r\n  </li>\r\n  <li class=\"nav-item\">\r\n    <a (click)='login()' class=\"nav-link\" routerLink=\"\">Login</a>\r\n  </li>\r\n</ul>\r\n" }]
         }], ctorParameters: function () { return [{ type: AuthorizeService }]; } });
 class AuthorizeGuard {
-    constructor(authorize, router) {
-        this.authorize = authorize;
+    constructor(authorizeService, router) {
+        this.authorizeService = authorizeService;
         this.router = router;
     }
     canActivate(next, state) {
@@ -180,9 +193,10 @@ class AuthorizeGuard {
     }
     handleAuthorization(route, url) {
         return __awaiter(this, void 0, void 0, function* () {
-            const isAuthenticated = yield firstValueFrom(this.authorize.getIsAuthenticated());
+            yield this.authorizeService.initialize();
+            const isAuthenticated = yield firstValueFrom(this.authorizeService.getIsAuthenticated());
             if (isAuthenticated) {
-                const userRoles = yield firstValueFrom(this.authorize.getRoles());
+                const userRoles = yield firstValueFrom(this.authorizeService.getRoles());
                 if (route.data.roles && !route.data.roles.filter(value => userRoles.includes(value))) {
                     this.router.navigate(['']);
                     return false;
@@ -190,15 +204,15 @@ class AuthorizeGuard {
                 return true;
             }
             else {
-                this.authorize.login();
+                this.authorizeService.login();
             }
             return false;
         });
     }
 }
-AuthorizeGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: AuthorizeGuard, deps: [{ token: AuthorizeService }, { token: i2$1.Router }], target: i0.ɵɵFactoryTarget.Injectable });
-AuthorizeGuard.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: AuthorizeGuard });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: AuthorizeGuard, decorators: [{
+AuthorizeGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: AuthorizeGuard, deps: [{ token: AuthorizeService }, { token: i2$1.Router }], target: i0.ɵɵFactoryTarget.Injectable });
+AuthorizeGuard.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: AuthorizeGuard });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: AuthorizeGuard, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: AuthorizeService }, { type: i2$1.Router }]; } });
@@ -217,13 +231,13 @@ class SharedAuthModule {
         };
     }
 }
-SharedAuthModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: SharedAuthModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-SharedAuthModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.2.2", ngImport: i0, type: SharedAuthModule, declarations: [LoginMenuComponent], imports: [CommonModule,
+SharedAuthModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: SharedAuthModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+SharedAuthModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "15.2.3", ngImport: i0, type: SharedAuthModule, declarations: [LoginMenuComponent], imports: [CommonModule,
         HttpClientModule, i1.OAuthModule], exports: [LoginMenuComponent] });
-SharedAuthModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: SharedAuthModule, imports: [CommonModule,
+SharedAuthModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: SharedAuthModule, imports: [CommonModule,
         HttpClientModule,
         OAuthModule.forRoot()] });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: SharedAuthModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: SharedAuthModule, decorators: [{
             type: NgModule,
             args: [{
                     declarations: [LoginMenuComponent],
@@ -288,9 +302,9 @@ class AuthorizeInterceptor {
         return false;
     }
 }
-AuthorizeInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: AuthorizeInterceptor, deps: [{ token: AuthorizeService }], target: i0.ɵɵFactoryTarget.Injectable });
-AuthorizeInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: AuthorizeInterceptor });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: AuthorizeInterceptor, decorators: [{
+AuthorizeInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: AuthorizeInterceptor, deps: [{ token: AuthorizeService }], target: i0.ɵɵFactoryTarget.Injectable });
+AuthorizeInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: AuthorizeInterceptor });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: AuthorizeInterceptor, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: AuthorizeService }]; } });

package/fesm2015/meshmakers-shared-auth.mjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"meshmakers-shared-auth.mjs","sources":["../../../../projects/meshmakers/shared-auth/src/lib/authorize.service.ts","../../../../projects/meshmakers/shared-auth/src/lib/login-menu/login-menu.component.ts","../../../../projects/meshmakers/shared-auth/src/lib/login-menu/login-menu.component.html","../../../../projects/meshmakers/shared-auth/src/lib/authorize.guard.ts","../../../../projects/meshmakers/shared-auth/src/lib/shared-auth.module.ts","../../../../projects/meshmakers/shared-auth/src/lib/authorize.interceptor.ts","../../../../projects/meshmakers/shared-auth/src/public-api.ts","../../../../projects/meshmakers/shared-auth/src/meshmakers-shared-auth.ts"],"sourcesContent":["import {Inject, Injectable} from '@angular/core';\r\nimport {BehaviorSubject, Observable} from 'rxjs';\r\nimport {filter, map} from 'rxjs/operators';\r\nimport {AuthConfig, OAuthService} from \"angular-oauth2-oidc\";\r\n\r\nexport interface IUser {\r\n name: string;\r\n role: string[];\r\n}\r\n\r\nexport class AuthorizeOptions {\r\n wellKnownServiceUris: string[];\r\n // Url of the Identity Provider\r\n issuer: string;\r\n // URL of the SPA to redirect the user to after login\r\n redirectUri: string;\r\n postLogoutRedirectUri: string;\r\n // The SPA's id. The SPA is registered with this id at the auth-server\r\n clientId: string;\r\n // set the scope for the permissions the client should request\r\n // The first three are defined by OIDC. The 4th is a use case-specific one\r\n scope: string;\r\n showDebugInformation: boolean;\r\n sessionChecksEnabled: boolean;\r\n}\r\n\r\n@Injectable()\r\nexport class AuthorizeService {\r\n private isAuthenticated: BehaviorSubject<boolean> = new BehaviorSubject(false);\r\n private isAdmin: BehaviorSubject<boolean> = new BehaviorSubject(false);\r\n private isDeveloper: BehaviorSubject<boolean> = new BehaviorSubject(false);\r\n private isManager: BehaviorSubject<boolean> = new BehaviorSubject(false);\r\n private authority: BehaviorSubject<string> = new BehaviorSubject(null);\r\n private accessToken: BehaviorSubject<string> = new BehaviorSubject(null);\r\n private user: BehaviorSubject<IUser> = new BehaviorSubject(null);\r\n\r\n constructor(@Inject(AuthorizeOptions) private authorizeOptions: AuthorizeOptions, private oauthService: OAuthService) {\r\n console.debug(\"AuthorizeService::created\");\r\n this.getUser().subscribe(s => {\r\n this.isAuthenticated.next(!!s);\r\n this.isAdmin.next(!!s && (s.role.includes(\"Administrators\")));\r\n this.isDeveloper.next(!!s && (s.role.includes(\"Developers\")));\r\n this.isManager.next(!!s && s.role.includes(\"Managers\"));\r\n });\r\n }\r\n\r\n public getRoles(): Observable<Array<string>>{\r\n return this.getUser().pipe(\r\n map(u=> u.role)\r\n );\r\n }\r\n\r\n public getServiceUris(): Array<string> {\r\n return this.authorizeOptions.wellKnownServiceUris;\r\n }\r\n\r\n public getAuthority(): BehaviorSubject<string> {\r\n return this.authority;\r\n }\r\n\r\n public getIsAuthenticated(): BehaviorSubject<boolean> {\r\n return this.isAuthenticated;\r\n }\r\n\r\n public getIsAdmin(): BehaviorSubject<boolean> {\r\n return this.isAdmin;\r\n }\r\n\r\n public getIsDeveloper(): BehaviorSubject<boolean> {\r\n return this.isDeveloper;\r\n }\r\n\r\n public getIsManager(): BehaviorSubject<boolean> {\r\n return this.isManager;\r\n }\r\n\r\n public getAccessToken(): BehaviorSubject<string> {\r\n return this.accessToken;\r\n }\r\n\r\n public getUser(): BehaviorSubject<IUser> {\r\n return this.user;\r\n }\r\n\r\n public login() {\r\n this.oauthService.initImplicitFlow();\r\n }\r\n\r\n public logout() {\r\n this.oauthService.logOut(false);\r\n }\r\n\r\n\r\n public initialize() {\r\n\r\n console.debug(\"AuthorizeService::initialize::started\");\r\n\r\n const config: AuthConfig = {\r\n responseType: 'code',\r\n issuer: this.authorizeOptions.issuer,\r\n redirectUri: this.authorizeOptions.redirectUri,\r\n postLogoutRedirectUri: this.authorizeOptions.postLogoutRedirectUri,\r\n clientId: this.authorizeOptions.clientId,\r\n scope: this.authorizeOptions.scope,\r\n showDebugInformation: this.authorizeOptions.showDebugInformation,\r\n sessionChecksEnabled: this.authorizeOptions.sessionChecksEnabled\r\n };\r\n\r\n this.oauthService.configure(config);\r\n this.oauthService.setStorage(localStorage);\r\n this.oauthService.loadDiscoveryDocumentAndTryLogin();\r\n\r\n this.oauthService.setupAutomaticSilentRefresh();\r\n\r\n this.oauthService.events.subscribe(e => {\r\n // tslint:disable-next-line:no-console\r\n console.debug('oauth/oidc event', e);\r\n });\r\n\r\n this.oauthService.events\r\n .pipe(filter(e => e.type === 'session_terminated'))\r\n .subscribe(_ => {\r\n // tslint:disable-next-line:no-console\r\n console.debug('Your session has been terminated!');\r\n });\r\n\r\n this.oauthService.events\r\n .pipe(filter(e => e.type === 'token_received'))\r\n .subscribe(_ => {\r\n this.loadUser();\r\n });\r\n\r\n this.oauthService.events\r\n .pipe(filter(e => e.type === 'logout'))\r\n .subscribe(_ => {\r\n this.accessToken.next(null);\r\n this.user.next(null);\r\n });\r\n\r\n if (this.oauthService.hasValidAccessToken()) {\r\n this.loadUser();\r\n }\r\n\r\n this.authority.next(this.authorizeOptions.issuer);\r\n\r\n console.debug(\"AuthorizeService::initialize::done\");\r\n\r\n }\r\n\r\n private loadUser() {\r\n const claims = this.oauthService.getIdentityClaims();\r\n if (!claims) {\r\n console.error(\"claims where null when loading identity claims\");\r\n return;\r\n }\r\n\r\n const user = <IUser>claims;\r\n const accessToken = this.oauthService.getAccessToken();\r\n this.user.next(user);\r\n this.accessToken.next(accessToken);\r\n }\r\n}\r\n","import {Component, OnInit} from '@angular/core';\r\nimport {AuthorizeService} from '../authorize.service';\r\nimport {BehaviorSubject, Observable} from 'rxjs';\r\nimport {map} from 'rxjs/operators';\r\n\r\n@Component({\r\n selector: 'app-login-menu',\r\n templateUrl: './login-menu.component.html',\r\n styleUrls: ['./login-menu.component.css']\r\n})\r\nexport class LoginMenuComponent implements OnInit {\r\n public isAuthenticated: BehaviorSubject<boolean>;\r\n public userName: Observable<string>;\r\n public isAdmin: Observable<boolean>;\r\n\r\n constructor(private authorizeService: AuthorizeService) {\r\n }\r\n\r\n ngOnInit() {\r\n const isIFrame = window.self !== window.top;\r\n\r\n console.log(\"app-login-menu::created\");\r\n\r\n this.isAuthenticated = this.authorizeService.getIsAuthenticated();\r\n this.userName = this.authorizeService.getUser().pipe(map(u => u && u.name));\r\n this.isAdmin = this.authorizeService.getIsAdmin();\r\n\r\n this.isAuthenticated.subscribe(x => {\r\n\r\n console.log(`isAuthenticated changed to ${x} (iframe ${isIFrame})`);\r\n });\r\n }\r\n\r\n public login() {\r\n this.authorizeService.login();\r\n }\r\n\r\n public logout() {\r\n this.authorizeService.logout();\r\n }\r\n\r\n public register() {\r\n\r\n }\r\n}\r\n","<ul ngIf=\"isAuthenticated \| async\" class=\"navbar-nav\">\r\n <li class=\"nav-item dropdown\">\r\n <a aria-expanded=\"false\" aria-haspopup=\"true\" class=\"nav-link dropdown-toggle\" data-toggle=\"dropdown\" href=\"#\"\r\n id=\"navbarDropdownLogin\" role=\"button\">\r\n {{ userName \| async }} <b class=\"caret\"></b>\r\n </a>\r\n <div aria-labelledby=\"navbarDropdown\" class=\"dropdown-menu\">\r\n <!--<a class=\"dropdown-item\" asp-action=\"Index\" asp-area=\"Authentication\" asp-controller=\"Grants\">Client Application Access</a>-->\r\n <!--<a class=\"dropdown-item\" [routerLink]='[\"/authentication/profile\"]' title=\"Manage\">Manage</a>-->\r\n <!--<a class=\"dropdown-item\" asp-action=\"Index\" asp-area=\"Authentication\" asp-controller=\"Diagnostics\">Diagnostics</a>-->\r\n <div class=\"dropdown-divider\"></div>\r\n <a (click)='logout()' class=\"dropdown-item\" routerLink=\"\" title=\"Logout\">Logout</a>\r\n </div>\r\n </li>\r\n</ul>\r\n<ul ngIf=\"!(isAuthenticated \| async)\" class=\"navbar-nav\">\r\n <li class=\"nav-item\">\r\n <a (click)='register()' class=\"nav-link\" routerLink=\"\">Register</a>\r\n </li>\r\n <li class=\"nav-item\">\r\n <a (click)='login()' class=\"nav-link\" routerLink=\"\">Login</a>\r\n </li>\r\n</ul>\r\n","import {Injectable} from '@angular/core';\r\nimport {\r\n ActivatedRouteSnapshot,\r\n CanActivate,\r\n CanActivateChild,\r\n CanDeactivate,\r\n CanLoad, Route,\r\n Router,\r\n RouterStateSnapshot, UrlSegment,\r\n UrlTree\r\n} from '@angular/router';\r\nimport {AuthorizeService} from './authorize.service';\r\nimport {firstValueFrom, lastValueFrom, Observable} from \"rxjs\";\r\n\r\n@Injectable()\r\nexport class AuthorizeGuard implements CanActivate, CanActivateChild, CanDeactivate<unknown>, CanLoad {\r\n constructor(private authorize: AuthorizeService, private router: Router) {\r\n }\r\n\r\n canActivate(\r\n next: ActivatedRouteSnapshot,\r\n state: RouterStateSnapshot): Observable<boolean \| UrlTree> \| Promise<boolean \| UrlTree> \| boolean \| UrlTree {\r\n let url: string = state.url;\r\n return this.handleAuthorization(next, url);\r\n }\r\n\r\n canActivateChild(\r\n next: ActivatedRouteSnapshot,\r\n state: RouterStateSnapshot): Observable<boolean \| UrlTree> \| Promise<boolean \| UrlTree> \| boolean \| UrlTree {\r\n return this.canActivate(next, state);\r\n }\r\n\r\n canDeactivate(\r\n component: unknown,\r\n currentRoute: ActivatedRouteSnapshot,\r\n currentState: RouterStateSnapshot,\r\n nextState?: RouterStateSnapshot): Observable<boolean \| UrlTree> \| Promise<boolean \| UrlTree> \| boolean \| UrlTree {\r\n return true;\r\n }\r\n\r\n canLoad(\r\n route: Route,\r\n segments: UrlSegment[]): Observable<boolean> \| Promise<boolean> \| boolean {\r\n return true;\r\n }\r\n\r\n private async handleAuthorization(route: ActivatedRouteSnapshot, url: any): Promise<boolean> {\r\n const isAuthenticated = await firstValueFrom(this.authorize.getIsAuthenticated());\r\n if (isAuthenticated) {\r\n const userRoles = await firstValueFrom(this.authorize.getRoles());\r\n if (route.data.roles && !route.data.roles.filter(value => userRoles.includes(value))) {\r\n this.router.navigate(['']);\r\n return false;\r\n }\r\n return true;\r\n } else {\r\n this.authorize.login();\r\n }\r\n\r\n return false;\r\n }\r\n}\r\n","import {ModuleWithProviders, NgModule} from '@angular/core';\r\nimport {CommonModule} from \"@angular/common\";\r\nimport {HttpClientModule} from \"@angular/common/http\";\r\nimport {LoginMenuComponent} from \"./login-menu/login-menu.component\";\r\nimport {AuthorizeOptions, AuthorizeService} from \"./authorize.service\";\r\nimport {OAuthModule} from \"angular-oauth2-oidc\";\r\nimport {AuthorizeGuard} from \"./authorize.guard\";\r\n\r\n@NgModule({\r\n declarations: [LoginMenuComponent],\r\n exports: [LoginMenuComponent],\r\n providers: [],\r\n imports: [\r\n CommonModule,\r\n HttpClientModule,\r\n OAuthModule.forRoot()\r\n ]\r\n})\r\nexport class SharedAuthModule {\r\n static forRoot(authorizeOptions: AuthorizeOptions): ModuleWithProviders<SharedAuthModule> {\r\n return {\r\n ngModule: SharedAuthModule,\r\n providers: [\r\n {\r\n provide: AuthorizeOptions,\r\n useValue: authorizeOptions\r\n },\r\n AuthorizeService,\r\n AuthorizeGuard\r\n ]\r\n }\r\n }\r\n}\r\n","import {Injectable} from '@angular/core';\r\nimport {HttpEvent, HttpHandler, HttpInterceptor, HttpRequest} from '@angular/common/http';\r\nimport {Observable} from 'rxjs';\r\nimport {AuthorizeService} from './authorize.service';\r\n\r\n@Injectable()\r\nexport class AuthorizeInterceptor implements HttpInterceptor {\r\n\r\n accessToken: string;\r\n\r\n constructor(private authorize: AuthorizeService) {\r\n\r\n authorize.getAccessToken().subscribe(value => this.accessToken = value);\r\n\r\n }\r\n\r\n private static isSameOriginUrl(req: any) {\r\n // It's an absolute url with the same origin.\r\n if (req.url.startsWith(`${window.location.origin}/`)) {\r\n return true;\r\n }\r\n\r\n // It's a protocol relative url with the same origin.\r\n // For example: //www.example.com/api/Products\r\n if (req.url.startsWith(`//${window.location.host}/`)) {\r\n return true;\r\n }\r\n\r\n // It's a relative url like /api/Products\r\n if (/^\\/[^\\/]./.test(req.url)) {\r\n return true;\r\n }\r\n\r\n // It's an absolute or protocol relative url that\r\n // doesn't have the same origin.\r\n return false;\r\n }\r\n\r\n // Checks if there is an access_token available in the authorize service\r\n // and adds it to the request in case it's targeted at the same origin as the\r\n\r\n intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {\r\n return this.processRequestWithToken(this.accessToken, req, next);\r\n }\r\n\r\n // single page application.\r\n private processRequestWithToken(token: string, req: HttpRequest<any>, next: HttpHandler) {\r\n if (!!token && (AuthorizeInterceptor.isSameOriginUrl(req) \|\| this.isKnownServiceUri(req))) {\r\n req = req.clone({\r\n setHeaders: {\r\n Authorization: `Bearer ${token}`\r\n }\r\n });\r\n }\r\n\r\n return next.handle(req);\r\n }\r\n\r\n private isKnownServiceUri(req: any) {\r\n\r\n const serviceUris = this.authorize.getServiceUris();\r\n\r\n for (let i = 0; i < serviceUris.length; i++) {\r\n if (req.url.startsWith(`${serviceUris[i]}`)) {\r\n return true;\r\n }\r\n }\r\n\r\n // It's an absolute or protocol relative url that\r\n // doesn't have the same origin.\r\n return false;\r\n }\r\n}\r\n","/\r\n * Public API Surface of shared-auth\r\n /\r\n\r\nexport from './lib/authorize.service';\r\nexport * from './lib/login-menu/login-menu.component';\r\nexport * from './lib/shared-auth.module';\r\nexport * from './lib/authorize.interceptor';\r\nexport * from './lib/authorize.guard';\r\n","/*\n Generated bundle index. Do not edit.\n /\n\nexport from './public-api';\n"],"names":["i1.AuthorizeService","i2"],"mappings":"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"}
1	+ {"version":3,"file":"meshmakers-shared-auth.mjs","sources":["../../../../projects/meshmakers/shared-auth/src/lib/authorize.service.ts","../../../../projects/meshmakers/shared-auth/src/lib/login-menu/login-menu.component.ts","../../../../projects/meshmakers/shared-auth/src/lib/login-menu/login-menu.component.html","../../../../projects/meshmakers/shared-auth/src/lib/authorize.guard.ts","../../../../projects/meshmakers/shared-auth/src/lib/shared-auth.module.ts","../../../../projects/meshmakers/shared-auth/src/lib/authorize.interceptor.ts","../../../../projects/meshmakers/shared-auth/src/public-api.ts","../../../../projects/meshmakers/shared-auth/src/meshmakers-shared-auth.ts"],"sourcesContent":["import {Inject, Injectable} from '@angular/core';\r\nimport {BehaviorSubject, firstValueFrom, Observable} from 'rxjs';\r\nimport {filter, map} from 'rxjs/operators';\r\nimport {AuthConfig, OAuthService} from \"angular-oauth2-oidc\";\r\n\r\nexport interface IUser {\r\n name: string;\r\n role: string[];\r\n}\r\n\r\nexport class AuthorizeOptions {\r\n wellKnownServiceUris: string[];\r\n // Url of the Identity Provider\r\n issuer: string;\r\n // URL of the SPA to redirect the user to after login\r\n redirectUri: string;\r\n postLogoutRedirectUri: string;\r\n // The SPA's id. The SPA is registered with this id at the auth-server\r\n clientId: string;\r\n // set the scope for the permissions the client should request\r\n // The first three are defined by OIDC. The 4th is a use case-specific one\r\n scope: string;\r\n showDebugInformation: boolean;\r\n sessionChecksEnabled: boolean;\r\n}\r\n\r\n@Injectable()\r\nexport class AuthorizeService {\r\n private isAuthenticated: BehaviorSubject<boolean> = new BehaviorSubject(false);\r\n private isAdmin: BehaviorSubject<boolean> = new BehaviorSubject(false);\r\n private isDeveloper: BehaviorSubject<boolean> = new BehaviorSubject(false);\r\n private isManager: BehaviorSubject<boolean> = new BehaviorSubject(false);\r\n private authority: BehaviorSubject<string> = new BehaviorSubject(null);\r\n private accessToken: BehaviorSubject<string> = new BehaviorSubject(null);\r\n private user: BehaviorSubject<IUser> = new BehaviorSubject(null);\r\n private isInitialized : BehaviorSubject<boolean> = new BehaviorSubject(false);\r\n private isInitializing : BehaviorSubject<boolean> = new BehaviorSubject(false);\r\n\r\n constructor(@Inject(AuthorizeOptions) private authorizeOptions: AuthorizeOptions, private oauthService: OAuthService) {\r\n console.debug(\"AuthorizeService::created\");\r\n\r\n this.getUser().subscribe(s => {\r\n this.isAuthenticated.next(!!s);\r\n this.isAdmin.next(!!s && (s.role.includes(\"Administrators\")));\r\n this.isDeveloper.next(!!s && (s.role.includes(\"Developers\")));\r\n this.isManager.next(!!s && s.role.includes(\"Managers\"));\r\n });\r\n\r\n this.oauthService.events.subscribe(e => {\r\n // tslint:disable-next-line:no-console\r\n console.debug('oauth/oidc event', e);\r\n });\r\n\r\n this.oauthService.events\r\n .pipe(filter(e => e.type === 'session_terminated'))\r\n .subscribe(_ => {\r\n // tslint:disable-next-line:no-console\r\n console.debug('Your session has been terminated!');\r\n });\r\n\r\n this.oauthService.events\r\n .pipe(filter(e => e.type === 'token_received'))\r\n .subscribe(_ => {\r\n this.loadUser();\r\n });\r\n\r\n this.oauthService.events\r\n .pipe(filter(e => e.type === 'logout'))\r\n .subscribe(_ => {\r\n this.accessToken.next(null);\r\n this.user.next(null);\r\n });\r\n\r\n }\r\n\r\n public getRoles(): Observable<Array<string>>{\r\n return this.getUser().pipe(\r\n map(u=> u.role)\r\n );\r\n }\r\n\r\n public getServiceUris(): Array<string> {\r\n return this.authorizeOptions.wellKnownServiceUris;\r\n }\r\n\r\n public getAuthority(): BehaviorSubject<string> {\r\n return this.authority;\r\n }\r\n\r\n public getIsAuthenticated(): BehaviorSubject<boolean> {\r\n return this.isAuthenticated;\r\n }\r\n\r\n public getIsAdmin(): BehaviorSubject<boolean> {\r\n return this.isAdmin;\r\n }\r\n\r\n public getIsDeveloper(): BehaviorSubject<boolean> {\r\n return this.isDeveloper;\r\n }\r\n\r\n public getIsManager(): BehaviorSubject<boolean> {\r\n return this.isManager;\r\n }\r\n\r\n public getAccessToken(): BehaviorSubject<string> {\r\n return this.accessToken;\r\n }\r\n\r\n public getUser(): BehaviorSubject<IUser> {\r\n return this.user;\r\n }\r\n\r\n public login() {\r\n this.oauthService.initImplicitFlow();\r\n }\r\n\r\n public logout() {\r\n this.oauthService.logOut(false);\r\n }\r\n\r\n\r\n public async initialize() {\r\n\r\n console.debug(\"AuthorizeService::initialize::started\");\r\n\r\n if (await firstValueFrom(this.isInitializing)) {\r\n return\r\n }\r\n if (await firstValueFrom(this.isInitialized)) {\r\n return;\r\n }\r\n this.isInitializing.next(true);\r\n\r\n const config: AuthConfig = {\r\n responseType: 'code',\r\n issuer: this.authorizeOptions.issuer,\r\n redirectUri: this.authorizeOptions.redirectUri,\r\n postLogoutRedirectUri: this.authorizeOptions.postLogoutRedirectUri,\r\n clientId: this.authorizeOptions.clientId,\r\n scope: this.authorizeOptions.scope,\r\n showDebugInformation: this.authorizeOptions.showDebugInformation,\r\n sessionChecksEnabled: this.authorizeOptions.sessionChecksEnabled\r\n };\r\n\r\n this.oauthService.configure(config);\r\n this.oauthService.setStorage(localStorage);\r\n await this.oauthService.loadDiscoveryDocumentAndTryLogin();\r\n\r\n this.oauthService.setupAutomaticSilentRefresh();\r\n\r\n if (this.oauthService.hasValidAccessToken()) {\r\n this.loadUser();\r\n }\r\n\r\n this.authority.next(this.authorizeOptions.issuer);\r\n this.isInitializing.next(false);\r\n this.isInitialized.next(true);\r\n\r\n console.debug(\"AuthorizeService::initialize::done\");\r\n }\r\n\r\n private loadUser() {\r\n const claims = this.oauthService.getIdentityClaims();\r\n if (!claims) {\r\n console.error(\"claims where null when loading identity claims\");\r\n return;\r\n }\r\n\r\n const user = <IUser>claims;\r\n const accessToken = this.oauthService.getAccessToken();\r\n this.user.next(user);\r\n this.accessToken.next(accessToken);\r\n }\r\n}\r\n","import {Component, OnInit} from '@angular/core';\r\nimport {AuthorizeService} from '../authorize.service';\r\nimport {BehaviorSubject, Observable} from 'rxjs';\r\nimport {map} from 'rxjs/operators';\r\n\r\n@Component({\r\n selector: 'app-login-menu',\r\n templateUrl: './login-menu.component.html',\r\n styleUrls: ['./login-menu.component.css']\r\n})\r\nexport class LoginMenuComponent implements OnInit {\r\n public isAuthenticated: BehaviorSubject<boolean>;\r\n public userName: Observable<string>;\r\n public isAdmin: Observable<boolean>;\r\n\r\n constructor(private authorizeService: AuthorizeService) {\r\n }\r\n\r\n ngOnInit() {\r\n const isIFrame = window.self !== window.top;\r\n\r\n console.log(\"app-login-menu::created\");\r\n\r\n this.isAuthenticated = this.authorizeService.getIsAuthenticated();\r\n this.userName = this.authorizeService.getUser().pipe(map(u => u && u.name));\r\n this.isAdmin = this.authorizeService.getIsAdmin();\r\n\r\n this.isAuthenticated.subscribe(x => {\r\n\r\n console.log(`isAuthenticated changed to ${x} (iframe ${isIFrame})`);\r\n });\r\n }\r\n\r\n public login() {\r\n this.authorizeService.login();\r\n }\r\n\r\n public logout() {\r\n this.authorizeService.logout();\r\n }\r\n\r\n public register() {\r\n\r\n }\r\n}\r\n","<ul ngIf=\"isAuthenticated \| async\" class=\"navbar-nav\">\r\n <li class=\"nav-item dropdown\">\r\n <a aria-expanded=\"false\" aria-haspopup=\"true\" class=\"nav-link dropdown-toggle\" data-toggle=\"dropdown\" href=\"#\"\r\n id=\"navbarDropdownLogin\" role=\"button\">\r\n {{ userName \| async }} <b class=\"caret\"></b>\r\n </a>\r\n <div aria-labelledby=\"navbarDropdown\" class=\"dropdown-menu\">\r\n <!--<a class=\"dropdown-item\" asp-action=\"Index\" asp-area=\"Authentication\" asp-controller=\"Grants\">Client Application Access</a>-->\r\n <!--<a class=\"dropdown-item\" [routerLink]='[\"/authentication/profile\"]' title=\"Manage\">Manage</a>-->\r\n <!--<a class=\"dropdown-item\" asp-action=\"Index\" asp-area=\"Authentication\" asp-controller=\"Diagnostics\">Diagnostics</a>-->\r\n <div class=\"dropdown-divider\"></div>\r\n <a (click)='logout()' class=\"dropdown-item\" routerLink=\"\" title=\"Logout\">Logout</a>\r\n </div>\r\n </li>\r\n</ul>\r\n<ul ngIf=\"!(isAuthenticated \| async)\" class=\"navbar-nav\">\r\n <li class=\"nav-item\">\r\n <a (click)='register()' class=\"nav-link\" routerLink=\"\">Register</a>\r\n </li>\r\n <li class=\"nav-item\">\r\n <a (click)='login()' class=\"nav-link\" routerLink=\"\">Login</a>\r\n </li>\r\n</ul>\r\n","import {Injectable} from '@angular/core';\r\nimport {\r\n ActivatedRouteSnapshot,\r\n CanActivate,\r\n CanActivateChild,\r\n CanDeactivate,\r\n CanLoad, Route,\r\n Router,\r\n RouterStateSnapshot, UrlSegment,\r\n UrlTree\r\n} from '@angular/router';\r\nimport {AuthorizeService} from './authorize.service';\r\nimport {firstValueFrom, lastValueFrom, Observable} from \"rxjs\";\r\n\r\n@Injectable()\r\nexport class AuthorizeGuard implements CanActivate, CanActivateChild, CanDeactivate<unknown>, CanLoad {\r\n constructor(private authorizeService: AuthorizeService, private router: Router) {\r\n }\r\n\r\n canActivate(\r\n next: ActivatedRouteSnapshot,\r\n state: RouterStateSnapshot): Observable<boolean \| UrlTree> \| Promise<boolean \| UrlTree> \| boolean \| UrlTree {\r\n let url: string = state.url;\r\n return this.handleAuthorization(next, url);\r\n }\r\n\r\n canActivateChild(\r\n next: ActivatedRouteSnapshot,\r\n state: RouterStateSnapshot): Observable<boolean \| UrlTree> \| Promise<boolean \| UrlTree> \| boolean \| UrlTree {\r\n return this.canActivate(next, state);\r\n }\r\n\r\n canDeactivate(\r\n component: unknown,\r\n currentRoute: ActivatedRouteSnapshot,\r\n currentState: RouterStateSnapshot,\r\n nextState?: RouterStateSnapshot): Observable<boolean \| UrlTree> \| Promise<boolean \| UrlTree> \| boolean \| UrlTree {\r\n return true;\r\n }\r\n\r\n canLoad(\r\n route: Route,\r\n segments: UrlSegment[]): Observable<boolean> \| Promise<boolean> \| boolean {\r\n return true;\r\n }\r\n\r\n private async handleAuthorization(route: ActivatedRouteSnapshot, url: any): Promise<boolean> {\r\n\r\n await this.authorizeService.initialize()\r\n\r\n const isAuthenticated = await firstValueFrom(this.authorizeService.getIsAuthenticated());\r\n if (isAuthenticated) {\r\n const userRoles = await firstValueFrom(this.authorizeService.getRoles());\r\n if (route.data.roles && !route.data.roles.filter(value => userRoles.includes(value))) {\r\n this.router.navigate(['']);\r\n return false;\r\n }\r\n return true;\r\n } else {\r\n this.authorizeService.login();\r\n }\r\n\r\n return false;\r\n }\r\n}\r\n","import {ModuleWithProviders, NgModule} from '@angular/core';\r\nimport {CommonModule} from \"@angular/common\";\r\nimport {HttpClientModule} from \"@angular/common/http\";\r\nimport {LoginMenuComponent} from \"./login-menu/login-menu.component\";\r\nimport {AuthorizeOptions, AuthorizeService} from \"./authorize.service\";\r\nimport {OAuthModule} from \"angular-oauth2-oidc\";\r\nimport {AuthorizeGuard} from \"./authorize.guard\";\r\n\r\n@NgModule({\r\n declarations: [LoginMenuComponent],\r\n exports: [LoginMenuComponent],\r\n providers: [],\r\n imports: [\r\n CommonModule,\r\n HttpClientModule,\r\n OAuthModule.forRoot()\r\n ]\r\n})\r\nexport class SharedAuthModule {\r\n static forRoot(authorizeOptions: AuthorizeOptions): ModuleWithProviders<SharedAuthModule> {\r\n return {\r\n ngModule: SharedAuthModule,\r\n providers: [\r\n {\r\n provide: AuthorizeOptions,\r\n useValue: authorizeOptions\r\n },\r\n AuthorizeService,\r\n AuthorizeGuard\r\n ]\r\n }\r\n }\r\n}\r\n","import {Injectable} from '@angular/core';\r\nimport {HttpEvent, HttpHandler, HttpInterceptor, HttpRequest} from '@angular/common/http';\r\nimport {Observable} from 'rxjs';\r\nimport {AuthorizeService} from './authorize.service';\r\n\r\n@Injectable()\r\nexport class AuthorizeInterceptor implements HttpInterceptor {\r\n\r\n accessToken: string;\r\n\r\n constructor(private authorize: AuthorizeService) {\r\n\r\n authorize.getAccessToken().subscribe(value => this.accessToken = value);\r\n\r\n }\r\n\r\n private static isSameOriginUrl(req: any) {\r\n // It's an absolute url with the same origin.\r\n if (req.url.startsWith(`${window.location.origin}/`)) {\r\n return true;\r\n }\r\n\r\n // It's a protocol relative url with the same origin.\r\n // For example: //www.example.com/api/Products\r\n if (req.url.startsWith(`//${window.location.host}/`)) {\r\n return true;\r\n }\r\n\r\n // It's a relative url like /api/Products\r\n if (/^\\/[^\\/]./.test(req.url)) {\r\n return true;\r\n }\r\n\r\n // It's an absolute or protocol relative url that\r\n // doesn't have the same origin.\r\n return false;\r\n }\r\n\r\n // Checks if there is an access_token available in the authorize service\r\n // and adds it to the request in case it's targeted at the same origin as the\r\n\r\n intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {\r\n return this.processRequestWithToken(this.accessToken, req, next);\r\n }\r\n\r\n // single page application.\r\n private processRequestWithToken(token: string, req: HttpRequest<any>, next: HttpHandler) {\r\n if (!!token && (AuthorizeInterceptor.isSameOriginUrl(req) \|\| this.isKnownServiceUri(req))) {\r\n req = req.clone({\r\n setHeaders: {\r\n Authorization: `Bearer ${token}`\r\n }\r\n });\r\n }\r\n\r\n return next.handle(req);\r\n }\r\n\r\n private isKnownServiceUri(req: any) {\r\n\r\n const serviceUris = this.authorize.getServiceUris();\r\n\r\n for (let i = 0; i < serviceUris.length; i++) {\r\n if (req.url.startsWith(`${serviceUris[i]}`)) {\r\n return true;\r\n }\r\n }\r\n\r\n // It's an absolute or protocol relative url that\r\n // doesn't have the same origin.\r\n return false;\r\n }\r\n}\r\n","/\r\n * Public API Surface of shared-auth\r\n /\r\n\r\nexport from './lib/authorize.service';\r\nexport * from './lib/login-menu/login-menu.component';\r\nexport * from './lib/shared-auth.module';\r\nexport * from './lib/authorize.interceptor';\r\nexport * from './lib/authorize.guard';\r\n","/*\n Generated bundle index. Do not edit.\n /\n\nexport from './public-api';\n"],"names":["i1.AuthorizeService","i2"],"mappings":"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"}

package/fesm2020/meshmakers-shared-auth.mjs CHANGED Viewed

@@ -1,7 +1,7 @@
 import * as i0 from '@angular/core';
 import { Injectable, Inject, Component, NgModule } from '@angular/core';
 import { BehaviorSubject, firstValueFrom } from 'rxjs';
-import { map, filter } from 'rxjs/operators';
+import { filter, map } from 'rxjs/operators';
 import * as i1 from 'angular-oauth2-oidc';
 import { OAuthModule } from 'angular-oauth2-oidc';
 import * as i2 from '@angular/common';
@@ -22,6 +22,8 @@ class AuthorizeService {
         this.authority = new BehaviorSubject(null);
         this.accessToken = new BehaviorSubject(null);
         this.user = new BehaviorSubject(null);
+        this.isInitialized = new BehaviorSubject(false);
+        this.isInitializing = new BehaviorSubject(false);
         console.debug("AuthorizeService::created");
         this.getUser().subscribe(s => {
             this.isAuthenticated.next(!!s);
@@ -29,6 +31,27 @@ class AuthorizeService {
             this.isDeveloper.next(!!s && (s.role.includes("Developers")));
             this.isManager.next(!!s && s.role.includes("Managers"));
         });
+        this.oauthService.events.subscribe(e => {
+            // tslint:disable-next-line:no-console
+            console.debug('oauth/oidc event', e);
+        });
+        this.oauthService.events
+            .pipe(filter(e => e.type === 'session_terminated'))
+            .subscribe(_ => {
+            // tslint:disable-next-line:no-console
+            console.debug('Your session has been terminated!');
+        });
+        this.oauthService.events
+            .pipe(filter(e => e.type === 'token_received'))
+            .subscribe(_ => {
+            this.loadUser();
+        });
+        this.oauthService.events
+            .pipe(filter(e => e.type === 'logout'))
+            .subscribe(_ => {
+            this.accessToken.next(null);
+            this.user.next(null);
+        });
     }
     getRoles() {
         return this.getUser().pipe(map(u => u.role));
@@ -63,8 +86,15 @@ class AuthorizeService {
     logout() {
         this.oauthService.logOut(false);
     }
-    initialize() {
+    async initialize() {
         console.debug("AuthorizeService::initialize::started");
+        if (await firstValueFrom(this.isInitializing)) {
+            return;
+        }
+        if (await firstValueFrom(this.isInitialized)) {
+            return;
+        }
+        this.isInitializing.next(true);
         const config = {
             responseType: 'code',
             issuer: this.authorizeOptions.issuer,
@@ -77,33 +107,14 @@ class AuthorizeService {
         };
         this.oauthService.configure(config);
         this.oauthService.setStorage(localStorage);
-        this.oauthService.loadDiscoveryDocumentAndTryLogin();
+        await this.oauthService.loadDiscoveryDocumentAndTryLogin();
         this.oauthService.setupAutomaticSilentRefresh();
-        this.oauthService.events.subscribe(e => {
-            // tslint:disable-next-line:no-console
-            console.debug('oauth/oidc event', e);
-        });
-        this.oauthService.events
-            .pipe(filter(e => e.type === 'session_terminated'))
-            .subscribe(_ => {
-            // tslint:disable-next-line:no-console
-            console.debug('Your session has been terminated!');
-        });
-        this.oauthService.events
-            .pipe(filter(e => e.type === 'token_received'))
-            .subscribe(_ => {
-            this.loadUser();
-        });
-        this.oauthService.events
-            .pipe(filter(e => e.type === 'logout'))
-            .subscribe(_ => {
-            this.accessToken.next(null);
-            this.user.next(null);
-        });
         if (this.oauthService.hasValidAccessToken()) {
             this.loadUser();
         }
         this.authority.next(this.authorizeOptions.issuer);
+        this.isInitializing.next(false);
+        this.isInitialized.next(true);
         console.debug("AuthorizeService::initialize::done");
     }
     loadUser() {
@@ -118,9 +129,9 @@ class AuthorizeService {
         this.accessToken.next(accessToken);
     }
 }
-AuthorizeService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: AuthorizeService, deps: [{ token: AuthorizeOptions }, { token: i1.OAuthService }], target: i0.ɵɵFactoryTarget.Injectable });
-AuthorizeService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: AuthorizeService });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: AuthorizeService, decorators: [{
+AuthorizeService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: AuthorizeService, deps: [{ token: AuthorizeOptions }, { token: i1.OAuthService }], target: i0.ɵɵFactoryTarget.Injectable });
+AuthorizeService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: AuthorizeService });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: AuthorizeService, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: AuthorizeOptions, decorators: [{
                     type: Inject,
@@ -150,16 +161,16 @@ class LoginMenuComponent {
     register() {
     }
 }
-LoginMenuComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: LoginMenuComponent, deps: [{ token: AuthorizeService }], target: i0.ɵɵFactoryTarget.Component });
-LoginMenuComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.2.2", type: LoginMenuComponent, selector: "app-login-menu", ngImport: i0, template: "<ul *ngIf=\"isAuthenticated | async\" class=\"navbar-nav\">\r\n  <li class=\"nav-item dropdown\">\r\n    <a aria-expanded=\"false\" aria-haspopup=\"true\" class=\"nav-link dropdown-toggle\" data-toggle=\"dropdown\" href=\"#\"\r\n       id=\"navbarDropdownLogin\" role=\"button\">\r\n      {{ userName | async }} <b class=\"caret\"></b>\r\n    </a>\r\n    <div aria-labelledby=\"navbarDropdown\" class=\"dropdown-menu\">\r\n      <!--<a class=\"dropdown-item\" asp-action=\"Index\" asp-area=\"Authentication\" asp-controller=\"Grants\">Client Application Access</a>-->\r\n      <!--<a class=\"dropdown-item\" [routerLink]='[\"/authentication/profile\"]' title=\"Manage\">Manage</a>-->\r\n      <!--<a class=\"dropdown-item\" asp-action=\"Index\" asp-area=\"Authentication\" asp-controller=\"Diagnostics\">Diagnostics</a>-->\r\n      <div class=\"dropdown-divider\"></div>\r\n      <a (click)='logout()' class=\"dropdown-item\" routerLink=\"\" title=\"Logout\">Logout</a>\r\n    </div>\r\n  </li>\r\n</ul>\r\n<ul *ngIf=\"!(isAuthenticated | async)\" class=\"navbar-nav\">\r\n  <li class=\"nav-item\">\r\n    <a (click)='register()' class=\"nav-link\" routerLink=\"\">Register</a>\r\n  </li>\r\n  <li class=\"nav-item\">\r\n    <a (click)='login()' class=\"nav-link\" routerLink=\"\">Login</a>\r\n  </li>\r\n</ul>\r\n", styles: [""], dependencies: [{ kind: "directive", type: i2.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "pipe", type: i2.AsyncPipe, name: "async" }] });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: LoginMenuComponent, decorators: [{
+LoginMenuComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: LoginMenuComponent, deps: [{ token: AuthorizeService }], target: i0.ɵɵFactoryTarget.Component });
+LoginMenuComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.3", type: LoginMenuComponent, selector: "app-login-menu", ngImport: i0, template: "<ul *ngIf=\"isAuthenticated | async\" class=\"navbar-nav\">\r\n  <li class=\"nav-item dropdown\">\r\n    <a aria-expanded=\"false\" aria-haspopup=\"true\" class=\"nav-link dropdown-toggle\" data-toggle=\"dropdown\" href=\"#\"\r\n       id=\"navbarDropdownLogin\" role=\"button\">\r\n      {{ userName | async }} <b class=\"caret\"></b>\r\n    </a>\r\n    <div aria-labelledby=\"navbarDropdown\" class=\"dropdown-menu\">\r\n      <!--<a class=\"dropdown-item\" asp-action=\"Index\" asp-area=\"Authentication\" asp-controller=\"Grants\">Client Application Access</a>-->\r\n      <!--<a class=\"dropdown-item\" [routerLink]='[\"/authentication/profile\"]' title=\"Manage\">Manage</a>-->\r\n      <!--<a class=\"dropdown-item\" asp-action=\"Index\" asp-area=\"Authentication\" asp-controller=\"Diagnostics\">Diagnostics</a>-->\r\n      <div class=\"dropdown-divider\"></div>\r\n      <a (click)='logout()' class=\"dropdown-item\" routerLink=\"\" title=\"Logout\">Logout</a>\r\n    </div>\r\n  </li>\r\n</ul>\r\n<ul *ngIf=\"!(isAuthenticated | async)\" class=\"navbar-nav\">\r\n  <li class=\"nav-item\">\r\n    <a (click)='register()' class=\"nav-link\" routerLink=\"\">Register</a>\r\n  </li>\r\n  <li class=\"nav-item\">\r\n    <a (click)='login()' class=\"nav-link\" routerLink=\"\">Login</a>\r\n  </li>\r\n</ul>\r\n", styles: [""], dependencies: [{ kind: "directive", type: i2.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "pipe", type: i2.AsyncPipe, name: "async" }] });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: LoginMenuComponent, decorators: [{
             type: Component,
             args: [{ selector: 'app-login-menu', template: "<ul *ngIf=\"isAuthenticated | async\" class=\"navbar-nav\">\r\n  <li class=\"nav-item dropdown\">\r\n    <a aria-expanded=\"false\" aria-haspopup=\"true\" class=\"nav-link dropdown-toggle\" data-toggle=\"dropdown\" href=\"#\"\r\n       id=\"navbarDropdownLogin\" role=\"button\">\r\n      {{ userName | async }} <b class=\"caret\"></b>\r\n    </a>\r\n    <div aria-labelledby=\"navbarDropdown\" class=\"dropdown-menu\">\r\n      <!--<a class=\"dropdown-item\" asp-action=\"Index\" asp-area=\"Authentication\" asp-controller=\"Grants\">Client Application Access</a>-->\r\n      <!--<a class=\"dropdown-item\" [routerLink]='[\"/authentication/profile\"]' title=\"Manage\">Manage</a>-->\r\n      <!--<a class=\"dropdown-item\" asp-action=\"Index\" asp-area=\"Authentication\" asp-controller=\"Diagnostics\">Diagnostics</a>-->\r\n      <div class=\"dropdown-divider\"></div>\r\n      <a (click)='logout()' class=\"dropdown-item\" routerLink=\"\" title=\"Logout\">Logout</a>\r\n    </div>\r\n  </li>\r\n</ul>\r\n<ul *ngIf=\"!(isAuthenticated | async)\" class=\"navbar-nav\">\r\n  <li class=\"nav-item\">\r\n    <a (click)='register()' class=\"nav-link\" routerLink=\"\">Register</a>\r\n  </li>\r\n  <li class=\"nav-item\">\r\n    <a (click)='login()' class=\"nav-link\" routerLink=\"\">Login</a>\r\n  </li>\r\n</ul>\r\n" }]
         }], ctorParameters: function () { return [{ type: AuthorizeService }]; } });
 class AuthorizeGuard {
-    constructor(authorize, router) {
-        this.authorize = authorize;
+    constructor(authorizeService, router) {
+        this.authorizeService = authorizeService;
         this.router = router;
     }
     canActivate(next, state) {
@@ -176,9 +187,10 @@ class AuthorizeGuard {
         return true;
     }
     async handleAuthorization(route, url) {
-        const isAuthenticated = await firstValueFrom(this.authorize.getIsAuthenticated());
+        await this.authorizeService.initialize();
+        const isAuthenticated = await firstValueFrom(this.authorizeService.getIsAuthenticated());
         if (isAuthenticated) {
-            const userRoles = await firstValueFrom(this.authorize.getRoles());
+            const userRoles = await firstValueFrom(this.authorizeService.getRoles());
             if (route.data.roles && !route.data.roles.filter(value => userRoles.includes(value))) {
                 this.router.navigate(['']);
                 return false;
@@ -186,14 +198,14 @@ class AuthorizeGuard {
             return true;
         }
         else {
-            this.authorize.login();
+            this.authorizeService.login();
         }
         return false;
     }
 }
-AuthorizeGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: AuthorizeGuard, deps: [{ token: AuthorizeService }, { token: i2$1.Router }], target: i0.ɵɵFactoryTarget.Injectable });
-AuthorizeGuard.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: AuthorizeGuard });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: AuthorizeGuard, decorators: [{
+AuthorizeGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: AuthorizeGuard, deps: [{ token: AuthorizeService }, { token: i2$1.Router }], target: i0.ɵɵFactoryTarget.Injectable });
+AuthorizeGuard.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: AuthorizeGuard });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: AuthorizeGuard, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: AuthorizeService }, { type: i2$1.Router }]; } });
@@ -212,13 +224,13 @@ class SharedAuthModule {
         };
     }
 }
-SharedAuthModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: SharedAuthModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-SharedAuthModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.2.2", ngImport: i0, type: SharedAuthModule, declarations: [LoginMenuComponent], imports: [CommonModule,
+SharedAuthModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: SharedAuthModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+SharedAuthModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "15.2.3", ngImport: i0, type: SharedAuthModule, declarations: [LoginMenuComponent], imports: [CommonModule,
         HttpClientModule, i1.OAuthModule], exports: [LoginMenuComponent] });
-SharedAuthModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: SharedAuthModule, imports: [CommonModule,
+SharedAuthModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: SharedAuthModule, imports: [CommonModule,
         HttpClientModule,
         OAuthModule.forRoot()] });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: SharedAuthModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: SharedAuthModule, decorators: [{
             type: NgModule,
             args: [{
                     declarations: [LoginMenuComponent],
@@ -283,9 +295,9 @@ class AuthorizeInterceptor {
         return false;
     }
 }
-AuthorizeInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: AuthorizeInterceptor, deps: [{ token: AuthorizeService }], target: i0.ɵɵFactoryTarget.Injectable });
-AuthorizeInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: AuthorizeInterceptor });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: AuthorizeInterceptor, decorators: [{
+AuthorizeInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: AuthorizeInterceptor, deps: [{ token: AuthorizeService }], target: i0.ɵɵFactoryTarget.Injectable });
+AuthorizeInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: AuthorizeInterceptor });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: AuthorizeInterceptor, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: AuthorizeService }]; } });

package/fesm2020/meshmakers-shared-auth.mjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"meshmakers-shared-auth.mjs","sources":["../../../../projects/meshmakers/shared-auth/src/lib/authorize.service.ts","../../../../projects/meshmakers/shared-auth/src/lib/login-menu/login-menu.component.ts","../../../../projects/meshmakers/shared-auth/src/lib/login-menu/login-menu.component.html","../../../../projects/meshmakers/shared-auth/src/lib/authorize.guard.ts","../../../../projects/meshmakers/shared-auth/src/lib/shared-auth.module.ts","../../../../projects/meshmakers/shared-auth/src/lib/authorize.interceptor.ts","../../../../projects/meshmakers/shared-auth/src/public-api.ts","../../../../projects/meshmakers/shared-auth/src/meshmakers-shared-auth.ts"],"sourcesContent":["import {Inject, Injectable} from '@angular/core';\r\nimport {BehaviorSubject, Observable} from 'rxjs';\r\nimport {filter, map} from 'rxjs/operators';\r\nimport {AuthConfig, OAuthService} from \"angular-oauth2-oidc\";\r\n\r\nexport interface IUser {\r\n name: string;\r\n role: string[];\r\n}\r\n\r\nexport class AuthorizeOptions {\r\n wellKnownServiceUris: string[];\r\n // Url of the Identity Provider\r\n issuer: string;\r\n // URL of the SPA to redirect the user to after login\r\n redirectUri: string;\r\n postLogoutRedirectUri: string;\r\n // The SPA's id. The SPA is registered with this id at the auth-server\r\n clientId: string;\r\n // set the scope for the permissions the client should request\r\n // The first three are defined by OIDC. The 4th is a use case-specific one\r\n scope: string;\r\n showDebugInformation: boolean;\r\n sessionChecksEnabled: boolean;\r\n}\r\n\r\n@Injectable()\r\nexport class AuthorizeService {\r\n private isAuthenticated: BehaviorSubject<boolean> = new BehaviorSubject(false);\r\n private isAdmin: BehaviorSubject<boolean> = new BehaviorSubject(false);\r\n private isDeveloper: BehaviorSubject<boolean> = new BehaviorSubject(false);\r\n private isManager: BehaviorSubject<boolean> = new BehaviorSubject(false);\r\n private authority: BehaviorSubject<string> = new BehaviorSubject(null);\r\n private accessToken: BehaviorSubject<string> = new BehaviorSubject(null);\r\n private user: BehaviorSubject<IUser> = new BehaviorSubject(null);\r\n\r\n constructor(@Inject(AuthorizeOptions) private authorizeOptions: AuthorizeOptions, private oauthService: OAuthService) {\r\n console.debug(\"AuthorizeService::created\");\r\n this.getUser().subscribe(s => {\r\n this.isAuthenticated.next(!!s);\r\n this.isAdmin.next(!!s && (s.role.includes(\"Administrators\")));\r\n this.isDeveloper.next(!!s && (s.role.includes(\"Developers\")));\r\n this.isManager.next(!!s && s.role.includes(\"Managers\"));\r\n });\r\n }\r\n\r\n public getRoles(): Observable<Array<string>>{\r\n return this.getUser().pipe(\r\n map(u=> u.role)\r\n );\r\n }\r\n\r\n public getServiceUris(): Array<string> {\r\n return this.authorizeOptions.wellKnownServiceUris;\r\n }\r\n\r\n public getAuthority(): BehaviorSubject<string> {\r\n return this.authority;\r\n }\r\n\r\n public getIsAuthenticated(): BehaviorSubject<boolean> {\r\n return this.isAuthenticated;\r\n }\r\n\r\n public getIsAdmin(): BehaviorSubject<boolean> {\r\n return this.isAdmin;\r\n }\r\n\r\n public getIsDeveloper(): BehaviorSubject<boolean> {\r\n return this.isDeveloper;\r\n }\r\n\r\n public getIsManager(): BehaviorSubject<boolean> {\r\n return this.isManager;\r\n }\r\n\r\n public getAccessToken(): BehaviorSubject<string> {\r\n return this.accessToken;\r\n }\r\n\r\n public getUser(): BehaviorSubject<IUser> {\r\n return this.user;\r\n }\r\n\r\n public login() {\r\n this.oauthService.initImplicitFlow();\r\n }\r\n\r\n public logout() {\r\n this.oauthService.logOut(false);\r\n }\r\n\r\n\r\n public initialize() {\r\n\r\n console.debug(\"AuthorizeService::initialize::started\");\r\n\r\n const config: AuthConfig = {\r\n responseType: 'code',\r\n issuer: this.authorizeOptions.issuer,\r\n redirectUri: this.authorizeOptions.redirectUri,\r\n postLogoutRedirectUri: this.authorizeOptions.postLogoutRedirectUri,\r\n clientId: this.authorizeOptions.clientId,\r\n scope: this.authorizeOptions.scope,\r\n showDebugInformation: this.authorizeOptions.showDebugInformation,\r\n sessionChecksEnabled: this.authorizeOptions.sessionChecksEnabled\r\n };\r\n\r\n this.oauthService.configure(config);\r\n this.oauthService.setStorage(localStorage);\r\n this.oauthService.loadDiscoveryDocumentAndTryLogin();\r\n\r\n this.oauthService.setupAutomaticSilentRefresh();\r\n\r\n this.oauthService.events.subscribe(e => {\r\n // tslint:disable-next-line:no-console\r\n console.debug('oauth/oidc event', e);\r\n });\r\n\r\n this.oauthService.events\r\n .pipe(filter(e => e.type === 'session_terminated'))\r\n .subscribe(_ => {\r\n // tslint:disable-next-line:no-console\r\n console.debug('Your session has been terminated!');\r\n });\r\n\r\n this.oauthService.events\r\n .pipe(filter(e => e.type === 'token_received'))\r\n .subscribe(_ => {\r\n this.loadUser();\r\n });\r\n\r\n this.oauthService.events\r\n .pipe(filter(e => e.type === 'logout'))\r\n .subscribe(_ => {\r\n this.accessToken.next(null);\r\n this.user.next(null);\r\n });\r\n\r\n if (this.oauthService.hasValidAccessToken()) {\r\n this.loadUser();\r\n }\r\n\r\n this.authority.next(this.authorizeOptions.issuer);\r\n\r\n console.debug(\"AuthorizeService::initialize::done\");\r\n\r\n }\r\n\r\n private loadUser() {\r\n const claims = this.oauthService.getIdentityClaims();\r\n if (!claims) {\r\n console.error(\"claims where null when loading identity claims\");\r\n return;\r\n }\r\n\r\n const user = <IUser>claims;\r\n const accessToken = this.oauthService.getAccessToken();\r\n this.user.next(user);\r\n this.accessToken.next(accessToken);\r\n }\r\n}\r\n","import {Component, OnInit} from '@angular/core';\r\nimport {AuthorizeService} from '../authorize.service';\r\nimport {BehaviorSubject, Observable} from 'rxjs';\r\nimport {map} from 'rxjs/operators';\r\n\r\n@Component({\r\n selector: 'app-login-menu',\r\n templateUrl: './login-menu.component.html',\r\n styleUrls: ['./login-menu.component.css']\r\n})\r\nexport class LoginMenuComponent implements OnInit {\r\n public isAuthenticated: BehaviorSubject<boolean>;\r\n public userName: Observable<string>;\r\n public isAdmin: Observable<boolean>;\r\n\r\n constructor(private authorizeService: AuthorizeService) {\r\n }\r\n\r\n ngOnInit() {\r\n const isIFrame = window.self !== window.top;\r\n\r\n console.log(\"app-login-menu::created\");\r\n\r\n this.isAuthenticated = this.authorizeService.getIsAuthenticated();\r\n this.userName = this.authorizeService.getUser().pipe(map(u => u && u.name));\r\n this.isAdmin = this.authorizeService.getIsAdmin();\r\n\r\n this.isAuthenticated.subscribe(x => {\r\n\r\n console.log(`isAuthenticated changed to ${x} (iframe ${isIFrame})`);\r\n });\r\n }\r\n\r\n public login() {\r\n this.authorizeService.login();\r\n }\r\n\r\n public logout() {\r\n this.authorizeService.logout();\r\n }\r\n\r\n public register() {\r\n\r\n }\r\n}\r\n","<ul ngIf=\"isAuthenticated \| async\" class=\"navbar-nav\">\r\n <li class=\"nav-item dropdown\">\r\n <a aria-expanded=\"false\" aria-haspopup=\"true\" class=\"nav-link dropdown-toggle\" data-toggle=\"dropdown\" href=\"#\"\r\n id=\"navbarDropdownLogin\" role=\"button\">\r\n {{ userName \| async }} <b class=\"caret\"></b>\r\n </a>\r\n <div aria-labelledby=\"navbarDropdown\" class=\"dropdown-menu\">\r\n <!--<a class=\"dropdown-item\" asp-action=\"Index\" asp-area=\"Authentication\" asp-controller=\"Grants\">Client Application Access</a>-->\r\n <!--<a class=\"dropdown-item\" [routerLink]='[\"/authentication/profile\"]' title=\"Manage\">Manage</a>-->\r\n <!--<a class=\"dropdown-item\" asp-action=\"Index\" asp-area=\"Authentication\" asp-controller=\"Diagnostics\">Diagnostics</a>-->\r\n <div class=\"dropdown-divider\"></div>\r\n <a (click)='logout()' class=\"dropdown-item\" routerLink=\"\" title=\"Logout\">Logout</a>\r\n </div>\r\n </li>\r\n</ul>\r\n<ul ngIf=\"!(isAuthenticated \| async)\" class=\"navbar-nav\">\r\n <li class=\"nav-item\">\r\n <a (click)='register()' class=\"nav-link\" routerLink=\"\">Register</a>\r\n </li>\r\n <li class=\"nav-item\">\r\n <a (click)='login()' class=\"nav-link\" routerLink=\"\">Login</a>\r\n </li>\r\n</ul>\r\n","import {Injectable} from '@angular/core';\r\nimport {\r\n ActivatedRouteSnapshot,\r\n CanActivate,\r\n CanActivateChild,\r\n CanDeactivate,\r\n CanLoad, Route,\r\n Router,\r\n RouterStateSnapshot, UrlSegment,\r\n UrlTree\r\n} from '@angular/router';\r\nimport {AuthorizeService} from './authorize.service';\r\nimport {firstValueFrom, lastValueFrom, Observable} from \"rxjs\";\r\n\r\n@Injectable()\r\nexport class AuthorizeGuard implements CanActivate, CanActivateChild, CanDeactivate<unknown>, CanLoad {\r\n constructor(private authorize: AuthorizeService, private router: Router) {\r\n }\r\n\r\n canActivate(\r\n next: ActivatedRouteSnapshot,\r\n state: RouterStateSnapshot): Observable<boolean \| UrlTree> \| Promise<boolean \| UrlTree> \| boolean \| UrlTree {\r\n let url: string = state.url;\r\n return this.handleAuthorization(next, url);\r\n }\r\n\r\n canActivateChild(\r\n next: ActivatedRouteSnapshot,\r\n state: RouterStateSnapshot): Observable<boolean \| UrlTree> \| Promise<boolean \| UrlTree> \| boolean \| UrlTree {\r\n return this.canActivate(next, state);\r\n }\r\n\r\n canDeactivate(\r\n component: unknown,\r\n currentRoute: ActivatedRouteSnapshot,\r\n currentState: RouterStateSnapshot,\r\n nextState?: RouterStateSnapshot): Observable<boolean \| UrlTree> \| Promise<boolean \| UrlTree> \| boolean \| UrlTree {\r\n return true;\r\n }\r\n\r\n canLoad(\r\n route: Route,\r\n segments: UrlSegment[]): Observable<boolean> \| Promise<boolean> \| boolean {\r\n return true;\r\n }\r\n\r\n private async handleAuthorization(route: ActivatedRouteSnapshot, url: any): Promise<boolean> {\r\n const isAuthenticated = await firstValueFrom(this.authorize.getIsAuthenticated());\r\n if (isAuthenticated) {\r\n const userRoles = await firstValueFrom(this.authorize.getRoles());\r\n if (route.data.roles && !route.data.roles.filter(value => userRoles.includes(value))) {\r\n this.router.navigate(['']);\r\n return false;\r\n }\r\n return true;\r\n } else {\r\n this.authorize.login();\r\n }\r\n\r\n return false;\r\n }\r\n}\r\n","import {ModuleWithProviders, NgModule} from '@angular/core';\r\nimport {CommonModule} from \"@angular/common\";\r\nimport {HttpClientModule} from \"@angular/common/http\";\r\nimport {LoginMenuComponent} from \"./login-menu/login-menu.component\";\r\nimport {AuthorizeOptions, AuthorizeService} from \"./authorize.service\";\r\nimport {OAuthModule} from \"angular-oauth2-oidc\";\r\nimport {AuthorizeGuard} from \"./authorize.guard\";\r\n\r\n@NgModule({\r\n declarations: [LoginMenuComponent],\r\n exports: [LoginMenuComponent],\r\n providers: [],\r\n imports: [\r\n CommonModule,\r\n HttpClientModule,\r\n OAuthModule.forRoot()\r\n ]\r\n})\r\nexport class SharedAuthModule {\r\n static forRoot(authorizeOptions: AuthorizeOptions): ModuleWithProviders<SharedAuthModule> {\r\n return {\r\n ngModule: SharedAuthModule,\r\n providers: [\r\n {\r\n provide: AuthorizeOptions,\r\n useValue: authorizeOptions\r\n },\r\n AuthorizeService,\r\n AuthorizeGuard\r\n ]\r\n }\r\n }\r\n}\r\n","import {Injectable} from '@angular/core';\r\nimport {HttpEvent, HttpHandler, HttpInterceptor, HttpRequest} from '@angular/common/http';\r\nimport {Observable} from 'rxjs';\r\nimport {AuthorizeService} from './authorize.service';\r\n\r\n@Injectable()\r\nexport class AuthorizeInterceptor implements HttpInterceptor {\r\n\r\n accessToken: string;\r\n\r\n constructor(private authorize: AuthorizeService) {\r\n\r\n authorize.getAccessToken().subscribe(value => this.accessToken = value);\r\n\r\n }\r\n\r\n private static isSameOriginUrl(req: any) {\r\n // It's an absolute url with the same origin.\r\n if (req.url.startsWith(`${window.location.origin}/`)) {\r\n return true;\r\n }\r\n\r\n // It's a protocol relative url with the same origin.\r\n // For example: //www.example.com/api/Products\r\n if (req.url.startsWith(`//${window.location.host}/`)) {\r\n return true;\r\n }\r\n\r\n // It's a relative url like /api/Products\r\n if (/^\\/[^\\/]./.test(req.url)) {\r\n return true;\r\n }\r\n\r\n // It's an absolute or protocol relative url that\r\n // doesn't have the same origin.\r\n return false;\r\n }\r\n\r\n // Checks if there is an access_token available in the authorize service\r\n // and adds it to the request in case it's targeted at the same origin as the\r\n\r\n intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {\r\n return this.processRequestWithToken(this.accessToken, req, next);\r\n }\r\n\r\n // single page application.\r\n private processRequestWithToken(token: string, req: HttpRequest<any>, next: HttpHandler) {\r\n if (!!token && (AuthorizeInterceptor.isSameOriginUrl(req) \|\| this.isKnownServiceUri(req))) {\r\n req = req.clone({\r\n setHeaders: {\r\n Authorization: `Bearer ${token}`\r\n }\r\n });\r\n }\r\n\r\n return next.handle(req);\r\n }\r\n\r\n private isKnownServiceUri(req: any) {\r\n\r\n const serviceUris = this.authorize.getServiceUris();\r\n\r\n for (let i = 0; i < serviceUris.length; i++) {\r\n if (req.url.startsWith(`${serviceUris[i]}`)) {\r\n return true;\r\n }\r\n }\r\n\r\n // It's an absolute or protocol relative url that\r\n // doesn't have the same origin.\r\n return false;\r\n }\r\n}\r\n","/\r\n * Public API Surface of shared-auth\r\n /\r\n\r\nexport from './lib/authorize.service';\r\nexport * from './lib/login-menu/login-menu.component';\r\nexport * from './lib/shared-auth.module';\r\nexport * from './lib/authorize.interceptor';\r\nexport * from './lib/authorize.guard';\r\n","/*\n Generated bundle index. Do not edit.\n /\n\nexport from './public-api';\n"],"names":["i1.AuthorizeService","i2"],"mappings":"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"}
1	+ {"version":3,"file":"meshmakers-shared-auth.mjs","sources":["../../../../projects/meshmakers/shared-auth/src/lib/authorize.service.ts","../../../../projects/meshmakers/shared-auth/src/lib/login-menu/login-menu.component.ts","../../../../projects/meshmakers/shared-auth/src/lib/login-menu/login-menu.component.html","../../../../projects/meshmakers/shared-auth/src/lib/authorize.guard.ts","../../../../projects/meshmakers/shared-auth/src/lib/shared-auth.module.ts","../../../../projects/meshmakers/shared-auth/src/lib/authorize.interceptor.ts","../../../../projects/meshmakers/shared-auth/src/public-api.ts","../../../../projects/meshmakers/shared-auth/src/meshmakers-shared-auth.ts"],"sourcesContent":["import {Inject, Injectable} from '@angular/core';\r\nimport {BehaviorSubject, firstValueFrom, Observable} from 'rxjs';\r\nimport {filter, map} from 'rxjs/operators';\r\nimport {AuthConfig, OAuthService} from \"angular-oauth2-oidc\";\r\n\r\nexport interface IUser {\r\n name: string;\r\n role: string[];\r\n}\r\n\r\nexport class AuthorizeOptions {\r\n wellKnownServiceUris: string[];\r\n // Url of the Identity Provider\r\n issuer: string;\r\n // URL of the SPA to redirect the user to after login\r\n redirectUri: string;\r\n postLogoutRedirectUri: string;\r\n // The SPA's id. The SPA is registered with this id at the auth-server\r\n clientId: string;\r\n // set the scope for the permissions the client should request\r\n // The first three are defined by OIDC. The 4th is a use case-specific one\r\n scope: string;\r\n showDebugInformation: boolean;\r\n sessionChecksEnabled: boolean;\r\n}\r\n\r\n@Injectable()\r\nexport class AuthorizeService {\r\n private isAuthenticated: BehaviorSubject<boolean> = new BehaviorSubject(false);\r\n private isAdmin: BehaviorSubject<boolean> = new BehaviorSubject(false);\r\n private isDeveloper: BehaviorSubject<boolean> = new BehaviorSubject(false);\r\n private isManager: BehaviorSubject<boolean> = new BehaviorSubject(false);\r\n private authority: BehaviorSubject<string> = new BehaviorSubject(null);\r\n private accessToken: BehaviorSubject<string> = new BehaviorSubject(null);\r\n private user: BehaviorSubject<IUser> = new BehaviorSubject(null);\r\n private isInitialized : BehaviorSubject<boolean> = new BehaviorSubject(false);\r\n private isInitializing : BehaviorSubject<boolean> = new BehaviorSubject(false);\r\n\r\n constructor(@Inject(AuthorizeOptions) private authorizeOptions: AuthorizeOptions, private oauthService: OAuthService) {\r\n console.debug(\"AuthorizeService::created\");\r\n\r\n this.getUser().subscribe(s => {\r\n this.isAuthenticated.next(!!s);\r\n this.isAdmin.next(!!s && (s.role.includes(\"Administrators\")));\r\n this.isDeveloper.next(!!s && (s.role.includes(\"Developers\")));\r\n this.isManager.next(!!s && s.role.includes(\"Managers\"));\r\n });\r\n\r\n this.oauthService.events.subscribe(e => {\r\n // tslint:disable-next-line:no-console\r\n console.debug('oauth/oidc event', e);\r\n });\r\n\r\n this.oauthService.events\r\n .pipe(filter(e => e.type === 'session_terminated'))\r\n .subscribe(_ => {\r\n // tslint:disable-next-line:no-console\r\n console.debug('Your session has been terminated!');\r\n });\r\n\r\n this.oauthService.events\r\n .pipe(filter(e => e.type === 'token_received'))\r\n .subscribe(_ => {\r\n this.loadUser();\r\n });\r\n\r\n this.oauthService.events\r\n .pipe(filter(e => e.type === 'logout'))\r\n .subscribe(_ => {\r\n this.accessToken.next(null);\r\n this.user.next(null);\r\n });\r\n\r\n }\r\n\r\n public getRoles(): Observable<Array<string>>{\r\n return this.getUser().pipe(\r\n map(u=> u.role)\r\n );\r\n }\r\n\r\n public getServiceUris(): Array<string> {\r\n return this.authorizeOptions.wellKnownServiceUris;\r\n }\r\n\r\n public getAuthority(): BehaviorSubject<string> {\r\n return this.authority;\r\n }\r\n\r\n public getIsAuthenticated(): BehaviorSubject<boolean> {\r\n return this.isAuthenticated;\r\n }\r\n\r\n public getIsAdmin(): BehaviorSubject<boolean> {\r\n return this.isAdmin;\r\n }\r\n\r\n public getIsDeveloper(): BehaviorSubject<boolean> {\r\n return this.isDeveloper;\r\n }\r\n\r\n public getIsManager(): BehaviorSubject<boolean> {\r\n return this.isManager;\r\n }\r\n\r\n public getAccessToken(): BehaviorSubject<string> {\r\n return this.accessToken;\r\n }\r\n\r\n public getUser(): BehaviorSubject<IUser> {\r\n return this.user;\r\n }\r\n\r\n public login() {\r\n this.oauthService.initImplicitFlow();\r\n }\r\n\r\n public logout() {\r\n this.oauthService.logOut(false);\r\n }\r\n\r\n\r\n public async initialize() {\r\n\r\n console.debug(\"AuthorizeService::initialize::started\");\r\n\r\n if (await firstValueFrom(this.isInitializing)) {\r\n return\r\n }\r\n if (await firstValueFrom(this.isInitialized)) {\r\n return;\r\n }\r\n this.isInitializing.next(true);\r\n\r\n const config: AuthConfig = {\r\n responseType: 'code',\r\n issuer: this.authorizeOptions.issuer,\r\n redirectUri: this.authorizeOptions.redirectUri,\r\n postLogoutRedirectUri: this.authorizeOptions.postLogoutRedirectUri,\r\n clientId: this.authorizeOptions.clientId,\r\n scope: this.authorizeOptions.scope,\r\n showDebugInformation: this.authorizeOptions.showDebugInformation,\r\n sessionChecksEnabled: this.authorizeOptions.sessionChecksEnabled\r\n };\r\n\r\n this.oauthService.configure(config);\r\n this.oauthService.setStorage(localStorage);\r\n await this.oauthService.loadDiscoveryDocumentAndTryLogin();\r\n\r\n this.oauthService.setupAutomaticSilentRefresh();\r\n\r\n if (this.oauthService.hasValidAccessToken()) {\r\n this.loadUser();\r\n }\r\n\r\n this.authority.next(this.authorizeOptions.issuer);\r\n this.isInitializing.next(false);\r\n this.isInitialized.next(true);\r\n\r\n console.debug(\"AuthorizeService::initialize::done\");\r\n }\r\n\r\n private loadUser() {\r\n const claims = this.oauthService.getIdentityClaims();\r\n if (!claims) {\r\n console.error(\"claims where null when loading identity claims\");\r\n return;\r\n }\r\n\r\n const user = <IUser>claims;\r\n const accessToken = this.oauthService.getAccessToken();\r\n this.user.next(user);\r\n this.accessToken.next(accessToken);\r\n }\r\n}\r\n","import {Component, OnInit} from '@angular/core';\r\nimport {AuthorizeService} from '../authorize.service';\r\nimport {BehaviorSubject, Observable} from 'rxjs';\r\nimport {map} from 'rxjs/operators';\r\n\r\n@Component({\r\n selector: 'app-login-menu',\r\n templateUrl: './login-menu.component.html',\r\n styleUrls: ['./login-menu.component.css']\r\n})\r\nexport class LoginMenuComponent implements OnInit {\r\n public isAuthenticated: BehaviorSubject<boolean>;\r\n public userName: Observable<string>;\r\n public isAdmin: Observable<boolean>;\r\n\r\n constructor(private authorizeService: AuthorizeService) {\r\n }\r\n\r\n ngOnInit() {\r\n const isIFrame = window.self !== window.top;\r\n\r\n console.log(\"app-login-menu::created\");\r\n\r\n this.isAuthenticated = this.authorizeService.getIsAuthenticated();\r\n this.userName = this.authorizeService.getUser().pipe(map(u => u && u.name));\r\n this.isAdmin = this.authorizeService.getIsAdmin();\r\n\r\n this.isAuthenticated.subscribe(x => {\r\n\r\n console.log(`isAuthenticated changed to ${x} (iframe ${isIFrame})`);\r\n });\r\n }\r\n\r\n public login() {\r\n this.authorizeService.login();\r\n }\r\n\r\n public logout() {\r\n this.authorizeService.logout();\r\n }\r\n\r\n public register() {\r\n\r\n }\r\n}\r\n","<ul ngIf=\"isAuthenticated \| async\" class=\"navbar-nav\">\r\n <li class=\"nav-item dropdown\">\r\n <a aria-expanded=\"false\" aria-haspopup=\"true\" class=\"nav-link dropdown-toggle\" data-toggle=\"dropdown\" href=\"#\"\r\n id=\"navbarDropdownLogin\" role=\"button\">\r\n {{ userName \| async }} <b class=\"caret\"></b>\r\n </a>\r\n <div aria-labelledby=\"navbarDropdown\" class=\"dropdown-menu\">\r\n <!--<a class=\"dropdown-item\" asp-action=\"Index\" asp-area=\"Authentication\" asp-controller=\"Grants\">Client Application Access</a>-->\r\n <!--<a class=\"dropdown-item\" [routerLink]='[\"/authentication/profile\"]' title=\"Manage\">Manage</a>-->\r\n <!--<a class=\"dropdown-item\" asp-action=\"Index\" asp-area=\"Authentication\" asp-controller=\"Diagnostics\">Diagnostics</a>-->\r\n <div class=\"dropdown-divider\"></div>\r\n <a (click)='logout()' class=\"dropdown-item\" routerLink=\"\" title=\"Logout\">Logout</a>\r\n </div>\r\n </li>\r\n</ul>\r\n<ul ngIf=\"!(isAuthenticated \| async)\" class=\"navbar-nav\">\r\n <li class=\"nav-item\">\r\n <a (click)='register()' class=\"nav-link\" routerLink=\"\">Register</a>\r\n </li>\r\n <li class=\"nav-item\">\r\n <a (click)='login()' class=\"nav-link\" routerLink=\"\">Login</a>\r\n </li>\r\n</ul>\r\n","import {Injectable} from '@angular/core';\r\nimport {\r\n ActivatedRouteSnapshot,\r\n CanActivate,\r\n CanActivateChild,\r\n CanDeactivate,\r\n CanLoad, Route,\r\n Router,\r\n RouterStateSnapshot, UrlSegment,\r\n UrlTree\r\n} from '@angular/router';\r\nimport {AuthorizeService} from './authorize.service';\r\nimport {firstValueFrom, lastValueFrom, Observable} from \"rxjs\";\r\n\r\n@Injectable()\r\nexport class AuthorizeGuard implements CanActivate, CanActivateChild, CanDeactivate<unknown>, CanLoad {\r\n constructor(private authorizeService: AuthorizeService, private router: Router) {\r\n }\r\n\r\n canActivate(\r\n next: ActivatedRouteSnapshot,\r\n state: RouterStateSnapshot): Observable<boolean \| UrlTree> \| Promise<boolean \| UrlTree> \| boolean \| UrlTree {\r\n let url: string = state.url;\r\n return this.handleAuthorization(next, url);\r\n }\r\n\r\n canActivateChild(\r\n next: ActivatedRouteSnapshot,\r\n state: RouterStateSnapshot): Observable<boolean \| UrlTree> \| Promise<boolean \| UrlTree> \| boolean \| UrlTree {\r\n return this.canActivate(next, state);\r\n }\r\n\r\n canDeactivate(\r\n component: unknown,\r\n currentRoute: ActivatedRouteSnapshot,\r\n currentState: RouterStateSnapshot,\r\n nextState?: RouterStateSnapshot): Observable<boolean \| UrlTree> \| Promise<boolean \| UrlTree> \| boolean \| UrlTree {\r\n return true;\r\n }\r\n\r\n canLoad(\r\n route: Route,\r\n segments: UrlSegment[]): Observable<boolean> \| Promise<boolean> \| boolean {\r\n return true;\r\n }\r\n\r\n private async handleAuthorization(route: ActivatedRouteSnapshot, url: any): Promise<boolean> {\r\n\r\n await this.authorizeService.initialize()\r\n\r\n const isAuthenticated = await firstValueFrom(this.authorizeService.getIsAuthenticated());\r\n if (isAuthenticated) {\r\n const userRoles = await firstValueFrom(this.authorizeService.getRoles());\r\n if (route.data.roles && !route.data.roles.filter(value => userRoles.includes(value))) {\r\n this.router.navigate(['']);\r\n return false;\r\n }\r\n return true;\r\n } else {\r\n this.authorizeService.login();\r\n }\r\n\r\n return false;\r\n }\r\n}\r\n","import {ModuleWithProviders, NgModule} from '@angular/core';\r\nimport {CommonModule} from \"@angular/common\";\r\nimport {HttpClientModule} from \"@angular/common/http\";\r\nimport {LoginMenuComponent} from \"./login-menu/login-menu.component\";\r\nimport {AuthorizeOptions, AuthorizeService} from \"./authorize.service\";\r\nimport {OAuthModule} from \"angular-oauth2-oidc\";\r\nimport {AuthorizeGuard} from \"./authorize.guard\";\r\n\r\n@NgModule({\r\n declarations: [LoginMenuComponent],\r\n exports: [LoginMenuComponent],\r\n providers: [],\r\n imports: [\r\n CommonModule,\r\n HttpClientModule,\r\n OAuthModule.forRoot()\r\n ]\r\n})\r\nexport class SharedAuthModule {\r\n static forRoot(authorizeOptions: AuthorizeOptions): ModuleWithProviders<SharedAuthModule> {\r\n return {\r\n ngModule: SharedAuthModule,\r\n providers: [\r\n {\r\n provide: AuthorizeOptions,\r\n useValue: authorizeOptions\r\n },\r\n AuthorizeService,\r\n AuthorizeGuard\r\n ]\r\n }\r\n }\r\n}\r\n","import {Injectable} from '@angular/core';\r\nimport {HttpEvent, HttpHandler, HttpInterceptor, HttpRequest} from '@angular/common/http';\r\nimport {Observable} from 'rxjs';\r\nimport {AuthorizeService} from './authorize.service';\r\n\r\n@Injectable()\r\nexport class AuthorizeInterceptor implements HttpInterceptor {\r\n\r\n accessToken: string;\r\n\r\n constructor(private authorize: AuthorizeService) {\r\n\r\n authorize.getAccessToken().subscribe(value => this.accessToken = value);\r\n\r\n }\r\n\r\n private static isSameOriginUrl(req: any) {\r\n // It's an absolute url with the same origin.\r\n if (req.url.startsWith(`${window.location.origin}/`)) {\r\n return true;\r\n }\r\n\r\n // It's a protocol relative url with the same origin.\r\n // For example: //www.example.com/api/Products\r\n if (req.url.startsWith(`//${window.location.host}/`)) {\r\n return true;\r\n }\r\n\r\n // It's a relative url like /api/Products\r\n if (/^\\/[^\\/]./.test(req.url)) {\r\n return true;\r\n }\r\n\r\n // It's an absolute or protocol relative url that\r\n // doesn't have the same origin.\r\n return false;\r\n }\r\n\r\n // Checks if there is an access_token available in the authorize service\r\n // and adds it to the request in case it's targeted at the same origin as the\r\n\r\n intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {\r\n return this.processRequestWithToken(this.accessToken, req, next);\r\n }\r\n\r\n // single page application.\r\n private processRequestWithToken(token: string, req: HttpRequest<any>, next: HttpHandler) {\r\n if (!!token && (AuthorizeInterceptor.isSameOriginUrl(req) \|\| this.isKnownServiceUri(req))) {\r\n req = req.clone({\r\n setHeaders: {\r\n Authorization: `Bearer ${token}`\r\n }\r\n });\r\n }\r\n\r\n return next.handle(req);\r\n }\r\n\r\n private isKnownServiceUri(req: any) {\r\n\r\n const serviceUris = this.authorize.getServiceUris();\r\n\r\n for (let i = 0; i < serviceUris.length; i++) {\r\n if (req.url.startsWith(`${serviceUris[i]}`)) {\r\n return true;\r\n }\r\n }\r\n\r\n // It's an absolute or protocol relative url that\r\n // doesn't have the same origin.\r\n return false;\r\n }\r\n}\r\n","/\r\n * Public API Surface of shared-auth\r\n /\r\n\r\nexport from './lib/authorize.service';\r\nexport * from './lib/login-menu/login-menu.component';\r\nexport * from './lib/shared-auth.module';\r\nexport * from './lib/authorize.interceptor';\r\nexport * from './lib/authorize.guard';\r\n","/*\n Generated bundle index. Do not edit.\n /\n\nexport from './public-api';\n"],"names":["i1.AuthorizeService","i2"],"mappings":"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"}

package/lib/authorize.guard.d.ts CHANGED Viewed

@@ -3,9 +3,9 @@ import { AuthorizeService } from './authorize.service';
 import { Observable } from "rxjs";
 import * as i0 from "@angular/core";
 export declare class AuthorizeGuard implements CanActivate, CanActivateChild, CanDeactivate<unknown>, CanLoad {
-    private authorize;
+    private authorizeService;
     private router;
-    constructor(authorize: AuthorizeService, router: Router);
+    constructor(authorizeService: AuthorizeService, router: Router);
     canActivate(next: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree;
     canActivateChild(next: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree;
     canDeactivate(component: unknown, currentRoute: ActivatedRouteSnapshot, currentState: RouterStateSnapshot, nextState?: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree;

package/lib/authorize.service.d.ts CHANGED Viewed

@@ -25,6 +25,8 @@ export declare class AuthorizeService {
     private authority;
     private accessToken;
     private user;
+    private isInitialized;
+    private isInitializing;
     constructor(authorizeOptions: AuthorizeOptions, oauthService: OAuthService);
     getRoles(): Observable<Array<string>>;
     getServiceUris(): Array<string>;
@@ -37,7 +39,7 @@ export declare class AuthorizeService {
     getUser(): BehaviorSubject<IUser>;
     login(): void;
     logout(): void;
-    initialize(): void;
+    initialize(): Promise<void>;
     private loadUser;
     static ɵfac: i0.ɵɵFactoryDeclaration<AuthorizeService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<AuthorizeService>;

package/lib/login-menu/login-menu.component.d.ts CHANGED Viewed

@@ -13,5 +13,5 @@ export declare class LoginMenuComponent implements OnInit {
     logout(): void;
     register(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<LoginMenuComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<LoginMenuComponent, "app-login-menu", never, {}, {}, never, never, false>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<LoginMenuComponent, "app-login-menu", never, {}, {}, never, never, false, never>;
 }

package/package.json CHANGED Viewed

@@ -1,8 +1,8 @@
 {
   "name": "@meshmakers/shared-auth",
-  "version": "2.0.2303-3003",
+  "version": "2.0.2304-13002",
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.5.0"
   },
   "module": "fesm2015/meshmakers-shared-auth.mjs",
   "es2020": "fesm2020/meshmakers-shared-auth.mjs",