ngx-vector-components 4.11.0 → 4.11.1
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/CHANGELOG.md +5 -0
- package/esm2020/lib/guards/get-token-by-guid.guard.mjs +14 -8
- package/esm2020/lib/services/profile.service.mjs +4 -1
- package/esm2020/lib/services/storage.service.mjs +8 -5
- package/fesm2015/ngx-vector-components.mjs +22 -11
- package/fesm2015/ngx-vector-components.mjs.map +1 -1
- package/fesm2020/ngx-vector-components.mjs +22 -11
- package/fesm2020/ngx-vector-components.mjs.map +1 -1
- package/lib/guards/get-token-by-guid.guard.d.ts +4 -3
- package/lib/services/profile.service.d.ts +2 -1
- package/lib/services/storage.service.d.ts +3 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,15 +1,16 @@
|
|
|
1
1
|
import { Inject, Injectable } from '@angular/core';
|
|
2
|
-
import { map } from 'rxjs/operators';
|
|
2
|
+
import { map, switchMap } from 'rxjs/operators';
|
|
3
3
|
import { Role } from '../models';
|
|
4
4
|
import * as i0 from "@angular/core";
|
|
5
5
|
import * as i1 from "../services";
|
|
6
6
|
import * as i2 from "@angular/router";
|
|
7
7
|
import * as i3 from "../models";
|
|
8
8
|
export class GetTokenByGuidGuard {
|
|
9
|
-
constructor(authService, storageService, router, appName) {
|
|
9
|
+
constructor(authService, storageService, router, profileService, appName) {
|
|
10
10
|
this.authService = authService;
|
|
11
11
|
this.storageService = storageService;
|
|
12
12
|
this.router = router;
|
|
13
|
+
this.profileService = profileService;
|
|
13
14
|
this.appName = appName;
|
|
14
15
|
}
|
|
15
16
|
canActivate(route) {
|
|
@@ -20,11 +21,16 @@ export class GetTokenByGuidGuard {
|
|
|
20
21
|
this.storageService.clear();
|
|
21
22
|
this.storageService.setRole(route.queryParams['role']);
|
|
22
23
|
this.storageService.setUserId(route.queryParams['userId']);
|
|
23
|
-
return this.authService.getTokenByGuid(paramTokenGuid).pipe(
|
|
24
|
+
return this.authService.getTokenByGuid(paramTokenGuid).pipe(switchMap((token) => {
|
|
24
25
|
if (token && role !== Role.ADMIN) {
|
|
25
|
-
|
|
26
|
+
this.router.createUrlTree([this.appName.toLowerCase()]);
|
|
26
27
|
}
|
|
27
|
-
return
|
|
28
|
+
return this.profileService.getUserInfo().pipe(map((response) => {
|
|
29
|
+
if (response.id) {
|
|
30
|
+
this.storageService.setUserId(response.id);
|
|
31
|
+
}
|
|
32
|
+
return true;
|
|
33
|
+
}));
|
|
28
34
|
}));
|
|
29
35
|
}
|
|
30
36
|
else if (this.storageService.getToken()) {
|
|
@@ -37,12 +43,12 @@ export class GetTokenByGuidGuard {
|
|
|
37
43
|
return false;
|
|
38
44
|
}
|
|
39
45
|
}
|
|
40
|
-
GetTokenByGuidGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: GetTokenByGuidGuard, deps: [{ token: i1.AuthService }, { token: i1.StorageService }, { token: i2.Router }, { token: 'appName' }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
46
|
+
GetTokenByGuidGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: GetTokenByGuidGuard, deps: [{ token: i1.AuthService }, { token: i1.StorageService }, { token: i2.Router }, { token: i1.ProfileService }, { token: 'appName' }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
41
47
|
GetTokenByGuidGuard.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: GetTokenByGuidGuard });
|
|
42
48
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: GetTokenByGuidGuard, decorators: [{
|
|
43
49
|
type: Injectable
|
|
44
|
-
}], ctorParameters: function () { return [{ type: i1.AuthService }, { type: i1.StorageService }, { type: i2.Router }, { type: i3.AppName, decorators: [{
|
|
50
|
+
}], ctorParameters: function () { return [{ type: i1.AuthService }, { type: i1.StorageService }, { type: i2.Router }, { type: i1.ProfileService }, { type: i3.AppName, decorators: [{
|
|
45
51
|
type: Inject,
|
|
46
52
|
args: ['appName']
|
|
47
53
|
}] }]; } });
|
|
48
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
54
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0LXRva2VuLWJ5LWd1aWQuZ3VhcmQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9uZ3gtdmVjdG9yLWNvbXBvbmVudHMvc3JjL2xpYi9ndWFyZHMvZ2V0LXRva2VuLWJ5LWd1aWQuZ3VhcmQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFbkQsT0FBTyxFQUFFLEdBQUcsRUFBRSxTQUFTLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUNoRCxPQUFPLEVBQVcsSUFBSSxFQUFFLE1BQU0sV0FBVyxDQUFDOzs7OztBQUkxQyxNQUFNLE9BQU8sbUJBQW1CO0lBQzlCLFlBQ1UsV0FBd0IsRUFDeEIsY0FBOEIsRUFDOUIsTUFBYyxFQUNkLGNBQThCLEVBQ1gsT0FBZ0I7UUFKbkMsZ0JBQVcsR0FBWCxXQUFXLENBQWE7UUFDeEIsbUJBQWMsR0FBZCxjQUFjLENBQWdCO1FBQzlCLFdBQU0sR0FBTixNQUFNLENBQVE7UUFDZCxtQkFBYyxHQUFkLGNBQWMsQ0FBZ0I7UUFDWCxZQUFPLEdBQVAsT0FBTyxDQUFTO0lBQzFDLENBQUM7SUFFSixXQUFXLENBQUMsS0FBNkI7UUFDdkMsTUFBTSxjQUFjLEdBQUcsS0FBSyxDQUFDLFdBQVcsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUNsRCxNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLENBQVMsQ0FBQztRQUMzRCxJQUFJLENBQUMsV0FBVyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDbEMsSUFBSSxjQUFjLEVBQUU7WUFDbEIsSUFBSSxDQUFDLGNBQWMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztZQUM1QixJQUFJLENBQUMsY0FBYyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUM7WUFDdkQsSUFBSSxDQUFDLGNBQWMsQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLFdBQVcsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDO1lBQzNELE9BQU8sSUFBSSxDQUFDLFdBQVcsQ0FBQyxjQUFjLENBQUMsY0FBYyxDQUFDLENBQUMsSUFBSSxDQUN6RCxTQUFTLENBQUMsQ0FBQyxLQUFLLEVBQUUsRUFBRTtnQkFDbEIsSUFBSSxLQUFLLElBQUksSUFBSSxLQUFLLElBQUksQ0FBQyxLQUFLLEVBQUU7b0JBQ2hDLElBQUksQ0FBQyxNQUFNLENBQUMsYUFBYSxDQUFDLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxXQUFXLEVBQUUsQ0FBQyxDQUFDLENBQUM7aUJBQ3pEO2dCQUNELE9BQU8sSUFBSSxDQUFDLGNBQWMsQ0FBQyxXQUFXLEVBQUUsQ0FBQyxJQUFJLENBQzNDLEdBQUcsQ0FBQyxDQUFDLFFBQVEsRUFBRSxFQUFFO29CQUNmLElBQUksUUFBUSxDQUFDLEVBQUUsRUFBRTt3QkFDZixJQUFJLENBQUMsY0FBYyxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDLENBQUM7cUJBQzVDO29CQUNELE9BQU8sSUFBSSxDQUFDO2dCQUNkLENBQUMsQ0FBQyxDQUNILENBQUM7WUFDSixDQUFDLENBQUMsQ0FDSCxDQUFDO1NBQ0g7YUFBTSxJQUFJLElBQUksQ0FBQyxjQUFjLENBQUMsUUFBUSxFQUFFLEVBQUU7WUFDekMsSUFBSSxJQUFJLEtBQUssSUFBSSxDQUFDLEtBQUssRUFBRTtnQkFDdkIsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLGFBQWEsQ0FBQyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsV0FBVyxFQUFFLENBQUMsQ0FBQyxDQUFDO2FBQ2hFO1lBQ0QsT0FBTyxJQUFJLENBQUM7U0FDYjtRQUNELElBQUksQ0FBQyxXQUFXLENBQUMsTUFBTSxFQUFFLENBQUM7UUFDMUIsT0FBTyxLQUFLLENBQUM7SUFDZixDQUFDOztnSEF4Q1UsbUJBQW1CLCtIQU1wQixTQUFTO29IQU5SLG1CQUFtQjsyRkFBbkIsbUJBQW1CO2tCQUQvQixVQUFVOzswQkFPTixNQUFNOzJCQUFDLFNBQVMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3QsIEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcclxuaW1wb3J0IHsgQWN0aXZhdGVkUm91dGVTbmFwc2hvdCwgQ2FuQWN0aXZhdGUsIFJvdXRlciB9IGZyb20gJ0Bhbmd1bGFyL3JvdXRlcic7XHJcbmltcG9ydCB7IG1hcCwgc3dpdGNoTWFwIH0gZnJvbSAncnhqcy9vcGVyYXRvcnMnO1xyXG5pbXBvcnQgeyBBcHBOYW1lLCBSb2xlIH0gZnJvbSAnLi4vbW9kZWxzJztcclxuaW1wb3J0IHsgQXV0aFNlcnZpY2UsIFByb2ZpbGVTZXJ2aWNlLCBTdG9yYWdlU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzJztcclxuXHJcbkBJbmplY3RhYmxlKClcclxuZXhwb3J0IGNsYXNzIEdldFRva2VuQnlHdWlkR3VhcmQgaW1wbGVtZW50cyBDYW5BY3RpdmF0ZSB7XHJcbiAgY29uc3RydWN0b3IoXHJcbiAgICBwcml2YXRlIGF1dGhTZXJ2aWNlOiBBdXRoU2VydmljZSxcclxuICAgIHByaXZhdGUgc3RvcmFnZVNlcnZpY2U6IFN0b3JhZ2VTZXJ2aWNlLFxyXG4gICAgcHJpdmF0ZSByb3V0ZXI6IFJvdXRlcixcclxuICAgIHByaXZhdGUgcHJvZmlsZVNlcnZpY2U6IFByb2ZpbGVTZXJ2aWNlLFxyXG4gICAgQEluamVjdCgnYXBwTmFtZScpIHByaXZhdGUgYXBwTmFtZTogQXBwTmFtZVxyXG4gICkge31cclxuXHJcbiAgY2FuQWN0aXZhdGUocm91dGU6IEFjdGl2YXRlZFJvdXRlU25hcHNob3QpIHtcclxuICAgIGNvbnN0IHBhcmFtVG9rZW5HdWlkID0gcm91dGUucXVlcnlQYXJhbXNbJ1Rva2VuJ107XHJcbiAgICBjb25zdCByb2xlID0gYXRvYihyb3V0ZS5xdWVyeVBhcmFtc1sncm9sZSddIHx8ICcnKSBhcyBSb2xlO1xyXG4gICAgdGhpcy5hdXRoU2VydmljZS5yb2xlJC5uZXh0KHJvbGUpO1xyXG4gICAgaWYgKHBhcmFtVG9rZW5HdWlkKSB7XHJcbiAgICAgIHRoaXMuc3RvcmFnZVNlcnZpY2UuY2xlYXIoKTtcclxuICAgICAgdGhpcy5zdG9yYWdlU2VydmljZS5zZXRSb2xlKHJvdXRlLnF1ZXJ5UGFyYW1zWydyb2xlJ10pO1xyXG4gICAgICB0aGlzLnN0b3JhZ2VTZXJ2aWNlLnNldFVzZXJJZChyb3V0ZS5xdWVyeVBhcmFtc1sndXNlcklkJ10pO1xyXG4gICAgICByZXR1cm4gdGhpcy5hdXRoU2VydmljZS5nZXRUb2tlbkJ5R3VpZChwYXJhbVRva2VuR3VpZCkucGlwZShcclxuICAgICAgICBzd2l0Y2hNYXAoKHRva2VuKSA9PiB7XHJcbiAgICAgICAgICBpZiAodG9rZW4gJiYgcm9sZSAhPT0gUm9sZS5BRE1JTikge1xyXG4gICAgICAgICAgICB0aGlzLnJvdXRlci5jcmVhdGVVcmxUcmVlKFt0aGlzLmFwcE5hbWUudG9Mb3dlckNhc2UoKV0pO1xyXG4gICAgICAgICAgfVxyXG4gICAgICAgICAgcmV0dXJuIHRoaXMucHJvZmlsZVNlcnZpY2UuZ2V0VXNlckluZm8oKS5waXBlKFxyXG4gICAgICAgICAgICBtYXAoKHJlc3BvbnNlKSA9PiB7XHJcbiAgICAgICAgICAgICAgaWYgKHJlc3BvbnNlLmlkKSB7XHJcbiAgICAgICAgICAgICAgICB0aGlzLnN0b3JhZ2VTZXJ2aWNlLnNldFVzZXJJZChyZXNwb25zZS5pZCk7XHJcbiAgICAgICAgICAgICAgfVxyXG4gICAgICAgICAgICAgIHJldHVybiB0cnVlO1xyXG4gICAgICAgICAgICB9KVxyXG4gICAgICAgICAgKTtcclxuICAgICAgICB9KVxyXG4gICAgICApO1xyXG4gICAgfSBlbHNlIGlmICh0aGlzLnN0b3JhZ2VTZXJ2aWNlLmdldFRva2VuKCkpIHtcclxuICAgICAgaWYgKHJvbGUgIT09IFJvbGUuQURNSU4pIHtcclxuICAgICAgICByZXR1cm4gdGhpcy5yb3V0ZXIuY3JlYXRlVXJsVHJlZShbdGhpcy5hcHBOYW1lLnRvTG93ZXJDYXNlKCldKTtcclxuICAgICAgfVxyXG4gICAgICByZXR1cm4gdHJ1ZTtcclxuICAgIH1cclxuICAgIHRoaXMuYXV0aFNlcnZpY2UubG9nb3V0KCk7XHJcbiAgICByZXR1cm4gZmFsc2U7XHJcbiAgfVxyXG59XHJcbiJdfQ==
|
|
@@ -84,6 +84,9 @@ export class ProfileService {
|
|
|
84
84
|
}
|
|
85
85
|
return false;
|
|
86
86
|
}
|
|
87
|
+
getUserInfo() {
|
|
88
|
+
return this.http.get(`connect/userinfo`);
|
|
89
|
+
}
|
|
87
90
|
}
|
|
88
91
|
ProfileService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: ProfileService, deps: [{ token: i1.HttpClient }, { token: i2.StorageService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
89
92
|
ProfileService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: ProfileService, providedIn: 'root' });
|
|
@@ -91,4 +94,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.3", ngImpor
|
|
|
91
94
|
type: Injectable,
|
|
92
95
|
args: [{ providedIn: 'root' }]
|
|
93
96
|
}], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: i2.StorageService }]; } });
|
|
94
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"profile.service.js","sourceRoot":"","sources":["../../../../../projects/ngx-vector-components/src/lib/services/profile.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpClient } from '@angular/common/http';\r\nimport { Injectable } from '@angular/core';\r\nimport { BehaviorSubject } from 'rxjs';\r\nimport { Profile, ProfileModule, ProfileModuleActionType, ProfileModuleType } from '../models/profile.model';\r\nimport { StorageService } from './storage.service';\r\n\r\n@Injectable({ providedIn: 'root' })\r\nexport class ProfileService {\r\n  public readonly moduleProfile$ = new BehaviorSubject<ProfileModule[] | undefined>(\r\n    this.storageService.getProfile().allModules\r\n  );\r\n\r\n  public readonly profileFirstName$ = new BehaviorSubject<string | undefined>(undefined);\r\n  public readonly profileTypeItens$ = new BehaviorSubject<\r\n    { shipper: number; carrierId: number; profileTypeId: number } | undefined\r\n  >(undefined);\r\n  public hasFintechAdminPermission = false;\r\n  public hasMarketplaceAdminPermission = false;\r\n  public hasAnyFintechPermission = false;\r\n  public hasAnyMarketplacePermission = false;\r\n\r\n  constructor(private http: HttpClient, private storageService: StorageService) {\r\n    const { fintech, marketplace } = this.storageService.getProfile();\r\n    this.hasFintechAdminPermission = !!fintech?.actions.some((act) =>\r\n      [\r\n        ProfileModuleActionType.FINTECH_BANK_ADMIN.toString(),\r\n        ProfileModuleActionType.FINTECH_CREDIT_ADMIN.toString(),\r\n      ].includes(act.name)\r\n    );\r\n    this.hasMarketplaceAdminPermission = !!marketplace?.actions.some(\r\n      (act) => act.name === ProfileModuleActionType.ADMIN_MARKEPLACE\r\n    );\r\n    this.hasAnyFintechPermission = !!fintech?.actions?.length;\r\n    this.hasAnyMarketplacePermission = !!marketplace?.actions?.length;\r\n  }\r\n\r\n  public getUserProfile() {\r\n    this.http.get<any>('connect/userinfo').subscribe((response) => {\r\n      if (response.firstName) {\r\n        this.profileFirstName$.next(response.firstName);\r\n      }\r\n\r\n      if (response) {\r\n        let dataObject = {\r\n          shipper: response?.shipper,\r\n          carrierId: response?.carrierId,\r\n          profileTypeId: response?.profile.profileTypeId,\r\n        };\r\n        this.storageService.setSession('userInfo', dataObject);\r\n        this.profileTypeItens$.next(dataObject);\r\n      }\r\n\r\n      const completeProfile: Profile = response.profile;\r\n      const marketplaceProfileModule = completeProfile.modules.find((mod) => mod.name === 'Marketplace');\r\n      const fintechProfileModule = completeProfile.modules.find((mod) => mod.name === 'Fintech');\r\n      const allModules = completeProfile.modules;\r\n      this.hasFintechAdminPermission = !!fintechProfileModule?.actions.some((act) =>\r\n        [\r\n          ProfileModuleActionType.FINTECH_BANK_ADMIN.toString(),\r\n          ProfileModuleActionType.FINTECH_CREDIT_ADMIN.toString(),\r\n        ].includes(act.name)\r\n      );\r\n      this.hasMarketplaceAdminPermission = !!marketplaceProfileModule?.actions.some(\r\n        (act) => act.name === ProfileModuleActionType.ADMIN_MARKEPLACE\r\n      );\r\n      this.hasAnyFintechPermission = !!fintechProfileModule?.actions?.length;\r\n      this.storageService.setProfile({\r\n        marketplace: marketplaceProfileModule,\r\n        fintech: fintechProfileModule,\r\n        allModules,\r\n      });\r\n      this.moduleProfile$.next(allModules);\r\n    });\r\n  }\r\n\r\n  public userHasPermission(\r\n    action: ProfileModuleActionType | ProfileModuleType | ProfileModuleActionType[] | ProfileModuleType[] | undefined\r\n  ) {\r\n    if (!action) {\r\n      return true;\r\n    }\r\n    if (!this.moduleProfile$.value) {\r\n      return false;\r\n    }\r\n\r\n    if (Array.isArray(action)) {\r\n      return action.some((act) => {\r\n        if (Object.values(ProfileModuleActionType).some((val) => val === act)) {\r\n          return this.moduleProfile$.value?.some((module) =>\r\n            module.actions.some((moduleAction) => moduleAction.name === act)\r\n          );\r\n        }\r\n\r\n        if (Object.values(ProfileModuleType).some((val) => val === act)) {\r\n          return this.moduleProfile$.value?.some((module) => module.name === act);\r\n        }\r\n\r\n        return false;\r\n      });\r\n    } else {\r\n      if (Object.values(ProfileModuleActionType).some((val) => val === action)) {\r\n        return this.moduleProfile$.value.some((module) => module.actions.some((act) => act.name === action));\r\n      }\r\n\r\n      if (Object.values(ProfileModuleType).some((val) => val === action)) {\r\n        return this.moduleProfile$.value.some((module) => module.name === action);\r\n      }\r\n    }\r\n\r\n    return false;\r\n  }\r\n}\r\n"]}
|
|
97
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"profile.service.js","sourceRoot":"","sources":["../../../../../projects/ngx-vector-components/src/lib/services/profile.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpClient } from '@angular/common/http';\r\nimport { Injectable } from '@angular/core';\r\nimport { BehaviorSubject, Observable } from 'rxjs';\r\nimport { Profile, ProfileModule, ProfileModuleActionType, ProfileModuleType } from '../models/profile.model';\r\nimport { StorageService } from './storage.service';\r\n\r\n@Injectable({ providedIn: 'root' })\r\nexport class ProfileService {\r\n  public readonly moduleProfile$ = new BehaviorSubject<ProfileModule[] | undefined>(\r\n    this.storageService.getProfile().allModules\r\n  );\r\n\r\n  public readonly profileFirstName$ = new BehaviorSubject<string | undefined>(undefined);\r\n  public readonly profileTypeItens$ = new BehaviorSubject<\r\n    { shipper: number; carrierId: number; profileTypeId: number } | undefined\r\n  >(undefined);\r\n  public hasFintechAdminPermission = false;\r\n  public hasMarketplaceAdminPermission = false;\r\n  public hasAnyFintechPermission = false;\r\n  public hasAnyMarketplacePermission = false;\r\n\r\n  constructor(private http: HttpClient, private storageService: StorageService) {\r\n    const { fintech, marketplace } = this.storageService.getProfile();\r\n    this.hasFintechAdminPermission = !!fintech?.actions.some((act) =>\r\n      [\r\n        ProfileModuleActionType.FINTECH_BANK_ADMIN.toString(),\r\n        ProfileModuleActionType.FINTECH_CREDIT_ADMIN.toString(),\r\n      ].includes(act.name)\r\n    );\r\n    this.hasMarketplaceAdminPermission = !!marketplace?.actions.some(\r\n      (act) => act.name === ProfileModuleActionType.ADMIN_MARKEPLACE\r\n    );\r\n    this.hasAnyFintechPermission = !!fintech?.actions?.length;\r\n    this.hasAnyMarketplacePermission = !!marketplace?.actions?.length;\r\n  }\r\n\r\n  public getUserProfile() {\r\n    this.http.get<any>('connect/userinfo').subscribe((response) => {\r\n      if (response.firstName) {\r\n        this.profileFirstName$.next(response.firstName);\r\n      }\r\n\r\n      if (response) {\r\n        let dataObject = {\r\n          shipper: response?.shipper,\r\n          carrierId: response?.carrierId,\r\n          profileTypeId: response?.profile.profileTypeId,\r\n        };\r\n        this.storageService.setSession('userInfo', dataObject);\r\n        this.profileTypeItens$.next(dataObject);\r\n      }\r\n\r\n      const completeProfile: Profile = response.profile;\r\n      const marketplaceProfileModule = completeProfile.modules.find((mod) => mod.name === 'Marketplace');\r\n      const fintechProfileModule = completeProfile.modules.find((mod) => mod.name === 'Fintech');\r\n      const allModules = completeProfile.modules;\r\n      this.hasFintechAdminPermission = !!fintechProfileModule?.actions.some((act) =>\r\n        [\r\n          ProfileModuleActionType.FINTECH_BANK_ADMIN.toString(),\r\n          ProfileModuleActionType.FINTECH_CREDIT_ADMIN.toString(),\r\n        ].includes(act.name)\r\n      );\r\n      this.hasMarketplaceAdminPermission = !!marketplaceProfileModule?.actions.some(\r\n        (act) => act.name === ProfileModuleActionType.ADMIN_MARKEPLACE\r\n      );\r\n      this.hasAnyFintechPermission = !!fintechProfileModule?.actions?.length;\r\n      this.storageService.setProfile({\r\n        marketplace: marketplaceProfileModule,\r\n        fintech: fintechProfileModule,\r\n        allModules,\r\n      });\r\n      this.moduleProfile$.next(allModules);\r\n    });\r\n  }\r\n\r\n  public userHasPermission(\r\n    action: ProfileModuleActionType | ProfileModuleType | ProfileModuleActionType[] | ProfileModuleType[] | undefined\r\n  ) {\r\n    if (!action) {\r\n      return true;\r\n    }\r\n    if (!this.moduleProfile$.value) {\r\n      return false;\r\n    }\r\n\r\n    if (Array.isArray(action)) {\r\n      return action.some((act) => {\r\n        if (Object.values(ProfileModuleActionType).some((val) => val === act)) {\r\n          return this.moduleProfile$.value?.some((module) =>\r\n            module.actions.some((moduleAction) => moduleAction.name === act)\r\n          );\r\n        }\r\n\r\n        if (Object.values(ProfileModuleType).some((val) => val === act)) {\r\n          return this.moduleProfile$.value?.some((module) => module.name === act);\r\n        }\r\n\r\n        return false;\r\n      });\r\n    } else {\r\n      if (Object.values(ProfileModuleActionType).some((val) => val === action)) {\r\n        return this.moduleProfile$.value.some((module) => module.actions.some((act) => act.name === action));\r\n      }\r\n\r\n      if (Object.values(ProfileModuleType).some((val) => val === action)) {\r\n        return this.moduleProfile$.value.some((module) => module.name === action);\r\n      }\r\n    }\r\n\r\n    return false;\r\n  }\r\n\r\n  public getUserInfo(): Observable<any> {\r\n    return this.http.get<any>(`connect/userinfo`);\r\n  }\r\n}\r\n"]}
|
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
import { Injectable } from '@angular/core';
|
|
2
2
|
import * as i0 from "@angular/core";
|
|
3
|
+
import * as i1 from "@angular/common/http";
|
|
3
4
|
export class StorageService {
|
|
4
|
-
constructor() {
|
|
5
|
+
constructor(http) {
|
|
6
|
+
this.http = http;
|
|
7
|
+
}
|
|
5
8
|
clear() {
|
|
6
9
|
sessionStorage.clear();
|
|
7
10
|
localStorage.clear();
|
|
@@ -67,7 +70,7 @@ export class StorageService {
|
|
|
67
70
|
sessionStorage.removeItem('username');
|
|
68
71
|
}
|
|
69
72
|
getUserId() {
|
|
70
|
-
const userId = sessionStorage.getItem('userId')
|
|
73
|
+
const userId = sessionStorage.getItem('userId');
|
|
71
74
|
return userId ? +atob(userId) : 0;
|
|
72
75
|
}
|
|
73
76
|
setUserId(userId) {
|
|
@@ -96,10 +99,10 @@ export class StorageService {
|
|
|
96
99
|
sessionStorage.removeItem('profile');
|
|
97
100
|
}
|
|
98
101
|
}
|
|
99
|
-
StorageService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: StorageService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
|
|
102
|
+
StorageService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: StorageService, deps: [{ token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
100
103
|
StorageService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: StorageService, providedIn: 'root' });
|
|
101
104
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: StorageService, decorators: [{
|
|
102
105
|
type: Injectable,
|
|
103
106
|
args: [{ providedIn: 'root' }]
|
|
104
|
-
}], ctorParameters: function () { return []; } });
|
|
105
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
107
|
+
}], ctorParameters: function () { return [{ type: i1.HttpClient }]; } });
|
|
108
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"storage.service.js","sourceRoot":"","sources":["../../../../../projects/ngx-vector-components/src/lib/services/storage.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpClient } from '@angular/common/http';\r\nimport { Injectable } from '@angular/core';\r\nimport { ProfileModule, Role } from '../models';\r\n\r\n@Injectable({ providedIn: 'root' })\r\nexport class StorageService {\r\n  constructor(private http: HttpClient) {}\r\n\r\n  public clear(): void {\r\n    sessionStorage.clear();\r\n    localStorage.clear();\r\n  }\r\n\r\n  public clearSession(): void {\r\n    sessionStorage.clear();\r\n  }\r\n\r\n  public get(key: string): any {\r\n    const storageItem = localStorage.getItem(key);\r\n    try {\r\n      return storageItem ? JSON.parse(storageItem) : '';\r\n    } catch (e) {\r\n      return storageItem;\r\n    }\r\n  }\r\n\r\n  public set(key: string, value: any): void {\r\n    localStorage.setItem(key, typeof value === 'string' ? value : JSON.stringify(value));\r\n  }\r\n\r\n  public remove(key: string): void {\r\n    localStorage.removeItem(key);\r\n  }\r\n\r\n  public getSession(key: string): any {\r\n    const storageItem = sessionStorage.getItem(key);\r\n    try {\r\n      return storageItem ? JSON.parse(storageItem) : '';\r\n    } catch (e) {\r\n      return storageItem;\r\n    }\r\n  }\r\n\r\n  public setSession(key: string, value: any): void {\r\n    sessionStorage.setItem(key, typeof value === 'string' ? value : JSON.stringify(value));\r\n  }\r\n\r\n  public removeSession(key: string): void {\r\n    sessionStorage.removeItem(key);\r\n  }\r\n\r\n  public getToken(): string {\r\n    return localStorage.getItem('token') || '';\r\n  }\r\n\r\n  public setToken(token: string) {\r\n    localStorage.setItem('token', token);\r\n  }\r\n\r\n  public removeToken() {\r\n    localStorage.removeItem('token');\r\n  }\r\n\r\n  public getRefreshToken(): string {\r\n    return sessionStorage.getItem('refreshToken') || '';\r\n  }\r\n\r\n  public setRefreshToken(refreshToken: string) {\r\n    sessionStorage.setItem('refreshToken', refreshToken);\r\n  }\r\n\r\n  public removeRefreshToken() {\r\n    sessionStorage.removeItem('refreshToken');\r\n  }\r\n\r\n  public getUsername(): string {\r\n    return sessionStorage.getItem('username') || '';\r\n  }\r\n\r\n  public setUsername(username: string) {\r\n    sessionStorage.setItem('username', username);\r\n  }\r\n\r\n  public removeUsername() {\r\n    sessionStorage.removeItem('username');\r\n  }\r\n\r\n  public getUserId(): number {\r\n    const userId = sessionStorage.getItem('userId');\r\n    return userId ? +atob(userId) : 0;\r\n  }\r\n\r\n  public setUserId(userId: number) {\r\n    sessionStorage.setItem('userId', btoa(`${userId}`));\r\n  }\r\n\r\n  public clearUserId() {\r\n    sessionStorage.removeItem('userId');\r\n  }\r\n\r\n  public getRole(): Role {\r\n    return atob(sessionStorage.getItem('role') || '') as Role;\r\n  }\r\n\r\n  public setRole(role?: string) {\r\n    sessionStorage.setItem('role', role || '');\r\n  }\r\n\r\n  public clearRole() {\r\n    sessionStorage.removeItem('role');\r\n  }\r\n\r\n  public getProfile(): {\r\n    marketplace: ProfileModule | undefined;\r\n    fintech: ProfileModule | undefined;\r\n    allModules: ProfileModule[] | undefined;\r\n  } {\r\n    const data = sessionStorage.getItem('profile') || '';\r\n    return data ? JSON.parse(data) : data;\r\n  }\r\n\r\n  public setProfile(profiles: {\r\n    marketplace: ProfileModule | undefined;\r\n    fintech: ProfileModule | undefined;\r\n    allModules: ProfileModule[] | undefined;\r\n  }) {\r\n    sessionStorage.setItem('profile', JSON.stringify(profiles || ''));\r\n  }\r\n\r\n  public removeProfile() {\r\n    sessionStorage.removeItem('profile');\r\n  }\r\n}\r\n"]}
|
|
@@ -53,7 +53,7 @@ import * as i2$2 from 'primeng/api';
|
|
|
53
53
|
import { DateTime } from 'luxon';
|
|
54
54
|
import * as i1$2 from '@angular/common/http';
|
|
55
55
|
import { HttpHeaders, HttpClient, HttpResponse } from '@angular/common/http';
|
|
56
|
-
import { tap, map, debounceTime,
|
|
56
|
+
import { tap, map, debounceTime, switchMap, catchError, filter, take } from 'rxjs/operators';
|
|
57
57
|
import * as i1$3 from '@ngx-translate/core';
|
|
58
58
|
import * as i1$b from 'primeng/accordion';
|
|
59
59
|
import { AccordionModule } from 'primeng/accordion';
|
|
@@ -1292,7 +1292,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.3", ngImpor
|
|
|
1292
1292
|
}] });
|
|
1293
1293
|
|
|
1294
1294
|
class StorageService {
|
|
1295
|
-
constructor() {
|
|
1295
|
+
constructor(http) {
|
|
1296
|
+
this.http = http;
|
|
1297
|
+
}
|
|
1296
1298
|
clear() {
|
|
1297
1299
|
sessionStorage.clear();
|
|
1298
1300
|
localStorage.clear();
|
|
@@ -1358,7 +1360,7 @@ class StorageService {
|
|
|
1358
1360
|
sessionStorage.removeItem('username');
|
|
1359
1361
|
}
|
|
1360
1362
|
getUserId() {
|
|
1361
|
-
const userId = sessionStorage.getItem('userId')
|
|
1363
|
+
const userId = sessionStorage.getItem('userId');
|
|
1362
1364
|
return userId ? +atob(userId) : 0;
|
|
1363
1365
|
}
|
|
1364
1366
|
setUserId(userId) {
|
|
@@ -1387,12 +1389,12 @@ class StorageService {
|
|
|
1387
1389
|
sessionStorage.removeItem('profile');
|
|
1388
1390
|
}
|
|
1389
1391
|
}
|
|
1390
|
-
StorageService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: StorageService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
|
|
1392
|
+
StorageService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: StorageService, deps: [{ token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
1391
1393
|
StorageService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: StorageService, providedIn: 'root' });
|
|
1392
1394
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: StorageService, decorators: [{
|
|
1393
1395
|
type: Injectable,
|
|
1394
1396
|
args: [{ providedIn: 'root' }]
|
|
1395
|
-
}], ctorParameters: function () { return []; } });
|
|
1397
|
+
}], ctorParameters: function () { return [{ type: i1$2.HttpClient }]; } });
|
|
1396
1398
|
|
|
1397
1399
|
class ProfileService {
|
|
1398
1400
|
constructor(http, storageService) {
|
|
@@ -1477,6 +1479,9 @@ class ProfileService {
|
|
|
1477
1479
|
}
|
|
1478
1480
|
return false;
|
|
1479
1481
|
}
|
|
1482
|
+
getUserInfo() {
|
|
1483
|
+
return this.http.get(`connect/userinfo`);
|
|
1484
|
+
}
|
|
1480
1485
|
}
|
|
1481
1486
|
ProfileService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: ProfileService, deps: [{ token: i1$2.HttpClient }, { token: StorageService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
1482
1487
|
ProfileService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: ProfileService, providedIn: 'root' });
|
|
@@ -3603,10 +3608,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.3", ngImpor
|
|
|
3603
3608
|
}], ctorParameters: function () { return [{ type: i0.Injector }]; } });
|
|
3604
3609
|
|
|
3605
3610
|
class GetTokenByGuidGuard {
|
|
3606
|
-
constructor(authService, storageService, router, appName) {
|
|
3611
|
+
constructor(authService, storageService, router, profileService, appName) {
|
|
3607
3612
|
this.authService = authService;
|
|
3608
3613
|
this.storageService = storageService;
|
|
3609
3614
|
this.router = router;
|
|
3615
|
+
this.profileService = profileService;
|
|
3610
3616
|
this.appName = appName;
|
|
3611
3617
|
}
|
|
3612
3618
|
canActivate(route) {
|
|
@@ -3617,11 +3623,16 @@ class GetTokenByGuidGuard {
|
|
|
3617
3623
|
this.storageService.clear();
|
|
3618
3624
|
this.storageService.setRole(route.queryParams['role']);
|
|
3619
3625
|
this.storageService.setUserId(route.queryParams['userId']);
|
|
3620
|
-
return this.authService.getTokenByGuid(paramTokenGuid).pipe(
|
|
3626
|
+
return this.authService.getTokenByGuid(paramTokenGuid).pipe(switchMap((token) => {
|
|
3621
3627
|
if (token && role !== Role.ADMIN) {
|
|
3622
|
-
|
|
3628
|
+
this.router.createUrlTree([this.appName.toLowerCase()]);
|
|
3623
3629
|
}
|
|
3624
|
-
return
|
|
3630
|
+
return this.profileService.getUserInfo().pipe(map((response) => {
|
|
3631
|
+
if (response.id) {
|
|
3632
|
+
this.storageService.setUserId(response.id);
|
|
3633
|
+
}
|
|
3634
|
+
return true;
|
|
3635
|
+
}));
|
|
3625
3636
|
}));
|
|
3626
3637
|
}
|
|
3627
3638
|
else if (this.storageService.getToken()) {
|
|
@@ -3634,12 +3645,12 @@ class GetTokenByGuidGuard {
|
|
|
3634
3645
|
return false;
|
|
3635
3646
|
}
|
|
3636
3647
|
}
|
|
3637
|
-
GetTokenByGuidGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: GetTokenByGuidGuard, deps: [{ token: AuthService }, { token: StorageService }, { token: i2$1.Router }, { token: 'appName' }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
3648
|
+
GetTokenByGuidGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: GetTokenByGuidGuard, deps: [{ token: AuthService }, { token: StorageService }, { token: i2$1.Router }, { token: ProfileService }, { token: 'appName' }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
3638
3649
|
GetTokenByGuidGuard.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: GetTokenByGuidGuard });
|
|
3639
3650
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.3", ngImport: i0, type: GetTokenByGuidGuard, decorators: [{
|
|
3640
3651
|
type: Injectable
|
|
3641
3652
|
}], ctorParameters: function () {
|
|
3642
|
-
return [{ type: AuthService }, { type: StorageService }, { type: i2$1.Router }, { type: AppName, decorators: [{
|
|
3653
|
+
return [{ type: AuthService }, { type: StorageService }, { type: i2$1.Router }, { type: ProfileService }, { type: AppName, decorators: [{
|
|
3643
3654
|
type: Inject,
|
|
3644
3655
|
args: ['appName']
|
|
3645
3656
|
}] }];
|