@osovitny/anatoly 3.16.24 → 3.16.26
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/esm2022/lib/anatoly.module.mjs +2 -16
- package/esm2022/lib/iam/configs.mjs +5 -18
- package/esm2022/lib/iam/pages/signin.page.mjs +2 -2
- package/esm2022/lib/iam/utils.mjs +18 -1
- package/fesm2022/osovitny-anatoly.mjs +19 -30
- package/fesm2022/osovitny-anatoly.mjs.map +1 -1
- package/lib/anatoly.module.d.ts +2 -3
- package/lib/iam/utils.d.ts +2 -0
- package/package.json +1 -1
|
@@ -18,8 +18,6 @@ import { CommonModule } from "@angular/common";
|
|
|
18
18
|
//Modules
|
|
19
19
|
import { AnatolyCoreModule } from './core/core.module';
|
|
20
20
|
import { AnatolyDataModule } from './data/data.module';
|
|
21
|
-
import { AnatolyIAMModule } from './iam/iam.module';
|
|
22
|
-
//import { AnatolyIAMPagesModule } from './iam/iam-pages.module'
|
|
23
21
|
import { AnatolyUIModule } from './ui/ui.module';
|
|
24
22
|
import * as i0 from "@angular/core";
|
|
25
23
|
export class AnatolyModule {
|
|
@@ -28,12 +26,8 @@ export class AnatolyModule {
|
|
|
28
26
|
static ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [CommonModule,
|
|
29
27
|
AnatolyCoreModule,
|
|
30
28
|
AnatolyDataModule,
|
|
31
|
-
AnatolyIAMModule,
|
|
32
|
-
//AnatolyIAMPagesModule,
|
|
33
29
|
AnatolyUIModule, AnatolyCoreModule,
|
|
34
30
|
AnatolyDataModule,
|
|
35
|
-
AnatolyIAMModule,
|
|
36
|
-
//AnatolyIAMPagesModule,
|
|
37
31
|
AnatolyUIModule] });
|
|
38
32
|
}
|
|
39
33
|
(function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(AnatolyModule, [{
|
|
@@ -43,28 +37,20 @@ export class AnatolyModule {
|
|
|
43
37
|
CommonModule,
|
|
44
38
|
AnatolyCoreModule,
|
|
45
39
|
AnatolyDataModule,
|
|
46
|
-
AnatolyIAMModule,
|
|
47
|
-
//AnatolyIAMPagesModule,
|
|
48
40
|
AnatolyUIModule
|
|
49
41
|
],
|
|
50
42
|
exports: [
|
|
51
43
|
AnatolyCoreModule,
|
|
52
44
|
AnatolyDataModule,
|
|
53
|
-
AnatolyIAMModule,
|
|
54
|
-
//AnatolyIAMPagesModule,
|
|
55
45
|
AnatolyUIModule
|
|
56
46
|
],
|
|
57
|
-
providers: []
|
|
47
|
+
providers: []
|
|
58
48
|
}]
|
|
59
49
|
}], null, null); })();
|
|
60
50
|
(function () { (typeof ngJitMode === "undefined" || ngJitMode) && i0.ɵɵsetNgModuleScope(AnatolyModule, { imports: [CommonModule,
|
|
61
51
|
AnatolyCoreModule,
|
|
62
52
|
AnatolyDataModule,
|
|
63
|
-
AnatolyIAMModule,
|
|
64
|
-
//AnatolyIAMPagesModule,
|
|
65
53
|
AnatolyUIModule], exports: [AnatolyCoreModule,
|
|
66
54
|
AnatolyDataModule,
|
|
67
|
-
AnatolyIAMModule,
|
|
68
|
-
//AnatolyIAMPagesModule,
|
|
69
55
|
AnatolyUIModule] }); })();
|
|
70
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
56
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYW5hdG9seS5tb2R1bGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9wcm9qZWN0cy9hbmF0b2x5L3NyYy9saWIvYW5hdG9seS5tb2R1bGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7Ozs7O0VBY0U7QUFFRixPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ3pDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUUvQyxTQUFTO0FBQ1QsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sb0JBQW9CLENBQUE7QUFDdEQsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sb0JBQW9CLENBQUE7QUFDdEQsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLGdCQUFnQixDQUFBOztBQWlCaEQsTUFBTSxPQUFPLGFBQWE7dUVBQWIsYUFBYTs0REFBYixhQUFhO2dFQWJ0QixZQUFZO1lBQ1osaUJBQWlCO1lBQ2pCLGlCQUFpQjtZQUNqQixlQUFlLEVBR2YsaUJBQWlCO1lBQ2pCLGlCQUFpQjtZQUNqQixlQUFlOzt1RkFLTixhQUFhO2NBZnpCLFFBQVE7ZUFBQztnQkFDUixPQUFPLEVBQUU7b0JBQ1AsWUFBWTtvQkFDWixpQkFBaUI7b0JBQ2pCLGlCQUFpQjtvQkFDakIsZUFBZTtpQkFDaEI7Z0JBQ0QsT0FBTyxFQUFFO29CQUNQLGlCQUFpQjtvQkFDakIsaUJBQWlCO29CQUNqQixlQUFlO2lCQUNoQjtnQkFDRCxTQUFTLEVBQUUsRUFDVjthQUNGOzt3RkFDWSxhQUFhLGNBYnRCLFlBQVk7UUFDWixpQkFBaUI7UUFDakIsaUJBQWlCO1FBQ2pCLGVBQWUsYUFHZixpQkFBaUI7UUFDakIsaUJBQWlCO1FBQ2pCLGVBQWUiLCJzb3VyY2VzQ29udGVudCI6WyIvKlxyXG48ZmlsZT5cclxuICBQcm9qZWN0OlxyXG4gICAgQG9zb3ZpdG55L2FuYXRvbHlcclxuXHJcbiAgQXV0aG9yczpcclxuICAgIFZhZGltIE9zb3ZpdG55IHZhZGltQG9zb3ZpdG55LmNvbVxyXG4gICAgQW5hdG9seSBPc292aXRueSBhbmF0b2x5QG9zb3ZpdG55LmNvbVxyXG5cclxuICBDcmVhdGVkOlxyXG4gICAgMjkgQXVnIDIwMjJcclxuXHJcbiAgQ29weXJpZ2h0IChjKSAyMDE2LTIwMjIgT3Nvdml0bnkgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLlxyXG48L2ZpbGU+XHJcbiovXHJcblxyXG5pbXBvcnQgeyBOZ01vZHVsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xyXG5pbXBvcnQgeyBDb21tb25Nb2R1bGUgfSBmcm9tIFwiQGFuZ3VsYXIvY29tbW9uXCI7XHJcblxyXG4vL01vZHVsZXNcclxuaW1wb3J0IHsgQW5hdG9seUNvcmVNb2R1bGUgfSBmcm9tICcuL2NvcmUvY29yZS5tb2R1bGUnXHJcbmltcG9ydCB7IEFuYXRvbHlEYXRhTW9kdWxlIH0gZnJvbSAnLi9kYXRhL2RhdGEubW9kdWxlJ1xyXG5pbXBvcnQgeyBBbmF0b2x5VUlNb2R1bGUgfSBmcm9tICcuL3VpL3VpLm1vZHVsZSdcclxuXHJcbkBOZ01vZHVsZSh7XHJcbiAgaW1wb3J0czogW1xyXG4gICAgQ29tbW9uTW9kdWxlLFxyXG4gICAgQW5hdG9seUNvcmVNb2R1bGUsXHJcbiAgICBBbmF0b2x5RGF0YU1vZHVsZSxcclxuICAgIEFuYXRvbHlVSU1vZHVsZVxyXG4gIF0sXHJcbiAgZXhwb3J0czogW1xyXG4gICAgQW5hdG9seUNvcmVNb2R1bGUsXHJcbiAgICBBbmF0b2x5RGF0YU1vZHVsZSxcclxuICAgIEFuYXRvbHlVSU1vZHVsZVxyXG4gIF0sXHJcbiAgcHJvdmlkZXJzOiBbXHJcbiAgXVxyXG59KVxyXG5leHBvcnQgY2xhc3MgQW5hdG9seU1vZHVsZSB7XHJcbn1cclxuIl19
|
|
@@ -19,11 +19,11 @@
|
|
|
19
19
|
import { InteractionType, LogLevel, PublicClientApplication } from '@azure/msal-browser';
|
|
20
20
|
//App
|
|
21
21
|
import { MSALB2C, PolicyType } from './b2c';
|
|
22
|
-
import {
|
|
22
|
+
import { MSALB2CConfig, MSALConfig } from './consts';
|
|
23
23
|
import { MSALStorage } from './storage';
|
|
24
|
+
import { MSALUtils } from './utils';
|
|
24
25
|
export function MSALInterceptorConfigFactory() {
|
|
25
|
-
let protectedResourceMap =
|
|
26
|
-
protectedResourceMap.set('https://graph.microsoft.com/v1.0/me', ['user.read']);
|
|
26
|
+
let protectedResourceMap = MSALUtils.getApis();
|
|
27
27
|
return {
|
|
28
28
|
interactionType: InteractionType.Redirect,
|
|
29
29
|
protectedResourceMap
|
|
@@ -33,21 +33,8 @@ export function MSALGuardConfigFactory() {
|
|
|
33
33
|
return {
|
|
34
34
|
interactionType: InteractionType.Redirect,
|
|
35
35
|
authRequest: (authService, state) => {
|
|
36
|
-
let scopes =
|
|
36
|
+
let scopes = MSALUtils.getApiScopes();
|
|
37
37
|
let redirectTo = state.url;
|
|
38
|
-
/*
|
|
39
|
-
VadimOS: not working for some reason
|
|
40
|
-
|
|
41
|
-
let stateData = {
|
|
42
|
-
redirectTo: redirectTo
|
|
43
|
-
};
|
|
44
|
-
let state64 = Buffer.from(JSON.stringify(stateData)).toString('base64');
|
|
45
|
-
let request: RedirectRequest = {
|
|
46
|
-
scopes: [...scopes],
|
|
47
|
-
state: state64,
|
|
48
|
-
redirectStartPage: redirectTo
|
|
49
|
-
}
|
|
50
|
-
*/
|
|
51
38
|
let request = {
|
|
52
39
|
scopes: [...scopes]
|
|
53
40
|
};
|
|
@@ -104,4 +91,4 @@ function loggerCallback(logLevel, message, containsPii) {
|
|
|
104
91
|
return;
|
|
105
92
|
}
|
|
106
93
|
}
|
|
107
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
94
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlncy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2FuYXRvbHkvc3JjL2xpYi9pYW0vY29uZmlncy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7Ozs7Ozs7Ozs7RUFpQkU7QUFLRixPQUFPLEVBQUUsZUFBZSxFQUE0QixRQUFRLEVBQUUsdUJBQXVCLEVBQW1CLE1BQU0scUJBQXFCLENBQUM7QUFFcEksS0FBSztBQUNMLE9BQU8sRUFBRSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sT0FBTyxDQUFDO0FBQzVDLE9BQU8sRUFBRSxhQUFhLEVBQUUsVUFBVSxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBQ3JELE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDeEMsT0FBTyxFQUFFLFNBQVMsRUFBQyxNQUFNLFNBQVMsQ0FBQztBQUVuQyxNQUFNLFVBQVUsNEJBQTRCO0lBQzFDLElBQUksb0JBQW9CLEdBQUcsU0FBUyxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBRS9DLE9BQU87UUFDTCxlQUFlLEVBQUUsZUFBZSxDQUFDLFFBQVE7UUFDekMsb0JBQW9CO0tBQ3JCLENBQUM7QUFDSixDQUFDO0FBRUQsTUFBTSxVQUFVLHNCQUFzQjtJQUNwQyxPQUFPO1FBQ0wsZUFBZSxFQUFFLGVBQWUsQ0FBQyxRQUFRO1FBQ3pDLFdBQVcsRUFBRSxDQUFDLFdBQXdCLEVBQUUsS0FBMEIsRUFBd0IsRUFBRTtZQUMxRixJQUFJLE1BQU0sR0FBRyxTQUFTLENBQUMsWUFBWSxFQUFFLENBQUM7WUFDdEMsSUFBSSxVQUFVLEdBQUcsS0FBSyxDQUFDLEdBQUcsQ0FBQztZQUUzQixJQUFJLE9BQU8sR0FBb0I7Z0JBQzdCLE1BQU0sRUFBRSxDQUFDLEdBQUcsTUFBTSxDQUFDO2FBQ3BCLENBQUE7WUFFRCxXQUFXLENBQUMsaUJBQWlCLENBQUMsVUFBVSxFQUFFLG9DQUFvQyxDQUFDLENBQUM7WUFDaEYsT0FBTyxPQUFPLENBQUM7UUFDakIsQ0FBQztLQUNGLENBQUM7QUFDSixDQUFDO0FBRUQsTUFBTSxVQUFVLG1CQUFtQjtJQUNqQyxJQUFJLFNBQVMsR0FBRyxVQUFVLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUM7SUFDOUMsSUFBSSxhQUFhLEdBQVE7UUFDdkIsSUFBSSxFQUFFO1lBQ0osU0FBUyxFQUFFLFNBQVM7WUFDcEIsUUFBUSxFQUFFLFVBQVUsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLFFBQVE7WUFDdEMsV0FBVyxFQUFFLFVBQVUsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLFdBQVc7WUFDNUMscUJBQXFCLEVBQUUsVUFBVSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMscUJBQXFCO1lBQ2hFLHlCQUF5QixFQUFFLFVBQVUsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLHlCQUF5QjtTQUN6RTtRQUNELEtBQUssRUFBRTtZQUNMLGFBQWEsRUFBRSxVQUFVLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxhQUFhO1lBQ2pELHNCQUFzQixFQUFFLFVBQVUsQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLHNCQUFzQjtTQUNwRTtRQUNELE1BQU0sRUFBRTtZQUNOLGlCQUFpQixFQUFFLEtBQUs7WUFDeEIsYUFBYSxFQUFFO2dCQUNiLGNBQWM7Z0JBQ2QsUUFBUSxFQUFFLFVBQVUsQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLGFBQWEsQ0FBQyxRQUFRO2dCQUN0RCxpQkFBaUIsRUFBRSxLQUFLO2FBQ3pCO1NBQ0Y7S0FDRixDQUFBO0lBRUQsSUFBSSxPQUFPLENBQUMsU0FBUyxFQUFFLEVBQUU7UUFDdkIsYUFBYSxDQUFDLElBQUksQ0FBQyxTQUFTLEdBQUcsT0FBTyxDQUFDLGtCQUFrQixDQUFDLFVBQVUsQ0FBQyxZQUFZLENBQUMsQ0FBQztRQUNuRixhQUFhLENBQUMsSUFBSSxDQUFDLGdCQUFnQixHQUFHLENBQUMsYUFBYSxDQUFDLGVBQWUsQ0FBQyxDQUFDO0tBQ3ZFO0lBRUQsT0FBTyxJQUFJLHVCQUF1QixDQUFDLGFBQWEsQ0FBQyxDQUFDO0FBQ3BELENBQUM7QUFFRCxTQUFTLGNBQWMsQ0FBQyxRQUFrQixFQUFFLE9BQWUsRUFBRSxXQUFvQjtJQUMvRSxJQUFJLFdBQVcsRUFBRTtRQUNmLE9BQU87S0FDUjtJQUVELFFBQVEsUUFBUSxFQUFFO1FBQ2hCLEtBQUssUUFBUSxDQUFDLEtBQUs7WUFDakIsT0FBTyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQztZQUN2QixPQUFPO1FBRVQsS0FBSyxRQUFRLENBQUMsSUFBSTtZQUNoQixPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1lBQ3RCLE9BQU87UUFFVCxLQUFLLFFBQVEsQ0FBQyxPQUFPO1lBQ25CLE9BQU8sQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7WUFDdkIsT0FBTztRQUVULEtBQUssUUFBUSxDQUFDLE9BQU87WUFDbkIsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQztZQUN0QixPQUFPO0tBQ1Y7QUFDSCxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLypcclxuPGZpbGU+XHJcbiAgUHJvamVjdDpcclxuICAgIEBvc292aXRueS9hbmF0b2x5XHJcblxyXG4gIEF1dGhvcnM6XHJcbiAgICBWYWRpbSBPc292aXRueSB2YWRpbUBvc292aXRueS5jb21cclxuICAgIEFuYXRvbHkgT3Nvdml0bnkgYW5hdG9seUBvc292aXRueS5jb21cclxuXHJcblx0Q3JlYXRlZDpcclxuXHRcdDIgTWF5IDIwMjNcclxuXHJcbiAgRGVzY3JpcHRpb246XHJcbiAgICBJZGVudGl0eSBhbmQgQWNjZXNzIE1hbmFnZW1lbnRcclxuXHJcblx0Q29weXJpZ2h0IChjKSAyMDE2LTIwMjIgT3Nvdml0bnkgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLlxyXG48L2ZpbGU+XHJcbiovXHJcblxyXG4vL05vZGVcclxuaW1wb3J0IHsgUm91dGVyU3RhdGVTbmFwc2hvdCB9IGZyb20gXCJAYW5ndWxhci9yb3V0ZXJcIjtcclxuaW1wb3J0IHsgTXNhbEd1YXJkQXV0aFJlcXVlc3QsIE1zYWxHdWFyZENvbmZpZ3VyYXRpb24sIE1zYWxJbnRlcmNlcHRvckNvbmZpZ3VyYXRpb24sIE1zYWxTZXJ2aWNlIH0gZnJvbSAnQGF6dXJlL21zYWwtYW5ndWxhcic7XHJcbmltcG9ydCB7IEludGVyYWN0aW9uVHlwZSwgSVB1YmxpY0NsaWVudEFwcGxpY2F0aW9uLCBMb2dMZXZlbCwgUHVibGljQ2xpZW50QXBwbGljYXRpb24sIFJlZGlyZWN0UmVxdWVzdCB9IGZyb20gJ0BhenVyZS9tc2FsLWJyb3dzZXInO1xyXG5cclxuLy9BcHBcclxuaW1wb3J0IHsgTVNBTEIyQywgUG9saWN5VHlwZSB9IGZyb20gJy4vYjJjJztcclxuaW1wb3J0IHsgTVNBTEIyQ0NvbmZpZywgTVNBTENvbmZpZyB9IGZyb20gJy4vY29uc3RzJztcclxuaW1wb3J0IHsgTVNBTFN0b3JhZ2UgfSBmcm9tICcuL3N0b3JhZ2UnO1xyXG5pbXBvcnQgeyBNU0FMVXRpbHN9IGZyb20gJy4vdXRpbHMnO1xyXG5cclxuZXhwb3J0IGZ1bmN0aW9uIE1TQUxJbnRlcmNlcHRvckNvbmZpZ0ZhY3RvcnkoKTogTXNhbEludGVyY2VwdG9yQ29uZmlndXJhdGlvbiB7XHJcbiAgbGV0IHByb3RlY3RlZFJlc291cmNlTWFwID0gTVNBTFV0aWxzLmdldEFwaXMoKTtcclxuXHJcbiAgcmV0dXJuIHtcclxuICAgIGludGVyYWN0aW9uVHlwZTogSW50ZXJhY3Rpb25UeXBlLlJlZGlyZWN0LFxyXG4gICAgcHJvdGVjdGVkUmVzb3VyY2VNYXBcclxuICB9O1xyXG59XHJcblxyXG5leHBvcnQgZnVuY3Rpb24gTVNBTEd1YXJkQ29uZmlnRmFjdG9yeSgpOiBNc2FsR3VhcmRDb25maWd1cmF0aW9uIHtcclxuICByZXR1cm4ge1xyXG4gICAgaW50ZXJhY3Rpb25UeXBlOiBJbnRlcmFjdGlvblR5cGUuUmVkaXJlY3QsXHJcbiAgICBhdXRoUmVxdWVzdDogKGF1dGhTZXJ2aWNlOiBNc2FsU2VydmljZSwgc3RhdGU6IFJvdXRlclN0YXRlU25hcHNob3QpOiBNc2FsR3VhcmRBdXRoUmVxdWVzdCA9PiB7XHJcbiAgICAgIGxldCBzY29wZXMgPSBNU0FMVXRpbHMuZ2V0QXBpU2NvcGVzKCk7XHJcbiAgICAgIGxldCByZWRpcmVjdFRvID0gc3RhdGUudXJsO1xyXG5cclxuICAgICAgbGV0IHJlcXVlc3Q6IFJlZGlyZWN0UmVxdWVzdCA9IHtcclxuICAgICAgICBzY29wZXM6IFsuLi5zY29wZXNdXHJcbiAgICAgIH1cclxuXHJcbiAgICAgIE1TQUxTdG9yYWdlLnNhdmVSZWRpcmVjdFN0YXRlKHJlZGlyZWN0VG8sICdNU0FMR3VhcmRDb25maWdGYWN0b3J5LmF1dGhSZXF1ZXN0Jyk7XHJcbiAgICAgIHJldHVybiByZXF1ZXN0O1xyXG4gICAgfVxyXG4gIH07XHJcbn1cclxuXHJcbmV4cG9ydCBmdW5jdGlvbiBNU0FMSW5zdGFuY2VGYWN0b3J5KCk6IElQdWJsaWNDbGllbnRBcHBsaWNhdGlvbiB7XHJcbiAgbGV0IGF1dGhvcml0eSA9IE1TQUxDb25maWcuYXBwLmF1dGguYXV0aG9yaXR5O1xyXG4gIGxldCBjb25maWd1cmF0aW9uOiBhbnkgPSB7XHJcbiAgICBhdXRoOiB7XHJcbiAgICAgIGF1dGhvcml0eTogYXV0aG9yaXR5LFxyXG4gICAgICBjbGllbnRJZDogTVNBTENvbmZpZy5hcHAuYXV0aC5jbGllbnRJZCxcclxuICAgICAgcmVkaXJlY3RVcmk6IE1TQUxDb25maWcuYXBwLmF1dGgucmVkaXJlY3RVcmksXHJcbiAgICAgIHBvc3RMb2dvdXRSZWRpcmVjdFVyaTogTVNBTENvbmZpZy5hcHAuYXV0aC5wb3N0TG9nb3V0UmVkaXJlY3RVcmksXHJcbiAgICAgIG5hdmlnYXRlVG9Mb2dpblJlcXVlc3RVcmw6IE1TQUxDb25maWcuYXBwLmF1dGgubmF2aWdhdGVUb0xvZ2luUmVxdWVzdFVybFxyXG4gICAgfSxcclxuICAgIGNhY2hlOiB7XHJcbiAgICAgIGNhY2hlTG9jYXRpb246IE1TQUxDb25maWcuYXBwLmNhY2hlLmNhY2hlTG9jYXRpb24sXHJcbiAgICAgIHN0b3JlQXV0aFN0YXRlSW5Db29raWU6IE1TQUxDb25maWcuYXBwLmNhY2hlLnN0b3JlQXV0aFN0YXRlSW5Db29raWVcclxuICAgIH0sXHJcbiAgICBzeXN0ZW06IHtcclxuICAgICAgYWxsb3dOYXRpdmVCcm9rZXI6IGZhbHNlLFxyXG4gICAgICBsb2dnZXJPcHRpb25zOiB7XHJcbiAgICAgICAgbG9nZ2VyQ2FsbGJhY2ssXHJcbiAgICAgICAgbG9nTGV2ZWw6IE1TQUxDb25maWcuYXBwLnN5c3RlbS5sb2dnZXJPcHRpb25zLmxvZ0xldmVsLFxyXG4gICAgICAgIHBpaUxvZ2dpbmdFbmFibGVkOiBmYWxzZVxyXG4gICAgICB9XHJcbiAgICB9XHJcbiAgfVxyXG5cclxuICBpZiAoTVNBTEIyQy5pc0VuYWJsZWQoKSkge1xyXG4gICAgY29uZmlndXJhdGlvbi5hdXRoLmF1dGhvcml0eSA9IE1TQUxCMkMuZ2V0QXV0aG9yaXR5QnlUeXBlKFBvbGljeVR5cGUuc2lnblVwU2lnbkluKTtcclxuICAgIGNvbmZpZ3VyYXRpb24uYXV0aC5rbm93bkF1dGhvcml0aWVzID0gW01TQUxCMkNDb25maWcuYXV0aG9yaXR5RG9tYWluXTtcclxuICB9XHJcblxyXG4gIHJldHVybiBuZXcgUHVibGljQ2xpZW50QXBwbGljYXRpb24oY29uZmlndXJhdGlvbik7XHJcbn1cclxuXHJcbmZ1bmN0aW9uIGxvZ2dlckNhbGxiYWNrKGxvZ0xldmVsOiBMb2dMZXZlbCwgbWVzc2FnZTogc3RyaW5nLCBjb250YWluc1BpaTogYm9vbGVhbikge1xyXG4gIGlmIChjb250YWluc1BpaSkge1xyXG4gICAgcmV0dXJuO1xyXG4gIH1cclxuXHJcbiAgc3dpdGNoIChsb2dMZXZlbCkge1xyXG4gICAgY2FzZSBMb2dMZXZlbC5FcnJvcjpcclxuICAgICAgY29uc29sZS5lcnJvcihtZXNzYWdlKTtcclxuICAgICAgcmV0dXJuO1xyXG5cclxuICAgIGNhc2UgTG9nTGV2ZWwuSW5mbzpcclxuICAgICAgY29uc29sZS5pbmZvKG1lc3NhZ2UpO1xyXG4gICAgICByZXR1cm47XHJcblxyXG4gICAgY2FzZSBMb2dMZXZlbC5WZXJib3NlOlxyXG4gICAgICBjb25zb2xlLmRlYnVnKG1lc3NhZ2UpO1xyXG4gICAgICByZXR1cm47XHJcblxyXG4gICAgY2FzZSBMb2dMZXZlbC5XYXJuaW5nOlxyXG4gICAgICBjb25zb2xlLndhcm4obWVzc2FnZSk7XHJcbiAgICAgIHJldHVybjtcclxuICB9XHJcbn1cclxuIl19
|
|
@@ -28,7 +28,7 @@ export class SignInPage extends BasePage {
|
|
|
28
28
|
this.auth = auth;
|
|
29
29
|
}
|
|
30
30
|
ngOnInit() {
|
|
31
|
-
this.auth.login()
|
|
31
|
+
this.auth.login();
|
|
32
32
|
}
|
|
33
33
|
static ɵfac = function SignInPage_Factory(t) { return new (t || SignInPage)(i0.ɵɵdirectiveInject(i1.AuthService)); };
|
|
34
34
|
static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: SignInPage, selectors: [["iam-signin-page"]], features: [i0.ɵɵInheritDefinitionFeature], decls: 0, vars: 0, template: function SignInPage_Template(rf, ctx) { }, encapsulation: 2 });
|
|
@@ -37,4 +37,4 @@ export class SignInPage extends BasePage {
|
|
|
37
37
|
type: Component,
|
|
38
38
|
args: [{ selector: 'iam-signin-page', template: "" }]
|
|
39
39
|
}], function () { return [{ type: i1.AuthService }]; }, null); })();
|
|
40
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2lnbmluLnBhZ2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9hbmF0b2x5L3NyYy9saWIvaWFtL3BhZ2VzL3NpZ25pbi5wYWdlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7Ozs7Ozs7OztFQWlCRTtBQUVGLE1BQU07QUFDTixPQUFPLEVBQUUsU0FBUyxFQUFVLE1BQU0sZUFBZSxDQUFDO0FBSWxELE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQzs7O0FBTTlELE1BQU0sT0FBTyxVQUFXLFNBQVEsUUFBUTtJQUNsQjtJQUFwQixZQUFvQixJQUFpQjtRQUNuQyxLQUFLLEVBQUUsQ0FBQztRQURVLFNBQUksR0FBSixJQUFJLENBQWE7SUFFckMsQ0FBQztJQUVELFFBQVE7UUFDTixJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQ3BCLENBQUM7b0VBUFUsVUFBVTs2REFBVixVQUFVOzt1RkFBVixVQUFVO2NBSnRCLFNBQVM7MkJBQ0UsaUJBQWlCIiwic291cmNlc0NvbnRlbnQiOlsiLypcclxuPGZpbGU+XHJcbiAgUHJvamVjdDpcclxuICAgIEBvc292aXRueS9hbmF0b2x5XHJcblxyXG4gIEF1dGhvcnM6XHJcbiAgICBWYWRpbSBPc292aXRueSB2YWRpbUBvc292aXRueS5jb21cclxuICAgIEFuYXRvbHkgT3Nvdml0bnkgYW5hdG9seUBvc292aXRueS5jb21cclxuXHJcbiAgQ3JlYXRlZDpcclxuICAgIDIwIFNlcCAyMDIzXHJcblxyXG4gIERlc2NyaXB0aW9uOlxyXG4gICAgSWRlbnRpdHkgYW5kIEFjY2VzcyBNYW5hZ2VtZW50XHJcblxyXG4gIENvcHlyaWdodCAoYykgMjAxNi0yMDIyIE9zb3ZpdG55IEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC5cclxuPC9maWxlPlxyXG4qL1xyXG5cclxuLy9Ob2RlXHJcbmltcG9ydCB7IENvbXBvbmVudCwgT25Jbml0IH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XHJcblxyXG4vL0FwcFxyXG5pbXBvcnQgeyBBdXRoU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzL2F1dGguc2VydmljZSc7XHJcbmltcG9ydCB7IEJhc2VQYWdlIH0gZnJvbSAnLi4vLi4vdWkvY29tcG9uZW50cy9iYXNlL2Jhc2UucGFnZSc7XHJcblxyXG5AQ29tcG9uZW50KHtcclxuICBzZWxlY3RvcjogJ2lhbS1zaWduaW4tcGFnZScsXHJcbiAgdGVtcGxhdGVVcmw6ICcuL3NpZ25pbi5wYWdlLmh0bWwnXHJcbn0pXHJcbmV4cG9ydCBjbGFzcyBTaWduSW5QYWdlIGV4dGVuZHMgQmFzZVBhZ2UgaW1wbGVtZW50cyBPbkluaXQge1xyXG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgYXV0aDogQXV0aFNlcnZpY2UpIHtcclxuICAgIHN1cGVyKCk7XHJcbiAgfVxyXG5cclxuICBuZ09uSW5pdCgpIHtcclxuICAgIHRoaXMuYXV0aC5sb2dpbigpO1xyXG4gIH1cclxufVxyXG4iXX0=
|
|
@@ -16,11 +16,28 @@
|
|
|
16
16
|
Copyright (c) 2016-2022 Osovitny Inc. All rights reserved.
|
|
17
17
|
</file>
|
|
18
18
|
*/
|
|
19
|
+
//Node
|
|
19
20
|
import { BrowserUtils } from '@azure/msal-browser';
|
|
21
|
+
//App
|
|
22
|
+
import { MSALApiConfig } from './consts';
|
|
20
23
|
export class MSALUtils {
|
|
21
24
|
// Don't perform initial navigation in iframes or popups
|
|
22
25
|
static initialNavigation() {
|
|
23
26
|
return !BrowserUtils.isInIframe() && !BrowserUtils.isInPopup() ? 'enabledNonBlocking' : 'disabled';
|
|
24
27
|
}
|
|
28
|
+
static getApis() {
|
|
29
|
+
let map = new Map();
|
|
30
|
+
for (const api of MSALApiConfig) {
|
|
31
|
+
map.set(api.uri, api.scopes);
|
|
32
|
+
}
|
|
33
|
+
return map;
|
|
34
|
+
}
|
|
35
|
+
static getApiScopes() {
|
|
36
|
+
let scopes = [];
|
|
37
|
+
for (const api of MSALApiConfig) {
|
|
38
|
+
scopes.push(api.scopes);
|
|
39
|
+
}
|
|
40
|
+
return scopes;
|
|
41
|
+
}
|
|
25
42
|
}
|
|
26
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
43
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9hbmF0b2x5L3NyYy9saWIvaWFtL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7Ozs7Ozs7OztFQWlCRTtBQUVGLE1BQU07QUFDTixPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFFbkQsS0FBSztBQUNMLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxVQUFVLENBQUM7QUFFekMsTUFBTSxPQUFPLFNBQVM7SUFDcEIsd0RBQXdEO0lBQ2pELE1BQU0sQ0FBQyxpQkFBaUI7UUFDN0IsT0FBTyxDQUFDLFlBQVksQ0FBQyxVQUFVLEVBQUUsSUFBSSxDQUFDLFlBQVksQ0FBQyxTQUFTLEVBQUUsQ0FBQyxDQUFDLENBQUMsb0JBQW9CLENBQUMsQ0FBQyxDQUFDLFVBQVUsQ0FBQztJQUNyRyxDQUFDO0lBRU0sTUFBTSxDQUFDLE9BQU87UUFDbkIsSUFBSSxHQUFHLEdBQUcsSUFBSSxHQUFHLEVBQXlCLENBQUM7UUFFM0MsS0FBSyxNQUFNLEdBQUcsSUFBSSxhQUFhLEVBQUU7WUFDL0IsR0FBRyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQztTQUM5QjtRQUVELE9BQU8sR0FBRyxDQUFDO0lBQ2IsQ0FBQztJQUVNLE1BQU0sQ0FBQyxZQUFZO1FBQ3hCLElBQUksTUFBTSxHQUFHLEVBQUUsQ0FBQztRQUVoQixLQUFLLE1BQU0sR0FBRyxJQUFJLGFBQWEsRUFBRTtZQUMvQixNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQztTQUN6QjtRQUVELE9BQU8sTUFBTSxDQUFDO0lBQ2hCLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbIi8qXHJcbjxmaWxlPlxyXG4gIFByb2plY3Q6XHJcbiAgICBAb3Nvdml0bnkvYW5hdG9seVxyXG5cclxuICBBdXRob3JzOlxyXG4gICAgVmFkaW0gT3Nvdml0bnkgdmFkaW1Ab3Nvdml0bnkuY29tXHJcbiAgICBBbmF0b2x5IE9zb3ZpdG55IGFuYXRvbHlAb3Nvdml0bnkuY29tXHJcblxyXG5cdENyZWF0ZWQ6XHJcblx0XHQyNyBOb3YgMjAyM1xyXG5cclxuICBEZXNjcmlwdGlvbjpcclxuICAgIElkZW50aXR5IGFuZCBBY2Nlc3MgTWFuYWdlbWVudFxyXG5cclxuXHRDb3B5cmlnaHQgKGMpIDIwMTYtMjAyMiBPc292aXRueSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuXHJcbjwvZmlsZT5cclxuKi9cclxuXHJcbi8vTm9kZVxyXG5pbXBvcnQgeyBCcm93c2VyVXRpbHMgfSBmcm9tICdAYXp1cmUvbXNhbC1icm93c2VyJztcclxuXHJcbi8vQXBwXHJcbmltcG9ydCB7IE1TQUxBcGlDb25maWcgfSBmcm9tICcuL2NvbnN0cyc7XHJcblxyXG5leHBvcnQgY2xhc3MgTVNBTFV0aWxzIHtcclxuICAvLyBEb24ndCBwZXJmb3JtIGluaXRpYWwgbmF2aWdhdGlvbiBpbiBpZnJhbWVzIG9yIHBvcHVwc1xyXG4gIHB1YmxpYyBzdGF0aWMgaW5pdGlhbE5hdmlnYXRpb24oKSB7XHJcbiAgICByZXR1cm4gIUJyb3dzZXJVdGlscy5pc0luSWZyYW1lKCkgJiYgIUJyb3dzZXJVdGlscy5pc0luUG9wdXAoKSA/ICdlbmFibGVkTm9uQmxvY2tpbmcnIDogJ2Rpc2FibGVkJztcclxuICB9XHJcblxyXG4gIHB1YmxpYyBzdGF0aWMgZ2V0QXBpcygpIDogTWFwPHN0cmluZywgQXJyYXk8c3RyaW5nPj4ge1xyXG4gICAgbGV0IG1hcCA9IG5ldyBNYXA8c3RyaW5nLCBBcnJheTxzdHJpbmc+PigpO1xyXG5cclxuICAgIGZvciAoY29uc3QgYXBpIG9mIE1TQUxBcGlDb25maWcpIHtcclxuICAgICAgbWFwLnNldChhcGkudXJpLCBhcGkuc2NvcGVzKTtcclxuICAgIH1cclxuXHJcbiAgICByZXR1cm4gbWFwO1xyXG4gIH1cclxuXHJcbiAgcHVibGljIHN0YXRpYyBnZXRBcGlTY29wZXMoKSA6IGFueVtdIHtcclxuICAgIGxldCBzY29wZXMgPSBbXTtcclxuXHJcbiAgICBmb3IgKGNvbnN0IGFwaSBvZiBNU0FMQXBpQ29uZmlnKSB7XHJcbiAgICAgIHNjb3Blcy5wdXNoKGFwaS5zY29wZXMpO1xyXG4gICAgfVxyXG5cclxuICAgIHJldHVybiBzY29wZXM7XHJcbiAgfVxyXG59XHJcbiJdfQ==
|
|
@@ -2833,11 +2833,26 @@ class AuthenticationGuard extends MsalGuard {
|
|
|
2833
2833
|
Copyright (c) 2016-2022 Osovitny Inc. All rights reserved.
|
|
2834
2834
|
</file>
|
|
2835
2835
|
*/
|
|
2836
|
+
//Node
|
|
2836
2837
|
class MSALUtils {
|
|
2837
2838
|
// Don't perform initial navigation in iframes or popups
|
|
2838
2839
|
static initialNavigation() {
|
|
2839
2840
|
return !BrowserUtils.isInIframe() && !BrowserUtils.isInPopup() ? 'enabledNonBlocking' : 'disabled';
|
|
2840
2841
|
}
|
|
2842
|
+
static getApis() {
|
|
2843
|
+
let map = new Map();
|
|
2844
|
+
for (const api of MSALApiConfig) {
|
|
2845
|
+
map.set(api.uri, api.scopes);
|
|
2846
|
+
}
|
|
2847
|
+
return map;
|
|
2848
|
+
}
|
|
2849
|
+
static getApiScopes() {
|
|
2850
|
+
let scopes = [];
|
|
2851
|
+
for (const api of MSALApiConfig) {
|
|
2852
|
+
scopes.push(api.scopes);
|
|
2853
|
+
}
|
|
2854
|
+
return scopes;
|
|
2855
|
+
}
|
|
2841
2856
|
}
|
|
2842
2857
|
|
|
2843
2858
|
/*
|
|
@@ -6039,8 +6054,7 @@ const PolicyType = {
|
|
|
6039
6054
|
</file>
|
|
6040
6055
|
*/
|
|
6041
6056
|
function MSALInterceptorConfigFactory() {
|
|
6042
|
-
let protectedResourceMap =
|
|
6043
|
-
protectedResourceMap.set('https://graph.microsoft.com/v1.0/me', ['user.read']);
|
|
6057
|
+
let protectedResourceMap = MSALUtils.getApis();
|
|
6044
6058
|
return {
|
|
6045
6059
|
interactionType: InteractionType.Redirect,
|
|
6046
6060
|
protectedResourceMap
|
|
@@ -6050,21 +6064,8 @@ function MSALGuardConfigFactory() {
|
|
|
6050
6064
|
return {
|
|
6051
6065
|
interactionType: InteractionType.Redirect,
|
|
6052
6066
|
authRequest: (authService, state) => {
|
|
6053
|
-
let scopes =
|
|
6067
|
+
let scopes = MSALUtils.getApiScopes();
|
|
6054
6068
|
let redirectTo = state.url;
|
|
6055
|
-
/*
|
|
6056
|
-
VadimOS: not working for some reason
|
|
6057
|
-
|
|
6058
|
-
let stateData = {
|
|
6059
|
-
redirectTo: redirectTo
|
|
6060
|
-
};
|
|
6061
|
-
let state64 = Buffer.from(JSON.stringify(stateData)).toString('base64');
|
|
6062
|
-
let request: RedirectRequest = {
|
|
6063
|
-
scopes: [...scopes],
|
|
6064
|
-
state: state64,
|
|
6065
|
-
redirectStartPage: redirectTo
|
|
6066
|
-
}
|
|
6067
|
-
*/
|
|
6068
6069
|
let request = {
|
|
6069
6070
|
scopes: [...scopes]
|
|
6070
6071
|
};
|
|
@@ -6239,7 +6240,7 @@ class SignInPage extends BasePage {
|
|
|
6239
6240
|
this.auth = auth;
|
|
6240
6241
|
}
|
|
6241
6242
|
ngOnInit() {
|
|
6242
|
-
this.auth.login()
|
|
6243
|
+
this.auth.login();
|
|
6243
6244
|
}
|
|
6244
6245
|
static ɵfac = function SignInPage_Factory(t) { return new (t || SignInPage)(i0.ɵɵdirectiveInject(AuthService)); };
|
|
6245
6246
|
static ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent({ type: SignInPage, selectors: [["iam-signin-page"]], features: [i0.ɵɵInheritDefinitionFeature], decls: 0, vars: 0, template: function SignInPage_Template(rf, ctx) { }, encapsulation: 2 });
|
|
@@ -6713,12 +6714,8 @@ class AnatolyModule {
|
|
|
6713
6714
|
static ɵinj = /*@__PURE__*/ i0.ɵɵdefineInjector({ imports: [CommonModule,
|
|
6714
6715
|
AnatolyCoreModule,
|
|
6715
6716
|
AnatolyDataModule,
|
|
6716
|
-
AnatolyIAMModule,
|
|
6717
|
-
//AnatolyIAMPagesModule,
|
|
6718
6717
|
AnatolyUIModule, AnatolyCoreModule,
|
|
6719
6718
|
AnatolyDataModule,
|
|
6720
|
-
AnatolyIAMModule,
|
|
6721
|
-
//AnatolyIAMPagesModule,
|
|
6722
6719
|
AnatolyUIModule] });
|
|
6723
6720
|
}
|
|
6724
6721
|
(function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(AnatolyModule, [{
|
|
@@ -6728,29 +6725,21 @@ class AnatolyModule {
|
|
|
6728
6725
|
CommonModule,
|
|
6729
6726
|
AnatolyCoreModule,
|
|
6730
6727
|
AnatolyDataModule,
|
|
6731
|
-
AnatolyIAMModule,
|
|
6732
|
-
//AnatolyIAMPagesModule,
|
|
6733
6728
|
AnatolyUIModule
|
|
6734
6729
|
],
|
|
6735
6730
|
exports: [
|
|
6736
6731
|
AnatolyCoreModule,
|
|
6737
6732
|
AnatolyDataModule,
|
|
6738
|
-
AnatolyIAMModule,
|
|
6739
|
-
//AnatolyIAMPagesModule,
|
|
6740
6733
|
AnatolyUIModule
|
|
6741
6734
|
],
|
|
6742
|
-
providers: []
|
|
6735
|
+
providers: []
|
|
6743
6736
|
}]
|
|
6744
6737
|
}], null, null); })();
|
|
6745
6738
|
(function () { (typeof ngJitMode === "undefined" || ngJitMode) && i0.ɵɵsetNgModuleScope(AnatolyModule, { imports: [CommonModule,
|
|
6746
6739
|
AnatolyCoreModule,
|
|
6747
6740
|
AnatolyDataModule,
|
|
6748
|
-
AnatolyIAMModule,
|
|
6749
|
-
//AnatolyIAMPagesModule,
|
|
6750
6741
|
AnatolyUIModule], exports: [AnatolyCoreModule,
|
|
6751
6742
|
AnatolyDataModule,
|
|
6752
|
-
AnatolyIAMModule,
|
|
6753
|
-
//AnatolyIAMPagesModule,
|
|
6754
6743
|
AnatolyUIModule] }); })();
|
|
6755
6744
|
|
|
6756
6745
|
/*
|