@acorex/modules 1.0.0 → 1.0.2
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/auth/index.d.ts +1 -0
- package/auth/lib/account/account.module.d.ts +1 -1
- package/auth/lib/account/app-chooser/app-chooser-slot.component.d.ts +1 -1
- package/auth/lib/account/app-chooser/app-chooser.component.d.ts +1 -1
- package/auth/lib/account/profile/profile-slot.component.d.ts +6 -1
- package/auth/lib/account/tenant-chooser/tenant-chooser-dropdown.component.d.ts +1 -1
- package/auth/lib/auth.config.d.ts +5 -5
- package/auth/lib/error-handler.d.ts +1 -1
- package/auth/lib/login/password/password.component.d.ts +1 -1
- package/backend/index.d.ts +2 -0
- package/backend/lib/auth/oidc/application.loader.d.ts +2 -2
- package/backend/lib/auth/oidc/configuration.service.d.ts +60 -0
- package/backend/lib/auth/oidc/feature.loader.d.ts +1 -0
- package/backend/lib/auth/oidc/index.d.ts +3 -0
- package/backend/lib/auth/oidc/oidc.strategy.d.ts +5 -3
- package/backend/lib/auth/oidc/permission.loader.d.ts +11 -2
- package/backend/lib/auth/oidc/signincallback.component.d.ts +1 -0
- package/backend/lib/auth/oidc/tenant.loader.d.ts +2 -2
- package/backend/lib/auth/oidc/usermanager.service.d.ts +4 -1
- package/backend/lib/backend.configs.d.ts +0 -5
- package/backend/lib/data/api/data-provider.d.ts +4 -0
- package/backend/lib/data/index.d.ts +3 -0
- package/backend/lib/data/local/data-Conditioner.d.ts +6 -0
- package/backend/lib/data/local/local-data-provider.d.ts +23 -0
- package/esm2022/auth/index.mjs +2 -1
- package/esm2022/auth/lib/account/account.module.mjs +12 -12
- package/esm2022/auth/lib/account/app-chooser/app-chooser-list.component.mjs +6 -6
- package/esm2022/auth/lib/account/app-chooser/app-chooser-slot.component.mjs +7 -6
- package/esm2022/auth/lib/account/app-chooser/app-chooser.component.mjs +7 -6
- package/esm2022/auth/lib/account/profile/profile-slot.component.mjs +45 -18
- package/esm2022/auth/lib/account/tenant-chooser/tenant-chooser-dropdown.component.mjs +6 -5
- package/esm2022/auth/lib/account/tenant-chooser/tenant-chooser.component.mjs +7 -7
- package/esm2022/auth/lib/auth.config.mjs +7 -6
- package/esm2022/auth/lib/auth.module.mjs +4 -4
- package/esm2022/auth/lib/auth.routes.mjs +7 -6
- package/esm2022/auth/lib/error-handler.mjs +14 -7
- package/esm2022/auth/lib/forgot/password/password.component.mjs +4 -4
- package/esm2022/auth/lib/login/login.module.mjs +5 -6
- package/esm2022/auth/lib/login/password/password.component.mjs +26 -11
- package/esm2022/auth/lib/shared/layouts/blank/blank.layout.mjs +3 -3
- package/esm2022/auth/lib/shared/layouts/master/master.layout.mjs +8 -7
- package/esm2022/auth/lib/shared/services/idle.service.mjs +3 -3
- package/esm2022/auth/lib/store/auth.effects.mjs +3 -3
- package/esm2022/auth/lib/two-factor/two-factor-code/two-factor-code.component.mjs +4 -4
- package/esm2022/auth/lib/two-factor/two-factor.module.mjs +4 -4
- package/esm2022/backend/index.mjs +3 -1
- package/esm2022/backend/lib/auth/oidc/application.loader.mjs +15 -13
- package/esm2022/backend/lib/auth/oidc/configuration.service.mjs +53 -0
- package/esm2022/backend/lib/auth/oidc/feature.loader.mjs +16 -2
- package/esm2022/backend/lib/auth/oidc/index.mjs +4 -1
- package/esm2022/backend/lib/auth/oidc/oidc.strategy.mjs +59 -39
- package/esm2022/backend/lib/auth/oidc/permission.loader.mjs +31 -4
- package/esm2022/backend/lib/auth/oidc/signincallback.component.mjs +27 -7
- package/esm2022/backend/lib/auth/oidc/tenant.loader.mjs +16 -14
- package/esm2022/backend/lib/auth/oidc/usermanager.service.mjs +8 -6
- package/esm2022/backend/lib/backend.configs.mjs +2 -3
- package/esm2022/backend/lib/backend.module.mjs +9 -23
- package/esm2022/backend/lib/data/api/data-provider.mjs +49 -13
- package/esm2022/backend/lib/data/index.mjs +4 -0
- package/esm2022/backend/lib/data/local/data-Conditioner.mjs +76 -0
- package/esm2022/backend/lib/data/local/local-data-provider.mjs +84 -0
- package/esm2022/log-management/acorex-modules-log-management.mjs +5 -0
- package/esm2022/log-management/index.mjs +3 -0
- package/esm2022/log-management/lib/audit-logs.entity.mjs +392 -0
- package/esm2022/log-management/lib/log-management.module.mjs +16 -0
- package/esm2022/notification/index.mjs +3 -1
- package/esm2022/notification/lib/notification.module.mjs +4 -4
- package/fesm2022/{acorex-modules-auth-acorex-modules-auth-3tiGzryz.mjs → acorex-modules-auth-acorex-modules-auth-jEqtVhBE.mjs} +143 -109
- package/fesm2022/acorex-modules-auth-acorex-modules-auth-jEqtVhBE.mjs.map +1 -0
- package/fesm2022/acorex-modules-auth-app-chooser.component-BbtMSwfI.mjs +72 -0
- package/fesm2022/acorex-modules-auth-app-chooser.component-BbtMSwfI.mjs.map +1 -0
- package/fesm2022/{acorex-modules-auth-blank.layout-0xNRyD5z.mjs → acorex-modules-auth-blank.layout-BOdRxDNv.mjs} +4 -4
- package/fesm2022/{acorex-modules-auth-blank.layout-0xNRyD5z.mjs.map → acorex-modules-auth-blank.layout-BOdRxDNv.mjs.map} +1 -1
- package/fesm2022/{acorex-modules-auth-login.module-lGs54nBU.mjs → acorex-modules-auth-login.module-Drm4fC1I.mjs} +13 -12
- package/fesm2022/acorex-modules-auth-login.module-Drm4fC1I.mjs.map +1 -0
- package/fesm2022/{acorex-modules-auth-master.layout-ytopPv2z.mjs → acorex-modules-auth-master.layout-cAm6TYeA.mjs} +12 -10
- package/fesm2022/acorex-modules-auth-master.layout-cAm6TYeA.mjs.map +1 -0
- package/fesm2022/{acorex-modules-auth-password.component-Q9Me4kkK.mjs → acorex-modules-auth-password.component-Ch2Wqi2W.mjs} +12 -10
- package/fesm2022/{acorex-modules-auth-password.component-Q9Me4kkK.mjs.map → acorex-modules-auth-password.component-Ch2Wqi2W.mjs.map} +1 -1
- package/fesm2022/acorex-modules-auth-password.component-D4CkGaq0.mjs +127 -0
- package/fesm2022/acorex-modules-auth-password.component-D4CkGaq0.mjs.map +1 -0
- package/fesm2022/{acorex-modules-auth-routes-jgo2XGe0.mjs → acorex-modules-auth-routes-DyjibH6l.mjs} +2 -2
- package/fesm2022/{acorex-modules-auth-routes-jgo2XGe0.mjs.map → acorex-modules-auth-routes-DyjibH6l.mjs.map} +1 -1
- package/fesm2022/acorex-modules-auth-tenant-chooser.component-CJu2Lfbf.mjs +84 -0
- package/fesm2022/acorex-modules-auth-tenant-chooser.component-CJu2Lfbf.mjs.map +1 -0
- package/fesm2022/{acorex-modules-auth-two-factor-code.component-fP6CLq9T.mjs → acorex-modules-auth-two-factor-code.component-B41iXHoT.mjs} +5 -5
- package/fesm2022/{acorex-modules-auth-two-factor-code.component-fP6CLq9T.mjs.map → acorex-modules-auth-two-factor-code.component-B41iXHoT.mjs.map} +1 -1
- package/fesm2022/{acorex-modules-auth-two-factor.module--fcoNW-s.mjs → acorex-modules-auth-two-factor.module-A0hevYO2.mjs} +12 -10
- package/fesm2022/acorex-modules-auth-two-factor.module-A0hevYO2.mjs.map +1 -0
- package/fesm2022/acorex-modules-auth.mjs +7 -5
- package/fesm2022/acorex-modules-auth.mjs.map +1 -1
- package/fesm2022/acorex-modules-backend.mjs +432 -227
- package/fesm2022/acorex-modules-backend.mjs.map +1 -1
- package/fesm2022/acorex-modules-log-management.mjs +415 -0
- package/fesm2022/acorex-modules-log-management.mjs.map +1 -0
- package/fesm2022/acorex-modules-notification.mjs +7 -4
- package/fesm2022/acorex-modules-notification.mjs.map +1 -1
- package/log-management/README.md +4 -0
- package/log-management/index.d.ts +2 -0
- package/log-management/lib/audit-logs.entity.d.ts +3 -0
- package/log-management/lib/log-management.module.d.ts +6 -0
- package/package.json +9 -3
- package/auth/lib/register/email/email.component.d.ts +0 -5
- package/auth/lib/register/register.module.d.ts +0 -7
- package/auth/lib/register/result/result.component.d.ts +0 -5
- package/backend/lib/auth/userpass/application.loader.d.ts +0 -6
- package/backend/lib/auth/userpass/index.d.ts +0 -4
- package/backend/lib/auth/userpass/permission.loader.d.ts +0 -5
- package/backend/lib/auth/userpass/tenant.loader.d.ts +0 -6
- package/backend/lib/auth/userpass/userpass.strategy.d.ts +0 -12
- package/esm2022/auth/lib/register/email/email.component.mjs +0 -42
- package/esm2022/auth/lib/register/register.module.mjs +0 -59
- package/esm2022/auth/lib/register/result/result.component.mjs +0 -33
- package/esm2022/backend/lib/auth/userpass/application.loader.mjs +0 -30
- package/esm2022/backend/lib/auth/userpass/index.mjs +0 -5
- package/esm2022/backend/lib/auth/userpass/permission.loader.mjs +0 -12
- package/esm2022/backend/lib/auth/userpass/tenant.loader.mjs +0 -26
- package/esm2022/backend/lib/auth/userpass/userpass.strategy.mjs +0 -40
- package/fesm2022/acorex-modules-auth-acorex-modules-auth-3tiGzryz.mjs.map +0 -1
- package/fesm2022/acorex-modules-auth-app-chooser.component-Hh2T5orM.mjs +0 -70
- package/fesm2022/acorex-modules-auth-app-chooser.component-Hh2T5orM.mjs.map +0 -1
- package/fesm2022/acorex-modules-auth-email.component-ZbTwT8iu.mjs +0 -45
- package/fesm2022/acorex-modules-auth-email.component-ZbTwT8iu.mjs.map +0 -1
- package/fesm2022/acorex-modules-auth-login.module-lGs54nBU.mjs.map +0 -1
- package/fesm2022/acorex-modules-auth-master.layout-ytopPv2z.mjs.map +0 -1
- package/fesm2022/acorex-modules-auth-password.component-p1Ks9S5q.mjs +0 -110
- package/fesm2022/acorex-modules-auth-password.component-p1Ks9S5q.mjs.map +0 -1
- package/fesm2022/acorex-modules-auth-register.module-ckbVm-yf.mjs +0 -77
- package/fesm2022/acorex-modules-auth-register.module-ckbVm-yf.mjs.map +0 -1
- package/fesm2022/acorex-modules-auth-result.component-ORUU7lkV.mjs +0 -36
- package/fesm2022/acorex-modules-auth-result.component-ORUU7lkV.mjs.map +0 -1
- package/fesm2022/acorex-modules-auth-tenant-chooser.component-PeGg21Im.mjs +0 -84
- package/fesm2022/acorex-modules-auth-tenant-chooser.component-PeGg21Im.mjs.map +0 -1
- package/fesm2022/acorex-modules-auth-two-factor.module--fcoNW-s.mjs.map +0 -1
@@ -14,9 +14,9 @@ function routesFacory() {
|
|
14
14
|
return routes;
|
15
15
|
}
|
16
16
|
export class AXPTwoFactorModule {
|
17
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "
|
18
|
-
static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "
|
19
|
-
static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "
|
17
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.0.2", ngImport: i0, type: AXPTwoFactorModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
|
18
|
+
static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "18.0.2", ngImport: i0, type: AXPTwoFactorModule, imports: [RouterModule] }); }
|
19
|
+
static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "18.0.2", ngImport: i0, type: AXPTwoFactorModule, providers: [
|
20
20
|
{
|
21
21
|
provide: ROUTES,
|
22
22
|
multi: true,
|
@@ -24,7 +24,7 @@ export class AXPTwoFactorModule {
|
|
24
24
|
},
|
25
25
|
], imports: [RouterModule] }); }
|
26
26
|
}
|
27
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "
|
27
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.0.2", ngImport: i0, type: AXPTwoFactorModule, decorators: [{
|
28
28
|
type: NgModule,
|
29
29
|
args: [{
|
30
30
|
declarations: [],
|
@@ -1,3 +1,5 @@
|
|
1
1
|
export * from './lib/backend.configs';
|
2
2
|
export * from './lib/backend.module';
|
3
|
-
|
3
|
+
export * from './lib/data';
|
4
|
+
export * from './lib/auth/oidc';
|
5
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9saWJzL21vZHVsZXMvYmFja2VuZC9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsY0FBYyx1QkFBdUIsQ0FBQztBQUN0QyxjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMsWUFBWSxDQUFDO0FBQzNCLGNBQWMsaUJBQWlCLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJcbmV4cG9ydCAqIGZyb20gJy4vbGliL2JhY2tlbmQuY29uZmlncyc7XG5leHBvcnQgKiBmcm9tICcuL2xpYi9iYWNrZW5kLm1vZHVsZSc7XG5leHBvcnQgKiBmcm9tICcuL2xpYi9kYXRhJztcbmV4cG9ydCAqIGZyb20gJy4vbGliL2F1dGgvb2lkYyc7XG4iXX0=
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import {
|
1
|
+
import { AXP_ROOT_CONFIG_TOKEN } from '@acorex/platform/core';
|
2
2
|
import { HttpClient } from '@angular/common/http';
|
3
3
|
import { Injectable, inject } from '@angular/core';
|
4
4
|
import { map } from 'rxjs';
|
@@ -7,30 +7,32 @@ import * as i1 from "@angular/common/http";
|
|
7
7
|
export class AXMOidcApplicationLoader {
|
8
8
|
constructor(http) {
|
9
9
|
this.http = http;
|
10
|
-
this.configs = inject(
|
11
|
-
this.apiGetApps = `${this.configs.
|
12
|
-
this.apiSetApp = `${this.configs.
|
10
|
+
this.configs = inject(AXP_ROOT_CONFIG_TOKEN);
|
11
|
+
this.apiGetApps = `${this.configs.baseUrl}/applications/GetListByTenantId`;
|
12
|
+
this.apiSetApp = `${this.configs.baseUrl}/SetApplication`;
|
13
13
|
}
|
14
14
|
getList() {
|
15
15
|
return this.http.get(this.apiGetApps).pipe(map((response) => {
|
16
|
-
console.log('response', response);
|
17
16
|
return response.items.map((item) => this.mapToAXPApplication(item));
|
18
17
|
}));
|
19
18
|
}
|
19
|
+
//TODO: shoud be removed
|
20
20
|
set(application) {
|
21
21
|
return this.http.post(this.apiSetApp, { applicationId: application.id }).pipe(map((response) => {
|
22
22
|
return {
|
23
|
-
|
24
|
-
|
23
|
+
succeed: true,
|
24
|
+
data: {
|
25
|
+
accessToken: response.token,
|
26
|
+
refreshToken: response.token,
|
27
|
+
}
|
25
28
|
};
|
26
29
|
}));
|
27
30
|
}
|
28
31
|
mapToAXPApplication(item) {
|
29
|
-
console.log('mapToAXPApplication', item);
|
30
32
|
return {
|
31
33
|
id: item.id,
|
32
34
|
name: item.name || 'defaultName',
|
33
|
-
title: item.
|
35
|
+
title: item.title || 'defaultTitle',
|
34
36
|
version: item.version || '1.0.0',
|
35
37
|
description: item.description,
|
36
38
|
logo: item.logo, // Assuming logo is of type AXPLogoConfig or undefined
|
@@ -38,10 +40,10 @@ export class AXMOidcApplicationLoader {
|
|
38
40
|
// features: item.features || [],
|
39
41
|
};
|
40
42
|
}
|
41
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "
|
42
|
-
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "
|
43
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.0.2", ngImport: i0, type: AXMOidcApplicationLoader, deps: [{ token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
44
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.0.2", ngImport: i0, type: AXMOidcApplicationLoader }); }
|
43
45
|
}
|
44
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "
|
46
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.0.2", ngImport: i0, type: AXMOidcApplicationLoader, decorators: [{
|
45
47
|
type: Injectable
|
46
48
|
}], ctorParameters: () => [{ type: i1.HttpClient }] });
|
47
|
-
//# sourceMappingURL=data:application/json;base64,
|
49
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwbGljYXRpb24ubG9hZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vbGlicy9tb2R1bGVzL2JhY2tlbmQvc3JjL2xpYi9hdXRoL29pZGMvYXBwbGljYXRpb24ubG9hZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQzlELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNsRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUNuRCxPQUFPLEVBQWMsR0FBRyxFQUFFLE1BQU0sTUFBTSxDQUFDOzs7QUFHdkMsTUFBTSxPQUFPLHdCQUF3QjtJQUluQyxZQUFvQixJQUFnQjtRQUFoQixTQUFJLEdBQUosSUFBSSxDQUFZO1FBSDVCLFlBQU8sR0FBRyxNQUFNLENBQUMscUJBQXFCLENBQUMsQ0FBQztRQUN4QyxlQUFVLEdBQUcsR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8saUNBQWlDLENBQUM7UUFDdEUsY0FBUyxHQUFHLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLGlCQUFpQixDQUFDO0lBQ3JCLENBQUM7SUFFekMsT0FBTztRQUNMLE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQW1CLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQyxJQUFJLENBQzFELEdBQUcsQ0FBQyxDQUFDLFFBQVEsRUFBRSxFQUFFO1lBQ2YsT0FBTyxRQUFRLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLG1CQUFtQixDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7UUFDdEUsQ0FBQyxDQUFDLENBQ0gsQ0FBQztJQUNKLENBQUM7SUFFRCx3QkFBd0I7SUFDeEIsR0FBRyxDQUFDLFdBQTJCO1FBQzdCLE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQU0sSUFBSSxDQUFDLFNBQVMsRUFBRSxFQUFFLGFBQWEsRUFBRSxXQUFXLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQ2hGLEdBQUcsQ0FBQyxDQUFDLFFBQVEsRUFBRSxFQUFFO1lBQ2YsT0FBTztnQkFDTCxPQUFPLEVBQUUsSUFBSTtnQkFDYixJQUFJLEVBQUU7b0JBQ0osV0FBVyxFQUFFLFFBQVEsQ0FBQyxLQUFLO29CQUMzQixZQUFZLEVBQUUsUUFBUSxDQUFDLEtBQUs7aUJBQzdCO2FBQ0YsQ0FBQztRQUNKLENBQUMsQ0FBQyxDQUNILENBQUM7SUFDSixDQUFDO0lBRU8sbUJBQW1CLENBQUMsSUFBUztRQUNuQyxPQUFPO1lBQ0wsRUFBRSxFQUFFLElBQUksQ0FBQyxFQUFFO1lBQ1gsSUFBSSxFQUFFLElBQUksQ0FBQyxJQUFJLElBQUksYUFBYTtZQUNoQyxLQUFLLEVBQUUsSUFBSSxDQUFDLEtBQUssSUFBSSxjQUFjO1lBQ25DLE9BQU8sRUFBRSxJQUFJLENBQUMsT0FBTyxJQUFJLE9BQU87WUFDaEMsV0FBVyxFQUFFLElBQUksQ0FBQyxXQUFXO1lBQzdCLElBQUksRUFBRSxJQUFJLENBQUMsSUFBSSxFQUFFLHNEQUFzRDtZQUN2RSxXQUFXLEVBQUUsSUFBSSxDQUFDLFdBQVc7WUFDN0IsaUNBQWlDO1NBQ2xDLENBQUM7SUFDSixDQUFDOzhHQXhDVSx3QkFBd0I7a0hBQXhCLHdCQUF3Qjs7MkZBQXhCLHdCQUF3QjtrQkFEcEMsVUFBVSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEFYUEFwcGxpY2F0aW9uLCBBWFBBcHBsaWNhdGlvbkxvYWRlciwgQVhQUmVmcmVzaFRva2VuUmVzdWx0IH0gZnJvbSAnQGFjb3JleC9wbGF0Zm9ybS9hdXRoJztcbmltcG9ydCB7IEFYUF9ST09UX0NPTkZJR19UT0tFTiB9IGZyb20gJ0BhY29yZXgvcGxhdGZvcm0vY29yZSc7XG5pbXBvcnQgeyBIdHRwQ2xpZW50IH0gZnJvbSAnQGFuZ3VsYXIvY29tbW9uL2h0dHAnO1xuaW1wb3J0IHsgSW5qZWN0YWJsZSwgaW5qZWN0IH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBPYnNlcnZhYmxlLCBtYXAgfSBmcm9tICdyeGpzJztcblxuQEluamVjdGFibGUoKVxuZXhwb3J0IGNsYXNzIEFYTU9pZGNBcHBsaWNhdGlvbkxvYWRlciBpbXBsZW1lbnRzIEFYUEFwcGxpY2F0aW9uTG9hZGVyIHtcbiAgcHJpdmF0ZSBjb25maWdzID0gaW5qZWN0KEFYUF9ST09UX0NPTkZJR19UT0tFTik7XG4gIHByaXZhdGUgYXBpR2V0QXBwcyA9IGAke3RoaXMuY29uZmlncy5iYXNlVXJsfS9hcHBsaWNhdGlvbnMvR2V0TGlzdEJ5VGVuYW50SWRgO1xuICBwcml2YXRlIGFwaVNldEFwcCA9IGAke3RoaXMuY29uZmlncy5iYXNlVXJsfS9TZXRBcHBsaWNhdGlvbmA7XG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgaHR0cDogSHR0cENsaWVudCkgeyB9XG5cbiAgZ2V0TGlzdCgpOiBPYnNlcnZhYmxlPEFYUEFwcGxpY2F0aW9uW10+IHtcbiAgICByZXR1cm4gdGhpcy5odHRwLmdldDx7IGl0ZW1zOiBhbnlbXSB9Pih0aGlzLmFwaUdldEFwcHMpLnBpcGUoXG4gICAgICBtYXAoKHJlc3BvbnNlKSA9PiB7XG4gICAgICAgIHJldHVybiByZXNwb25zZS5pdGVtcy5tYXAoKGl0ZW0pID0+IHRoaXMubWFwVG9BWFBBcHBsaWNhdGlvbihpdGVtKSk7XG4gICAgICB9KVxuICAgICk7XG4gIH1cblxuICAvL1RPRE86IHNob3VkIGJlIHJlbW92ZWRcbiAgc2V0KGFwcGxpY2F0aW9uOiBBWFBBcHBsaWNhdGlvbik6IE9ic2VydmFibGU8QVhQUmVmcmVzaFRva2VuUmVzdWx0PiB7XG4gICAgcmV0dXJuIHRoaXMuaHR0cC5wb3N0PGFueT4odGhpcy5hcGlTZXRBcHAsIHsgYXBwbGljYXRpb25JZDogYXBwbGljYXRpb24uaWQgfSkucGlwZShcbiAgICAgIG1hcCgocmVzcG9uc2UpID0+IHtcbiAgICAgICAgcmV0dXJuIHtcbiAgICAgICAgICBzdWNjZWVkOiB0cnVlLFxuICAgICAgICAgIGRhdGE6IHtcbiAgICAgICAgICAgIGFjY2Vzc1Rva2VuOiByZXNwb25zZS50b2tlbixcbiAgICAgICAgICAgIHJlZnJlc2hUb2tlbjogcmVzcG9uc2UudG9rZW4sXG4gICAgICAgICAgfVxuICAgICAgICB9O1xuICAgICAgfSlcbiAgICApO1xuICB9XG5cbiAgcHJpdmF0ZSBtYXBUb0FYUEFwcGxpY2F0aW9uKGl0ZW06IGFueSk6IEFYUEFwcGxpY2F0aW9uIHtcbiAgICByZXR1cm4ge1xuICAgICAgaWQ6IGl0ZW0uaWQsXG4gICAgICBuYW1lOiBpdGVtLm5hbWUgfHwgJ2RlZmF1bHROYW1lJyxcbiAgICAgIHRpdGxlOiBpdGVtLnRpdGxlIHx8ICdkZWZhdWx0VGl0bGUnLFxuICAgICAgdmVyc2lvbjogaXRlbS52ZXJzaW9uIHx8ICcxLjAuMCcsXG4gICAgICBkZXNjcmlwdGlvbjogaXRlbS5kZXNjcmlwdGlvbixcbiAgICAgIGxvZ286IGl0ZW0ubG9nbywgLy8gQXNzdW1pbmcgbG9nbyBpcyBvZiB0eXBlIEFYUExvZ29Db25maWcgb3IgdW5kZWZpbmVkXG4gICAgICBlZGl0aW9uTmFtZTogaXRlbS5lZGl0aW9uTmFtZSxcbiAgICAgIC8vIGZlYXR1cmVzOiBpdGVtLmZlYXR1cmVzIHx8IFtdLFxuICAgIH07XG4gIH1cbn1cbiJdfQ==
|
@@ -0,0 +1,53 @@
|
|
1
|
+
import { AXP_ROOT_CONFIG_TOKEN } from '@acorex/platform/core';
|
2
|
+
import { HttpClient } from '@angular/common/http';
|
3
|
+
import { Injectable, inject } from '@angular/core';
|
4
|
+
import { BehaviorSubject, filter, of, switchMap, take, tap } from 'rxjs';
|
5
|
+
import * as i0 from "@angular/core";
|
6
|
+
import * as i1 from "@angular/common/http";
|
7
|
+
export class AXMConfigurationService {
|
8
|
+
constructor(http) {
|
9
|
+
this.http = http;
|
10
|
+
this.configs = inject(AXP_ROOT_CONFIG_TOKEN);
|
11
|
+
this.applicationConfig = null;
|
12
|
+
this.apiGetConfig = `${this.configs.baseUrl}/abp/application-configuration`;
|
13
|
+
this.fetchInProgress = false;
|
14
|
+
this.configSubject = new BehaviorSubject(null);
|
15
|
+
this.init().subscribe(); // Automatically trigger configuration load on service instantiation
|
16
|
+
}
|
17
|
+
init() {
|
18
|
+
if (!this.fetchInProgress) {
|
19
|
+
this.fetchInProgress = true;
|
20
|
+
return this.http.get(this.apiGetConfig).pipe(tap((response) => {
|
21
|
+
console.log('%cGranted ', 'background: #03fc9d; color: #000;', response);
|
22
|
+
this.applicationConfig = response;
|
23
|
+
this.configSubject.next(this.applicationConfig);
|
24
|
+
this.fetchInProgress = false;
|
25
|
+
}));
|
26
|
+
}
|
27
|
+
else {
|
28
|
+
// Adjusted approach to handle TypeScript's type safety requirements
|
29
|
+
return this.configSubject.asObservable().pipe(filter((config) => config !== null), take(1) // Ensures it completes after emitting the first non-null value
|
30
|
+
);
|
31
|
+
}
|
32
|
+
}
|
33
|
+
getConfig() {
|
34
|
+
if (this.applicationConfig) {
|
35
|
+
// If the config is already loaded, return it immediately
|
36
|
+
return of(this.applicationConfig);
|
37
|
+
}
|
38
|
+
else {
|
39
|
+
// If the config is not loaded, initiate loading
|
40
|
+
return this.configSubject.asObservable().pipe(filter((config) => config !== null), take(1), // Ensure it only emits the first non-null value and completes
|
41
|
+
switchMap(() => of(this.applicationConfig)));
|
42
|
+
}
|
43
|
+
}
|
44
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.0.2", ngImport: i0, type: AXMConfigurationService, deps: [{ token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
45
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.0.2", ngImport: i0, type: AXMConfigurationService, providedIn: 'root' }); }
|
46
|
+
}
|
47
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.0.2", ngImport: i0, type: AXMConfigurationService, decorators: [{
|
48
|
+
type: Injectable,
|
49
|
+
args: [{
|
50
|
+
providedIn: 'root',
|
51
|
+
}]
|
52
|
+
}], ctorParameters: () => [{ type: i1.HttpClient }] });
|
53
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlndXJhdGlvbi5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vbGlicy9tb2R1bGVzL2JhY2tlbmQvc3JjL2xpYi9hdXRoL29pZGMvY29uZmlndXJhdGlvbi5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQzlELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNsRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUNuRCxPQUFPLEVBQUUsZUFBZSxFQUFjLE1BQU0sRUFBRSxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxHQUFHLEVBQUUsTUFBTSxNQUFNLENBQUM7OztBQTZEckYsTUFBTSxPQUFPLHVCQUF1QjtJQU9sQyxZQUFvQixJQUFnQjtRQUFoQixTQUFJLEdBQUosSUFBSSxDQUFZO1FBTjVCLFlBQU8sR0FBRyxNQUFNLENBQUMscUJBQXFCLENBQUMsQ0FBQztRQUN4QyxzQkFBaUIsR0FBb0MsSUFBSSxDQUFDO1FBQzFELGlCQUFZLEdBQUcsR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sZ0NBQWdDLENBQUM7UUFDdkUsb0JBQWUsR0FBWSxLQUFLLENBQUM7UUFDakMsa0JBQWEsR0FBcUQsSUFBSSxlQUFlLENBQWtDLElBQUksQ0FBQyxDQUFDO1FBR25JLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQyxTQUFTLEVBQUUsQ0FBQyxDQUFDLG9FQUFvRTtJQUMvRixDQUFDO0lBRU0sSUFBSTtRQUNULElBQUksQ0FBQyxJQUFJLENBQUMsZUFBZSxFQUFFLENBQUM7WUFDMUIsSUFBSSxDQUFDLGVBQWUsR0FBRyxJQUFJLENBQUM7WUFDNUIsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBMkIsSUFBSSxDQUFDLFlBQVksQ0FBQyxDQUFDLElBQUksQ0FDcEUsR0FBRyxDQUFDLENBQUMsUUFBUSxFQUFFLEVBQUU7Z0JBQ2YsT0FBTyxDQUFDLEdBQUcsQ0FBQyxZQUFZLEVBQUUsbUNBQW1DLEVBQUUsUUFBUSxDQUFDLENBQUM7Z0JBQ3pFLElBQUksQ0FBQyxpQkFBaUIsR0FBRyxRQUFRLENBQUM7Z0JBQ2xDLElBQUksQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO2dCQUNoRCxJQUFJLENBQUMsZUFBZSxHQUFHLEtBQUssQ0FBQztZQUMvQixDQUFDLENBQUMsQ0FDSCxDQUFDO1FBQ0osQ0FBQzthQUFNLENBQUM7WUFDTixvRUFBb0U7WUFDcEUsT0FBTyxJQUFJLENBQUMsYUFBYSxDQUFDLFlBQVksRUFBRSxDQUFDLElBQUksQ0FDM0MsTUFBTSxDQUFDLENBQUMsTUFBTSxFQUFzQyxFQUFFLENBQUMsTUFBTSxLQUFLLElBQUksQ0FBQyxFQUN2RSxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsK0RBQStEO2FBQ3hFLENBQUM7UUFDSixDQUFDO0lBQ0gsQ0FBQztJQUVELFNBQVM7UUFDUCxJQUFJLElBQUksQ0FBQyxpQkFBaUIsRUFBRSxDQUFDO1lBQzNCLHlEQUF5RDtZQUN6RCxPQUFPLEVBQUUsQ0FBQyxJQUFJLENBQUMsaUJBQWlCLENBQUMsQ0FBQztRQUNwQyxDQUFDO2FBQU0sQ0FBQztZQUNOLGdEQUFnRDtZQUNoRCxPQUFPLElBQUksQ0FBQyxhQUFhLENBQUMsWUFBWSxFQUFFLENBQUMsSUFBSSxDQUMzQyxNQUFNLENBQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLE1BQU0sS0FBSyxJQUFJLENBQUMsRUFDbkMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLDhEQUE4RDtZQUN2RSxTQUFTLENBQUMsR0FBRyxFQUFFLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxpQkFBa0IsQ0FBQyxDQUFDLENBQzdDLENBQUM7UUFDSixDQUFDO0lBQ0gsQ0FBQzs4R0EzQ1UsdUJBQXVCO2tIQUF2Qix1QkFBdUIsY0FGdEIsTUFBTTs7MkZBRVAsdUJBQXVCO2tCQUhuQyxVQUFVO21CQUFDO29CQUNWLFVBQVUsRUFBRSxNQUFNO2lCQUNuQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEFYTV9BVVRIX0NPTkZJR19UT0tFTiB9IGZyb20gJ0BhY29yZXgvbW9kdWxlcy9hdXRoJztcbmltcG9ydCB7IEFYUF9ST09UX0NPTkZJR19UT0tFTiB9IGZyb20gJ0BhY29yZXgvcGxhdGZvcm0vY29yZSc7XG5pbXBvcnQgeyBIdHRwQ2xpZW50IH0gZnJvbSAnQGFuZ3VsYXIvY29tbW9uL2h0dHAnO1xuaW1wb3J0IHsgSW5qZWN0YWJsZSwgaW5qZWN0IH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBCZWhhdmlvclN1YmplY3QsIE9ic2VydmFibGUsIGZpbHRlciwgb2YsIHN3aXRjaE1hcCwgdGFrZSwgdGFwIH0gZnJvbSAncnhqcyc7XG5cbmV4cG9ydCBpbnRlcmZhY2UgTG9jYWxpemF0aW9uIHtcbiAgdmFsdWVzOiBSZWNvcmQ8c3RyaW5nLCBSZWNvcmQ8c3RyaW5nLCBzdHJpbmc+PjtcbiAgcmVzb3VyY2VzOiBSZWNvcmQ8c3RyaW5nLCBSZXNvdXJjZT47XG4gIGxhbmd1YWdlczogTGFuZ3VhZ2VbXTtcbiAgY3VycmVudEN1bHR1cmU6IEN1bHR1cmU7XG4gIGRlZmF1bHRSZXNvdXJjZU5hbWU6IHN0cmluZztcbiAgbGFuZ3VhZ2VzTWFwOiBSZWNvcmQ8c3RyaW5nLCBOYW1lVmFsdWVbXT47XG4gIGxhbmd1YWdlRmlsZXNNYXA6IFJlY29yZDxzdHJpbmcsIE5hbWVWYWx1ZVtdPjtcbn1cblxuZXhwb3J0IGludGVyZmFjZSBSZXNvdXJjZSB7XG4gIHRleHRzOiBSZWNvcmQ8c3RyaW5nLCBzdHJpbmc+O1xuICBiYXNlUmVzb3VyY2VzOiBzdHJpbmdbXTtcbn1cblxuZXhwb3J0IGludGVyZmFjZSBMYW5ndWFnZSB7XG4gIGN1bHR1cmVOYW1lOiBzdHJpbmc7XG4gIHVpQ3VsdHVyZU5hbWU6IHN0cmluZztcbiAgZGlzcGxheU5hbWU6IHN0cmluZztcbiAgdHdvTGV0dGVySVNPTGFuZ3VhZ2VOYW1lOiBzdHJpbmc7XG4gIGZsYWdJY29uOiBzdHJpbmc7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgQ3VsdHVyZSB7XG4gIGRpc3BsYXlOYW1lOiBzdHJpbmc7XG4gIC8vIC4uLiBvdGhlciBwcm9wZXJ0aWVzXG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgTmFtZVZhbHVlIHtcbiAgbmFtZTogc3RyaW5nO1xuICB2YWx1ZTogc3RyaW5nO1xufVxuXG4vLyBSZXBlYXQgc2ltaWxhciBwYXR0ZXJucyBmb3IgJ2F1dGgnLCAnc2V0dGluZycsICdjdXJyZW50VXNlcicsIGV0Yy5cbmV4cG9ydCBpbnRlcmZhY2UgQXV0aCB7XG4gIGdyYW50ZWRQb2xpY2llczogUmVjb3JkPHN0cmluZywgYm9vbGVhbj47XG59XG5cbi8vIE1haW4gY29uZmlndXJhdGlvbiBpbnRlcmZhY2VcbmV4cG9ydCBpbnRlcmZhY2UgQXBwbGljYXRpb25Db25maWd1cmF0aW9uIHtcbiAgbG9jYWxpemF0aW9uOiBMb2NhbGl6YXRpb247XG4gIGF1dGg6IEF1dGg7XG4gIHNldHRpbmc6IFJlY29yZDxzdHJpbmcsIGFueT47XG4gIGN1cnJlbnRVc2VyOiBhbnk7XG4gIGZlYXR1cmVzOiBSZWNvcmQ8c3RyaW5nLCBhbnk+O1xuICBnbG9iYWxGZWF0dXJlczogUmVjb3JkPHN0cmluZywgYW55PjtcbiAgbXVsdGlUZW5hbmN5OiBSZWNvcmQ8c3RyaW5nLCBhbnk+O1xuICBjdXJyZW50Q3VsdHVyZTogQ3VsdHVyZTtcbiAgdGltaW5nOiBSZWNvcmQ8c3RyaW5nLCBhbnk+O1xuICBjbG9jazogUmVjb3JkPHN0cmluZywgYW55PjtcbiAgb2JqZWN0RXh0ZW5zaW9uczogUmVjb3JkPHN0cmluZywgYW55PjtcbiAgZXh0cmFQcm9wZXJ0aWVzOiBSZWNvcmQ8c3RyaW5nLCBhbnk+O1xuXG4gIC8vIC4uLiBvdGhlciBwcm9wZXJ0aWVzXG59XG5cbkBJbmplY3RhYmxlKHtcbiAgcHJvdmlkZWRJbjogJ3Jvb3QnLFxufSlcbmV4cG9ydCBjbGFzcyBBWE1Db25maWd1cmF0aW9uU2VydmljZSB7XG4gIHByaXZhdGUgY29uZmlncyA9IGluamVjdChBWFBfUk9PVF9DT05GSUdfVE9LRU4pO1xuICBwcml2YXRlIGFwcGxpY2F0aW9uQ29uZmlnOiBBcHBsaWNhdGlvbkNvbmZpZ3VyYXRpb24gfCBudWxsID0gbnVsbDtcbiAgcHJpdmF0ZSBhcGlHZXRDb25maWcgPSBgJHt0aGlzLmNvbmZpZ3MuYmFzZVVybH0vYWJwL2FwcGxpY2F0aW9uLWNvbmZpZ3VyYXRpb25gO1xuICBwcml2YXRlIGZldGNoSW5Qcm9ncmVzczogYm9vbGVhbiA9IGZhbHNlO1xuICBwcml2YXRlIGNvbmZpZ1N1YmplY3Q6IEJlaGF2aW9yU3ViamVjdDxBcHBsaWNhdGlvbkNvbmZpZ3VyYXRpb24gfCBudWxsPiA9IG5ldyBCZWhhdmlvclN1YmplY3Q8QXBwbGljYXRpb25Db25maWd1cmF0aW9uIHwgbnVsbD4obnVsbCk7XG5cbiAgY29uc3RydWN0b3IocHJpdmF0ZSBodHRwOiBIdHRwQ2xpZW50KSB7XG4gICAgdGhpcy5pbml0KCkuc3Vic2NyaWJlKCk7IC8vIEF1dG9tYXRpY2FsbHkgdHJpZ2dlciBjb25maWd1cmF0aW9uIGxvYWQgb24gc2VydmljZSBpbnN0YW50aWF0aW9uXG4gIH1cblxuICBwdWJsaWMgaW5pdCgpOiBPYnNlcnZhYmxlPEFwcGxpY2F0aW9uQ29uZmlndXJhdGlvbj4ge1xuICAgIGlmICghdGhpcy5mZXRjaEluUHJvZ3Jlc3MpIHtcbiAgICAgIHRoaXMuZmV0Y2hJblByb2dyZXNzID0gdHJ1ZTtcbiAgICAgIHJldHVybiB0aGlzLmh0dHAuZ2V0PEFwcGxpY2F0aW9uQ29uZmlndXJhdGlvbj4odGhpcy5hcGlHZXRDb25maWcpLnBpcGUoXG4gICAgICAgIHRhcCgocmVzcG9uc2UpID0+IHtcbiAgICAgICAgICBjb25zb2xlLmxvZygnJWNHcmFudGVkICcsICdiYWNrZ3JvdW5kOiAjMDNmYzlkOyBjb2xvcjogIzAwMDsnLCByZXNwb25zZSk7XG4gICAgICAgICAgdGhpcy5hcHBsaWNhdGlvbkNvbmZpZyA9IHJlc3BvbnNlO1xuICAgICAgICAgIHRoaXMuY29uZmlnU3ViamVjdC5uZXh0KHRoaXMuYXBwbGljYXRpb25Db25maWcpO1xuICAgICAgICAgIHRoaXMuZmV0Y2hJblByb2dyZXNzID0gZmFsc2U7XG4gICAgICAgIH0pXG4gICAgICApO1xuICAgIH0gZWxzZSB7XG4gICAgICAvLyBBZGp1c3RlZCBhcHByb2FjaCB0byBoYW5kbGUgVHlwZVNjcmlwdCdzIHR5cGUgc2FmZXR5IHJlcXVpcmVtZW50c1xuICAgICAgcmV0dXJuIHRoaXMuY29uZmlnU3ViamVjdC5hc09ic2VydmFibGUoKS5waXBlKFxuICAgICAgICBmaWx0ZXIoKGNvbmZpZyk6IGNvbmZpZyBpcyBBcHBsaWNhdGlvbkNvbmZpZ3VyYXRpb24gPT4gY29uZmlnICE9PSBudWxsKSxcbiAgICAgICAgdGFrZSgxKSAvLyBFbnN1cmVzIGl0IGNvbXBsZXRlcyBhZnRlciBlbWl0dGluZyB0aGUgZmlyc3Qgbm9uLW51bGwgdmFsdWVcbiAgICAgICk7XG4gICAgfVxuICB9XG5cbiAgZ2V0Q29uZmlnKCk6IE9ic2VydmFibGU8QXBwbGljYXRpb25Db25maWd1cmF0aW9uPiB7XG4gICAgaWYgKHRoaXMuYXBwbGljYXRpb25Db25maWcpIHtcbiAgICAgIC8vIElmIHRoZSBjb25maWcgaXMgYWxyZWFkeSBsb2FkZWQsIHJldHVybiBpdCBpbW1lZGlhdGVseVxuICAgICAgcmV0dXJuIG9mKHRoaXMuYXBwbGljYXRpb25Db25maWcpO1xuICAgIH0gZWxzZSB7XG4gICAgICAvLyBJZiB0aGUgY29uZmlnIGlzIG5vdCBsb2FkZWQsIGluaXRpYXRlIGxvYWRpbmdcbiAgICAgIHJldHVybiB0aGlzLmNvbmZpZ1N1YmplY3QuYXNPYnNlcnZhYmxlKCkucGlwZShcbiAgICAgICAgZmlsdGVyKChjb25maWcpID0+IGNvbmZpZyAhPT0gbnVsbCksXG4gICAgICAgIHRha2UoMSksIC8vIEVuc3VyZSBpdCBvbmx5IGVtaXRzIHRoZSBmaXJzdCBub24tbnVsbCB2YWx1ZSBhbmQgY29tcGxldGVzXG4gICAgICAgIHN3aXRjaE1hcCgoKSA9PiBvZih0aGlzLmFwcGxpY2F0aW9uQ29uZmlnISkpXG4gICAgICApO1xuICAgIH1cbiAgfVxufVxuIl19
|
@@ -1,7 +1,21 @@
|
|
1
1
|
import { delay, of } from 'rxjs';
|
2
2
|
export class AXMOidcFeatureLoader {
|
3
|
+
constructor() {
|
4
|
+
this.list = [
|
5
|
+
{
|
6
|
+
name: 'axp-entity-list-custom-view',
|
7
|
+
title: 'Custom View',
|
8
|
+
value: false
|
9
|
+
},
|
10
|
+
{
|
11
|
+
name: 'axp-entity-list-quick-search',
|
12
|
+
title: 'Custom View',
|
13
|
+
value: false
|
14
|
+
}
|
15
|
+
];
|
16
|
+
}
|
3
17
|
getList() {
|
4
|
-
return of(
|
18
|
+
return of(this.list).pipe(delay(0));
|
5
19
|
}
|
6
20
|
}
|
7
|
-
//# sourceMappingURL=data:application/json;base64,
|
21
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVhdHVyZS5sb2FkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9saWJzL21vZHVsZXMvYmFja2VuZC9zcmMvbGliL2F1dGgvb2lkYy9mZWF0dXJlLmxvYWRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQWMsS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUU3QyxNQUFNLE9BQU8sb0JBQW9CO0lBQWpDO1FBRVUsU0FBSSxHQUFpQjtZQUMzQjtnQkFDRSxJQUFJLEVBQUUsNkJBQTZCO2dCQUNuQyxLQUFLLEVBQUUsYUFBYTtnQkFDcEIsS0FBSyxFQUFFLEtBQUs7YUFDYjtZQUNEO2dCQUNFLElBQUksRUFBRSw4QkFBOEI7Z0JBQ3BDLEtBQUssRUFBRSxhQUFhO2dCQUNwQixLQUFLLEVBQUUsS0FBSzthQUNiO1NBQ0YsQ0FBQTtJQUtILENBQUM7SUFIQyxPQUFPO1FBQ0wsT0FBTyxFQUFFLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUN0QyxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBWFBGZWF0dXJlLCBBWFBGZWF0dXJlTG9hZGVyIH0gZnJvbSAnQGFjb3JleC9wbGF0Zm9ybS9hdXRoJztcbmltcG9ydCB7IE9ic2VydmFibGUsIGRlbGF5LCBvZiB9IGZyb20gJ3J4anMnO1xuXG5leHBvcnQgY2xhc3MgQVhNT2lkY0ZlYXR1cmVMb2FkZXIgaW1wbGVtZW50cyBBWFBGZWF0dXJlTG9hZGVyIHtcblxuICBwcml2YXRlIGxpc3Q6IEFYUEZlYXR1cmVbXSA9IFtcbiAgICB7XG4gICAgICBuYW1lOiAnYXhwLWVudGl0eS1saXN0LWN1c3RvbS12aWV3JyxcbiAgICAgIHRpdGxlOiAnQ3VzdG9tIFZpZXcnLFxuICAgICAgdmFsdWU6IGZhbHNlXG4gICAgfSxcbiAgICB7XG4gICAgICBuYW1lOiAnYXhwLWVudGl0eS1saXN0LXF1aWNrLXNlYXJjaCcsXG4gICAgICB0aXRsZTogJ0N1c3RvbSBWaWV3JyxcbiAgICAgIHZhbHVlOiBmYWxzZVxuICAgIH1cbiAgXVxuXG4gIGdldExpc3QoKTogT2JzZXJ2YWJsZTxBWFBGZWF0dXJlW10+IHtcbiAgICByZXR1cm4gb2YodGhpcy5saXN0KS5waXBlKGRlbGF5KDApKTtcbiAgfVxufVxuIl19
|
@@ -1,6 +1,9 @@
|
|
1
1
|
export * from './application.loader';
|
2
|
+
export * from './configuration.service';
|
2
3
|
export * from './feature.loader';
|
3
4
|
export * from './oidc.strategy';
|
4
5
|
export * from './permission.loader';
|
6
|
+
export * from './signincallback.component';
|
5
7
|
export * from './tenant.loader';
|
6
|
-
|
8
|
+
export * from './usermanager.service';
|
9
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9saWJzL21vZHVsZXMvYmFja2VuZC9zcmMvbGliL2F1dGgvb2lkYy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMseUJBQXlCLENBQUM7QUFDeEMsY0FBYyxrQkFBa0IsQ0FBQztBQUNqQyxjQUFjLGlCQUFpQixDQUFDO0FBQ2hDLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLGlCQUFpQixDQUFDO0FBQ2hDLGNBQWMsdUJBQXVCLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgKiBmcm9tICcuL2FwcGxpY2F0aW9uLmxvYWRlcic7XG5leHBvcnQgKiBmcm9tICcuL2NvbmZpZ3VyYXRpb24uc2VydmljZSc7XG5leHBvcnQgKiBmcm9tICcuL2ZlYXR1cmUubG9hZGVyJztcbmV4cG9ydCAqIGZyb20gJy4vb2lkYy5zdHJhdGVneSc7XG5leHBvcnQgKiBmcm9tICcuL3Blcm1pc3Npb24ubG9hZGVyJztcbmV4cG9ydCAqIGZyb20gJy4vc2lnbmluY2FsbGJhY2suY29tcG9uZW50JztcbmV4cG9ydCAqIGZyb20gJy4vdGVuYW50LmxvYWRlcic7XG5leHBvcnQgKiBmcm9tICcuL3VzZXJtYW5hZ2VyLnNlcnZpY2UnO1xuIl19
|
@@ -1,52 +1,69 @@
|
|
1
|
+
import { AXPDataProvider } from '@acorex/platform/common';
|
2
|
+
import { MockDataService } from '@acorex/platform/mocks';
|
1
3
|
import { Injectable, Injector, inject } from '@angular/core';
|
2
4
|
import { AXMOidcUserManagerService } from './usermanager.service';
|
3
5
|
import * as i0 from "@angular/core";
|
4
6
|
export class AXMOidcStrategy {
|
5
7
|
constructor() {
|
6
8
|
this.injector = inject(Injector);
|
9
|
+
this.mockerService = inject(MockDataService);
|
10
|
+
this.dataService = inject(AXPDataProvider);
|
7
11
|
this.userManagerService = this.injector.get(AXMOidcUserManagerService);
|
8
12
|
this.userManager = this.userManagerService.getUserManager();
|
9
13
|
}
|
10
14
|
get name() {
|
11
|
-
return '
|
15
|
+
return 'user-pass';
|
12
16
|
}
|
13
17
|
async signin(credentials) {
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
18
|
+
try {
|
19
|
+
const currentUser = await this.userManager.getUser();
|
20
|
+
if (currentUser && !currentUser.expired && currentUser.profile.name === credentials.username) {
|
21
|
+
const user = {
|
22
|
+
id: currentUser.profile.sub,
|
23
|
+
name: currentUser.profile.name ?? credentials.username,
|
24
|
+
title: currentUser.profile.given_name ?? 'no Name!',
|
25
|
+
avatar: currentUser.profile.picture,
|
26
|
+
};
|
27
|
+
const accessToken = currentUser.access_token;
|
28
|
+
const refreshToken = currentUser.refresh_token ?? '';
|
29
|
+
return {
|
30
|
+
succeed: true,
|
31
|
+
data: { user, accessToken, refreshToken },
|
32
|
+
};
|
33
|
+
}
|
34
|
+
await this.userManager.removeUser();
|
35
|
+
await this.userManager.clearStaleState();
|
36
|
+
const oidcUser = await this.userManager.signinSilent({
|
37
|
+
extraQueryParams: {
|
38
|
+
username: credentials.username,
|
39
|
+
password: credentials.password,
|
40
|
+
},
|
41
|
+
});
|
42
|
+
if (oidcUser) {
|
43
|
+
const profile = oidcUser.profile; // Cast to any to access deeply nested properties
|
44
|
+
const user = {
|
45
|
+
id: profile.sub,
|
46
|
+
name: `${profile.email}`,
|
47
|
+
title: `${profile.name}`,
|
48
|
+
avatar: `${profile.picture}`,
|
49
|
+
};
|
50
|
+
const accessToken = oidcUser.access_token;
|
51
|
+
const refreshToken = oidcUser.refresh_token ?? '';
|
52
|
+
return {
|
53
|
+
succeed: true,
|
54
|
+
data: { user, accessToken, refreshToken },
|
55
|
+
};
|
56
|
+
}
|
57
|
+
return {
|
58
|
+
succeed: false,
|
22
59
|
};
|
23
|
-
const accessToken = currentUser.access_token;
|
24
|
-
const refreshToken = currentUser.refresh_token ?? '';
|
25
|
-
return { user, accessToken, refreshToken };
|
26
60
|
}
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
hardcoded_identity_id: '1',
|
33
|
-
username: credentials.username,
|
34
|
-
password: credentials.password,
|
35
|
-
},
|
36
|
-
});
|
37
|
-
console.log('here is oidcUser', oidcUser);
|
38
|
-
if (oidcUser) {
|
39
|
-
const user = {
|
40
|
-
id: oidcUser.id_token ?? '1',
|
41
|
-
name: oidcUser.profile.name ?? credentials.username,
|
42
|
-
title: oidcUser.profile.given_name ?? 'no Name!',
|
43
|
-
avatar: oidcUser.profile.picture ?? 'https://i.pravatar.cc/150?img=52',
|
44
|
-
};
|
45
|
-
const accessToken = oidcUser.access_token;
|
46
|
-
const refreshToken = oidcUser.refresh_token ?? '';
|
47
|
-
return { user, accessToken, refreshToken };
|
61
|
+
catch (error) {
|
62
|
+
if (error?.message)
|
63
|
+
throw new Error(error.message);
|
64
|
+
// Depending on the error type, you might want to throw a specific error
|
65
|
+
throw new Error('Network or server error occurred');
|
48
66
|
}
|
49
|
-
throw new Error('Invalid credentials');
|
50
67
|
}
|
51
68
|
async signout() {
|
52
69
|
console.log('User signed out');
|
@@ -63,15 +80,18 @@ export class AXMOidcStrategy {
|
|
63
80
|
};
|
64
81
|
const accessToken = this.generateAccessToken();
|
65
82
|
const newRefreshToken = this.generateAccessToken();
|
66
|
-
return {
|
83
|
+
return {
|
84
|
+
succeed: true,
|
85
|
+
data: { accessToken, refreshToken: newRefreshToken },
|
86
|
+
};
|
67
87
|
}
|
68
88
|
generateAccessToken() {
|
69
89
|
return 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJPbmxpbmUgSldUIEJ1aWxkZXIiLCJpYXQiOjE3MDU5MjE4ODUsImV4cCI6MTczNzQ1Nzg4NSwiYXVkIjoid3d3LmV4YW1wbGUuY29tIiwic3ViIjoianJvY2tldEBleGFtcGxlLmNvbSIsImlkIjoiMTAiLCJ0aXRsZSI6IkFyYXNoIiwiRW1haWwiOiJqcm9ja2V0QGV4YW1wbGUuY29tIiwiUm9sZSI6WyJNYW5hZ2VyIiwiUHJvamVjdCBBZG1pbmlzdHJhdG9yIl0sIm5hbWUiOiJhZG1pbiJ9.IgJL7uvJNBd9yBvWS4aTms5XjBI4VDyT01KhMSESXdQ';
|
70
90
|
}
|
71
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "
|
72
|
-
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "
|
91
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.0.2", ngImport: i0, type: AXMOidcStrategy, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
|
92
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.0.2", ngImport: i0, type: AXMOidcStrategy }); }
|
73
93
|
}
|
74
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "
|
94
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.0.2", ngImport: i0, type: AXMOidcStrategy, decorators: [{
|
75
95
|
type: Injectable
|
76
96
|
}], ctorParameters: () => [] });
|
77
|
-
//# sourceMappingURL=data:application/json;base64,
|
97
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"oidc.strategy.js","sourceRoot":"","sources":["../../../../../../../../libs/modules/backend/src/lib/auth/oidc/oidc.strategy.ts"],"names":[],"mappings":"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","sourcesContent":["import { AXPAuthStrategy, AXPBaseCredentials, AXPRefreshTokenResult, AXPSignInResult, AXPUser } from '@acorex/platform/auth';\nimport { AXPDataProvider } from '@acorex/platform/common';\nimport { MockDataService } from '@acorex/platform/mocks';\nimport { Injectable, Injector, inject } from '@angular/core';\nimport { UserManager } from 'oidc-client-ts';\nimport { AXMOidcUserManagerService } from './usermanager.service';\n\nexport interface AXPUserPassCredentials extends AXPBaseCredentials {\n  username: string;\n  password: string;\n}\n\n@Injectable()\nexport class AXMOidcStrategy implements AXPAuthStrategy {\n  private userManagerService: AXMOidcUserManagerService;\n  private userManager: UserManager;\n  private injector: Injector = inject(Injector);\n  private mockerService = inject(MockDataService);\n  private dataService = inject(AXPDataProvider);\n\n  constructor() {\n    this.userManagerService = this.injector.get(AXMOidcUserManagerService);\n    this.userManager = this.userManagerService.getUserManager();\n  }\n\n  get name(): string {\n    return 'user-pass';\n  }\n\n  async signin(credentials: AXPUserPassCredentials): Promise<AXPSignInResult> {\n    try {\n      const currentUser = await this.userManager.getUser();\n\n      if (currentUser && !currentUser.expired && currentUser.profile.name === credentials.username) {\n        const user: AXPUser = {\n          id: currentUser.profile.sub,\n          name: currentUser.profile.name ?? credentials.username,\n          title: currentUser.profile.given_name ?? 'no Name!',\n          avatar: currentUser.profile.picture,\n        };\n        const accessToken = currentUser.access_token;\n        const refreshToken = currentUser.refresh_token ?? '';\n        return {\n          succeed: true,\n          data: { user, accessToken, refreshToken },\n        };\n      }\n\n      await this.userManager.removeUser();\n      await this.userManager.clearStaleState();\n\n      const oidcUser = await this.userManager.signinSilent({\n        extraQueryParams: {\n          username: credentials.username,\n          password: credentials.password,\n        },\n      });\n      if (oidcUser) {\n        const profile = oidcUser.profile; // Cast to any to access deeply nested properties\n        const user: AXPUser = {\n          id: profile.sub,\n          name: `${profile.email}`,\n          title: `${profile.name}`,\n          avatar: `${profile.picture}`,\n        };\n        const accessToken = oidcUser.access_token;\n        const refreshToken = oidcUser.refresh_token ?? '';\n\n        return {\n          succeed: true,\n          data: { user, accessToken, refreshToken },\n        };\n      }\n\n      return {\n        succeed: false,\n      };\n    } catch (error: any) {\n      if (error?.message) throw new Error(error.message);\n      // Depending on the error type, you might want to throw a specific error\n      throw new Error('Network or server error occurred');\n    }\n  }\n\n  async signout(): Promise<void> {\n    console.log('User signed out');\n    this.userManager.removeUser();\n    this.userManager.clearStaleState();\n    this.userManager.signoutSilent();\n  }\n\n  async refreshToken(refreshToken: string): Promise<AXPRefreshTokenResult> {\n    const user: AXPUser = {\n      id: '1',\n      name: 'admin',\n      title: 'Arash',\n      avatar: 'https://i.pravatar.cc/150?img=52',\n    };\n\n    const accessToken = this.generateAccessToken();\n    const newRefreshToken = this.generateAccessToken();\n\n    return {\n      succeed: true,\n      data: { accessToken, refreshToken: newRefreshToken },\n    };\n  }\n\n  private generateAccessToken(): string {\n    return 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJPbmxpbmUgSldUIEJ1aWxkZXIiLCJpYXQiOjE3MDU5MjE4ODUsImV4cCI6MTczNzQ1Nzg4NSwiYXVkIjoid3d3LmV4YW1wbGUuY29tIiwic3ViIjoianJvY2tldEBleGFtcGxlLmNvbSIsImlkIjoiMTAiLCJ0aXRsZSI6IkFyYXNoIiwiRW1haWwiOiJqcm9ja2V0QGV4YW1wbGUuY29tIiwiUm9sZSI6WyJNYW5hZ2VyIiwiUHJvamVjdCBBZG1pbmlzdHJhdG9yIl0sIm5hbWUiOiJhZG1pbiJ9.IgJL7uvJNBd9yBvWS4aTms5XjBI4VDyT01KhMSESXdQ';\n  }\n}\n"]}
|
@@ -1,7 +1,34 @@
|
|
1
|
-
import {
|
1
|
+
import { AXP_ROOT_CONFIG_TOKEN } from '@acorex/platform/core';
|
2
|
+
import { HttpClient } from '@angular/common/http';
|
3
|
+
import { Injectable, inject } from '@angular/core';
|
4
|
+
import { map } from 'rxjs';
|
5
|
+
import * as i0 from "@angular/core";
|
6
|
+
import * as i1 from "@angular/common/http";
|
2
7
|
export class AXMOidcPermissionLoader {
|
3
|
-
|
4
|
-
|
8
|
+
constructor(http) {
|
9
|
+
this.http = http;
|
10
|
+
this.configs = inject(AXP_ROOT_CONFIG_TOKEN);
|
11
|
+
this.apiGetConfig = `${this.configs.baseUrl}/abp/application-configuration`;
|
5
12
|
}
|
13
|
+
getList(context) {
|
14
|
+
return this.http.get(this.apiGetConfig).pipe(map((response) => this.mapTo(response)));
|
15
|
+
// debugger
|
16
|
+
// if (context.user == null)
|
17
|
+
// return of([]);
|
18
|
+
// else if (context.user.name.toLowerCase() == 'admin')
|
19
|
+
// return of(['axp.admin.console', 'asc.admin.message', 'asc.admin.settings', 'asc.admin.gliding', 'asc.user.gliding']);
|
20
|
+
// else
|
21
|
+
// return of(['asc.user.gliding']);
|
22
|
+
}
|
23
|
+
mapTo(jsonObj) {
|
24
|
+
const policies = jsonObj.auth.grantedPolicies;
|
25
|
+
const truePolicies = Object.keys(policies).filter((key) => policies[key] === true);
|
26
|
+
return truePolicies;
|
27
|
+
}
|
28
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.0.2", ngImport: i0, type: AXMOidcPermissionLoader, deps: [{ token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
29
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.0.2", ngImport: i0, type: AXMOidcPermissionLoader }); }
|
6
30
|
}
|
7
|
-
|
31
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.0.2", ngImport: i0, type: AXMOidcPermissionLoader, decorators: [{
|
32
|
+
type: Injectable
|
33
|
+
}], ctorParameters: () => [{ type: i1.HttpClient }] });
|
34
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGVybWlzc2lvbi5sb2FkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9saWJzL21vZHVsZXMvYmFja2VuZC9zcmMvbGliL2F1dGgvb2lkYy9wZXJtaXNzaW9uLmxvYWRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUM5RCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDbEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDbkQsT0FBTyxFQUFjLEdBQUcsRUFBRSxNQUFNLE1BQU0sQ0FBQzs7O0FBR3ZDLE1BQU0sT0FBTyx1QkFBdUI7SUFJbEMsWUFBb0IsSUFBZ0I7UUFBaEIsU0FBSSxHQUFKLElBQUksQ0FBWTtRQUg1QixZQUFPLEdBQUcsTUFBTSxDQUFDLHFCQUFxQixDQUFDLENBQUM7UUFDeEMsaUJBQVksR0FBRyxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxnQ0FBZ0MsQ0FBQztJQUV4QyxDQUFDO0lBRXhDLE9BQU8sQ0FBQyxPQUEwQjtRQUNoQyxPQUFPLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFpQixJQUFJLENBQUMsWUFBWSxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLFFBQVEsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDdEcsV0FBVztRQUNYLDRCQUE0QjtRQUM1QixtQkFBbUI7UUFDbkIsdURBQXVEO1FBQ3ZELDBIQUEwSDtRQUMxSCxPQUFPO1FBQ1AscUNBQXFDO0lBQ3ZDLENBQUM7SUFFRCxLQUFLLENBQUMsT0FBWTtRQUNoQixNQUFNLFFBQVEsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLGVBQWUsQ0FBQztRQUM5QyxNQUFNLFlBQVksR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxLQUFLLElBQUksQ0FBQyxDQUFDO1FBQ25GLE9BQU8sWUFBWSxDQUFDO0lBQ3RCLENBQUM7OEdBckJVLHVCQUF1QjtrSEFBdkIsdUJBQXVCOzsyRkFBdkIsdUJBQXVCO2tCQURuQyxVQUFVIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQVhQUGVybWlzc2lvbiwgQVhQUGVybWlzc2lvbkxvYWRlciwgQVhQU2Vzc2lvbkNvbnRleHQgfSBmcm9tICdAYWNvcmV4L3BsYXRmb3JtL2F1dGgnO1xuaW1wb3J0IHsgQVhQX1JPT1RfQ09ORklHX1RPS0VOIH0gZnJvbSAnQGFjb3JleC9wbGF0Zm9ybS9jb3JlJztcbmltcG9ydCB7IEh0dHBDbGllbnQgfSBmcm9tICdAYW5ndWxhci9jb21tb24vaHR0cCc7XG5pbXBvcnQgeyBJbmplY3RhYmxlLCBpbmplY3QgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IE9ic2VydmFibGUsIG1hcCB9IGZyb20gJ3J4anMnO1xuXG5ASW5qZWN0YWJsZSgpXG5leHBvcnQgY2xhc3MgQVhNT2lkY1Blcm1pc3Npb25Mb2FkZXIgaW1wbGVtZW50cyBBWFBQZXJtaXNzaW9uTG9hZGVyIHtcbiAgcHJpdmF0ZSBjb25maWdzID0gaW5qZWN0KEFYUF9ST09UX0NPTkZJR19UT0tFTik7XG4gIHByaXZhdGUgYXBpR2V0Q29uZmlnID0gYCR7dGhpcy5jb25maWdzLmJhc2VVcmx9L2FicC9hcHBsaWNhdGlvbi1jb25maWd1cmF0aW9uYDtcblxuICBjb25zdHJ1Y3Rvcihwcml2YXRlIGh0dHA6IEh0dHBDbGllbnQpIHt9XG5cbiAgZ2V0TGlzdChjb250ZXh0OiBBWFBTZXNzaW9uQ29udGV4dCk6IE9ic2VydmFibGU8QVhQUGVybWlzc2lvbltdPiB7XG4gICAgcmV0dXJuIHRoaXMuaHR0cC5nZXQ8eyBpdGVtczogYW55IH0+KHRoaXMuYXBpR2V0Q29uZmlnKS5waXBlKG1hcCgocmVzcG9uc2UpID0+IHRoaXMubWFwVG8ocmVzcG9uc2UpKSk7XG4gICAgLy8gZGVidWdnZXJcbiAgICAvLyBpZiAoY29udGV4dC51c2VyID09IG51bGwpXG4gICAgLy8gICByZXR1cm4gb2YoW10pO1xuICAgIC8vIGVsc2UgaWYgKGNvbnRleHQudXNlci5uYW1lLnRvTG93ZXJDYXNlKCkgPT0gJ2FkbWluJylcbiAgICAvLyAgIHJldHVybiBvZihbJ2F4cC5hZG1pbi5jb25zb2xlJywgJ2FzYy5hZG1pbi5tZXNzYWdlJywgJ2FzYy5hZG1pbi5zZXR0aW5ncycsICdhc2MuYWRtaW4uZ2xpZGluZycsICdhc2MudXNlci5nbGlkaW5nJ10pO1xuICAgIC8vIGVsc2VcbiAgICAvLyAgIHJldHVybiBvZihbJ2FzYy51c2VyLmdsaWRpbmcnXSk7XG4gIH1cblxuICBtYXBUbyhqc29uT2JqOiBhbnkpOiBzdHJpbmdbXSB7XG4gICAgY29uc3QgcG9saWNpZXMgPSBqc29uT2JqLmF1dGguZ3JhbnRlZFBvbGljaWVzO1xuICAgIGNvbnN0IHRydWVQb2xpY2llcyA9IE9iamVjdC5rZXlzKHBvbGljaWVzKS5maWx0ZXIoKGtleSkgPT4gcG9saWNpZXNba2V5XSA9PT0gdHJ1ZSk7XG4gICAgcmV0dXJuIHRydWVQb2xpY2llcztcbiAgfVxufVxuIl19
|
@@ -1,4 +1,5 @@
|
|
1
|
-
import {
|
1
|
+
import { AXPSessionService } from '@acorex/platform/auth';
|
2
|
+
import { Component, inject } from '@angular/core';
|
2
3
|
import { ActivatedRoute, Router } from '@angular/router';
|
3
4
|
import { AXMOidcUserManagerService } from './usermanager.service';
|
4
5
|
import * as i0 from "@angular/core";
|
@@ -9,18 +10,37 @@ export class SignincallbackComponent {
|
|
9
10
|
this.userManagerService = userManagerService;
|
10
11
|
this.router = router;
|
11
12
|
this.route = route;
|
13
|
+
this.sessionService = inject(AXPSessionService);
|
12
14
|
}
|
13
15
|
ngOnInit() {
|
14
|
-
this.
|
16
|
+
const queryParams = this.route.snapshot.queryParams;
|
17
|
+
if (queryParams['tenantid']) {
|
18
|
+
const selectedTenant = {
|
19
|
+
id: queryParams['tenantid'],
|
20
|
+
name: queryParams['tenantname'],
|
21
|
+
title: queryParams['tenanttitle'],
|
22
|
+
};
|
23
|
+
this.sessionService.setTenant(selectedTenant);
|
24
|
+
}
|
25
|
+
if (queryParams['applicationid']) {
|
26
|
+
const selectedApplication = {
|
27
|
+
id: queryParams['applicationid'],
|
28
|
+
name: queryParams['applicationname'],
|
29
|
+
title: queryParams['applicationtitle'],
|
30
|
+
version: '1',
|
31
|
+
editionName: queryParams['editionname'],
|
32
|
+
};
|
33
|
+
this.sessionService.setApplication(selectedApplication);
|
34
|
+
}
|
35
|
+
this.userManagerService.signinSilentCallback();
|
15
36
|
}
|
16
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "
|
17
|
-
static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "
|
37
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.0.2", ngImport: i0, type: SignincallbackComponent, deps: [{ token: i1.AXMOidcUserManagerService }, { token: i2.Router }, { token: i2.ActivatedRoute }], target: i0.ɵɵFactoryTarget.Component }); }
|
38
|
+
static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.0.2", type: SignincallbackComponent, selector: "ng-component", ngImport: i0, template: '', isInline: true }); }
|
18
39
|
}
|
19
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "
|
40
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.0.2", ngImport: i0, type: SignincallbackComponent, decorators: [{
|
20
41
|
type: Component,
|
21
42
|
args: [{
|
22
43
|
template: '',
|
23
|
-
providers: [],
|
24
44
|
}]
|
25
45
|
}], ctorParameters: () => [{ type: i1.AXMOidcUserManagerService }, { type: i2.Router }, { type: i2.ActivatedRoute }] });
|
26
|
-
//# sourceMappingURL=data:application/json;base64,
|
46
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2lnbmluY2FsbGJhY2suY29tcG9uZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vbGlicy9tb2R1bGVzL2JhY2tlbmQvc3JjL2xpYi9hdXRoL29pZGMvc2lnbmluY2FsbGJhY2suY29tcG9uZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQzFELE9BQU8sRUFBRSxTQUFTLEVBQVUsTUFBTSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQzFELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDekQsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sdUJBQXVCLENBQUM7Ozs7QUFLbEUsTUFBTSxPQUFPLHVCQUF1QjtJQUVsQyxZQUNVLGtCQUE2QyxFQUM3QyxNQUFjLEVBQ2QsS0FBcUI7UUFGckIsdUJBQWtCLEdBQWxCLGtCQUFrQixDQUEyQjtRQUM3QyxXQUFNLEdBQU4sTUFBTSxDQUFRO1FBQ2QsVUFBSyxHQUFMLEtBQUssQ0FBZ0I7UUFKdkIsbUJBQWMsR0FBRyxNQUFNLENBQUMsaUJBQWlCLENBQUMsQ0FBQztJQU0vQyxDQUFDO0lBRUwsUUFBUTtRQUNOLE1BQU0sV0FBVyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQztRQUNwRCxJQUFJLFdBQVcsQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDO1lBQzVCLE1BQU0sY0FBYyxHQUFHO2dCQUNyQixFQUFFLEVBQUUsV0FBVyxDQUFDLFVBQVUsQ0FBQztnQkFDM0IsSUFBSSxFQUFFLFdBQVcsQ0FBQyxZQUFZLENBQUM7Z0JBQy9CLEtBQUssRUFBRSxXQUFXLENBQUMsYUFBYSxDQUFDO2FBQ2xDLENBQUM7WUFDRixJQUFJLENBQUMsY0FBYyxDQUFDLFNBQVMsQ0FBQyxjQUFjLENBQUMsQ0FBQztRQUNoRCxDQUFDO1FBQ0QsSUFBSSxXQUFXLENBQUMsZUFBZSxDQUFDLEVBQUUsQ0FBQztZQUNqQyxNQUFNLG1CQUFtQixHQUFHO2dCQUMxQixFQUFFLEVBQUUsV0FBVyxDQUFDLGVBQWUsQ0FBQztnQkFDaEMsSUFBSSxFQUFFLFdBQVcsQ0FBQyxpQkFBaUIsQ0FBQztnQkFDcEMsS0FBSyxFQUFFLFdBQVcsQ0FBQyxrQkFBa0IsQ0FBQztnQkFDdEMsT0FBTyxFQUFFLEdBQUc7Z0JBQ1osV0FBVyxFQUFFLFdBQVcsQ0FBQyxhQUFhLENBQUM7YUFDeEMsQ0FBQztZQUNGLElBQUksQ0FBQyxjQUFjLENBQUMsY0FBYyxDQUFDLG1CQUFtQixDQUFDLENBQUM7UUFDMUQsQ0FBQztRQUNELElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxvQkFBb0IsRUFBRSxDQUFDO0lBQ2pELENBQUM7OEdBOUJVLHVCQUF1QjtrR0FBdkIsdUJBQXVCLG9EQUZ4QixFQUFFOzsyRkFFRCx1QkFBdUI7a0JBSG5DLFNBQVM7bUJBQUM7b0JBQ1QsUUFBUSxFQUFFLEVBQUU7aUJBQ2IiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBWFBTZXNzaW9uU2VydmljZSB9IGZyb20gJ0BhY29yZXgvcGxhdGZvcm0vYXV0aCc7XG5pbXBvcnQgeyBDb21wb25lbnQsIE9uSW5pdCwgaW5qZWN0IH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBBY3RpdmF0ZWRSb3V0ZSwgUm91dGVyIH0gZnJvbSAnQGFuZ3VsYXIvcm91dGVyJztcbmltcG9ydCB7IEFYTU9pZGNVc2VyTWFuYWdlclNlcnZpY2UgfSBmcm9tICcuL3VzZXJtYW5hZ2VyLnNlcnZpY2UnO1xuXG5AQ29tcG9uZW50KHtcbiAgdGVtcGxhdGU6ICcnLFxufSlcbmV4cG9ydCBjbGFzcyBTaWduaW5jYWxsYmFja0NvbXBvbmVudCBpbXBsZW1lbnRzIE9uSW5pdCB7XG4gIHByaXZhdGUgc2Vzc2lvblNlcnZpY2UgPSBpbmplY3QoQVhQU2Vzc2lvblNlcnZpY2UpO1xuICBjb25zdHJ1Y3RvcihcbiAgICBwcml2YXRlIHVzZXJNYW5hZ2VyU2VydmljZTogQVhNT2lkY1VzZXJNYW5hZ2VyU2VydmljZSxcbiAgICBwcml2YXRlIHJvdXRlcjogUm91dGVyLFxuICAgIHByaXZhdGUgcm91dGU6IEFjdGl2YXRlZFJvdXRlLFxuXG4gICkgeyB9XG5cbiAgbmdPbkluaXQoKSB7XG4gICAgY29uc3QgcXVlcnlQYXJhbXMgPSB0aGlzLnJvdXRlLnNuYXBzaG90LnF1ZXJ5UGFyYW1zO1xuICAgIGlmIChxdWVyeVBhcmFtc1sndGVuYW50aWQnXSkge1xuICAgICAgY29uc3Qgc2VsZWN0ZWRUZW5hbnQgPSB7XG4gICAgICAgIGlkOiBxdWVyeVBhcmFtc1sndGVuYW50aWQnXSxcbiAgICAgICAgbmFtZTogcXVlcnlQYXJhbXNbJ3RlbmFudG5hbWUnXSxcbiAgICAgICAgdGl0bGU6IHF1ZXJ5UGFyYW1zWyd0ZW5hbnR0aXRsZSddLFxuICAgICAgfTtcbiAgICAgIHRoaXMuc2Vzc2lvblNlcnZpY2Uuc2V0VGVuYW50KHNlbGVjdGVkVGVuYW50KTtcbiAgICB9XG4gICAgaWYgKHF1ZXJ5UGFyYW1zWydhcHBsaWNhdGlvbmlkJ10pIHtcbiAgICAgIGNvbnN0IHNlbGVjdGVkQXBwbGljYXRpb24gPSB7XG4gICAgICAgIGlkOiBxdWVyeVBhcmFtc1snYXBwbGljYXRpb25pZCddLFxuICAgICAgICBuYW1lOiBxdWVyeVBhcmFtc1snYXBwbGljYXRpb25uYW1lJ10sXG4gICAgICAgIHRpdGxlOiBxdWVyeVBhcmFtc1snYXBwbGljYXRpb250aXRsZSddLFxuICAgICAgICB2ZXJzaW9uOiAnMScsXG4gICAgICAgIGVkaXRpb25OYW1lOiBxdWVyeVBhcmFtc1snZWRpdGlvbm5hbWUnXSxcbiAgICAgIH07XG4gICAgICB0aGlzLnNlc3Npb25TZXJ2aWNlLnNldEFwcGxpY2F0aW9uKHNlbGVjdGVkQXBwbGljYXRpb24pO1xuICAgIH1cbiAgICB0aGlzLnVzZXJNYW5hZ2VyU2VydmljZS5zaWduaW5TaWxlbnRDYWxsYmFjaygpO1xuICB9XG59XG4iXX0=
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import {
|
1
|
+
import { AXP_ROOT_CONFIG_TOKEN } from '@acorex/platform/core';
|
2
2
|
import { HttpClient } from '@angular/common/http';
|
3
3
|
import { Injectable, inject } from '@angular/core';
|
4
4
|
import { map } from 'rxjs';
|
@@ -7,20 +7,22 @@ import * as i1 from "@angular/common/http";
|
|
7
7
|
export class AXMOidcTenantLoader {
|
8
8
|
constructor(http) {
|
9
9
|
this.http = http;
|
10
|
-
this.configs = inject(
|
11
|
-
this.apiGetTenants = `${this.configs.
|
12
|
-
this.apiSetTenant = `${this.configs.
|
10
|
+
this.configs = inject(AXP_ROOT_CONFIG_TOKEN);
|
11
|
+
this.apiGetTenants = `${this.configs.baseUrl}/user-tenants/Tenants`;
|
12
|
+
this.apiSetTenant = `${this.configs.baseUrl}/SetTenant`;
|
13
13
|
}
|
14
14
|
getList() {
|
15
|
-
return this.http
|
16
|
-
.get(this.apiGetTenants)
|
17
|
-
.pipe(map((response) => response.items.map((item) => this.mapToAXPTenant(item))));
|
15
|
+
return this.http.get(this.apiGetTenants).pipe(map((response) => response.items.map((item) => this.mapToAXPTenant(item))));
|
18
16
|
}
|
17
|
+
//TODO: shoud be removed
|
19
18
|
set(tenant) {
|
20
19
|
return this.http.post(this.apiSetTenant, { tenantId: tenant.id }).pipe(map((response) => {
|
21
20
|
return {
|
22
|
-
|
23
|
-
|
21
|
+
succeed: true,
|
22
|
+
data: {
|
23
|
+
accessToken: response.token,
|
24
|
+
refreshToken: response.token,
|
25
|
+
},
|
24
26
|
};
|
25
27
|
}));
|
26
28
|
}
|
@@ -28,14 +30,14 @@ export class AXMOidcTenantLoader {
|
|
28
30
|
return {
|
29
31
|
id: item.id,
|
30
32
|
name: item.name || 'defaultName',
|
31
|
-
title: item.
|
33
|
+
title: item.title || 'defaultTitle',
|
32
34
|
// Add other fields and defaults as needed, and handle the logo if applicable
|
33
35
|
};
|
34
36
|
}
|
35
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "
|
36
|
-
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "
|
37
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.0.2", ngImport: i0, type: AXMOidcTenantLoader, deps: [{ token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
38
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.0.2", ngImport: i0, type: AXMOidcTenantLoader }); }
|
37
39
|
}
|
38
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "
|
40
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.0.2", ngImport: i0, type: AXMOidcTenantLoader, decorators: [{
|
39
41
|
type: Injectable
|
40
42
|
}], ctorParameters: () => [{ type: i1.HttpClient }] });
|
41
|
-
//# sourceMappingURL=data:application/json;base64,
|
43
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVuYW50LmxvYWRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL2xpYnMvbW9kdWxlcy9iYWNrZW5kL3NyYy9saWIvYXV0aC9vaWRjL3RlbmFudC5sb2FkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDOUQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2xELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ25ELE9BQU8sRUFBYyxHQUFHLEVBQUUsTUFBTSxNQUFNLENBQUM7OztBQUd2QyxNQUFNLE9BQU8sbUJBQW1CO0lBSTlCLFlBQW9CLElBQWdCO1FBQWhCLFNBQUksR0FBSixJQUFJLENBQVk7UUFINUIsWUFBTyxHQUFHLE1BQU0sQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDO1FBQ3hDLGtCQUFhLEdBQUcsR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sdUJBQXVCLENBQUM7UUFDL0QsaUJBQVksR0FBRyxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxZQUFZLENBQUM7SUFDbkIsQ0FBQztJQUV6QyxPQUFPO1FBQ0wsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBbUIsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxRQUFRLEVBQUUsRUFBRSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQzlJLENBQUM7SUFFRCx3QkFBd0I7SUFDeEIsR0FBRyxDQUFDLE1BQWlCO1FBQ25CLE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQU0sSUFBSSxDQUFDLFlBQVksRUFBRSxFQUFFLFFBQVEsRUFBRSxNQUFNLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQ3pFLEdBQUcsQ0FBQyxDQUFDLFFBQVEsRUFBRSxFQUFFO1lBQ2YsT0FBTztnQkFDTCxPQUFPLEVBQUUsSUFBSTtnQkFDYixJQUFJLEVBQUU7b0JBQ0osV0FBVyxFQUFFLFFBQVEsQ0FBQyxLQUFLO29CQUMzQixZQUFZLEVBQUUsUUFBUSxDQUFDLEtBQUs7aUJBQzdCO2FBQ0YsQ0FBQztRQUNKLENBQUMsQ0FBQyxDQUNILENBQUM7SUFDSixDQUFDO0lBRU8sY0FBYyxDQUFDLElBQVM7UUFDOUIsT0FBTztZQUNMLEVBQUUsRUFBRSxJQUFJLENBQUMsRUFBRTtZQUNYLElBQUksRUFBRSxJQUFJLENBQUMsSUFBSSxJQUFJLGFBQWE7WUFDaEMsS0FBSyxFQUFFLElBQUksQ0FBQyxLQUFLLElBQUksY0FBYztZQUNuQyw2RUFBNkU7U0FDOUUsQ0FBQztJQUNKLENBQUM7OEdBaENVLG1CQUFtQjtrSEFBbkIsbUJBQW1COzsyRkFBbkIsbUJBQW1CO2tCQUQvQixVQUFVIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQVhQUmVmcmVzaFRva2VuUmVzdWx0LCBBWFBUZW5hbnQsIEFYUFRlbmFudExvYWRlciB9IGZyb20gJ0BhY29yZXgvcGxhdGZvcm0vYXV0aCc7XG5pbXBvcnQgeyBBWFBfUk9PVF9DT05GSUdfVE9LRU4gfSBmcm9tICdAYWNvcmV4L3BsYXRmb3JtL2NvcmUnO1xuaW1wb3J0IHsgSHR0cENsaWVudCB9IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcbmltcG9ydCB7IEluamVjdGFibGUsIGluamVjdCB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgT2JzZXJ2YWJsZSwgbWFwIH0gZnJvbSAncnhqcyc7XG5cbkBJbmplY3RhYmxlKClcbmV4cG9ydCBjbGFzcyBBWE1PaWRjVGVuYW50TG9hZGVyIGltcGxlbWVudHMgQVhQVGVuYW50TG9hZGVyIHtcbiAgcHJpdmF0ZSBjb25maWdzID0gaW5qZWN0KEFYUF9ST09UX0NPTkZJR19UT0tFTik7XG4gIHByaXZhdGUgYXBpR2V0VGVuYW50cyA9IGAke3RoaXMuY29uZmlncy5iYXNlVXJsfS91c2VyLXRlbmFudHMvVGVuYW50c2A7XG4gIHByaXZhdGUgYXBpU2V0VGVuYW50ID0gYCR7dGhpcy5jb25maWdzLmJhc2VVcmx9L1NldFRlbmFudGA7XG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgaHR0cDogSHR0cENsaWVudCkgeyB9XG5cbiAgZ2V0TGlzdCgpOiBPYnNlcnZhYmxlPEFYUFRlbmFudFtdPiB7XG4gICAgcmV0dXJuIHRoaXMuaHR0cC5nZXQ8eyBpdGVtczogYW55W10gfT4odGhpcy5hcGlHZXRUZW5hbnRzKS5waXBlKG1hcCgocmVzcG9uc2UpID0+IHJlc3BvbnNlLml0ZW1zLm1hcCgoaXRlbSkgPT4gdGhpcy5tYXBUb0FYUFRlbmFudChpdGVtKSkpKTtcbiAgfVxuXG4gIC8vVE9ETzogc2hvdWQgYmUgcmVtb3ZlZFxuICBzZXQodGVuYW50OiBBWFBUZW5hbnQpOiBPYnNlcnZhYmxlPEFYUFJlZnJlc2hUb2tlblJlc3VsdD4ge1xuICAgIHJldHVybiB0aGlzLmh0dHAucG9zdDxhbnk+KHRoaXMuYXBpU2V0VGVuYW50LCB7IHRlbmFudElkOiB0ZW5hbnQuaWQgfSkucGlwZShcbiAgICAgIG1hcCgocmVzcG9uc2UpID0+IHtcbiAgICAgICAgcmV0dXJuIHtcbiAgICAgICAgICBzdWNjZWVkOiB0cnVlLFxuICAgICAgICAgIGRhdGE6IHtcbiAgICAgICAgICAgIGFjY2Vzc1Rva2VuOiByZXNwb25zZS50b2tlbixcbiAgICAgICAgICAgIHJlZnJlc2hUb2tlbjogcmVzcG9uc2UudG9rZW4sXG4gICAgICAgICAgfSxcbiAgICAgICAgfTtcbiAgICAgIH0pXG4gICAgKTtcbiAgfVxuXG4gIHByaXZhdGUgbWFwVG9BWFBUZW5hbnQoaXRlbTogYW55KTogQVhQVGVuYW50IHtcbiAgICByZXR1cm4ge1xuICAgICAgaWQ6IGl0ZW0uaWQsXG4gICAgICBuYW1lOiBpdGVtLm5hbWUgfHwgJ2RlZmF1bHROYW1lJyxcbiAgICAgIHRpdGxlOiBpdGVtLnRpdGxlIHx8ICdkZWZhdWx0VGl0bGUnLFxuICAgICAgLy8gQWRkIG90aGVyIGZpZWxkcyBhbmQgZGVmYXVsdHMgYXMgbmVlZGVkLCBhbmQgaGFuZGxlIHRoZSBsb2dvIGlmIGFwcGxpY2FibGVcbiAgICB9O1xuICB9XG59XG4iXX0=
|