@resolveio/client-lib-core 2.0.2 → 2.0.4
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/esm2020/lib/auth/auth-guard.service.mjs +8 -5
- package/fesm2015/resolveio-client-lib-core.mjs +7 -4
- package/fesm2015/resolveio-client-lib-core.mjs.map +1 -1
- package/fesm2020/resolveio-client-lib-core.mjs +7 -4
- package/fesm2020/resolveio-client-lib-core.mjs.map +1 -1
- package/package.json +1 -1
|
@@ -14,7 +14,7 @@ import { finalize } from 'rxjs/operators';
|
|
|
14
14
|
import { detailedDiff } from 'deep-object-diff';
|
|
15
15
|
import moment from 'moment';
|
|
16
16
|
import * as i1$3 from '@angular/router';
|
|
17
|
-
import { RouterModule, Router
|
|
17
|
+
import { RouterModule, Router } from '@angular/router';
|
|
18
18
|
import * as i4 from '@angular/common/http';
|
|
19
19
|
import { HttpClientModule } from '@angular/common/http';
|
|
20
20
|
import * as i1$4 from '@ng-bootstrap/ng-bootstrap';
|
|
@@ -7494,7 +7494,6 @@ const AuthGuard = (next) => {
|
|
|
7494
7494
|
let _offline = inject(OfflineManagerService);
|
|
7495
7495
|
let _aps = inject(AuthPermissionService);
|
|
7496
7496
|
// let _alert = inject(AlertService);
|
|
7497
|
-
let _state = inject(RouterStateSnapshot);
|
|
7498
7497
|
return new Promise((resolve) => {
|
|
7499
7498
|
_account.isInitCompleted().then(() => {
|
|
7500
7499
|
let user = _account.getUser();
|
|
@@ -7514,8 +7513,10 @@ const AuthGuard = (next) => {
|
|
|
7514
7513
|
resolve(false);
|
|
7515
7514
|
}
|
|
7516
7515
|
else {
|
|
7517
|
-
let view =
|
|
7516
|
+
let view = next.pathFromRoot.map(v => v.url.map(segment => segment.toString()).join('/')).join('/');
|
|
7518
7517
|
let moduleView = view.replace(/^(\/.*\/).*/, '$1');
|
|
7518
|
+
console.log(view);
|
|
7519
|
+
console.log(moduleView);
|
|
7519
7520
|
if (user.roles.super_admin) {
|
|
7520
7521
|
resolve(true);
|
|
7521
7522
|
}
|
|
@@ -7549,8 +7550,10 @@ const AuthGuard = (next) => {
|
|
|
7549
7550
|
resolve(false);
|
|
7550
7551
|
}
|
|
7551
7552
|
else {
|
|
7552
|
-
let view =
|
|
7553
|
+
let view = next.pathFromRoot.map(v => v.url.map(segment => segment.toString()).join('/')).join('/');
|
|
7553
7554
|
let moduleView = view.replace(/^(\/.*\/).*/, '$1');
|
|
7555
|
+
console.log(view);
|
|
7556
|
+
console.log(moduleView);
|
|
7554
7557
|
if (user.roles.super_admin) {
|
|
7555
7558
|
resolve(true);
|
|
7556
7559
|
}
|