@resolveio/client-lib-core 1.3.11 → 1.3.13

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.
Files changed (6) hide show
  1. package/esm2020/lib/auth/auth-guard.service.mjs +59 -61
  2. package/fesm2015/resolveio-client-lib-core.mjs +58 -60
  3. package/fesm2015/resolveio-client-lib-core.mjs.map +1 -1
  4. package/fesm2020/resolveio-client-lib-core.mjs +58 -60
  5. package/fesm2020/resolveio-client-lib-core.mjs.map +1 -1
  6. package/package.json +1 -1
package/fesm2020/resolveio-client-lib-core.mjs CHANGED
@@ -5520,13 +5520,14 @@ class AuthGuard {
5520
5520
  resolve(false);
5521
5521
  }
5522
5522
  else {
5523
- let view = state.url.replace(/^(\/[-a-z]+\/[^\/]+)\/.*$/, '$1').replace(/\?.+$/, '');
5524
- let moduleView = view.replace(/^(\/[-a-z]+\/).*$/, '$1');
5525
- if (!this.isLinkFakeRoute(view)) {
5526
- if (user.roles.super_admin) {
5527
- resolve(true);
5528
- }
5529
- else if (!this.isLinkPartialRoute(view) && !user.roles.groups.some(a => a.views.some(b => b === view))) {
5523
+ let fullView = state.url.replace(/\/[a-f0-9]{24}$/, '').replace(/\?.+$/, ''); //All but ID and Query String
5524
+ let partialView = state.url.replace(/^(\/[-a-z]+\/[^\/]+)\/.*$/, '$1').replace(/\?.+$/, ''); //Module and First Child Only
5525
+ let moduleView = partialView.replace(/^(\/[-a-z]+\/).*$/, '$1'); //Module Only
5526
+ if (user.roles.super_admin) {
5527
+ resolve(true);
5528
+ }
5529
+ else if (!this.isLinkFakeRoute(fullView)) {
5530
+ if (!this.isLinkPartialRoute(fullView) && !user.roles.groups.some(a => a.views.some(b => b === fullView))) {
5530
5531
  if (user.roles.groups.some(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))) {
5531
5532
  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
5533
  this._router.navigateByUrl(link);
@@ -5536,7 +5537,7 @@ class AuthGuard {
5536
5537
  }
5537
5538
  resolve(false);
5538
5539
  }
5539
- else if (this.isLinkPartialRoute(view) && !user.roles.groups.some(a => a.views.some(b => b.startsWith(view) || view.startsWith(b)))) {
5540
+ else if (this.isLinkPartialRoute(fullView) && !user.roles.groups.some(a => a.views.some(b => b.startsWith(fullView) || fullView.startsWith(b)))) {
5540
5541
  if (user.roles.groups.some(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))) {
5541
5542
  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
5543
  this._router.navigateByUrl(link);
@@ -5546,33 +5547,31 @@ class AuthGuard {
5546
5547
  }
5547
5548
  resolve(false);
5548
5549
  }
5549
- else {
5550
- resolve(true);
5551
- }
5552
5550
  }
5553
- else if (!this.isLinkPartialRoute(view) && user.roles.groups.some(a => a.views.some(b => b === view))) {
5554
- if (user.roles.groups.some(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))) {
5555
- 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
- this._router.navigateByUrl(link);
5557
- }
5558
- else {
5559
- this._router.navigateByUrl('/home');
5551
+ else {
5552
+ if (!this.isLinkPartialRoute(partialView) && !user.roles.groups.some(a => a.views.some(b => b === partialView))) {
5553
+ if (user.roles.groups.some(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))) {
5554
+ 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];
5555
+ this._router.navigateByUrl(link);
5556
+ }
5557
+ else {
5558
+ this._router.navigateByUrl('/home');
5559
+ }
5560
+ resolve(false);
5560
5561
  }
5561
- resolve(false);
5562
- }
5563
- else if (this.isLinkPartialRoute(view) && user.roles.groups.some(a => a.views.some(b => b.startsWith(view) || view.startsWith(b)))) {
5564
- if (user.roles.groups.some(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))) {
5565
- 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
- this._router.navigateByUrl(link);
5562
+ else if (this.isLinkPartialRoute(partialView) && !user.roles.groups.some(a => a.views.some(b => b.startsWith(partialView) || partialView.startsWith(b)))) {
5563
+ if (user.roles.groups.some(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))) {
5564
+ 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];
5565
+ this._router.navigateByUrl(link);
5566
+ }
5567
+ else {
5568
+ this._router.navigateByUrl('/home');
5569
+ }
5570
+ resolve(false);
5567
5571
  }
5568
5572
  else {
5569
- this._router.navigateByUrl('/home');
5573
+ resolve(true);
5570
5574
  }
5571
- resolve(false);
5572
- }
5573
- else {
5574
- this._router.navigateByUrl('/home');
5575
- resolve(false);
5576
5575
  }
5577
5576
  }
5578
5577
  });
@@ -5591,13 +5590,14 @@ class AuthGuard {
5591
5590
  resolve(false);
5592
5591
  }
5593
5592
  else {
5594
- let view = state.url.replace(/^(\/[-a-z]+\/[^\/]+)\/.*$/, '$1').replace(/\?.+$/, '');
5595
- let moduleView = view.replace(/^(\/[-a-z]+\/).*$/, '$1');
5596
- if (!this.isLinkFakeRoute(view)) {
5597
- if (user.roles.super_admin) {
5598
- resolve(true);
5599
- }
5600
- else if (!this.isLinkPartialRoute(view) && !user.roles.groups.some(a => a.views.some(b => b === view))) {
5593
+ let fullView = state.url.replace(/\/[a-f0-9]{24}$/, '').replace(/\?.+$/, ''); //All but ID and Query String
5594
+ let partialView = state.url.replace(/^(\/[-a-z]+\/[^\/]+)\/.*$/, '$1').replace(/\?.+$/, ''); //Module and First Child Only
5595
+ let moduleView = partialView.replace(/^(\/[-a-z]+\/).*$/, '$1'); //Module Only
5596
+ if (user.roles.super_admin) {
5597
+ resolve(true);
5598
+ }
5599
+ else if (!this.isLinkFakeRoute(fullView)) {
5600
+ if (!this.isLinkPartialRoute(fullView) && !user.roles.groups.some(a => a.views.some(b => b === fullView))) {
5601
5601
  if (user.roles.groups.some(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))) {
5602
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
5603
  this._router.navigateByUrl(link);
@@ -5607,7 +5607,7 @@ class AuthGuard {
5607
5607
  }
5608
5608
  resolve(false);
5609
5609
  }
5610
- else if (this.isLinkPartialRoute(view) && !user.roles.groups.some(a => a.views.some(b => b.startsWith(view) || view.startsWith(b)))) {
5610
+ else if (this.isLinkPartialRoute(fullView) && !user.roles.groups.some(a => a.views.some(b => b.startsWith(fullView) || fullView.startsWith(b)))) {
5611
5611
  if (user.roles.groups.some(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))) {
5612
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
5613
  this._router.navigateByUrl(link);
@@ -5617,33 +5617,31 @@ class AuthGuard {
5617
5617
  }
5618
5618
  resolve(false);
5619
5619
  }
5620
- else {
5621
- resolve(true);
5622
- }
5623
5620
  }
5624
- else if (!this.isLinkPartialRoute(view) && user.roles.groups.some(a => a.views.some(b => b === view))) {
5625
- if (user.roles.groups.some(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))) {
5626
- 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
- this._router.navigateByUrl(link);
5628
- }
5629
- else {
5630
- this._router.navigateByUrl('/home');
5621
+ else {
5622
+ if (!this.isLinkPartialRoute(partialView) && !user.roles.groups.some(a => a.views.some(b => b === partialView))) {
5623
+ if (user.roles.groups.some(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))) {
5624
+ 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];
5625
+ this._router.navigateByUrl(link);
5626
+ }
5627
+ else {
5628
+ this._router.navigateByUrl('/home');
5629
+ }
5630
+ resolve(false);
5631
5631
  }
5632
- resolve(false);
5633
- }
5634
- else if (this.isLinkPartialRoute(view) && user.roles.groups.some(a => a.views.some(b => b.startsWith(view) || view.startsWith(b)))) {
5635
- if (user.roles.groups.some(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))) {
5636
- 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
- this._router.navigateByUrl(link);
5632
+ else if (this.isLinkPartialRoute(partialView) && !user.roles.groups.some(a => a.views.some(b => b.startsWith(partialView) || partialView.startsWith(b)))) {
5633
+ if (user.roles.groups.some(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))) {
5634
+ 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];
5635
+ this._router.navigateByUrl(link);
5636
+ }
5637
+ else {
5638
+ this._router.navigateByUrl('/home');
5639
+ }
5640
+ resolve(false);
5638
5641
  }
5639
5642
  else {
5640
- this._router.navigateByUrl('/home');
5643
+ resolve(true);
5641
5644
  }
5642
- resolve(false);
5643
- }
5644
- else {
5645
- this._router.navigateByUrl('/home');
5646
- resolve(false);
5647
5645
  }
5648
5646
  }
5649
5647
  }