@azure/msal-angular 0.0.0-alpha1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/IMsalService.d.ts +16 -0
- package/IMsalService.d.ts.map +1 -0
- package/LICENSE +21 -0
- package/README.md +151 -0
- package/azure-msal-angular.d.ts +5 -0
- package/azure-msal-angular.d.ts.map +1 -0
- package/azure-msal-angular.metadata.json +1 -0
- package/bundles/azure-msal-angular.umd.js +991 -0
- package/bundles/azure-msal-angular.umd.js.map +1 -0
- package/bundles/azure-msal-angular.umd.min.js +2 -0
- package/bundles/azure-msal-angular.umd.min.js.map +1 -0
- package/constants.d.ts +6 -0
- package/constants.d.ts.map +1 -0
- package/esm2015/IMsalService.js +6 -0
- package/esm2015/azure-msal-angular.js +5 -0
- package/esm2015/constants.js +10 -0
- package/esm2015/msal.broadcast.config.js +6 -0
- package/esm2015/msal.broadcast.service.js +46 -0
- package/esm2015/msal.guard.config.js +6 -0
- package/esm2015/msal.guard.js +189 -0
- package/esm2015/msal.interceptor.config.js +6 -0
- package/esm2015/msal.interceptor.js +208 -0
- package/esm2015/msal.module.js +46 -0
- package/esm2015/msal.navigation.client.js +53 -0
- package/esm2015/msal.redirect.component.js +33 -0
- package/esm2015/msal.service.js +77 -0
- package/esm2015/packageMetadata.js +4 -0
- package/esm2015/public-api.js +18 -0
- package/fesm2015/azure-msal-angular.js +636 -0
- package/fesm2015/azure-msal-angular.js.map +1 -0
- package/msal.broadcast.config.d.ts +4 -0
- package/msal.broadcast.config.d.ts.map +1 -0
- package/msal.broadcast.service.d.ts +15 -0
- package/msal.broadcast.service.d.ts.map +1 -0
- package/msal.guard.config.d.ts +10 -0
- package/msal.guard.config.d.ts.map +1 -0
- package/msal.guard.d.ts +41 -0
- package/msal.guard.d.ts.map +1 -0
- package/msal.interceptor.config.d.ts +18 -0
- package/msal.interceptor.config.d.ts.map +1 -0
- package/msal.interceptor.d.ts +50 -0
- package/msal.interceptor.d.ts.map +1 -0
- package/msal.module.d.ts +8 -0
- package/msal.module.d.ts.map +1 -0
- package/msal.navigation.client.d.ts +17 -0
- package/msal.navigation.client.d.ts.map +1 -0
- package/msal.redirect.component.d.ts +13 -0
- package/msal.redirect.component.d.ts.map +1 -0
- package/msal.service.d.ts +29 -0
- package/msal.service.d.ts.map +1 -0
- package/package.json +35 -0
- package/packageMetadata.d.ts +3 -0
- package/packageMetadata.d.ts.map +1 -0
- package/public-api.d.ts +18 -0
- package/public-api.d.ts.map +1 -0
|
@@ -0,0 +1,189 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3
|
+
* Licensed under the MIT License.
|
|
4
|
+
*/
|
|
5
|
+
import { Router } from "@angular/router";
|
|
6
|
+
import { MsalService } from "./msal.service";
|
|
7
|
+
import { Injectable, Inject, VERSION } from "@angular/core";
|
|
8
|
+
import { Location } from "@angular/common";
|
|
9
|
+
import { InteractionType, BrowserConfigurationAuthError, BrowserUtils, UrlString } from "@azure/msal-browser";
|
|
10
|
+
import { MSAL_GUARD_CONFIG } from "./constants";
|
|
11
|
+
import { concatMap, catchError, map } from "rxjs/operators";
|
|
12
|
+
import { of } from "rxjs";
|
|
13
|
+
import { MsalBroadcastService } from "./msal.broadcast.service";
|
|
14
|
+
export class MsalGuard {
|
|
15
|
+
constructor(msalGuardConfig, msalBroadcastService, authService, location, router) {
|
|
16
|
+
this.msalGuardConfig = msalGuardConfig;
|
|
17
|
+
this.msalBroadcastService = msalBroadcastService;
|
|
18
|
+
this.authService = authService;
|
|
19
|
+
this.location = location;
|
|
20
|
+
this.router = router;
|
|
21
|
+
// Subscribing so events in MsalGuard will set inProgress$ observable
|
|
22
|
+
this.msalBroadcastService.inProgress$.subscribe();
|
|
23
|
+
}
|
|
24
|
+
/**
|
|
25
|
+
* Parses url string to UrlTree
|
|
26
|
+
* @param url
|
|
27
|
+
*/
|
|
28
|
+
parseUrl(url) {
|
|
29
|
+
return this.router.parseUrl(url);
|
|
30
|
+
}
|
|
31
|
+
/**
|
|
32
|
+
* Builds the absolute url for the destination page
|
|
33
|
+
* @param path Relative path of requested page
|
|
34
|
+
* @returns Full destination url
|
|
35
|
+
*/
|
|
36
|
+
getDestinationUrl(path) {
|
|
37
|
+
this.authService.getLogger().verbose("Guard - getting destination url");
|
|
38
|
+
// Absolute base url for the application (default to origin if base element not present)
|
|
39
|
+
const baseElements = document.getElementsByTagName("base");
|
|
40
|
+
const baseUrl = this.location.normalize(baseElements.length ? baseElements[0].href : window.location.origin);
|
|
41
|
+
// Path of page (including hash, if using hash routing)
|
|
42
|
+
const pathUrl = this.location.prepareExternalUrl(path);
|
|
43
|
+
// Hash location strategy
|
|
44
|
+
if (pathUrl.startsWith("#")) {
|
|
45
|
+
this.authService.getLogger().verbose("Guard - destination by hash routing");
|
|
46
|
+
return `${baseUrl}/${pathUrl}`;
|
|
47
|
+
}
|
|
48
|
+
/*
|
|
49
|
+
* If using path location strategy, pathUrl will include the relative portion of the base path (e.g. /base/page).
|
|
50
|
+
* Since baseUrl also includes /base, can just concatentate baseUrl + path
|
|
51
|
+
*/
|
|
52
|
+
return `${baseUrl}${path}`;
|
|
53
|
+
}
|
|
54
|
+
/**
|
|
55
|
+
* Interactively prompt the user to login
|
|
56
|
+
* @param url Path of the requested page
|
|
57
|
+
*/
|
|
58
|
+
loginInteractively(state) {
|
|
59
|
+
const authRequest = typeof this.msalGuardConfig.authRequest === "function"
|
|
60
|
+
? this.msalGuardConfig.authRequest(this.authService, state)
|
|
61
|
+
: Object.assign({}, this.msalGuardConfig.authRequest);
|
|
62
|
+
if (this.msalGuardConfig.interactionType === InteractionType.Popup) {
|
|
63
|
+
this.authService.getLogger().verbose("Guard - logging in by popup");
|
|
64
|
+
return this.authService.loginPopup(authRequest)
|
|
65
|
+
.pipe(map((response) => {
|
|
66
|
+
this.authService.getLogger().verbose("Guard - login by popup successful, can activate, setting active account");
|
|
67
|
+
this.authService.instance.setActiveAccount(response.account);
|
|
68
|
+
return true;
|
|
69
|
+
}));
|
|
70
|
+
}
|
|
71
|
+
this.authService.getLogger().verbose("Guard - logging in by redirect");
|
|
72
|
+
const redirectStartPage = this.getDestinationUrl(state.url);
|
|
73
|
+
return this.authService.loginRedirect(Object.assign({ redirectStartPage }, authRequest))
|
|
74
|
+
.pipe(map(() => false));
|
|
75
|
+
}
|
|
76
|
+
/**
|
|
77
|
+
* Helper which checks for the correct interaction type, prevents page with Guard to be set as reidrect, and calls handleRedirectObservable
|
|
78
|
+
* @param state
|
|
79
|
+
*/
|
|
80
|
+
activateHelper(state) {
|
|
81
|
+
if (this.msalGuardConfig.interactionType !== InteractionType.Popup && this.msalGuardConfig.interactionType !== InteractionType.Redirect) {
|
|
82
|
+
throw new BrowserConfigurationAuthError("invalid_interaction_type", "Invalid interaction type provided to MSAL Guard. InteractionType.Popup or InteractionType.Redirect must be provided in the MsalGuardConfiguration");
|
|
83
|
+
}
|
|
84
|
+
this.authService.getLogger().verbose("MSAL Guard activated");
|
|
85
|
+
/*
|
|
86
|
+
* If a page with MSAL Guard is set as the redirect for acquireTokenSilent,
|
|
87
|
+
* short-circuit to prevent redirecting or popups.
|
|
88
|
+
*/
|
|
89
|
+
if (typeof window !== "undefined") {
|
|
90
|
+
if (UrlString.hashContainsKnownProperties(window.location.hash) && BrowserUtils.isInIframe() && !this.authService.instance.getConfiguration().system.allowRedirectInIframe) {
|
|
91
|
+
this.authService.getLogger().warning("Guard - redirectUri set to page with MSAL Guard. It is recommended to not set redirectUri to a page that requires authentication.");
|
|
92
|
+
return of(false);
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
else {
|
|
96
|
+
this.authService.getLogger().info("Guard - window is undefined, MSAL does not support server-side token acquisition");
|
|
97
|
+
return of(true);
|
|
98
|
+
}
|
|
99
|
+
/**
|
|
100
|
+
* If a loginFailedRoute is set in the config, set this as the loginFailedRoute
|
|
101
|
+
*/
|
|
102
|
+
if (this.msalGuardConfig.loginFailedRoute) {
|
|
103
|
+
this.loginFailedRoute = this.parseUrl(this.msalGuardConfig.loginFailedRoute);
|
|
104
|
+
}
|
|
105
|
+
// Capture current path before it gets changed by handleRedirectObservable
|
|
106
|
+
const currentPath = this.location.path(true);
|
|
107
|
+
return this.authService.handleRedirectObservable()
|
|
108
|
+
.pipe(concatMap(() => {
|
|
109
|
+
if (!this.authService.instance.getAllAccounts().length) {
|
|
110
|
+
if (state) {
|
|
111
|
+
this.authService.getLogger().verbose("Guard - no accounts retrieved, log in required to activate");
|
|
112
|
+
return this.loginInteractively(state);
|
|
113
|
+
}
|
|
114
|
+
this.authService.getLogger().verbose("Guard - no accounts retrieved, no state, cannot load");
|
|
115
|
+
return of(false);
|
|
116
|
+
}
|
|
117
|
+
this.authService.getLogger().verbose("Guard - at least 1 account exists, can activate or load");
|
|
118
|
+
// Prevent navigating the app to /#code= or /code=
|
|
119
|
+
if (state) {
|
|
120
|
+
/*
|
|
121
|
+
* Path routing:
|
|
122
|
+
* state.url: /#code=...
|
|
123
|
+
* state.root.fragment: code=...
|
|
124
|
+
*/
|
|
125
|
+
/*
|
|
126
|
+
* Hash routing:
|
|
127
|
+
* state.url: /code
|
|
128
|
+
* state.root.fragment: null
|
|
129
|
+
*/
|
|
130
|
+
const urlContainsCode = this.includesCode(state.url);
|
|
131
|
+
const fragmentContainsCode = !!state.root && !!state.root.fragment && this.includesCode(`#${state.root.fragment}`);
|
|
132
|
+
const hashRouting = this.location.prepareExternalUrl(state.url).indexOf("#") === 0;
|
|
133
|
+
// Ensure code parameter is in fragment (and not in query parameter), or that hash hash routing is used
|
|
134
|
+
if (urlContainsCode && (fragmentContainsCode || hashRouting)) {
|
|
135
|
+
this.authService.getLogger().info("Guard - Hash contains known code response, stopping navigation.");
|
|
136
|
+
// Path routing (navigate to current path without hash)
|
|
137
|
+
if (currentPath.indexOf("#") > -1) {
|
|
138
|
+
return of(this.parseUrl(this.location.path()));
|
|
139
|
+
}
|
|
140
|
+
// Hash routing (navigate to root path)
|
|
141
|
+
return of(this.parseUrl(""));
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
return of(true);
|
|
145
|
+
}), catchError((error) => {
|
|
146
|
+
this.authService.getLogger().error("Guard - error while logging in, unable to activate");
|
|
147
|
+
this.authService.getLogger().errorPii(`Guard - error: ${error.message}`);
|
|
148
|
+
/**
|
|
149
|
+
* If a loginFailedRoute is set, checks to see if Angular 10+ is used and state is passed in before returning route
|
|
150
|
+
* Apps using Angular 9 will receive of(false) in canLoad interface, as it does not support UrlTree return types
|
|
151
|
+
*/
|
|
152
|
+
if (this.loginFailedRoute && parseInt(VERSION.major, 10) > 9 && state) {
|
|
153
|
+
this.authService.getLogger().verbose("Guard - loginFailedRoute set, redirecting");
|
|
154
|
+
return of(this.loginFailedRoute);
|
|
155
|
+
}
|
|
156
|
+
return of(false);
|
|
157
|
+
}));
|
|
158
|
+
}
|
|
159
|
+
includesCode(path) {
|
|
160
|
+
return (path.lastIndexOf("/code") > -1 &&
|
|
161
|
+
path.lastIndexOf("/code") === path.length - "/code".length) || // path.endsWith("/code")
|
|
162
|
+
path.indexOf("#code=") > -1 ||
|
|
163
|
+
path.indexOf("&code=") > -1;
|
|
164
|
+
}
|
|
165
|
+
canActivate(route, state) {
|
|
166
|
+
this.authService.getLogger().verbose("Guard - canActivate");
|
|
167
|
+
return this.activateHelper(state);
|
|
168
|
+
}
|
|
169
|
+
canActivateChild(route, state) {
|
|
170
|
+
this.authService.getLogger().verbose("Guard - canActivateChild");
|
|
171
|
+
return this.activateHelper(state);
|
|
172
|
+
}
|
|
173
|
+
canLoad() {
|
|
174
|
+
this.authService.getLogger().verbose("Guard - canLoad");
|
|
175
|
+
// @ts-ignore
|
|
176
|
+
return this.activateHelper();
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
MsalGuard.decorators = [
|
|
180
|
+
{ type: Injectable }
|
|
181
|
+
];
|
|
182
|
+
MsalGuard.ctorParameters = () => [
|
|
183
|
+
{ type: undefined, decorators: [{ type: Inject, args: [MSAL_GUARD_CONFIG,] }] },
|
|
184
|
+
{ type: MsalBroadcastService },
|
|
185
|
+
{ type: MsalService },
|
|
186
|
+
{ type: Location },
|
|
187
|
+
{ type: Router }
|
|
188
|
+
];
|
|
189
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"msal.guard.js","sourceRoot":"","sources":["../../src/msal.guard.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright (c) Microsoft Corporation. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, CanActivateChild, CanLoad, UrlTree, Router } from \"@angular/router\";\nimport { MsalService } from \"./msal.service\";\nimport { Injectable, Inject, VERSION } from \"@angular/core\";\nimport { Location } from \"@angular/common\";\nimport { InteractionType, BrowserConfigurationAuthError, BrowserUtils, UrlString, PopupRequest, RedirectRequest, AuthenticationResult } from \"@azure/msal-browser\";\nimport { MsalGuardConfiguration } from \"./msal.guard.config\";\nimport { MSAL_GUARD_CONFIG } from \"./constants\";\nimport { concatMap, catchError, map } from \"rxjs/operators\";\nimport { Observable, of } from \"rxjs\";\nimport { MsalBroadcastService } from \"./msal.broadcast.service\";\n\n@Injectable()\nexport class MsalGuard implements CanActivate, CanActivateChild, CanLoad {\n    private loginFailedRoute?: UrlTree;\n\n    constructor(\n        @Inject(MSAL_GUARD_CONFIG) private msalGuardConfig: MsalGuardConfiguration,\n        private msalBroadcastService: MsalBroadcastService,\n        private authService: MsalService,\n        private location: Location,\n        private router: Router\n    ) { \n        // Subscribing so events in MsalGuard will set inProgress$ observable\n        this.msalBroadcastService.inProgress$.subscribe();\n    }\n\n    /**\n     * Parses url string to UrlTree\n     * @param url \n     */\n    parseUrl(url: string): UrlTree {\n        return this.router.parseUrl(url);\n    }\n\n    /**\n     * Builds the absolute url for the destination page\n     * @param path Relative path of requested page\n     * @returns Full destination url\n     */\n    getDestinationUrl(path: string): string {\n        this.authService.getLogger().verbose(\"Guard - getting destination url\");\n        // Absolute base url for the application (default to origin if base element not present)\n        const baseElements = document.getElementsByTagName(\"base\");\n        const baseUrl = this.location.normalize(baseElements.length ? baseElements[0].href : window.location.origin);\n\n        // Path of page (including hash, if using hash routing)\n        const pathUrl = this.location.prepareExternalUrl(path);\n\n        // Hash location strategy\n        if (pathUrl.startsWith(\"#\")) {\n            this.authService.getLogger().verbose(\"Guard - destination by hash routing\");\n            return `${baseUrl}/${pathUrl}`;\n        }\n\n        /*\n         * If using path location strategy, pathUrl will include the relative portion of the base path (e.g. /base/page).\n         * Since baseUrl also includes /base, can just concatentate baseUrl + path\n         */\n        return `${baseUrl}${path}`;\n    }\n\n    /**\n     * Interactively prompt the user to login\n     * @param url Path of the requested page\n     */\n    private loginInteractively(state: RouterStateSnapshot): Observable<boolean> {\n        const authRequest = typeof this.msalGuardConfig.authRequest === \"function\"\n            ? this.msalGuardConfig.authRequest(this.authService, state)\n            : { ...this.msalGuardConfig.authRequest };\n        if (this.msalGuardConfig.interactionType === InteractionType.Popup) {\n            this.authService.getLogger().verbose(\"Guard - logging in by popup\");\n            return this.authService.loginPopup(authRequest as PopupRequest)\n                .pipe(\n                    map((response: AuthenticationResult) => {\n                        this.authService.getLogger().verbose(\"Guard - login by popup successful, can activate, setting active account\");\n                        this.authService.instance.setActiveAccount(response.account);\n                        return true;\n                    })\n                );\n        }\n\n        this.authService.getLogger().verbose(\"Guard - logging in by redirect\");\n        const redirectStartPage = this.getDestinationUrl(state.url);\n        return this.authService.loginRedirect({\n            redirectStartPage,\n            ...authRequest\n        } as RedirectRequest)\n            .pipe(\n                map(() => false)\n            );\n    }\n\n    /**\n     * Helper which checks for the correct interaction type, prevents page with Guard to be set as reidrect, and calls handleRedirectObservable\n     * @param state \n     */\n    private activateHelper(state?: RouterStateSnapshot): Observable<boolean|UrlTree> {\n        if (this.msalGuardConfig.interactionType !== InteractionType.Popup && this.msalGuardConfig.interactionType !== InteractionType.Redirect) {\n            throw new BrowserConfigurationAuthError(\"invalid_interaction_type\", \"Invalid interaction type provided to MSAL Guard. InteractionType.Popup or InteractionType.Redirect must be provided in the MsalGuardConfiguration\");\n        }\n        this.authService.getLogger().verbose(\"MSAL Guard activated\");\n\n        /*\n         * If a page with MSAL Guard is set as the redirect for acquireTokenSilent,\n         * short-circuit to prevent redirecting or popups.\n         */\n        if (typeof window !== \"undefined\") {\n            if (UrlString.hashContainsKnownProperties(window.location.hash) && BrowserUtils.isInIframe() && !this.authService.instance.getConfiguration().system.allowRedirectInIframe) {\n                this.authService.getLogger().warning(\"Guard - redirectUri set to page with MSAL Guard. It is recommended to not set redirectUri to a page that requires authentication.\");\n                return of(false);\n            }\n        } else {\n            this.authService.getLogger().info(\"Guard - window is undefined, MSAL does not support server-side token acquisition\");\n            return of(true);\n        }\n\n        /**\n         * If a loginFailedRoute is set in the config, set this as the loginFailedRoute\n         */\n        if (this.msalGuardConfig.loginFailedRoute) {\n            this.loginFailedRoute = this.parseUrl(this.msalGuardConfig.loginFailedRoute);\n        }\n\n        // Capture current path before it gets changed by handleRedirectObservable\n        const currentPath = this.location.path(true);\n\n        return this.authService.handleRedirectObservable()\n            .pipe(\n                concatMap(() => {\n                    if (!this.authService.instance.getAllAccounts().length) {\n                        if (state) {\n                            this.authService.getLogger().verbose(\"Guard - no accounts retrieved, log in required to activate\");\n                            return this.loginInteractively(state);\n                        } \n                        this.authService.getLogger().verbose(\"Guard - no accounts retrieved, no state, cannot load\");\n                        return of(false);\n                    }\n\n                    this.authService.getLogger().verbose(\"Guard - at least 1 account exists, can activate or load\");\n\n                    // Prevent navigating the app to /#code= or /code=\n                    if (state) {\n                        /*\n                         * Path routing:\n                         * state.url: /#code=...\n                         * state.root.fragment: code=...\n                         */\n\n                        /*\n                         * Hash routing:\n                         * state.url: /code\n                         * state.root.fragment: null\n                         */\n                        const urlContainsCode: boolean = this.includesCode(state.url);\n                        const fragmentContainsCode: boolean = !!state.root && !!state.root.fragment && this.includesCode(`#${state.root.fragment}`);\n                        const hashRouting: boolean = this.location.prepareExternalUrl(state.url).indexOf(\"#\") === 0;\n\n                        // Ensure code parameter is in fragment (and not in query parameter), or that hash hash routing is used\n                        if (urlContainsCode && (fragmentContainsCode || hashRouting)) {\n                            this.authService.getLogger().info(\"Guard - Hash contains known code response, stopping navigation.\");\n                            \n                            // Path routing (navigate to current path without hash)\n                            if (currentPath.indexOf(\"#\") > -1) {\n                                return of(this.parseUrl(this.location.path()));\n                            }\n                            \n                            // Hash routing (navigate to root path)\n                            return of(this.parseUrl(\"\"));\n                        }\n                    }\n\n                    return of(true);\n\n                }),\n                catchError((error: Error) => {\n                    this.authService.getLogger().error(\"Guard - error while logging in, unable to activate\");\n                    this.authService.getLogger().errorPii(`Guard - error: ${error.message}`);\n                    /**\n                     * If a loginFailedRoute is set, checks to see if Angular 10+ is used and state is passed in before returning route\n                     * Apps using Angular 9 will receive of(false) in canLoad interface, as it does not support UrlTree return types\n                     */\n                    if (this.loginFailedRoute && parseInt(VERSION.major, 10) > 9 && state) {\n                        this.authService.getLogger().verbose(\"Guard - loginFailedRoute set, redirecting\");\n                        return of(this.loginFailedRoute);\n                    }\n                    return of(false);\n                })\n            );\n    }\n\n    includesCode(path: string): boolean {\n        return (path.lastIndexOf(\"/code\") > -1 &&\n            path.lastIndexOf(\"/code\") === path.length - \"/code\".length) || // path.endsWith(\"/code\")\n            path.indexOf(\"#code=\") > -1 || \n            path.indexOf(\"&code=\") > -1;\n    }\n\n    canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean|UrlTree> {\n        this.authService.getLogger().verbose(\"Guard - canActivate\");\n        return this.activateHelper(state);\n    }\n\n    canActivateChild(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean|UrlTree> {\n        this.authService.getLogger().verbose(\"Guard - canActivateChild\");\n        return this.activateHelper(state);\n    }\n\n    canLoad(): Observable<boolean> {\n        this.authService.getLogger().verbose(\"Guard - canLoad\");\n        // @ts-ignore\n        return this.activateHelper();\n    }\n}\n"]}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3
|
+
* Licensed under the MIT License.
|
|
4
|
+
*/
|
|
5
|
+
export {};
|
|
6
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXNhbC5pbnRlcmNlcHRvci5jb25maWcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbXNhbC5pbnRlcmNlcHRvci5jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7OztHQUdHIiwic291cmNlc0NvbnRlbnQiOlsiLypcbiAqIENvcHlyaWdodCAoYykgTWljcm9zb2Z0IENvcnBvcmF0aW9uLiBBbGwgcmlnaHRzIHJlc2VydmVkLlxuICogTGljZW5zZWQgdW5kZXIgdGhlIE1JVCBMaWNlbnNlLlxuICovXG5cbmltcG9ydCB7IEh0dHBSZXF1ZXN0IH0gZnJvbSBcIkBhbmd1bGFyL2NvbW1vbi9odHRwXCI7XG5pbXBvcnQgeyBQb3B1cFJlcXVlc3QsIFJlZGlyZWN0UmVxdWVzdCwgSW50ZXJhY3Rpb25UeXBlLCBTaWxlbnRSZXF1ZXN0IH0gZnJvbSBcIkBhenVyZS9tc2FsLWJyb3dzZXJcIjtcbmltcG9ydCB7IE1zYWxTZXJ2aWNlIH0gZnJvbSBcIi4vbXNhbC5zZXJ2aWNlXCI7XG5cbmV4cG9ydCBkZWNsYXJlIHR5cGUgTXNhbEludGVyY2VwdG9yQXV0aFJlcXVlc3QgPSBPbWl0PFBvcHVwUmVxdWVzdCwgXCJzY29wZXNcIj4gfCBPbWl0PFJlZGlyZWN0UmVxdWVzdCwgXCJzY29wZXNcIj4gfCBPbWl0PFNpbGVudFJlcXVlc3QsIFwic2NvcGVzXCI+IDtcblxuZXhwb3J0IHR5cGUgTXNhbEludGVyY2VwdG9yQ29uZmlndXJhdGlvbiA9IHtcbiAgICBpbnRlcmFjdGlvblR5cGU6IEludGVyYWN0aW9uVHlwZS5Qb3B1cCB8IEludGVyYWN0aW9uVHlwZS5SZWRpcmVjdDtcbiAgICBwcm90ZWN0ZWRSZXNvdXJjZU1hcDogTWFwPHN0cmluZywgQXJyYXk8c3RyaW5nfFByb3RlY3RlZFJlc291cmNlU2NvcGVzPiB8IG51bGw+O1xuICAgIGF1dGhSZXF1ZXN0PzogTXNhbEludGVyY2VwdG9yQXV0aFJlcXVlc3QgfCAoKG1zYWxTZXJ2aWNlOiBNc2FsU2VydmljZSwgcmVxOiBIdHRwUmVxdWVzdDx1bmtub3duPiwgb3JpZ2luYWxBdXRoUmVxdWVzdDogTXNhbEludGVyY2VwdG9yQXV0aFJlcXVlc3QpID0+IE1zYWxJbnRlcmNlcHRvckF1dGhSZXF1ZXN0KTtcbn07XG5cbmV4cG9ydCB0eXBlIFByb3RlY3RlZFJlc291cmNlU2NvcGVzID0ge1xuICAgIGh0dHBNZXRob2Q6IHN0cmluZyxcbiAgICBzY29wZXM6IEFycmF5PHN0cmluZz5cbn07XG5cbmV4cG9ydCB0eXBlIE1hdGNoaW5nUmVzb3VyY2VzID0ge1xuICAgIGFic29sdXRlUmVzb3VyY2VzOiBBcnJheTxzdHJpbmc+LFxuICAgIHJlbGF0aXZlUmVzb3VyY2VzOiBBcnJheTxzdHJpbmc+XG59O1xuIl19
|
|
@@ -0,0 +1,208 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3
|
+
* Licensed under the MIT License.
|
|
4
|
+
*/
|
|
5
|
+
import { Location, DOCUMENT } from "@angular/common";
|
|
6
|
+
import { EMPTY, of } from "rxjs";
|
|
7
|
+
import { switchMap, catchError } from "rxjs/operators";
|
|
8
|
+
import { MsalService } from "./msal.service";
|
|
9
|
+
import { BrowserConfigurationAuthError, InteractionType, StringUtils, UrlString } from "@azure/msal-browser";
|
|
10
|
+
import { Injectable, Inject } from "@angular/core";
|
|
11
|
+
import { MSAL_INTERCEPTOR_CONFIG } from "./constants";
|
|
12
|
+
export class MsalInterceptor {
|
|
13
|
+
constructor(msalInterceptorConfig, authService, location,
|
|
14
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
|
|
15
|
+
document) {
|
|
16
|
+
this.msalInterceptorConfig = msalInterceptorConfig;
|
|
17
|
+
this.authService = authService;
|
|
18
|
+
this.location = location;
|
|
19
|
+
this._document = document;
|
|
20
|
+
}
|
|
21
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
22
|
+
intercept(req, next) {
|
|
23
|
+
if (this.msalInterceptorConfig.interactionType !== InteractionType.Popup && this.msalInterceptorConfig.interactionType !== InteractionType.Redirect) {
|
|
24
|
+
throw new BrowserConfigurationAuthError("invalid_interaction_type", "Invalid interaction type provided to MSAL Interceptor. InteractionType.Popup, InteractionType.Redirect must be provided in the msalInterceptorConfiguration");
|
|
25
|
+
}
|
|
26
|
+
this.authService.getLogger().verbose("MSAL Interceptor activated");
|
|
27
|
+
const scopes = this.getScopesForEndpoint(req.url, req.method);
|
|
28
|
+
// If no scopes for endpoint, does not acquire token
|
|
29
|
+
if (!scopes || scopes.length === 0) {
|
|
30
|
+
this.authService.getLogger().verbose("Interceptor - no scopes for endpoint");
|
|
31
|
+
return next.handle(req);
|
|
32
|
+
}
|
|
33
|
+
// Sets account as active account or first account
|
|
34
|
+
let account;
|
|
35
|
+
if (!!this.authService.instance.getActiveAccount()) {
|
|
36
|
+
this.authService.getLogger().verbose("Interceptor - active account selected");
|
|
37
|
+
account = this.authService.instance.getActiveAccount();
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
this.authService.getLogger().verbose("Interceptor - no active account, fallback to first account");
|
|
41
|
+
account = this.authService.instance.getAllAccounts()[0];
|
|
42
|
+
}
|
|
43
|
+
const authRequest = typeof this.msalInterceptorConfig.authRequest === "function"
|
|
44
|
+
? this.msalInterceptorConfig.authRequest(this.authService, req, { account: account })
|
|
45
|
+
: Object.assign(Object.assign({}, this.msalInterceptorConfig.authRequest), { account });
|
|
46
|
+
this.authService.getLogger().info(`Interceptor - ${scopes.length} scopes found for endpoint`);
|
|
47
|
+
this.authService.getLogger().infoPii(`Interceptor - [${scopes}] scopes found for ${req.url}`);
|
|
48
|
+
// Note: For MSA accounts, include openid scope when calling acquireTokenSilent to return idToken
|
|
49
|
+
return this.authService.acquireTokenSilent(Object.assign(Object.assign({}, authRequest), { scopes, account }))
|
|
50
|
+
.pipe(catchError(() => {
|
|
51
|
+
this.authService.getLogger().error("Interceptor - acquireTokenSilent rejected with error. Invoking interaction to resolve.");
|
|
52
|
+
return this.acquireTokenInteractively(authRequest, scopes);
|
|
53
|
+
}), switchMap((result) => {
|
|
54
|
+
if (!result.accessToken) {
|
|
55
|
+
this.authService.getLogger().error("Interceptor - acquireTokenSilent resolved with null access token. Known issue with B2C tenants, invoking interaction to resolve.");
|
|
56
|
+
return this.acquireTokenInteractively(authRequest, scopes);
|
|
57
|
+
}
|
|
58
|
+
return of(result);
|
|
59
|
+
}), switchMap((result) => {
|
|
60
|
+
this.authService.getLogger().verbose("Interceptor - setting authorization headers");
|
|
61
|
+
const headers = req.headers
|
|
62
|
+
.set("Authorization", `Bearer ${result.accessToken}`);
|
|
63
|
+
const requestClone = req.clone({ headers });
|
|
64
|
+
return next.handle(requestClone);
|
|
65
|
+
}));
|
|
66
|
+
}
|
|
67
|
+
/**
|
|
68
|
+
* Invoke interaction for the given set of scopes
|
|
69
|
+
* @param authRequest Request
|
|
70
|
+
* @param scopes Array of scopes for the request
|
|
71
|
+
* @returns Result from the interactive request
|
|
72
|
+
*/
|
|
73
|
+
acquireTokenInteractively(authRequest, scopes) {
|
|
74
|
+
if (this.msalInterceptorConfig.interactionType === InteractionType.Popup) {
|
|
75
|
+
this.authService.getLogger().verbose("Interceptor - error acquiring token silently, acquiring by popup");
|
|
76
|
+
return this.authService.acquireTokenPopup(Object.assign(Object.assign({}, authRequest), { scopes }));
|
|
77
|
+
}
|
|
78
|
+
this.authService.getLogger().verbose("Interceptor - error acquiring token silently, acquiring by redirect");
|
|
79
|
+
const redirectStartPage = window.location.href;
|
|
80
|
+
this.authService.acquireTokenRedirect(Object.assign(Object.assign({}, authRequest), { scopes, redirectStartPage }));
|
|
81
|
+
return EMPTY;
|
|
82
|
+
}
|
|
83
|
+
/**
|
|
84
|
+
* Looks up the scopes for the given endpoint from the protectedResourceMap
|
|
85
|
+
* @param endpoint Url of the request
|
|
86
|
+
* @param httpMethod Http method of the request
|
|
87
|
+
* @returns Array of scopes, or null if not found
|
|
88
|
+
*
|
|
89
|
+
*/
|
|
90
|
+
getScopesForEndpoint(endpoint, httpMethod) {
|
|
91
|
+
this.authService.getLogger().verbose("Interceptor - getting scopes for endpoint");
|
|
92
|
+
// Ensures endpoints and protected resources compared are normalized
|
|
93
|
+
const normalizedEndpoint = this.location.normalize(endpoint);
|
|
94
|
+
const protectedResourcesArray = Array.from(this.msalInterceptorConfig.protectedResourceMap.keys());
|
|
95
|
+
const matchingProtectedResources = this.matchResourcesToEndpoint(protectedResourcesArray, normalizedEndpoint);
|
|
96
|
+
// Check absolute urls of resources first before checking relative to prevent incorrect matching where multiple resources have similar relative urls
|
|
97
|
+
if (matchingProtectedResources.absoluteResources.length > 0) {
|
|
98
|
+
return this.matchScopesToEndpoint(this.msalInterceptorConfig.protectedResourceMap, matchingProtectedResources.absoluteResources, httpMethod);
|
|
99
|
+
}
|
|
100
|
+
else if (matchingProtectedResources.relativeResources.length > 0) {
|
|
101
|
+
return this.matchScopesToEndpoint(this.msalInterceptorConfig.protectedResourceMap, matchingProtectedResources.relativeResources, httpMethod);
|
|
102
|
+
}
|
|
103
|
+
return null;
|
|
104
|
+
}
|
|
105
|
+
/**
|
|
106
|
+
* Finds resource endpoints that match request endpoint
|
|
107
|
+
* @param protectedResourcesEndpoints
|
|
108
|
+
* @param endpoint
|
|
109
|
+
* @returns
|
|
110
|
+
*/
|
|
111
|
+
matchResourcesToEndpoint(protectedResourcesEndpoints, endpoint) {
|
|
112
|
+
const matchingResources = { absoluteResources: [], relativeResources: [] };
|
|
113
|
+
protectedResourcesEndpoints.forEach(key => {
|
|
114
|
+
// Normalizes and adds resource to matchingResources.absoluteResources if key matches endpoint. StringUtils.matchPattern accounts for wildcards
|
|
115
|
+
const normalizedKey = this.location.normalize(key);
|
|
116
|
+
if (StringUtils.matchPattern(normalizedKey, endpoint)) {
|
|
117
|
+
matchingResources.absoluteResources.push(key);
|
|
118
|
+
}
|
|
119
|
+
// Get url components for relative urls
|
|
120
|
+
const absoluteKey = this.getAbsoluteUrl(key);
|
|
121
|
+
const keyComponents = new UrlString(absoluteKey).getUrlComponents();
|
|
122
|
+
const absoluteEndpoint = this.getAbsoluteUrl(endpoint);
|
|
123
|
+
const endpointComponents = new UrlString(absoluteEndpoint).getUrlComponents();
|
|
124
|
+
// Normalized key should include query strings if applicable
|
|
125
|
+
const relativeNormalizedKey = keyComponents.QueryString ? `${keyComponents.AbsolutePath}?${keyComponents.QueryString}` : this.location.normalize(keyComponents.AbsolutePath);
|
|
126
|
+
// Add resource to matchingResources.relativeResources if same origin, relativeKey matches endpoint, and is not empty
|
|
127
|
+
if (keyComponents.HostNameAndPort === endpointComponents.HostNameAndPort && StringUtils.matchPattern(relativeNormalizedKey, absoluteEndpoint) && relativeNormalizedKey !== "" && relativeNormalizedKey !== "/*") {
|
|
128
|
+
matchingResources.relativeResources.push(key);
|
|
129
|
+
}
|
|
130
|
+
});
|
|
131
|
+
return matchingResources;
|
|
132
|
+
}
|
|
133
|
+
/**
|
|
134
|
+
* Transforms relative urls to absolute urls
|
|
135
|
+
* @param url
|
|
136
|
+
* @returns
|
|
137
|
+
*/
|
|
138
|
+
getAbsoluteUrl(url) {
|
|
139
|
+
const link = this._document.createElement("a");
|
|
140
|
+
link.href = url;
|
|
141
|
+
return link.href;
|
|
142
|
+
}
|
|
143
|
+
/**
|
|
144
|
+
* Finds scopes from first matching endpoint with HTTP method that matches request
|
|
145
|
+
* @param protectedResourceMap Protected resource map
|
|
146
|
+
* @param endpointArray Array of resources that match request endpoint
|
|
147
|
+
* @param httpMethod Http method of the request
|
|
148
|
+
* @returns
|
|
149
|
+
*/
|
|
150
|
+
matchScopesToEndpoint(protectedResourceMap, endpointArray, httpMethod) {
|
|
151
|
+
const allMatchedScopes = [];
|
|
152
|
+
// Check each matched endpoint for matching HttpMethod and scopes
|
|
153
|
+
endpointArray.forEach(matchedEndpoint => {
|
|
154
|
+
const scopesForEndpoint = [];
|
|
155
|
+
const methodAndScopesArray = protectedResourceMap.get(matchedEndpoint);
|
|
156
|
+
// Return if resource is unprotected
|
|
157
|
+
if (methodAndScopesArray === null) {
|
|
158
|
+
allMatchedScopes.push(null);
|
|
159
|
+
return;
|
|
160
|
+
}
|
|
161
|
+
methodAndScopesArray.forEach(entry => {
|
|
162
|
+
// Entry is either array of scopes or ProtectedResourceScopes object
|
|
163
|
+
if (typeof entry === "string") {
|
|
164
|
+
scopesForEndpoint.push(entry);
|
|
165
|
+
}
|
|
166
|
+
else {
|
|
167
|
+
// Ensure methods being compared are normalized
|
|
168
|
+
const normalizedRequestMethod = httpMethod.toLowerCase();
|
|
169
|
+
const normalizedResourceMethod = entry.httpMethod.toLowerCase();
|
|
170
|
+
// Method in protectedResourceMap matches request http method
|
|
171
|
+
if (normalizedResourceMethod === normalizedRequestMethod) {
|
|
172
|
+
// Validate if scopes comes null to unprotect the resource in a certain http method
|
|
173
|
+
if (entry.scopes === null) {
|
|
174
|
+
allMatchedScopes.push(null);
|
|
175
|
+
}
|
|
176
|
+
else {
|
|
177
|
+
entry.scopes.forEach((scope) => {
|
|
178
|
+
scopesForEndpoint.push(scope);
|
|
179
|
+
});
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
});
|
|
184
|
+
// Only add to all scopes if scopes for endpoint and method is found
|
|
185
|
+
if (scopesForEndpoint.length > 0) {
|
|
186
|
+
allMatchedScopes.push(scopesForEndpoint);
|
|
187
|
+
}
|
|
188
|
+
});
|
|
189
|
+
if (allMatchedScopes.length > 0) {
|
|
190
|
+
if (allMatchedScopes.length > 1) {
|
|
191
|
+
this.authService.getLogger().warning("Interceptor - More than 1 matching scopes for endpoint found.");
|
|
192
|
+
}
|
|
193
|
+
// Returns scopes for first matching endpoint
|
|
194
|
+
return allMatchedScopes[0];
|
|
195
|
+
}
|
|
196
|
+
return null;
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
MsalInterceptor.decorators = [
|
|
200
|
+
{ type: Injectable }
|
|
201
|
+
];
|
|
202
|
+
MsalInterceptor.ctorParameters = () => [
|
|
203
|
+
{ type: undefined, decorators: [{ type: Inject, args: [MSAL_INTERCEPTOR_CONFIG,] }] },
|
|
204
|
+
{ type: MsalService },
|
|
205
|
+
{ type: Location },
|
|
206
|
+
{ type: undefined, decorators: [{ type: Inject, args: [DOCUMENT,] }] }
|
|
207
|
+
];
|
|
208
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"msal.interceptor.js","sourceRoot":"","sources":["../../src/msal.interceptor.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright (c) Microsoft Corporation. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport {\n    HttpRequest,\n    HttpHandler,\n    HttpEvent,\n    HttpInterceptor\n} from \"@angular/common/http\";\nimport { Location, DOCUMENT } from \"@angular/common\";\nimport { Observable, EMPTY, of } from \"rxjs\";\nimport { switchMap, catchError } from \"rxjs/operators\";\nimport { MsalService } from \"./msal.service\";\nimport { AccountInfo, AuthenticationResult, BrowserConfigurationAuthError, InteractionType, StringUtils, UrlString } from \"@azure/msal-browser\";\nimport { Injectable, Inject } from \"@angular/core\";\nimport { MSAL_INTERCEPTOR_CONFIG } from \"./constants\";\nimport { MsalInterceptorAuthRequest, MsalInterceptorConfiguration, ProtectedResourceScopes, MatchingResources } from \"./msal.interceptor.config\";\n\n@Injectable()\nexport class MsalInterceptor implements HttpInterceptor {\n    private _document?: Document;\n\n    constructor(\n        @Inject(MSAL_INTERCEPTOR_CONFIG) private msalInterceptorConfig: MsalInterceptorConfiguration,\n        private authService: MsalService,\n        private location: Location,\n        // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types\n        @Inject(DOCUMENT) document?: any\n    ) {\n        this._document = document as Document;\n    }\n\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {\n        if (this.msalInterceptorConfig.interactionType !== InteractionType.Popup && this.msalInterceptorConfig.interactionType !== InteractionType.Redirect) {\n            throw new BrowserConfigurationAuthError(\"invalid_interaction_type\", \"Invalid interaction type provided to MSAL Interceptor. InteractionType.Popup, InteractionType.Redirect must be provided in the msalInterceptorConfiguration\");\n        }\n\n        this.authService.getLogger().verbose(\"MSAL Interceptor activated\");\n        const scopes = this.getScopesForEndpoint(req.url, req.method);\n\n        // If no scopes for endpoint, does not acquire token\n        if (!scopes || scopes.length === 0) {\n            this.authService.getLogger().verbose(\"Interceptor - no scopes for endpoint\");\n            return next.handle(req);\n        }\n\n        // Sets account as active account or first account\n        let account: AccountInfo;\n        if (!!this.authService.instance.getActiveAccount()) {\n            this.authService.getLogger().verbose(\"Interceptor - active account selected\");\n            account = this.authService.instance.getActiveAccount();\n        } else {\n            this.authService.getLogger().verbose(\"Interceptor - no active account, fallback to first account\");\n            account = this.authService.instance.getAllAccounts()[0];\n        }\n\n        const authRequest = typeof this.msalInterceptorConfig.authRequest === \"function\"\n            ? this.msalInterceptorConfig.authRequest(this.authService, req, { account: account })\n            : { ...this.msalInterceptorConfig.authRequest, account };\n\n        this.authService.getLogger().info(`Interceptor - ${scopes.length} scopes found for endpoint`);\n        this.authService.getLogger().infoPii(`Interceptor - [${scopes}] scopes found for ${req.url}`);\n\n        // Note: For MSA accounts, include openid scope when calling acquireTokenSilent to return idToken\n        return this.authService.acquireTokenSilent({...authRequest, scopes, account })\n            .pipe(\n                catchError(() => {\n                    this.authService.getLogger().error(\"Interceptor - acquireTokenSilent rejected with error. Invoking interaction to resolve.\");\n                    return this.acquireTokenInteractively(authRequest, scopes);\n                }),\n                switchMap((result: AuthenticationResult)  => {\n                    if (!result.accessToken) {\n                        this.authService.getLogger().error(\"Interceptor - acquireTokenSilent resolved with null access token. Known issue with B2C tenants, invoking interaction to resolve.\");\n                        return this.acquireTokenInteractively(authRequest, scopes);\n                    }\n                    return of(result);\n                }),\n                switchMap((result: AuthenticationResult) => {\n                    this.authService.getLogger().verbose(\"Interceptor - setting authorization headers\");\n                    const headers = req.headers\n                        .set(\"Authorization\", `Bearer ${result.accessToken}`);\n\n                    const requestClone = req.clone({headers});\n                    return next.handle(requestClone);\n                })\n            );\n    }\n\n    /**\n     * Invoke interaction for the given set of scopes\n     * @param authRequest Request\n     * @param scopes Array of scopes for the request\n     * @returns Result from the interactive request\n     */\n    private acquireTokenInteractively(authRequest: MsalInterceptorAuthRequest, scopes: string[]): Observable<AuthenticationResult> {\n        if (this.msalInterceptorConfig.interactionType === InteractionType.Popup) {\n            this.authService.getLogger().verbose(\"Interceptor - error acquiring token silently, acquiring by popup\");\n            return this.authService.acquireTokenPopup({ ...authRequest, scopes });\n        }\n        this.authService.getLogger().verbose(\"Interceptor - error acquiring token silently, acquiring by redirect\");\n        const redirectStartPage = window.location.href;\n        this.authService.acquireTokenRedirect({...authRequest, scopes, redirectStartPage });\n        return EMPTY;\n    }\n\n    /**\n     * Looks up the scopes for the given endpoint from the protectedResourceMap\n     * @param endpoint Url of the request\n     * @param httpMethod Http method of the request\n     * @returns Array of scopes, or null if not found\n     *\n     */\n    private getScopesForEndpoint(endpoint: string, httpMethod: string): Array<string>|null {\n        this.authService.getLogger().verbose(\"Interceptor - getting scopes for endpoint\");\n\n        // Ensures endpoints and protected resources compared are normalized\n        const normalizedEndpoint = this.location.normalize(endpoint);\n\n        const protectedResourcesArray = Array.from(this.msalInterceptorConfig.protectedResourceMap.keys());\n\n        const matchingProtectedResources = this.matchResourcesToEndpoint(protectedResourcesArray, normalizedEndpoint);\n\n        // Check absolute urls of resources first before checking relative to prevent incorrect matching where multiple resources have similar relative urls\n        if (matchingProtectedResources.absoluteResources.length > 0) {\n            return this.matchScopesToEndpoint(this.msalInterceptorConfig.protectedResourceMap, matchingProtectedResources.absoluteResources, httpMethod);\n        } else if (matchingProtectedResources.relativeResources.length > 0){\n            return this.matchScopesToEndpoint(this.msalInterceptorConfig.protectedResourceMap, matchingProtectedResources.relativeResources, httpMethod);\n        }\n\n        return null;\n    }\n\n    /**\n     * Finds resource endpoints that match request endpoint\n     * @param protectedResourcesEndpoints\n     * @param endpoint \n     * @returns \n     */\n    private matchResourcesToEndpoint(protectedResourcesEndpoints: string[], endpoint: string): MatchingResources {\n        const matchingResources: MatchingResources = {absoluteResources: [], relativeResources: []};\n\n        protectedResourcesEndpoints.forEach(key => {\n            // Normalizes and adds resource to matchingResources.absoluteResources if key matches endpoint. StringUtils.matchPattern accounts for wildcards\n            const normalizedKey = this.location.normalize(key);\n            if (StringUtils.matchPattern(normalizedKey, endpoint)){\n                matchingResources.absoluteResources.push(key);\n            }\n            \n            // Get url components for relative urls\n            const absoluteKey = this.getAbsoluteUrl(key);\n            const keyComponents = new UrlString(absoluteKey).getUrlComponents();\n            const absoluteEndpoint = this.getAbsoluteUrl(endpoint);\n            const endpointComponents = new UrlString(absoluteEndpoint).getUrlComponents();\n\n            // Normalized key should include query strings if applicable\n            const relativeNormalizedKey = keyComponents.QueryString ? `${keyComponents.AbsolutePath}?${keyComponents.QueryString}` : this.location.normalize(keyComponents.AbsolutePath);\n\n            // Add resource to matchingResources.relativeResources if same origin, relativeKey matches endpoint, and is not empty\n            if (keyComponents.HostNameAndPort === endpointComponents.HostNameAndPort && StringUtils.matchPattern(relativeNormalizedKey, absoluteEndpoint) && relativeNormalizedKey !== \"\" && relativeNormalizedKey !== \"/*\"){\n                matchingResources.relativeResources.push(key);\n            }\n        });\n\n        return matchingResources;\n    }\n\n    /**\n     * Transforms relative urls to absolute urls\n     * @param url \n     * @returns \n     */\n    private getAbsoluteUrl(url: string): string {\n        const link = this._document.createElement(\"a\");\n        link.href = url;\n        return link.href;\n    }\n\n    /**\n     * Finds scopes from first matching endpoint with HTTP method that matches request\n     * @param protectedResourceMap Protected resource map\n     * @param endpointArray Array of resources that match request endpoint\n     * @param httpMethod Http method of the request\n     * @returns \n     */\n    private matchScopesToEndpoint(protectedResourceMap: Map<string, Array<string|ProtectedResourceScopes> | null>, endpointArray: string[], httpMethod: string): Array<string>|null {\n        const allMatchedScopes = [];\n\n        // Check each matched endpoint for matching HttpMethod and scopes\n        endpointArray.forEach(matchedEndpoint => {\n            const scopesForEndpoint = [];\n            const methodAndScopesArray = protectedResourceMap.get(matchedEndpoint);\n\n            // Return if resource is unprotected\n            if (methodAndScopesArray === null) {\n                allMatchedScopes.push(null);\n                return;\n            }\n\n            methodAndScopesArray.forEach(entry => {\n                // Entry is either array of scopes or ProtectedResourceScopes object\n                if (typeof entry === \"string\") {\n                    scopesForEndpoint.push(entry);\n                } else {\n                    // Ensure methods being compared are normalized\n                    const normalizedRequestMethod = httpMethod.toLowerCase();\n                    const normalizedResourceMethod = entry.httpMethod.toLowerCase();\n                    // Method in protectedResourceMap matches request http method\n                    if (normalizedResourceMethod === normalizedRequestMethod) {\n                        // Validate if scopes comes null to unprotect the resource in a certain http method \n                        if (entry.scopes === null) {\n                            allMatchedScopes.push(null);\n                        } else {\n                            entry.scopes.forEach((scope) => {\n                                scopesForEndpoint.push(scope);\n                            });\n                        }\n                    }\n                }\n            });\n\n            // Only add to all scopes if scopes for endpoint and method is found\n            if (scopesForEndpoint.length > 0) {\n                allMatchedScopes.push(scopesForEndpoint);\n            }\n        });\n\n        if (allMatchedScopes.length > 0) {\n            if (allMatchedScopes.length > 1) {\n                this.authService.getLogger().warning(\"Interceptor - More than 1 matching scopes for endpoint found.\");\n            }\n            // Returns scopes for first matching endpoint\n            return allMatchedScopes[0];\n        }\n\n        return null;\n    }\n\n}\n"]}
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3
|
+
* Licensed under the MIT License.
|
|
4
|
+
*/
|
|
5
|
+
import { NgModule } from "@angular/core";
|
|
6
|
+
import { CommonModule } from "@angular/common";
|
|
7
|
+
import { MsalGuard } from "./msal.guard";
|
|
8
|
+
import { MsalBroadcastService } from "./msal.broadcast.service";
|
|
9
|
+
import { MsalService } from "./msal.service";
|
|
10
|
+
import { MSAL_INSTANCE, MSAL_GUARD_CONFIG, MSAL_INTERCEPTOR_CONFIG } from "./constants";
|
|
11
|
+
import { MsalRedirectComponent } from "./msal.redirect.component";
|
|
12
|
+
export class MsalModule {
|
|
13
|
+
static forRoot(msalInstance, guardConfig, interceptorConfig) {
|
|
14
|
+
return {
|
|
15
|
+
ngModule: MsalModule,
|
|
16
|
+
providers: [
|
|
17
|
+
{
|
|
18
|
+
provide: MSAL_INSTANCE,
|
|
19
|
+
useValue: msalInstance
|
|
20
|
+
},
|
|
21
|
+
{
|
|
22
|
+
provide: MSAL_GUARD_CONFIG,
|
|
23
|
+
useValue: guardConfig
|
|
24
|
+
},
|
|
25
|
+
{
|
|
26
|
+
provide: MSAL_INTERCEPTOR_CONFIG,
|
|
27
|
+
useValue: interceptorConfig
|
|
28
|
+
},
|
|
29
|
+
MsalService
|
|
30
|
+
]
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
MsalModule.decorators = [
|
|
35
|
+
{ type: NgModule, args: [{
|
|
36
|
+
declarations: [MsalRedirectComponent],
|
|
37
|
+
imports: [
|
|
38
|
+
CommonModule
|
|
39
|
+
],
|
|
40
|
+
providers: [
|
|
41
|
+
MsalGuard,
|
|
42
|
+
MsalBroadcastService
|
|
43
|
+
]
|
|
44
|
+
},] }
|
|
45
|
+
];
|
|
46
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXNhbC5tb2R1bGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbXNhbC5tb2R1bGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7OztHQUdHO0FBRUgsT0FBTyxFQUF1QixRQUFRLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDOUQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBSS9DLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDekMsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDaEUsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQzdDLE9BQU8sRUFBRSxhQUFhLEVBQUcsaUJBQWlCLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDekYsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFZbEUsTUFBTSxPQUFPLFVBQVU7SUFDbkIsTUFBTSxDQUFDLE9BQU8sQ0FDVixZQUFzQyxFQUN0QyxXQUFtQyxFQUNuQyxpQkFBK0M7UUFFL0MsT0FBTztZQUNILFFBQVEsRUFBRSxVQUFVO1lBQ3BCLFNBQVMsRUFBRTtnQkFDUDtvQkFDSSxPQUFPLEVBQUUsYUFBYTtvQkFDdEIsUUFBUSxFQUFFLFlBQVk7aUJBQ3pCO2dCQUNEO29CQUNJLE9BQU8sRUFBRSxpQkFBaUI7b0JBQzFCLFFBQVEsRUFBRSxXQUFXO2lCQUN4QjtnQkFDRDtvQkFDSSxPQUFPLEVBQUUsdUJBQXVCO29CQUNoQyxRQUFRLEVBQUUsaUJBQWlCO2lCQUM5QjtnQkFDRCxXQUFXO2FBQ2Q7U0FDSixDQUFDO0lBQ04sQ0FBQzs7O1lBbENKLFFBQVEsU0FBQztnQkFDTixZQUFZLEVBQUUsQ0FBQyxxQkFBcUIsQ0FBQztnQkFDckMsT0FBTyxFQUFFO29CQUNMLFlBQVk7aUJBQ2Y7Z0JBQ0QsU0FBUyxFQUFFO29CQUNQLFNBQVM7b0JBQ1Qsb0JBQW9CO2lCQUN2QjthQUNKIiwic291cmNlc0NvbnRlbnQiOlsiLypcbiAqIENvcHlyaWdodCAoYykgTWljcm9zb2Z0IENvcnBvcmF0aW9uLiBBbGwgcmlnaHRzIHJlc2VydmVkLlxuICogTGljZW5zZWQgdW5kZXIgdGhlIE1JVCBMaWNlbnNlLlxuICovXG5cbmltcG9ydCB7IE1vZHVsZVdpdGhQcm92aWRlcnMsIE5nTW9kdWxlIH0gZnJvbSBcIkBhbmd1bGFyL2NvcmVcIjtcbmltcG9ydCB7IENvbW1vbk1vZHVsZSB9IGZyb20gXCJAYW5ndWxhci9jb21tb25cIjtcbmltcG9ydCB7IElQdWJsaWNDbGllbnRBcHBsaWNhdGlvbiB9IGZyb20gXCJAYXp1cmUvbXNhbC1icm93c2VyXCI7XG5pbXBvcnQgeyBNc2FsR3VhcmRDb25maWd1cmF0aW9uIH0gZnJvbSBcIi4vbXNhbC5ndWFyZC5jb25maWdcIjtcbmltcG9ydCB7IE1zYWxJbnRlcmNlcHRvckNvbmZpZ3VyYXRpb24gfSBmcm9tIFwiLi9tc2FsLmludGVyY2VwdG9yLmNvbmZpZ1wiO1xuaW1wb3J0IHsgTXNhbEd1YXJkIH0gZnJvbSBcIi4vbXNhbC5ndWFyZFwiO1xuaW1wb3J0IHsgTXNhbEJyb2FkY2FzdFNlcnZpY2UgfSBmcm9tIFwiLi9tc2FsLmJyb2FkY2FzdC5zZXJ2aWNlXCI7XG5pbXBvcnQgeyBNc2FsU2VydmljZSB9IGZyb20gXCIuL21zYWwuc2VydmljZVwiO1xuaW1wb3J0IHsgTVNBTF9JTlNUQU5DRSAsIE1TQUxfR1VBUkRfQ09ORklHLCBNU0FMX0lOVEVSQ0VQVE9SX0NPTkZJRyB9IGZyb20gXCIuL2NvbnN0YW50c1wiO1xuaW1wb3J0IHsgTXNhbFJlZGlyZWN0Q29tcG9uZW50IH0gZnJvbSBcIi4vbXNhbC5yZWRpcmVjdC5jb21wb25lbnRcIjtcblxuQE5nTW9kdWxlKHtcbiAgICBkZWNsYXJhdGlvbnM6IFtNc2FsUmVkaXJlY3RDb21wb25lbnRdLFxuICAgIGltcG9ydHM6IFtcbiAgICAgICAgQ29tbW9uTW9kdWxlXG4gICAgXSxcbiAgICBwcm92aWRlcnM6IFtcbiAgICAgICAgTXNhbEd1YXJkLFxuICAgICAgICBNc2FsQnJvYWRjYXN0U2VydmljZVxuICAgIF1cbn0pXG5leHBvcnQgY2xhc3MgTXNhbE1vZHVsZSB7XG4gICAgc3RhdGljIGZvclJvb3QoXG4gICAgICAgIG1zYWxJbnN0YW5jZTogSVB1YmxpY0NsaWVudEFwcGxpY2F0aW9uLFxuICAgICAgICBndWFyZENvbmZpZzogTXNhbEd1YXJkQ29uZmlndXJhdGlvbixcbiAgICAgICAgaW50ZXJjZXB0b3JDb25maWc6IE1zYWxJbnRlcmNlcHRvckNvbmZpZ3VyYXRpb25cbiAgICApOiBNb2R1bGVXaXRoUHJvdmlkZXJzPE1zYWxNb2R1bGU+IHtcbiAgICAgICAgcmV0dXJuIHtcbiAgICAgICAgICAgIG5nTW9kdWxlOiBNc2FsTW9kdWxlLFxuICAgICAgICAgICAgcHJvdmlkZXJzOiBbXG4gICAgICAgICAgICAgICAge1xuICAgICAgICAgICAgICAgICAgICBwcm92aWRlOiBNU0FMX0lOU1RBTkNFLFxuICAgICAgICAgICAgICAgICAgICB1c2VWYWx1ZTogbXNhbEluc3RhbmNlXG4gICAgICAgICAgICAgICAgfSxcbiAgICAgICAgICAgICAgICB7XG4gICAgICAgICAgICAgICAgICAgIHByb3ZpZGU6IE1TQUxfR1VBUkRfQ09ORklHLFxuICAgICAgICAgICAgICAgICAgICB1c2VWYWx1ZTogZ3VhcmRDb25maWdcbiAgICAgICAgICAgICAgICB9LFxuICAgICAgICAgICAgICAgIHtcbiAgICAgICAgICAgICAgICAgICAgcHJvdmlkZTogTVNBTF9JTlRFUkNFUFRPUl9DT05GSUcsXG4gICAgICAgICAgICAgICAgICAgIHVzZVZhbHVlOiBpbnRlcmNlcHRvckNvbmZpZ1xuICAgICAgICAgICAgICAgIH0sXG4gICAgICAgICAgICAgICAgTXNhbFNlcnZpY2VcbiAgICAgICAgICAgIF1cbiAgICAgICAgfTtcbiAgICB9XG5cbn1cbiJdfQ==
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3
|
+
* Licensed under the MIT License.
|
|
4
|
+
*/
|
|
5
|
+
import { __awaiter } from "tslib";
|
|
6
|
+
import { NavigationClient, UrlString } from "@azure/msal-browser";
|
|
7
|
+
import { Router } from "@angular/router";
|
|
8
|
+
import { Location } from "@angular/common";
|
|
9
|
+
import { MsalService } from "./msal.service";
|
|
10
|
+
import { Injectable } from "@angular/core";
|
|
11
|
+
/**
|
|
12
|
+
* Custom navigation used for Angular client-side navigation.
|
|
13
|
+
* See performance doc for details:
|
|
14
|
+
* https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/lib/msal-angular/docs/v2-docs/performance.md
|
|
15
|
+
*/
|
|
16
|
+
export class MsalCustomNavigationClient extends NavigationClient {
|
|
17
|
+
constructor(authService, router, location) {
|
|
18
|
+
super();
|
|
19
|
+
this.authService = authService;
|
|
20
|
+
this.router = router;
|
|
21
|
+
this.location = location;
|
|
22
|
+
}
|
|
23
|
+
navigateInternal(url, options) {
|
|
24
|
+
const _super = Object.create(null, {
|
|
25
|
+
navigateInternal: { get: () => super.navigateInternal }
|
|
26
|
+
});
|
|
27
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
28
|
+
this.authService.getLogger().trace("MsalCustomNavigationClient called");
|
|
29
|
+
this.authService.getLogger().verbose("MsalCustomNavigationClient - navigating");
|
|
30
|
+
this.authService.getLogger().verbosePii(`MsalCustomNavigationClient - navigating to url: ${url}`);
|
|
31
|
+
// Prevent hash clearing from causing an issue with Client-side navigation after redirect is handled
|
|
32
|
+
if (options.noHistory) {
|
|
33
|
+
return _super.navigateInternal.call(this, url, options);
|
|
34
|
+
}
|
|
35
|
+
else {
|
|
36
|
+
// Normalizing newUrl if no query string
|
|
37
|
+
const urlComponents = new UrlString(url).getUrlComponents();
|
|
38
|
+
const newUrl = urlComponents.QueryString ? `${urlComponents.AbsolutePath}?${urlComponents.QueryString}` : this.location.normalize(urlComponents.AbsolutePath);
|
|
39
|
+
this.router.navigateByUrl(newUrl, { replaceUrl: options.noHistory });
|
|
40
|
+
}
|
|
41
|
+
return Promise.resolve(options.noHistory);
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
MsalCustomNavigationClient.decorators = [
|
|
46
|
+
{ type: Injectable }
|
|
47
|
+
];
|
|
48
|
+
MsalCustomNavigationClient.ctorParameters = () => [
|
|
49
|
+
{ type: MsalService },
|
|
50
|
+
{ type: Router },
|
|
51
|
+
{ type: Location }
|
|
52
|
+
];
|
|
53
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXNhbC5uYXZpZ2F0aW9uLmNsaWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9tc2FsLm5hdmlnYXRpb24uY2xpZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7R0FHRzs7QUFFSCxPQUFPLEVBQUUsZ0JBQWdCLEVBQXFCLFNBQVMsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3JGLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUN6QyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDM0MsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQzdDLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFM0M7Ozs7R0FJRztBQUVILE1BQU0sT0FBTywwQkFBMkIsU0FBUSxnQkFBZ0I7SUFFNUQsWUFDWSxXQUF3QixFQUN4QixNQUFjLEVBQ2QsUUFBa0I7UUFFMUIsS0FBSyxFQUFFLENBQUM7UUFKQSxnQkFBVyxHQUFYLFdBQVcsQ0FBYTtRQUN4QixXQUFNLEdBQU4sTUFBTSxDQUFRO1FBQ2QsYUFBUSxHQUFSLFFBQVEsQ0FBVTtJQUc5QixDQUFDO0lBRUssZ0JBQWdCLENBQUMsR0FBVSxFQUFFLE9BQTBCOzs7OztZQUN6RCxJQUFJLENBQUMsV0FBVyxDQUFDLFNBQVMsRUFBRSxDQUFDLEtBQUssQ0FBQyxtQ0FBbUMsQ0FBQyxDQUFDO1lBRXhFLElBQUksQ0FBQyxXQUFXLENBQUMsU0FBUyxFQUFFLENBQUMsT0FBTyxDQUFDLHlDQUF5QyxDQUFDLENBQUM7WUFDaEYsSUFBSSxDQUFDLFdBQVcsQ0FBQyxTQUFTLEVBQUUsQ0FBQyxVQUFVLENBQUMsbURBQW1ELEdBQUcsRUFBRSxDQUFDLENBQUM7WUFFbEcsb0dBQW9HO1lBQ3BHLElBQUksT0FBTyxDQUFDLFNBQVMsRUFBRTtnQkFDbkIsT0FBTyxPQUFNLGdCQUFnQixZQUFDLEdBQUcsRUFBRSxPQUFPLEVBQUU7YUFDL0M7aUJBQU07Z0JBQ0gsd0NBQXdDO2dCQUN4QyxNQUFNLGFBQWEsR0FBRyxJQUFJLFNBQVMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDO2dCQUM1RCxNQUFNLE1BQU0sR0FBRyxhQUFhLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxHQUFHLGFBQWEsQ0FBQyxZQUFZLElBQUksYUFBYSxDQUFDLFdBQVcsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBQyxhQUFhLENBQUMsWUFBWSxDQUFDLENBQUM7Z0JBQzlKLElBQUksQ0FBQyxNQUFNLENBQUMsYUFBYSxDQUFDLE1BQU0sRUFBRSxFQUFFLFVBQVUsRUFBRSxPQUFPLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FBQzthQUN4RTtZQUNELE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDOUMsQ0FBQztLQUFBOzs7WUEzQkosVUFBVTs7O1lBUkYsV0FBVztZQUZYLE1BQU07WUFDTixRQUFRIiwic291cmNlc0NvbnRlbnQiOlsiLypcbiAqIENvcHlyaWdodCAoYykgTWljcm9zb2Z0IENvcnBvcmF0aW9uLiBBbGwgcmlnaHRzIHJlc2VydmVkLlxuICogTGljZW5zZWQgdW5kZXIgdGhlIE1JVCBMaWNlbnNlLlxuICovXG5cbmltcG9ydCB7IE5hdmlnYXRpb25DbGllbnQsIE5hdmlnYXRpb25PcHRpb25zLCBVcmxTdHJpbmcgfSBmcm9tIFwiQGF6dXJlL21zYWwtYnJvd3NlclwiO1xuaW1wb3J0IHsgUm91dGVyIH0gZnJvbSBcIkBhbmd1bGFyL3JvdXRlclwiO1xuaW1wb3J0IHsgTG9jYXRpb24gfSBmcm9tIFwiQGFuZ3VsYXIvY29tbW9uXCI7XG5pbXBvcnQgeyBNc2FsU2VydmljZSB9IGZyb20gXCIuL21zYWwuc2VydmljZVwiO1xuaW1wb3J0IHsgSW5qZWN0YWJsZSB9IGZyb20gXCJAYW5ndWxhci9jb3JlXCI7XG5cbi8qKlxuICogQ3VzdG9tIG5hdmlnYXRpb24gdXNlZCBmb3IgQW5ndWxhciBjbGllbnQtc2lkZSBuYXZpZ2F0aW9uLlxuICogU2VlIHBlcmZvcm1hbmNlIGRvYyBmb3IgZGV0YWlsczpcbiAqIGh0dHBzOi8vZ2l0aHViLmNvbS9BenVyZUFEL21pY3Jvc29mdC1hdXRoZW50aWNhdGlvbi1saWJyYXJ5LWZvci1qcy90cmVlL2Rldi9saWIvbXNhbC1hbmd1bGFyL2RvY3MvdjItZG9jcy9wZXJmb3JtYW5jZS5tZFxuICovXG5ASW5qZWN0YWJsZSgpXG5leHBvcnQgY2xhc3MgTXNhbEN1c3RvbU5hdmlnYXRpb25DbGllbnQgZXh0ZW5kcyBOYXZpZ2F0aW9uQ2xpZW50IHtcblxuICAgIGNvbnN0cnVjdG9yKFxuICAgICAgICBwcml2YXRlIGF1dGhTZXJ2aWNlOiBNc2FsU2VydmljZSxcbiAgICAgICAgcHJpdmF0ZSByb3V0ZXI6IFJvdXRlciwgXG4gICAgICAgIHByaXZhdGUgbG9jYXRpb246IExvY2F0aW9uXG4gICAgKSB7XG4gICAgICAgIHN1cGVyKCk7XG4gICAgfVxuXG4gICAgYXN5bmMgbmF2aWdhdGVJbnRlcm5hbCh1cmw6c3RyaW5nLCBvcHRpb25zOiBOYXZpZ2F0aW9uT3B0aW9ucyk6IFByb21pc2U8Ym9vbGVhbj4ge1xuICAgICAgICB0aGlzLmF1dGhTZXJ2aWNlLmdldExvZ2dlcigpLnRyYWNlKFwiTXNhbEN1c3RvbU5hdmlnYXRpb25DbGllbnQgY2FsbGVkXCIpO1xuICAgICAgICBcbiAgICAgICAgdGhpcy5hdXRoU2VydmljZS5nZXRMb2dnZXIoKS52ZXJib3NlKFwiTXNhbEN1c3RvbU5hdmlnYXRpb25DbGllbnQgLSBuYXZpZ2F0aW5nXCIpO1xuICAgICAgICB0aGlzLmF1dGhTZXJ2aWNlLmdldExvZ2dlcigpLnZlcmJvc2VQaWkoYE1zYWxDdXN0b21OYXZpZ2F0aW9uQ2xpZW50IC0gbmF2aWdhdGluZyB0byB1cmw6ICR7dXJsfWApO1xuICAgICAgICBcbiAgICAgICAgLy8gUHJldmVudCBoYXNoIGNsZWFyaW5nIGZyb20gY2F1c2luZyBhbiBpc3N1ZSB3aXRoIENsaWVudC1zaWRlIG5hdmlnYXRpb24gYWZ0ZXIgcmVkaXJlY3QgaXMgaGFuZGxlZFxuICAgICAgICBpZiAob3B0aW9ucy5ub0hpc3RvcnkpIHtcbiAgICAgICAgICAgIHJldHVybiBzdXBlci5uYXZpZ2F0ZUludGVybmFsKHVybCwgb3B0aW9ucyk7XG4gICAgICAgIH0gZWxzZSB7XG4gICAgICAgICAgICAvLyBOb3JtYWxpemluZyBuZXdVcmwgaWYgbm8gcXVlcnkgc3RyaW5nXG4gICAgICAgICAgICBjb25zdCB1cmxDb21wb25lbnRzID0gbmV3IFVybFN0cmluZyh1cmwpLmdldFVybENvbXBvbmVudHMoKTtcbiAgICAgICAgICAgIGNvbnN0IG5ld1VybCA9IHVybENvbXBvbmVudHMuUXVlcnlTdHJpbmcgPyBgJHt1cmxDb21wb25lbnRzLkFic29sdXRlUGF0aH0/JHt1cmxDb21wb25lbnRzLlF1ZXJ5U3RyaW5nfWAgOiB0aGlzLmxvY2F0aW9uLm5vcm1hbGl6ZSh1cmxDb21wb25lbnRzLkFic29sdXRlUGF0aCk7XG4gICAgICAgICAgICB0aGlzLnJvdXRlci5uYXZpZ2F0ZUJ5VXJsKG5ld1VybCwgeyByZXBsYWNlVXJsOiBvcHRpb25zLm5vSGlzdG9yeSB9KTtcbiAgICAgICAgfVxuICAgICAgICByZXR1cm4gUHJvbWlzZS5yZXNvbHZlKG9wdGlvbnMubm9IaXN0b3J5KTtcbiAgICB9XG59XG4iXX0=
|