@bnsights/bbsf-admin-portal 1.1.76 → 1.1.79

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/README.md CHANGED
@@ -4,6 +4,18 @@ BBSF Admin Portal package is part of BBSF 3 packages. It hosts all the angular m
4
4
 
5
5
  For more info please visit [BBSF documentation](https://bnsightsprojects.visualstudio.com/BBSF%203/_wiki/wikis/BBSF-3.wiki/65/BBSF-Documentation)
6
6
 
7
+ ## 1.1.79 / 26-08-2025
8
+ =====================
9
+ - Updating controls package to 1.0.181
10
+ - Update utilities package to 1.0.64
11
+
12
+
13
+
14
+ ## 1.1.78 / 26-08-2025
15
+ =====================
16
+ - Updating controls package to 1.0.180
17
+ - Update utilities package to 1.0.64
18
+
7
19
 
8
20
  ## 1.1.76 / 11-08-2025
9
21
  =====================
@@ -11,25 +11,17 @@ export class AuthGuard {
11
11
  this.allowedPermission = [];
12
12
  this.homeURL = "";
13
13
  }
14
- async canActivate(route, state) {
14
+ canActivate(route, state) {
15
15
  if (this.authService.isAuthenticated()) {
16
- if (this.allowedPermission.length == 0 || this.authService.isUserInRole(this.allowedPermission))
16
+ let currentSelectedPermissionSetID = Number.parseInt(AuthService.user.profile["selectedpermissionsetid"]);
17
+ let excludedUrls = ['Admin/Home'];
18
+ let isExcludedUrl = excludedUrls.some(url => state.url.toLocaleLowerCase().includes(url.toLocaleLowerCase()));
19
+ let adminPermissionSetsIds = [1, 2];
20
+ if (currentSelectedPermissionSetID && !adminPermissionSetsIds.includes(currentSelectedPermissionSetID) && isExcludedUrl)
21
+ return this.navigateToUserArea(currentSelectedPermissionSetID);
22
+ if (this.allowedPermission.length == 0 || this.authService.isUserPermissionSetsInRoles(this.allowedPermission))
17
23
  return true;
18
- if (EnvironmentService.AreaList.length > 0) {
19
- let userPermissionSetID = Number.parseInt(AuthService.user.profile["selectedpermissionsetid"]);
20
- let area = EnvironmentService.AreaList.filter((item) => item.permissionSetID == userPermissionSetID)[0];
21
- if (area) {
22
- this.router.navigate([area.areaUrl], { replaceUrl: true });
23
- return true;
24
- }
25
- else {
26
- let error = "You are trying to access undefined area.";
27
- await this.masterLayoutService.logError(error).subscribe((res) => {
28
- this.router.navigate([`/Admin/account/error/${res}/${error}`]);
29
- return false;
30
- });
31
- }
32
- }
24
+ return this.navigateToUserArea(currentSelectedPermissionSetID);
33
25
  }
34
26
  else {
35
27
  this.authService.setUrl(state.url);
@@ -37,10 +29,27 @@ export class AuthGuard {
37
29
  return false;
38
30
  }
39
31
  }
32
+ navigateToUserArea(userPermissionSetID) {
33
+ if (EnvironmentService.AreaList.length > 0) {
34
+ let area = EnvironmentService.AreaList.filter((item) => item.permissionSetID == userPermissionSetID)[0];
35
+ if (area) {
36
+ this.router.navigate([area.areaUrl], { replaceUrl: true });
37
+ return true;
38
+ }
39
+ else {
40
+ let error = "You are trying to access undefined area.";
41
+ this.masterLayoutService.logError(error).subscribe((res) => {
42
+ this.router.navigate([`/Admin/account/error/${res}/${error}`]);
43
+ });
44
+ return false;
45
+ }
46
+ }
47
+ return false;
48
+ }
40
49
  static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: AuthGuard, deps: [{ token: i1.Router }, { token: i2.AuthService }, { token: i2.MasterLayoutService }], target: i0.ɵɵFactoryTarget.Injectable }); }
41
50
  static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: AuthGuard }); }
42
51
  }
43
52
  i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: AuthGuard, decorators: [{
44
53
  type: Injectable
45
54
  }], ctorParameters: () => [{ type: i1.Router }, { type: i2.AuthService }, { type: i2.MasterLayoutService }] });
46
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5ndWFyZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2Jic2YtYWRtaW4tcG9ydGFsL3NyYy9saWIvUGFnZXMvY29yZS9hdXRoZW50aWNhdGlvbi9hdXRoLmd1YXJkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFM0MsT0FBTyxFQUFFLFdBQVcsRUFBRSxrQkFBa0IsRUFBdUIsTUFBTSwwQkFBMEIsQ0FBQzs7OztBQUloRyxNQUFNLE9BQU8sU0FBUztJQUdwQixZQUFvQixNQUFjLEVBQVUsV0FBd0IsRUFBVSxtQkFBd0M7UUFBbEcsV0FBTSxHQUFOLE1BQU0sQ0FBUTtRQUFVLGdCQUFXLEdBQVgsV0FBVyxDQUFhO1FBQVUsd0JBQW1CLEdBQW5CLG1CQUFtQixDQUFxQjtRQUYvRyxzQkFBaUIsR0FBYSxFQUFFLENBQUM7UUFDakMsWUFBTyxHQUFXLEVBQUUsQ0FBQztJQUU1QixDQUFDO0lBRUQsS0FBSyxDQUFDLFdBQVcsQ0FBQyxLQUE2QixFQUFFLEtBQTBCO1FBQ3pFLElBQUksSUFBSSxDQUFDLFdBQVcsQ0FBQyxlQUFlLEVBQUUsRUFBRTtZQUN0QyxJQUFJLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxNQUFNLElBQUksQ0FBQyxJQUFJLElBQUksQ0FBQyxXQUFXLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxpQkFBaUIsQ0FBQztnQkFDN0YsT0FBTyxJQUFJLENBQUM7WUFFZCxJQUFJLGtCQUFrQixDQUFDLFFBQVEsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFO2dCQUMxQyxJQUFJLG1CQUFtQixHQUFHLE1BQU0sQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMseUJBQXlCLENBQUMsQ0FBQyxDQUFDO2dCQUMvRixJQUFJLElBQUksR0FBRyxrQkFBa0IsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsZUFBZSxJQUFJLG1CQUFtQixDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQ3hHLElBQUksSUFBSSxFQUFFO29CQUNSLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxFQUFFLEVBQUUsVUFBVSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7b0JBQzNELE9BQU8sSUFBSSxDQUFDO2lCQUNiO3FCQUNJO29CQUNILElBQUksS0FBSyxHQUFHLDBDQUEwQyxDQUFDO29CQUN2RCxNQUFNLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLENBQUMsU0FBUyxDQUN0RCxDQUFDLEdBQUcsRUFBRSxFQUFFO3dCQUNOLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUMsd0JBQXdCLEdBQUcsSUFBSSxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUM7d0JBQy9ELE9BQU8sS0FBSyxDQUFDO29CQUNmLENBQUMsQ0FDRixDQUFDO2lCQUNIO2FBQ0Y7U0FDRjthQUNJO1lBQ0gsSUFBSSxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ25DLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUMsc0JBQXNCLENBQUMsRUFBRSxFQUFFLFdBQVcsRUFBRSxFQUFFLFFBQVEsRUFBRSxLQUFLLENBQUMsR0FBRyxFQUFFLEVBQUUsVUFBVSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7WUFDM0csT0FBTyxLQUFLLENBQUM7U0FDZDtJQUVILENBQUM7K0dBbkNVLFNBQVM7bUhBQVQsU0FBUzs7NEZBQVQsU0FBUztrQkFEckIsVUFBVSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcclxuaW1wb3J0IHsgUm91dGVyLCBBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90LCBSb3V0ZXJTdGF0ZVNuYXBzaG90IH0gZnJvbSAnQGFuZ3VsYXIvcm91dGVyJztcclxuaW1wb3J0IHsgQXV0aFNlcnZpY2UsIEVudmlyb25tZW50U2VydmljZSwgTWFzdGVyTGF5b3V0U2VydmljZSB9IGZyb20gJ0BibnNpZ2h0cy9iYnNmLXV0aWxpdGllcyc7XHJcblxyXG5cclxuQEluamVjdGFibGUoKVxyXG5leHBvcnQgY2xhc3MgQXV0aEd1YXJkIHtcclxuICBwdWJsaWMgYWxsb3dlZFBlcm1pc3Npb246IG51bWJlcltdID0gW107XHJcbiAgcHVibGljIGhvbWVVUkw6IHN0cmluZyA9IFwiXCI7XHJcbiAgY29uc3RydWN0b3IocHJpdmF0ZSByb3V0ZXI6IFJvdXRlciwgcHJpdmF0ZSBhdXRoU2VydmljZTogQXV0aFNlcnZpY2UsIHByaXZhdGUgbWFzdGVyTGF5b3V0U2VydmljZTogTWFzdGVyTGF5b3V0U2VydmljZSkge1xyXG4gIH1cclxuXHJcbiAgYXN5bmMgY2FuQWN0aXZhdGUocm91dGU6IEFjdGl2YXRlZFJvdXRlU25hcHNob3QsIHN0YXRlOiBSb3V0ZXJTdGF0ZVNuYXBzaG90KTogUHJvbWlzZTxib29sZWFuPiB7XHJcbiAgICBpZiAodGhpcy5hdXRoU2VydmljZS5pc0F1dGhlbnRpY2F0ZWQoKSkge1xyXG4gICAgICBpZiAodGhpcy5hbGxvd2VkUGVybWlzc2lvbi5sZW5ndGggPT0gMCB8fCB0aGlzLmF1dGhTZXJ2aWNlLmlzVXNlckluUm9sZSh0aGlzLmFsbG93ZWRQZXJtaXNzaW9uKSlcclxuICAgICAgICByZXR1cm4gdHJ1ZTtcclxuXHJcbiAgICAgIGlmIChFbnZpcm9ubWVudFNlcnZpY2UuQXJlYUxpc3QubGVuZ3RoID4gMCkge1xyXG4gICAgICAgIGxldCB1c2VyUGVybWlzc2lvblNldElEID0gTnVtYmVyLnBhcnNlSW50KEF1dGhTZXJ2aWNlLnVzZXIucHJvZmlsZVtcInNlbGVjdGVkcGVybWlzc2lvbnNldGlkXCJdKTtcclxuICAgICAgICBsZXQgYXJlYSA9IEVudmlyb25tZW50U2VydmljZS5BcmVhTGlzdC5maWx0ZXIoKGl0ZW0pID0+IGl0ZW0ucGVybWlzc2lvblNldElEID09IHVzZXJQZXJtaXNzaW9uU2V0SUQpWzBdO1xyXG4gICAgICAgIGlmIChhcmVhKSB7XHJcbiAgICAgICAgICB0aGlzLnJvdXRlci5uYXZpZ2F0ZShbYXJlYS5hcmVhVXJsXSwgeyByZXBsYWNlVXJsOiB0cnVlIH0pO1xyXG4gICAgICAgICAgcmV0dXJuIHRydWU7XHJcbiAgICAgICAgfVxyXG4gICAgICAgIGVsc2Uge1xyXG4gICAgICAgICAgbGV0IGVycm9yID0gXCJZb3UgYXJlIHRyeWluZyB0byBhY2Nlc3MgdW5kZWZpbmVkIGFyZWEuXCI7XHJcbiAgICAgICAgICBhd2FpdCB0aGlzLm1hc3RlckxheW91dFNlcnZpY2UubG9nRXJyb3IoZXJyb3IpLnN1YnNjcmliZShcclxuICAgICAgICAgICAgKHJlcykgPT4ge1xyXG4gICAgICAgICAgICAgIHRoaXMucm91dGVyLm5hdmlnYXRlKFtgL0FkbWluL2FjY291bnQvZXJyb3IvJHtyZXN9LyR7ZXJyb3J9YF0pO1xyXG4gICAgICAgICAgICAgIHJldHVybiBmYWxzZTtcclxuICAgICAgICAgICAgfVxyXG4gICAgICAgICAgKTtcclxuICAgICAgICB9XHJcbiAgICAgIH1cclxuICAgIH1cclxuICAgIGVsc2Uge1xyXG4gICAgICB0aGlzLmF1dGhTZXJ2aWNlLnNldFVybChzdGF0ZS51cmwpO1xyXG4gICAgICB0aGlzLnJvdXRlci5uYXZpZ2F0ZShbJy9BZG1pbi9hY2NvdW50L2xvZ2luJ10sIHsgcXVlcnlQYXJhbXM6IHsgcmVkaXJlY3Q6IHN0YXRlLnVybCB9LCByZXBsYWNlVXJsOiB0cnVlIH0pO1xyXG4gICAgICByZXR1cm4gZmFsc2U7XHJcbiAgICB9XHJcblxyXG4gIH1cclxufVxyXG4iXX0=
55
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5ndWFyZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2Jic2YtYWRtaW4tcG9ydGFsL3NyYy9saWIvUGFnZXMvY29yZS9hdXRoZW50aWNhdGlvbi9hdXRoLmd1YXJkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBVSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFbkQsT0FBTyxFQUFFLFdBQVcsRUFBRSxrQkFBa0IsRUFBdUIsTUFBTSwwQkFBMEIsQ0FBQzs7OztBQUloRyxNQUFNLE9BQU8sU0FBUztJQUdwQixZQUFvQixNQUFjLEVBQVUsV0FBd0IsRUFBVSxtQkFBd0M7UUFBbEcsV0FBTSxHQUFOLE1BQU0sQ0FBUTtRQUFVLGdCQUFXLEdBQVgsV0FBVyxDQUFhO1FBQVUsd0JBQW1CLEdBQW5CLG1CQUFtQixDQUFxQjtRQUYvRyxzQkFBaUIsR0FBYSxFQUFFLENBQUM7UUFDakMsWUFBTyxHQUFXLEVBQUUsQ0FBQztJQUU1QixDQUFDO0lBRUQsV0FBVyxDQUFDLEtBQTZCLEVBQUUsS0FBMEI7UUFFbkUsSUFBSSxJQUFJLENBQUMsV0FBVyxDQUFDLGVBQWUsRUFBRSxFQUFFO1lBQ3RDLElBQUksOEJBQThCLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyx5QkFBeUIsQ0FBQyxDQUFDLENBQUM7WUFDMUcsSUFBSSxZQUFZLEdBQUcsQ0FBQyxZQUFZLENBQUMsQ0FBQztZQUNsQyxJQUFJLGFBQWEsR0FBRyxZQUFZLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsRUFBRSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsaUJBQWlCLEVBQUUsQ0FBQyxDQUFDLENBQUM7WUFDOUcsSUFBSSxzQkFBc0IsR0FBRyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQztZQUVwQyxJQUFJLDhCQUE4QixJQUFJLENBQUMsc0JBQXNCLENBQUMsUUFBUSxDQUFDLDhCQUE4QixDQUFDLElBQUksYUFBYTtnQkFDckgsT0FBTyxJQUFJLENBQUMsa0JBQWtCLENBQUMsOEJBQThCLENBQUMsQ0FBQztZQUVqRSxJQUFJLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxNQUFNLElBQUksQ0FBQyxJQUFJLElBQUksQ0FBQyxXQUFXLENBQUMsMkJBQTJCLENBQUMsSUFBSSxDQUFDLGlCQUFpQixDQUFDO2dCQUM1RyxPQUFPLElBQUksQ0FBQztZQUVkLE9BQU8sSUFBSSxDQUFDLGtCQUFrQixDQUFDLDhCQUE4QixDQUFDLENBQUM7U0FDaEU7YUFDSTtZQUNILElBQUksQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUNuQyxJQUFJLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDLHNCQUFzQixDQUFDLEVBQUUsRUFBRSxXQUFXLEVBQUUsRUFBRSxRQUFRLEVBQUUsS0FBSyxDQUFDLEdBQUcsRUFBRSxFQUFFLFVBQVUsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO1lBQzNHLE9BQU8sS0FBSyxDQUFDO1NBQ2Q7SUFDSCxDQUFDO0lBRU8sa0JBQWtCLENBQUMsbUJBQTJCO1FBQ3BELElBQUksa0JBQWtCLENBQUMsUUFBUSxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUU7WUFDMUMsSUFBSSxJQUFJLEdBQUcsa0JBQWtCLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLGVBQWUsSUFBSSxtQkFBbUIsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ3hHLElBQUksSUFBSSxFQUFFO2dCQUNSLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxFQUFFLEVBQUUsVUFBVSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7Z0JBQzNELE9BQU8sSUFBSSxDQUFDO2FBQ2I7aUJBQ0k7Z0JBQ0gsSUFBSSxLQUFLLEdBQUcsMENBQTBDLENBQUM7Z0JBQ3ZELElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLENBQUMsU0FBUyxDQUNoRCxDQUFDLEdBQUcsRUFBRSxFQUFFO29CQUNOLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUMsd0JBQXdCLEdBQUcsSUFBSSxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUM7Z0JBQ2pFLENBQUMsQ0FDRixDQUFDO2dCQUNGLE9BQU8sS0FBSyxDQUFDO2FBQ2Q7U0FDRjtRQUNELE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQzsrR0EvQ1UsU0FBUzttSEFBVCxTQUFTOzs0RkFBVCxTQUFTO2tCQURyQixVQUFVIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgaW5qZWN0LCBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XHJcbmltcG9ydCB7IFJvdXRlciwgQWN0aXZhdGVkUm91dGVTbmFwc2hvdCwgUm91dGVyU3RhdGVTbmFwc2hvdCwgQWN0aXZhdGVkUm91dGUgfSBmcm9tICdAYW5ndWxhci9yb3V0ZXInO1xyXG5pbXBvcnQgeyBBdXRoU2VydmljZSwgRW52aXJvbm1lbnRTZXJ2aWNlLCBNYXN0ZXJMYXlvdXRTZXJ2aWNlIH0gZnJvbSAnQGJuc2lnaHRzL2Jic2YtdXRpbGl0aWVzJztcclxuXHJcblxyXG5ASW5qZWN0YWJsZSgpXHJcbmV4cG9ydCBjbGFzcyBBdXRoR3VhcmQge1xyXG4gIHB1YmxpYyBhbGxvd2VkUGVybWlzc2lvbjogbnVtYmVyW10gPSBbXTtcclxuICBwdWJsaWMgaG9tZVVSTDogc3RyaW5nID0gXCJcIjtcclxuICBjb25zdHJ1Y3Rvcihwcml2YXRlIHJvdXRlcjogUm91dGVyLCBwcml2YXRlIGF1dGhTZXJ2aWNlOiBBdXRoU2VydmljZSwgcHJpdmF0ZSBtYXN0ZXJMYXlvdXRTZXJ2aWNlOiBNYXN0ZXJMYXlvdXRTZXJ2aWNlKSB7XHJcbiAgfVxyXG5cclxuICBjYW5BY3RpdmF0ZShyb3V0ZTogQWN0aXZhdGVkUm91dGVTbmFwc2hvdCwgc3RhdGU6IFJvdXRlclN0YXRlU25hcHNob3QpOiBib29sZWFuIHtcclxuXHJcbiAgICBpZiAodGhpcy5hdXRoU2VydmljZS5pc0F1dGhlbnRpY2F0ZWQoKSkge1xyXG4gICAgICBsZXQgY3VycmVudFNlbGVjdGVkUGVybWlzc2lvblNldElEID0gTnVtYmVyLnBhcnNlSW50KEF1dGhTZXJ2aWNlLnVzZXIucHJvZmlsZVtcInNlbGVjdGVkcGVybWlzc2lvbnNldGlkXCJdKTtcclxuICAgICAgbGV0IGV4Y2x1ZGVkVXJscyA9IFsnQWRtaW4vSG9tZSddO1xyXG4gICAgICBsZXQgaXNFeGNsdWRlZFVybCA9IGV4Y2x1ZGVkVXJscy5zb21lKHVybCA9PiBzdGF0ZS51cmwudG9Mb2NhbGVMb3dlckNhc2UoKS5pbmNsdWRlcyh1cmwudG9Mb2NhbGVMb3dlckNhc2UoKSkpO1xyXG4gICAgICBsZXQgYWRtaW5QZXJtaXNzaW9uU2V0c0lkcyA9IFsxLCAyXTtcclxuXHJcbiAgICAgIGlmIChjdXJyZW50U2VsZWN0ZWRQZXJtaXNzaW9uU2V0SUQgJiYgIWFkbWluUGVybWlzc2lvblNldHNJZHMuaW5jbHVkZXMoY3VycmVudFNlbGVjdGVkUGVybWlzc2lvblNldElEKSAmJiBpc0V4Y2x1ZGVkVXJsKVxyXG4gICAgICAgIHJldHVybiB0aGlzLm5hdmlnYXRlVG9Vc2VyQXJlYShjdXJyZW50U2VsZWN0ZWRQZXJtaXNzaW9uU2V0SUQpO1xyXG5cclxuICAgICAgaWYgKHRoaXMuYWxsb3dlZFBlcm1pc3Npb24ubGVuZ3RoID09IDAgfHwgdGhpcy5hdXRoU2VydmljZS5pc1VzZXJQZXJtaXNzaW9uU2V0c0luUm9sZXModGhpcy5hbGxvd2VkUGVybWlzc2lvbikpXHJcbiAgICAgICAgcmV0dXJuIHRydWU7XHJcblxyXG4gICAgICByZXR1cm4gdGhpcy5uYXZpZ2F0ZVRvVXNlckFyZWEoY3VycmVudFNlbGVjdGVkUGVybWlzc2lvblNldElEKTtcclxuICAgIH1cclxuICAgIGVsc2Uge1xyXG4gICAgICB0aGlzLmF1dGhTZXJ2aWNlLnNldFVybChzdGF0ZS51cmwpO1xyXG4gICAgICB0aGlzLnJvdXRlci5uYXZpZ2F0ZShbJy9BZG1pbi9hY2NvdW50L2xvZ2luJ10sIHsgcXVlcnlQYXJhbXM6IHsgcmVkaXJlY3Q6IHN0YXRlLnVybCB9LCByZXBsYWNlVXJsOiB0cnVlIH0pO1xyXG4gICAgICByZXR1cm4gZmFsc2U7XHJcbiAgICB9XHJcbiAgfVxyXG5cclxuICBwcml2YXRlIG5hdmlnYXRlVG9Vc2VyQXJlYSh1c2VyUGVybWlzc2lvblNldElEOiBudW1iZXIpOiBib29sZWFuIHtcclxuICAgIGlmIChFbnZpcm9ubWVudFNlcnZpY2UuQXJlYUxpc3QubGVuZ3RoID4gMCkge1xyXG4gICAgICBsZXQgYXJlYSA9IEVudmlyb25tZW50U2VydmljZS5BcmVhTGlzdC5maWx0ZXIoKGl0ZW0pID0+IGl0ZW0ucGVybWlzc2lvblNldElEID09IHVzZXJQZXJtaXNzaW9uU2V0SUQpWzBdO1xyXG4gICAgICBpZiAoYXJlYSkge1xyXG4gICAgICAgIHRoaXMucm91dGVyLm5hdmlnYXRlKFthcmVhLmFyZWFVcmxdLCB7IHJlcGxhY2VVcmw6IHRydWUgfSk7XHJcbiAgICAgICAgcmV0dXJuIHRydWU7XHJcbiAgICAgIH1cclxuICAgICAgZWxzZSB7XHJcbiAgICAgICAgbGV0IGVycm9yID0gXCJZb3UgYXJlIHRyeWluZyB0byBhY2Nlc3MgdW5kZWZpbmVkIGFyZWEuXCI7XHJcbiAgICAgICAgdGhpcy5tYXN0ZXJMYXlvdXRTZXJ2aWNlLmxvZ0Vycm9yKGVycm9yKS5zdWJzY3JpYmUoXHJcbiAgICAgICAgICAocmVzKSA9PiB7XHJcbiAgICAgICAgICAgIHRoaXMucm91dGVyLm5hdmlnYXRlKFtgL0FkbWluL2FjY291bnQvZXJyb3IvJHtyZXN9LyR7ZXJyb3J9YF0pO1xyXG4gICAgICAgICAgfVxyXG4gICAgICAgICk7XHJcbiAgICAgICAgcmV0dXJuIGZhbHNlO1xyXG4gICAgICB9XHJcbiAgICB9XHJcbiAgICByZXR1cm4gZmFsc2U7XHJcbiAgfVxyXG59XHJcbiJdfQ==
@@ -8,7 +8,7 @@ import { TranslateHttpLoader } from '@ngx-translate/http-loader';
8
8
  import * as i1 from '@angular/router';
9
9
  import { NavigationEnd, NavigationCancel, ResolveEnd, RouterModule, Router } from '@angular/router';
10
10
  import * as i1$1 from '@bnsights/bbsf-utilities';
11
- import { RequestOptionsModel, EnvironmentService, AuthService as AuthService$1, UtilityService, BBSFTranslateService, BBSFUtilitiesModule, RequestHandlerService, TranslationResolverService, AuthenticationModes, StylesBundleService as StylesBundleService$1, MasterLayoutService, AppearanceConfigurationService, ConfigurationService } from '@bnsights/bbsf-utilities';
11
+ import { RequestOptionsModel, AuthService as AuthService$1, EnvironmentService, UtilityService, BBSFTranslateService, BBSFUtilitiesModule, RequestHandlerService, TranslationResolverService, AuthenticationModes, StylesBundleService as StylesBundleService$1, MasterLayoutService, AppearanceConfigurationService, ConfigurationService } from '@bnsights/bbsf-utilities';
12
12
  import { __decorate } from 'tslib';
13
13
  import * as i1$2 from 'ng-block-ui';
14
14
  import { BlockUI, BlockUIModule } from 'ng-block-ui';
@@ -3402,25 +3402,17 @@ class AuthGuard {
3402
3402
  this.allowedPermission = [];
3403
3403
  this.homeURL = "";
3404
3404
  }
3405
- async canActivate(route, state) {
3405
+ canActivate(route, state) {
3406
3406
  if (this.authService.isAuthenticated()) {
3407
- if (this.allowedPermission.length == 0 || this.authService.isUserInRole(this.allowedPermission))
3407
+ let currentSelectedPermissionSetID = Number.parseInt(AuthService$1.user.profile["selectedpermissionsetid"]);
3408
+ let excludedUrls = ['Admin/Home'];
3409
+ let isExcludedUrl = excludedUrls.some(url => state.url.toLocaleLowerCase().includes(url.toLocaleLowerCase()));
3410
+ let adminPermissionSetsIds = [1, 2];
3411
+ if (currentSelectedPermissionSetID && !adminPermissionSetsIds.includes(currentSelectedPermissionSetID) && isExcludedUrl)
3412
+ return this.navigateToUserArea(currentSelectedPermissionSetID);
3413
+ if (this.allowedPermission.length == 0 || this.authService.isUserPermissionSetsInRoles(this.allowedPermission))
3408
3414
  return true;
3409
- if (EnvironmentService.AreaList.length > 0) {
3410
- let userPermissionSetID = Number.parseInt(AuthService$1.user.profile["selectedpermissionsetid"]);
3411
- let area = EnvironmentService.AreaList.filter((item) => item.permissionSetID == userPermissionSetID)[0];
3412
- if (area) {
3413
- this.router.navigate([area.areaUrl], { replaceUrl: true });
3414
- return true;
3415
- }
3416
- else {
3417
- let error = "You are trying to access undefined area.";
3418
- await this.masterLayoutService.logError(error).subscribe((res) => {
3419
- this.router.navigate([`/Admin/account/error/${res}/${error}`]);
3420
- return false;
3421
- });
3422
- }
3423
- }
3415
+ return this.navigateToUserArea(currentSelectedPermissionSetID);
3424
3416
  }
3425
3417
  else {
3426
3418
  this.authService.setUrl(state.url);
@@ -3428,6 +3420,23 @@ class AuthGuard {
3428
3420
  return false;
3429
3421
  }
3430
3422
  }
3423
+ navigateToUserArea(userPermissionSetID) {
3424
+ if (EnvironmentService.AreaList.length > 0) {
3425
+ let area = EnvironmentService.AreaList.filter((item) => item.permissionSetID == userPermissionSetID)[0];
3426
+ if (area) {
3427
+ this.router.navigate([area.areaUrl], { replaceUrl: true });
3428
+ return true;
3429
+ }
3430
+ else {
3431
+ let error = "You are trying to access undefined area.";
3432
+ this.masterLayoutService.logError(error).subscribe((res) => {
3433
+ this.router.navigate([`/Admin/account/error/${res}/${error}`]);
3434
+ });
3435
+ return false;
3436
+ }
3437
+ }
3438
+ return false;
3439
+ }
3431
3440
  static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: AuthGuard, deps: [{ token: i1.Router }, { token: i1$1.AuthService }, { token: i1$1.MasterLayoutService }], target: i0.ɵɵFactoryTarget.Injectable }); }
3432
3441
  static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: AuthGuard }); }
3433
3442
  }