@bnsights/bbsf-admin-portal 1.0.9 → 1.0.10
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/bnsights-bbsf-admin-portal-1.0.10.tgz +0 -0
- package/bundles/bnsights-bbsf-admin-portal.umd.js +30 -36
- package/bundles/bnsights-bbsf-admin-portal.umd.js.map +1 -1
- package/esm2015/lib/Pages/core/authentication/auth.guard.js +5 -13
- package/fesm2015/bnsights-bbsf-admin-portal.js +8 -24
- package/fesm2015/bnsights-bbsf-admin-portal.js.map +1 -1
- package/package.json +3 -3
- package/bnsights-bbsf-admin-portal-1.0.9.tgz +0 -0
|
@@ -14,25 +14,17 @@ export class AuthGuard {
|
|
|
14
14
|
canActivate(route, state) {
|
|
15
15
|
return __awaiter(this, void 0, void 0, function* () {
|
|
16
16
|
if (yield this.authService.isAuthenticated()) {
|
|
17
|
-
|
|
18
|
-
if (yield this.authService.isUserInRole(this.allowedPermission)) {
|
|
17
|
+
if (this.allowedPermission.length == 0 || (yield this.authService.isUserInRole(this.allowedPermission)))
|
|
19
18
|
return true;
|
|
20
|
-
|
|
21
|
-
else if (EnvironmentService.AreaList.length > 0) {
|
|
19
|
+
if (EnvironmentService.AreaList.length > 0) {
|
|
22
20
|
let userPermissionSetID = Number.parseInt(AuthService.user.profile["selectedpermissionsetid"]);
|
|
23
21
|
let area = EnvironmentService.AreaList.filter((item) => item.PermissionSetID == userPermissionSetID)[0];
|
|
24
22
|
if (area) {
|
|
25
|
-
this.
|
|
26
|
-
|
|
27
|
-
return false;
|
|
23
|
+
this.router.navigate([area.AreaUrl]);
|
|
24
|
+
return true;
|
|
28
25
|
}
|
|
29
|
-
else
|
|
30
|
-
this.authService.setUrl(state.url);
|
|
31
26
|
}
|
|
32
|
-
else
|
|
33
|
-
this.authService.setUrl(state.url);
|
|
34
27
|
}
|
|
35
|
-
debugger;
|
|
36
28
|
this.authService.setUrl(state.url);
|
|
37
29
|
this.router.navigate(['/Admin/account/login'], { queryParams: { redirect: state.url }, replaceUrl: true });
|
|
38
30
|
return false;
|
|
@@ -44,4 +36,4 @@ AuthGuard.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "
|
|
|
44
36
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: AuthGuard, decorators: [{
|
|
45
37
|
type: Injectable
|
|
46
38
|
}], ctorParameters: function () { return [{ type: i1.Router }, { type: i2.AuthService }]; } });
|
|
47
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
39
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5ndWFyZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2Jic2YtYWRtaW4tcG9ydGFsL3NyYy9saWIvUGFnZXMvY29yZS9hdXRoZW50aWNhdGlvbi9hdXRoLmd1YXJkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRTNDLE9BQU8sRUFBRSxXQUFXLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQzs7OztBQUkzRSxNQUFNLE9BQU8sU0FBUztJQUdwQixZQUFvQixNQUFjLEVBQVUsV0FBd0I7UUFBaEQsV0FBTSxHQUFOLE1BQU0sQ0FBUTtRQUFVLGdCQUFXLEdBQVgsV0FBVyxDQUFhO1FBRjdELHNCQUFpQixHQUFhLEVBQUUsQ0FBQztRQUNqQyxZQUFPLEdBQVcsRUFBRSxDQUFDO0lBRTVCLENBQUM7SUFFSyxXQUFXLENBQUMsS0FBNkIsRUFBRSxLQUEwQjs7WUFDekUsSUFBSSxNQUFNLElBQUksQ0FBQyxXQUFXLENBQUMsZUFBZSxFQUFFLEVBQUU7Z0JBQzVDLElBQUksSUFBSSxDQUFDLGlCQUFpQixDQUFDLE1BQU0sSUFBSSxDQUFDLEtBQUksTUFBTSxJQUFJLENBQUMsV0FBVyxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsaUJBQWlCLENBQUMsQ0FBQTtvQkFDbkcsT0FBTyxJQUFJLENBQUE7Z0JBRWIsSUFBSSxrQkFBa0IsQ0FBQyxRQUFRLENBQUMsTUFBTSxHQUFHLENBQUMsRUFBRTtvQkFDMUMsSUFBSSxtQkFBbUIsR0FBRyxNQUFNLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLHlCQUF5QixDQUFDLENBQUMsQ0FBQTtvQkFDOUYsSUFBSSxJQUFJLEdBQUcsa0JBQWtCLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLGVBQWUsSUFBSSxtQkFBbUIsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO29CQUN4RyxJQUFJLElBQUksRUFBRTt3QkFDUixJQUFJLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFBO3dCQUNwQyxPQUFPLElBQUksQ0FBQztxQkFDYjtpQkFDRjthQUNGO1lBQ0QsSUFBSSxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFBO1lBQ2xDLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUMsc0JBQXNCLENBQUMsRUFBRSxFQUFFLFdBQVcsRUFBRSxFQUFFLFFBQVEsRUFBRSxLQUFLLENBQUMsR0FBRyxFQUFFLEVBQUUsVUFBVSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUE7WUFDMUcsT0FBTyxLQUFLLENBQUE7UUFDZCxDQUFDO0tBQUE7O3VHQXZCVSxTQUFTOzJHQUFULFNBQVM7NEZBQVQsU0FBUztrQkFEckIsVUFBVSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcclxuaW1wb3J0IHsgUm91dGVyLCBDYW5BY3RpdmF0ZSwgQWN0aXZhdGVkUm91dGVTbmFwc2hvdCwgUm91dGVyU3RhdGVTbmFwc2hvdCB9IGZyb20gJ0Bhbmd1bGFyL3JvdXRlcic7XHJcbmltcG9ydCB7IEF1dGhTZXJ2aWNlLCBFbnZpcm9ubWVudFNlcnZpY2UgfSBmcm9tICdAYm5zaWdodHMvYmJzZi11dGlsaXRpZXMnO1xyXG5cclxuXHJcbkBJbmplY3RhYmxlKClcclxuZXhwb3J0IGNsYXNzIEF1dGhHdWFyZCBpbXBsZW1lbnRzIENhbkFjdGl2YXRlIHtcclxuICBwdWJsaWMgYWxsb3dlZFBlcm1pc3Npb246IG51bWJlcltdID0gW107XHJcbiAgcHVibGljIGhvbWVVUkw6IHN0cmluZyA9IFwiXCI7XHJcbiAgY29uc3RydWN0b3IocHJpdmF0ZSByb3V0ZXI6IFJvdXRlciwgcHJpdmF0ZSBhdXRoU2VydmljZTogQXV0aFNlcnZpY2UpIHtcclxuICB9XHJcblxyXG4gIGFzeW5jIGNhbkFjdGl2YXRlKHJvdXRlOiBBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90LCBzdGF0ZTogUm91dGVyU3RhdGVTbmFwc2hvdCk6IFByb21pc2U8Ym9vbGVhbj4ge1xyXG4gICAgaWYgKGF3YWl0IHRoaXMuYXV0aFNlcnZpY2UuaXNBdXRoZW50aWNhdGVkKCkpIHtcclxuICAgICAgaWYgKHRoaXMuYWxsb3dlZFBlcm1pc3Npb24ubGVuZ3RoID09IDAgfHwgYXdhaXQgdGhpcy5hdXRoU2VydmljZS5pc1VzZXJJblJvbGUodGhpcy5hbGxvd2VkUGVybWlzc2lvbikpXHJcbiAgICAgICAgcmV0dXJuIHRydWVcclxuXHJcbiAgICAgIGlmIChFbnZpcm9ubWVudFNlcnZpY2UuQXJlYUxpc3QubGVuZ3RoID4gMCkge1xyXG4gICAgICAgIGxldCB1c2VyUGVybWlzc2lvblNldElEID0gTnVtYmVyLnBhcnNlSW50KEF1dGhTZXJ2aWNlLnVzZXIucHJvZmlsZVtcInNlbGVjdGVkcGVybWlzc2lvbnNldGlkXCJdKVxyXG4gICAgICAgIGxldCBhcmVhID0gRW52aXJvbm1lbnRTZXJ2aWNlLkFyZWFMaXN0LmZpbHRlcigoaXRlbSkgPT4gaXRlbS5QZXJtaXNzaW9uU2V0SUQgPT0gdXNlclBlcm1pc3Npb25TZXRJRClbMF07XHJcbiAgICAgICAgaWYgKGFyZWEpIHtcclxuICAgICAgICAgIHRoaXMucm91dGVyLm5hdmlnYXRlKFthcmVhLkFyZWFVcmxdKVxyXG4gICAgICAgICAgcmV0dXJuIHRydWU7XHJcbiAgICAgICAgfVxyXG4gICAgICB9XHJcbiAgICB9XHJcbiAgICB0aGlzLmF1dGhTZXJ2aWNlLnNldFVybChzdGF0ZS51cmwpXHJcbiAgICB0aGlzLnJvdXRlci5uYXZpZ2F0ZShbJy9BZG1pbi9hY2NvdW50L2xvZ2luJ10sIHsgcXVlcnlQYXJhbXM6IHsgcmVkaXJlY3Q6IHN0YXRlLnVybCB9LCByZXBsYWNlVXJsOiB0cnVlIH0pXHJcbiAgICByZXR1cm4gZmFsc2VcclxuICB9XHJcbn1cclxuIl19
|
|
@@ -3394,25 +3394,17 @@ class AuthGuard$1 {
|
|
|
3394
3394
|
canActivate(route, state) {
|
|
3395
3395
|
return __awaiter(this, void 0, void 0, function* () {
|
|
3396
3396
|
if (yield this.authService.isAuthenticated()) {
|
|
3397
|
-
|
|
3398
|
-
if (yield this.authService.isUserInRole(this.allowedPermission)) {
|
|
3397
|
+
if (this.allowedPermission.length == 0 || (yield this.authService.isUserInRole(this.allowedPermission)))
|
|
3399
3398
|
return true;
|
|
3400
|
-
|
|
3401
|
-
else if (EnvironmentService.AreaList.length > 0) {
|
|
3399
|
+
if (EnvironmentService.AreaList.length > 0) {
|
|
3402
3400
|
let userPermissionSetID = Number.parseInt(AuthService$2.user.profile["selectedpermissionsetid"]);
|
|
3403
3401
|
let area = EnvironmentService.AreaList.filter((item) => item.PermissionSetID == userPermissionSetID)[0];
|
|
3404
3402
|
if (area) {
|
|
3405
|
-
this.
|
|
3406
|
-
|
|
3407
|
-
return false;
|
|
3403
|
+
this.router.navigate([area.AreaUrl]);
|
|
3404
|
+
return true;
|
|
3408
3405
|
}
|
|
3409
|
-
else
|
|
3410
|
-
this.authService.setUrl(state.url);
|
|
3411
3406
|
}
|
|
3412
|
-
else
|
|
3413
|
-
this.authService.setUrl(state.url);
|
|
3414
3407
|
}
|
|
3415
|
-
debugger;
|
|
3416
3408
|
this.authService.setUrl(state.url);
|
|
3417
3409
|
this.router.navigate(['/Admin/account/login'], { queryParams: { redirect: state.url }, replaceUrl: true });
|
|
3418
3410
|
return false;
|
|
@@ -22498,25 +22490,17 @@ class AuthGuard {
|
|
|
22498
22490
|
canActivate(route, state) {
|
|
22499
22491
|
return __awaiter(this, void 0, void 0, function* () {
|
|
22500
22492
|
if (yield this.authService.isAuthenticated()) {
|
|
22501
|
-
|
|
22502
|
-
if (yield this.authService.isUserInRole(this.allowedPermission)) {
|
|
22493
|
+
if (this.allowedPermission.length == 0 || (yield this.authService.isUserInRole(this.allowedPermission)))
|
|
22503
22494
|
return true;
|
|
22504
|
-
|
|
22505
|
-
else if (EnvironmentService.AreaList.length > 0) {
|
|
22495
|
+
if (EnvironmentService.AreaList.length > 0) {
|
|
22506
22496
|
let userPermissionSetID = Number.parseInt(AuthService$2.user.profile["selectedpermissionsetid"]);
|
|
22507
22497
|
let area = EnvironmentService.AreaList.filter((item) => item.PermissionSetID == userPermissionSetID)[0];
|
|
22508
22498
|
if (area) {
|
|
22509
|
-
this.
|
|
22510
|
-
|
|
22511
|
-
return false;
|
|
22499
|
+
this.router.navigate([area.AreaUrl]);
|
|
22500
|
+
return true;
|
|
22512
22501
|
}
|
|
22513
|
-
else
|
|
22514
|
-
this.authService.setUrl(state.url);
|
|
22515
22502
|
}
|
|
22516
|
-
else
|
|
22517
|
-
this.authService.setUrl(state.url);
|
|
22518
22503
|
}
|
|
22519
|
-
debugger;
|
|
22520
22504
|
this.authService.setUrl(state.url);
|
|
22521
22505
|
this.router.navigate(['/Admin/account/login'], { queryParams: { redirect: state.url }, replaceUrl: true });
|
|
22522
22506
|
return false;
|