@resolveio/client-lib-core 1.3.11 → 1.3.12
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 +11 -63
- package/fesm2015/resolveio-client-lib-core.mjs +10 -62
- package/fesm2015/resolveio-client-lib-core.mjs.map +1 -1
- package/fesm2020/resolveio-client-lib-core.mjs +10 -62
- package/fesm2020/resolveio-client-lib-core.mjs.map +1 -1
- package/package.json +1 -1
|
@@ -5522,35 +5522,10 @@ class AuthGuard {
|
|
|
5522
5522
|
else {
|
|
5523
5523
|
let view = state.url.replace(/^(\/[-a-z]+\/[^\/]+)\/.*$/, '$1').replace(/\?.+$/, '');
|
|
5524
5524
|
let moduleView = view.replace(/^(\/[-a-z]+\/).*$/, '$1');
|
|
5525
|
-
if (
|
|
5526
|
-
|
|
5527
|
-
resolve(true);
|
|
5528
|
-
}
|
|
5529
|
-
else if (!this.isLinkPartialRoute(view) && !user.roles.groups.some(a => a.views.some(b => b === view))) {
|
|
5530
|
-
if (user.roles.groups.some(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))) {
|
|
5531
|
-
let link = user.roles.groups.filter(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))[0].views.filter(a => a.startsWith(moduleView) && !this.doesLinkHaveParameter(a) && !this.isLinkFakeRoute(a))[0];
|
|
5532
|
-
this._router.navigateByUrl(link);
|
|
5533
|
-
}
|
|
5534
|
-
else {
|
|
5535
|
-
this._router.navigateByUrl('/home');
|
|
5536
|
-
}
|
|
5537
|
-
resolve(false);
|
|
5538
|
-
}
|
|
5539
|
-
else if (this.isLinkPartialRoute(view) && !user.roles.groups.some(a => a.views.some(b => b.startsWith(view) || view.startsWith(b)))) {
|
|
5540
|
-
if (user.roles.groups.some(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))) {
|
|
5541
|
-
let link = user.roles.groups.filter(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))[0].views.filter(a => a.startsWith(moduleView) && !this.doesLinkHaveParameter(a) && !this.isLinkFakeRoute(a))[0];
|
|
5542
|
-
this._router.navigateByUrl(link);
|
|
5543
|
-
}
|
|
5544
|
-
else {
|
|
5545
|
-
this._router.navigateByUrl('/home');
|
|
5546
|
-
}
|
|
5547
|
-
resolve(false);
|
|
5548
|
-
}
|
|
5549
|
-
else {
|
|
5550
|
-
resolve(true);
|
|
5551
|
-
}
|
|
5525
|
+
if (user.roles.super_admin) {
|
|
5526
|
+
resolve(true);
|
|
5552
5527
|
}
|
|
5553
|
-
else if (!this.isLinkPartialRoute(view) && user.roles.groups.some(a => a.views.some(b => b === view))) {
|
|
5528
|
+
else if (!this.isLinkPartialRoute(view) && !user.roles.groups.some(a => a.views.some(b => b === view))) {
|
|
5554
5529
|
if (user.roles.groups.some(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))) {
|
|
5555
5530
|
let link = user.roles.groups.filter(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))[0].views.filter(a => a.startsWith(moduleView) && !this.doesLinkHaveParameter(a) && !this.isLinkFakeRoute(a))[0];
|
|
5556
5531
|
this._router.navigateByUrl(link);
|
|
@@ -5560,7 +5535,7 @@ class AuthGuard {
|
|
|
5560
5535
|
}
|
|
5561
5536
|
resolve(false);
|
|
5562
5537
|
}
|
|
5563
|
-
else if (this.isLinkPartialRoute(view) && user.roles.groups.some(a => a.views.some(b => b.startsWith(view) || view.startsWith(b)))) {
|
|
5538
|
+
else if (this.isLinkPartialRoute(view) && !user.roles.groups.some(a => a.views.some(b => b.startsWith(view) || view.startsWith(b)))) {
|
|
5564
5539
|
if (user.roles.groups.some(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))) {
|
|
5565
5540
|
let link = user.roles.groups.filter(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))[0].views.filter(a => a.startsWith(moduleView) && !this.doesLinkHaveParameter(a) && !this.isLinkFakeRoute(a))[0];
|
|
5566
5541
|
this._router.navigateByUrl(link);
|
|
@@ -5571,8 +5546,7 @@ class AuthGuard {
|
|
|
5571
5546
|
resolve(false);
|
|
5572
5547
|
}
|
|
5573
5548
|
else {
|
|
5574
|
-
|
|
5575
|
-
resolve(false);
|
|
5549
|
+
resolve(true);
|
|
5576
5550
|
}
|
|
5577
5551
|
}
|
|
5578
5552
|
});
|
|
@@ -5593,35 +5567,10 @@ class AuthGuard {
|
|
|
5593
5567
|
else {
|
|
5594
5568
|
let view = state.url.replace(/^(\/[-a-z]+\/[^\/]+)\/.*$/, '$1').replace(/\?.+$/, '');
|
|
5595
5569
|
let moduleView = view.replace(/^(\/[-a-z]+\/).*$/, '$1');
|
|
5596
|
-
if (
|
|
5597
|
-
|
|
5598
|
-
resolve(true);
|
|
5599
|
-
}
|
|
5600
|
-
else if (!this.isLinkPartialRoute(view) && !user.roles.groups.some(a => a.views.some(b => b === view))) {
|
|
5601
|
-
if (user.roles.groups.some(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))) {
|
|
5602
|
-
let link = user.roles.groups.filter(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))[0].views.filter(a => a.startsWith(moduleView) && !this.doesLinkHaveParameter(a) && !this.isLinkFakeRoute(a))[0];
|
|
5603
|
-
this._router.navigateByUrl(link);
|
|
5604
|
-
}
|
|
5605
|
-
else {
|
|
5606
|
-
this._router.navigateByUrl('/home');
|
|
5607
|
-
}
|
|
5608
|
-
resolve(false);
|
|
5609
|
-
}
|
|
5610
|
-
else if (this.isLinkPartialRoute(view) && !user.roles.groups.some(a => a.views.some(b => b.startsWith(view) || view.startsWith(b)))) {
|
|
5611
|
-
if (user.roles.groups.some(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))) {
|
|
5612
|
-
let link = user.roles.groups.filter(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))[0].views.filter(a => a.startsWith(moduleView) && !this.doesLinkHaveParameter(a) && !this.isLinkFakeRoute(a))[0];
|
|
5613
|
-
this._router.navigateByUrl(link);
|
|
5614
|
-
}
|
|
5615
|
-
else {
|
|
5616
|
-
this._router.navigateByUrl('/home');
|
|
5617
|
-
}
|
|
5618
|
-
resolve(false);
|
|
5619
|
-
}
|
|
5620
|
-
else {
|
|
5621
|
-
resolve(true);
|
|
5622
|
-
}
|
|
5570
|
+
if (user.roles.super_admin) {
|
|
5571
|
+
resolve(true);
|
|
5623
5572
|
}
|
|
5624
|
-
else if (!this.isLinkPartialRoute(view) && user.roles.groups.some(a => a.views.some(b => b === view))) {
|
|
5573
|
+
else if (!this.isLinkPartialRoute(view) && !user.roles.groups.some(a => a.views.some(b => b === view))) {
|
|
5625
5574
|
if (user.roles.groups.some(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))) {
|
|
5626
5575
|
let link = user.roles.groups.filter(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))[0].views.filter(a => a.startsWith(moduleView) && !this.doesLinkHaveParameter(a) && !this.isLinkFakeRoute(a))[0];
|
|
5627
5576
|
this._router.navigateByUrl(link);
|
|
@@ -5631,7 +5580,7 @@ class AuthGuard {
|
|
|
5631
5580
|
}
|
|
5632
5581
|
resolve(false);
|
|
5633
5582
|
}
|
|
5634
|
-
else if (this.isLinkPartialRoute(view) && user.roles.groups.some(a => a.views.some(b => b.startsWith(view) || view.startsWith(b)))) {
|
|
5583
|
+
else if (this.isLinkPartialRoute(view) && !user.roles.groups.some(a => a.views.some(b => b.startsWith(view) || view.startsWith(b)))) {
|
|
5635
5584
|
if (user.roles.groups.some(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))) {
|
|
5636
5585
|
let link = user.roles.groups.filter(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))[0].views.filter(a => a.startsWith(moduleView) && !this.doesLinkHaveParameter(a) && !this.isLinkFakeRoute(a))[0];
|
|
5637
5586
|
this._router.navigateByUrl(link);
|
|
@@ -5642,8 +5591,7 @@ class AuthGuard {
|
|
|
5642
5591
|
resolve(false);
|
|
5643
5592
|
}
|
|
5644
5593
|
else {
|
|
5645
|
-
|
|
5646
|
-
resolve(false);
|
|
5594
|
+
resolve(true);
|
|
5647
5595
|
}
|
|
5648
5596
|
}
|
|
5649
5597
|
}
|