@osovitny/anatoly 3.17.20 → 3.17.21
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.
|
@@ -1,15 +1,16 @@
|
|
|
1
1
|
import { Inject, Injectable } from "@angular/core";
|
|
2
2
|
import { MsalGuard, MSAL_GUARD_CONFIG } from '@azure/msal-angular';
|
|
3
3
|
import { InteractionType } from "@azure/msal-browser";
|
|
4
|
-
import {
|
|
4
|
+
import { map } from "rxjs";
|
|
5
5
|
import * as i0 from "@angular/core";
|
|
6
6
|
import * as i1 from "@azure/msal-angular";
|
|
7
7
|
import * as i2 from "@angular/common";
|
|
8
8
|
import * as i3 from "@angular/router";
|
|
9
9
|
import * as i4 from "../services/auth.service";
|
|
10
10
|
export class AuthenticationGuard extends MsalGuard {
|
|
11
|
-
constructor(msalGuardConfig, msalBroadcastService,
|
|
11
|
+
constructor(msalGuardConfig, msalBroadcastService, location, router, authServiceMSAL, authServiceAOS) {
|
|
12
12
|
super(msalGuardConfig, msalBroadcastService, authServiceMSAL, location, router);
|
|
13
|
+
this.authServiceMSAL = authServiceMSAL;
|
|
13
14
|
this.authServiceAOS = authServiceAOS;
|
|
14
15
|
this._msalGuardConfig = msalGuardConfig;
|
|
15
16
|
}
|
|
@@ -19,9 +20,12 @@ export class AuthenticationGuard extends MsalGuard {
|
|
|
19
20
|
}
|
|
20
21
|
canActivate(route, state) {
|
|
21
22
|
this.setInteractionType(route);
|
|
22
|
-
|
|
23
|
+
let canActivate$ = super.canActivate(route, state);
|
|
24
|
+
return canActivate$.pipe(map((canActivate) => {
|
|
25
|
+
return canActivate && this.authServiceAOS.isUserSignedIn();
|
|
26
|
+
}));
|
|
23
27
|
}
|
|
24
|
-
static { this.ɵfac = function AuthenticationGuard_Factory(t) { return new (t || AuthenticationGuard)(i0.ɵɵinject(MSAL_GUARD_CONFIG), i0.ɵɵinject(i1.MsalBroadcastService), i0.ɵɵinject(
|
|
28
|
+
static { this.ɵfac = function AuthenticationGuard_Factory(t) { return new (t || AuthenticationGuard)(i0.ɵɵinject(MSAL_GUARD_CONFIG), i0.ɵɵinject(i1.MsalBroadcastService), i0.ɵɵinject(i2.Location), i0.ɵɵinject(i3.Router), i0.ɵɵinject(i1.MsalService), i0.ɵɵinject(i4.AuthService)); }; }
|
|
25
29
|
static { this.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: AuthenticationGuard, factory: AuthenticationGuard.ɵfac }); }
|
|
26
30
|
}
|
|
27
31
|
(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(AuthenticationGuard, [{
|
|
@@ -29,5 +33,5 @@ export class AuthenticationGuard extends MsalGuard {
|
|
|
29
33
|
}], () => [{ type: undefined, decorators: [{
|
|
30
34
|
type: Inject,
|
|
31
35
|
args: [MSAL_GUARD_CONFIG]
|
|
32
|
-
}] }, { type: i1.MsalBroadcastService }, { type:
|
|
33
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
36
|
+
}] }, { type: i1.MsalBroadcastService }, { type: i2.Location }, { type: i3.Router }, { type: i1.MsalService }, { type: i4.AuthService }], null); })();
|
|
37
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aGVudGljYXRpb24uZ3VhcmQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9hbmF0b2x5L3NyYy9saWIvaWFtL2d1YXJkcy9hdXRoZW50aWNhdGlvbi5ndWFyZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFxQkEsT0FBTyxFQUFFLE1BQU0sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFbkQsT0FBTyxFQUF3QixTQUFTLEVBQXVDLGlCQUFpQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDOUgsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3RELE9BQU8sRUFBc0IsR0FBRyxFQUFNLE1BQU0sTUFBTSxDQUFDOzs7Ozs7QUFNbkQsTUFBTSxPQUFPLG1CQUFvQixTQUFRLFNBQVM7SUFHaEQsWUFFRSxlQUF1QyxFQUN2QyxvQkFBMEMsRUFDMUMsUUFBa0IsRUFDbEIsTUFBYyxFQUNKLGVBQTRCLEVBQzVCLGNBQTJCO1FBRXJDLEtBQUssQ0FBQyxlQUFlLEVBQUUsb0JBQW9CLEVBQUUsZUFBZSxFQUFFLFFBQVEsRUFBRSxNQUFNLENBQUMsQ0FBQztRQUh0RSxvQkFBZSxHQUFmLGVBQWUsQ0FBYTtRQUM1QixtQkFBYyxHQUFkLGNBQWMsQ0FBYTtRQUdyQyxJQUFJLENBQUMsZ0JBQWdCLEdBQUcsZUFBZSxDQUFDO0lBQzFDLENBQUM7SUFFTyxrQkFBa0IsQ0FBQyxLQUE2QjtRQUN0RCxJQUFJLGVBQWUsR0FBSSxLQUFLLENBQUMsSUFBWSxDQUFDLGVBQWUsQ0FBQztRQUMxRCxJQUFJLENBQUMsZ0JBQWdCLENBQUMsZUFBZSxHQUFHLGVBQWUsSUFBSSxlQUFlLENBQUMsUUFBUSxDQUFDO0lBQ3RGLENBQUM7SUFFRCxXQUFXLENBQUMsS0FBNkIsRUFBRSxLQUEwQjtRQUNuRSxJQUFJLENBQUMsa0JBQWtCLENBQUMsS0FBSyxDQUFDLENBQUM7UUFFL0IsSUFBSSxZQUFZLEdBQUcsS0FBSyxDQUFDLFdBQVcsQ0FBQyxLQUFLLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFFbkQsT0FBTyxZQUFZLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLFdBQVcsRUFBRSxFQUFFO1lBQzNDLE9BQU8sV0FBVyxJQUFJLElBQUksQ0FBQyxjQUFjLENBQUMsY0FBYyxFQUFFLENBQUM7UUFDN0QsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNOLENBQUM7b0ZBN0JVLG1CQUFtQixjQUlwQixpQkFBaUI7dUVBSmhCLG1CQUFtQixXQUFuQixtQkFBbUI7O2lGQUFuQixtQkFBbUI7Y0FEL0IsVUFBVTs7c0JBS04sTUFBTTt1QkFBQyxpQkFBaUIiLCJzb3VyY2VzQ29udGVudCI6WyIvKlxyXG48ZmlsZT5cclxuICBQcm9qZWN0OlxyXG4gICAgQG9zb3ZpdG55L2FuYXRvbHlcclxuXHJcbiAgQXV0aG9yczpcclxuICAgIFZhZGltIE9zb3ZpdG55IHZhZGltQG9zb3ZpdG55LmNvbVxyXG4gICAgQW5hdG9seSBPc292aXRueSBhbmF0b2x5QG9zb3ZpdG55LmNvbVxyXG5cclxuICBDcmVhdGVkOlxyXG4gICAgMTUgT2N0IDIwMjNcclxuXHJcbiAgRGVzY3JpcHRpb246XHJcbiAgICBJZGVudGl0eSBhbmQgQWNjZXNzIE1hbmFnZW1lbnRcclxuXHJcbiAgQ29weXJpZ2h0IChjKSAyMDE2LTIwMjIgT3Nvdml0bnkgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLlxyXG48L2ZpbGU+XHJcbiovXHJcblxyXG4vL05vZGVcclxuaW1wb3J0IHsgTG9jYXRpb24gfSBmcm9tIFwiQGFuZ3VsYXIvY29tbW9uXCI7XHJcbmltcG9ydCB7IEluamVjdCwgSW5qZWN0YWJsZSB9IGZyb20gXCJAYW5ndWxhci9jb3JlXCI7XHJcbmltcG9ydCB7IEFjdGl2YXRlZFJvdXRlU25hcHNob3QsIENhbkFjdGl2YXRlLCBSb3V0ZXIsIFJvdXRlclN0YXRlU25hcHNob3QsIFVybFRyZWUgfSBmcm9tIFwiQGFuZ3VsYXIvcm91dGVyXCI7XHJcbmltcG9ydCB7IE1zYWxCcm9hZGNhc3RTZXJ2aWNlLCBNc2FsR3VhcmQsIE1zYWxHdWFyZENvbmZpZ3VyYXRpb24sIE1zYWxTZXJ2aWNlLCBNU0FMX0dVQVJEX0NPTkZJRyB9IGZyb20gJ0BhenVyZS9tc2FsLWFuZ3VsYXInO1xyXG5pbXBvcnQgeyBJbnRlcmFjdGlvblR5cGUgfSBmcm9tIFwiQGF6dXJlL21zYWwtYnJvd3NlclwiO1xyXG5pbXBvcnQgeyBPYnNlcnZhYmxlLCBjb25jYXQsIG1hcCwgb2YgfSBmcm9tIFwicnhqc1wiO1xyXG5cclxuLy9BcHBcclxuaW1wb3J0IHsgQXV0aFNlcnZpY2UgfSBmcm9tIFwiLi4vc2VydmljZXMvYXV0aC5zZXJ2aWNlXCI7XHJcblxyXG5ASW5qZWN0YWJsZSgpXHJcbmV4cG9ydCBjbGFzcyBBdXRoZW50aWNhdGlvbkd1YXJkIGV4dGVuZHMgTXNhbEd1YXJkIGltcGxlbWVudHMgQ2FuQWN0aXZhdGUge1xyXG4gIHByaXZhdGUgX21zYWxHdWFyZENvbmZpZzogTXNhbEd1YXJkQ29uZmlndXJhdGlvbjtcclxuXHJcbiAgY29uc3RydWN0b3IoXHJcbiAgICBASW5qZWN0KE1TQUxfR1VBUkRfQ09ORklHKVxyXG4gICAgbXNhbEd1YXJkQ29uZmlnOiBNc2FsR3VhcmRDb25maWd1cmF0aW9uLFxyXG4gICAgbXNhbEJyb2FkY2FzdFNlcnZpY2U6IE1zYWxCcm9hZGNhc3RTZXJ2aWNlLFxyXG4gICAgbG9jYXRpb246IExvY2F0aW9uLFxyXG4gICAgcm91dGVyOiBSb3V0ZXIsXHJcbiAgICBwcm90ZWN0ZWQgYXV0aFNlcnZpY2VNU0FMOiBNc2FsU2VydmljZSxcclxuICAgIHByb3RlY3RlZCBhdXRoU2VydmljZUFPUzogQXV0aFNlcnZpY2VcclxuICApIHtcclxuICAgIHN1cGVyKG1zYWxHdWFyZENvbmZpZywgbXNhbEJyb2FkY2FzdFNlcnZpY2UsIGF1dGhTZXJ2aWNlTVNBTCwgbG9jYXRpb24sIHJvdXRlcik7XHJcbiAgICB0aGlzLl9tc2FsR3VhcmRDb25maWcgPSBtc2FsR3VhcmRDb25maWc7XHJcbiAgfVxyXG5cclxuICBwcml2YXRlIHNldEludGVyYWN0aW9uVHlwZShyb3V0ZTogQWN0aXZhdGVkUm91dGVTbmFwc2hvdCkge1xyXG4gICAgbGV0IGludGVyYWN0aW9uVHlwZSA9IChyb3V0ZS5kYXRhIGFzIGFueSkuaW50ZXJhY3Rpb25UeXBlO1xyXG4gICAgdGhpcy5fbXNhbEd1YXJkQ29uZmlnLmludGVyYWN0aW9uVHlwZSA9IGludGVyYWN0aW9uVHlwZSB8fCBJbnRlcmFjdGlvblR5cGUuUmVkaXJlY3Q7XHJcbiAgfVxyXG5cclxuICBjYW5BY3RpdmF0ZShyb3V0ZTogQWN0aXZhdGVkUm91dGVTbmFwc2hvdCwgc3RhdGU6IFJvdXRlclN0YXRlU25hcHNob3QpOiBPYnNlcnZhYmxlPGJvb2xlYW4gfCBVcmxUcmVlPiB7XHJcbiAgICB0aGlzLnNldEludGVyYWN0aW9uVHlwZShyb3V0ZSk7XHJcblxyXG4gICAgbGV0IGNhbkFjdGl2YXRlJCA9IHN1cGVyLmNhbkFjdGl2YXRlKHJvdXRlLCBzdGF0ZSk7XHJcblxyXG4gICAgcmV0dXJuIGNhbkFjdGl2YXRlJC5waXBlKG1hcCgoY2FuQWN0aXZhdGUpID0+IHtcclxuICAgICAgcmV0dXJuIGNhbkFjdGl2YXRlICYmIHRoaXMuYXV0aFNlcnZpY2VBT1MuaXNVc2VyU2lnbmVkSW4oKTtcclxuICAgIH0pKTtcclxuICB9XHJcbn1cclxuIl19
|
|
@@ -6,7 +6,7 @@ import { NavigationEnd, NavigationStart, NavigationCancel, NavigationError, Rout
|
|
|
6
6
|
import * as i1$1 from '@angular/common/http';
|
|
7
7
|
import { HttpResponse, HttpClientModule, HttpClient, HTTP_INTERCEPTORS } from '@angular/common/http';
|
|
8
8
|
import { map, tap, mergeMap, catchError as catchError$1 } from 'rxjs/operators';
|
|
9
|
-
import { BehaviorSubject, Subject, filter, takeUntil, map as map$1, catchError, of,
|
|
9
|
+
import { BehaviorSubject, Subject, filter, takeUntil, map as map$1, catchError, of, timer, merge, fromEvent, forkJoin } from 'rxjs';
|
|
10
10
|
import * as i4 from '@azure/msal-angular';
|
|
11
11
|
import { MSAL_GUARD_CONFIG, MsalGuard, MsalInterceptor, MSAL_INTERCEPTOR_CONFIG, MSAL_INSTANCE, MsalService, MsalBroadcastService, MsalModule } from '@azure/msal-angular';
|
|
12
12
|
import { BrowserUtils, EventType, InteractionStatus, InteractionType, InteractionRequiredAuthError, PromptValue, PublicClientApplication, LogLevel } from '@azure/msal-browser';
|
|
@@ -1561,8 +1561,9 @@ class AdminGuard {
|
|
|
1561
1561
|
}], () => [{ type: AuthService }], null); })();
|
|
1562
1562
|
|
|
1563
1563
|
class AuthenticationGuard extends MsalGuard {
|
|
1564
|
-
constructor(msalGuardConfig, msalBroadcastService,
|
|
1564
|
+
constructor(msalGuardConfig, msalBroadcastService, location, router, authServiceMSAL, authServiceAOS) {
|
|
1565
1565
|
super(msalGuardConfig, msalBroadcastService, authServiceMSAL, location, router);
|
|
1566
|
+
this.authServiceMSAL = authServiceMSAL;
|
|
1566
1567
|
this.authServiceAOS = authServiceAOS;
|
|
1567
1568
|
this._msalGuardConfig = msalGuardConfig;
|
|
1568
1569
|
}
|
|
@@ -1572,9 +1573,12 @@ class AuthenticationGuard extends MsalGuard {
|
|
|
1572
1573
|
}
|
|
1573
1574
|
canActivate(route, state) {
|
|
1574
1575
|
this.setInteractionType(route);
|
|
1575
|
-
|
|
1576
|
+
let canActivate$ = super.canActivate(route, state);
|
|
1577
|
+
return canActivate$.pipe(map$1((canActivate) => {
|
|
1578
|
+
return canActivate && this.authServiceAOS.isUserSignedIn();
|
|
1579
|
+
}));
|
|
1576
1580
|
}
|
|
1577
|
-
static { this.ɵfac = function AuthenticationGuard_Factory(t) { return new (t || AuthenticationGuard)(i0.ɵɵinject(MSAL_GUARD_CONFIG), i0.ɵɵinject(i4.MsalBroadcastService), i0.ɵɵinject(
|
|
1581
|
+
static { this.ɵfac = function AuthenticationGuard_Factory(t) { return new (t || AuthenticationGuard)(i0.ɵɵinject(MSAL_GUARD_CONFIG), i0.ɵɵinject(i4.MsalBroadcastService), i0.ɵɵinject(i1$2.Location), i0.ɵɵinject(i1.Router), i0.ɵɵinject(i4.MsalService), i0.ɵɵinject(AuthService)); }; }
|
|
1578
1582
|
static { this.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: AuthenticationGuard, factory: AuthenticationGuard.ɵfac }); }
|
|
1579
1583
|
}
|
|
1580
1584
|
(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(AuthenticationGuard, [{
|
|
@@ -1582,7 +1586,7 @@ class AuthenticationGuard extends MsalGuard {
|
|
|
1582
1586
|
}], () => [{ type: undefined, decorators: [{
|
|
1583
1587
|
type: Inject,
|
|
1584
1588
|
args: [MSAL_GUARD_CONFIG]
|
|
1585
|
-
}] }, { type: i4.MsalBroadcastService }, { type:
|
|
1589
|
+
}] }, { type: i4.MsalBroadcastService }, { type: i1$2.Location }, { type: i1.Router }, { type: i4.MsalService }, { type: AuthService }], null); })();
|
|
1586
1590
|
|
|
1587
1591
|
/*
|
|
1588
1592
|
<file>
|