@resolveio/client-lib-core 1.3.9 → 1.3.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.
Files changed (6) hide show
  1. package/esm2020/lib/auth/auth-guard.service.mjs +59 -67
  2. package/fesm2015/resolveio-client-lib-core.mjs +58 -66
  3. package/fesm2015/resolveio-client-lib-core.mjs.map +1 -1
  4. package/fesm2020/resolveio-client-lib-core.mjs +58 -66
  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
@@ -5522,39 +5522,11 @@ 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 (view === '/home') {
5526
- resolve(true);
5527
- }
5528
- else {
5529
- if (!this.isLinkFakeRoute(view)) {
5530
- if (user.roles.super_admin) {
5531
- resolve(true);
5532
- }
5533
- else if (!this.isLinkPartialRoute(view) && !user.roles.groups.some(a => a.views.some(b => b === view))) {
5534
- if (user.roles.groups.some(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))) {
5535
- 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];
5536
- this._router.navigateByUrl(link);
5537
- }
5538
- else {
5539
- this._router.navigateByUrl('/home');
5540
- }
5541
- resolve(false);
5542
- }
5543
- else if (this.isLinkPartialRoute(view) && !user.roles.groups.some(a => a.views.some(b => b.startsWith(view) || view.startsWith(b)))) {
5544
- if (user.roles.groups.some(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))) {
5545
- 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];
5546
- this._router.navigateByUrl(link);
5547
- }
5548
- else {
5549
- this._router.navigateByUrl('/home');
5550
- }
5551
- resolve(false);
5552
- }
5553
- else {
5554
- resolve(true);
5555
- }
5525
+ if (!this.isLinkFakeRoute(view)) {
5526
+ if (user.roles.super_admin) {
5527
+ resolve(true);
5556
5528
  }
5557
- else if (!this.isLinkPartialRoute(view) && user.roles.groups.some(a => a.views.some(b => b === view))) {
5529
+ else if (!this.isLinkPartialRoute(view) && !user.roles.groups.some(a => a.views.some(b => b === view))) {
5558
5530
  if (user.roles.groups.some(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))) {
5559
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];
5560
5532
  this._router.navigateByUrl(link);
@@ -5564,7 +5536,7 @@ class AuthGuard {
5564
5536
  }
5565
5537
  resolve(false);
5566
5538
  }
5567
- else if (this.isLinkPartialRoute(view) && user.roles.groups.some(a => a.views.some(b => b.startsWith(view) || view.startsWith(b)))) {
5539
+ else if (this.isLinkPartialRoute(view) && !user.roles.groups.some(a => a.views.some(b => b.startsWith(view) || view.startsWith(b)))) {
5568
5540
  if (user.roles.groups.some(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))) {
5569
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];
5570
5542
  this._router.navigateByUrl(link);
@@ -5574,9 +5546,33 @@ class AuthGuard {
5574
5546
  }
5575
5547
  resolve(false);
5576
5548
  }
5549
+ else {
5550
+ resolve(true);
5551
+ }
5552
+ }
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');
5560
+ }
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);
5567
+ }
5577
5568
  else {
5578
5569
  this._router.navigateByUrl('/home');
5579
5570
  }
5571
+ resolve(false);
5572
+ }
5573
+ else {
5574
+ this._router.navigateByUrl('/home');
5575
+ resolve(false);
5580
5576
  }
5581
5577
  }
5582
5578
  });
@@ -5597,39 +5593,11 @@ class AuthGuard {
5597
5593
  else {
5598
5594
  let view = state.url.replace(/^(\/[-a-z]+\/[^\/]+)\/.*$/, '$1').replace(/\?.+$/, '');
5599
5595
  let moduleView = view.replace(/^(\/[-a-z]+\/).*$/, '$1');
5600
- if (view === '/home') {
5601
- resolve(true);
5602
- }
5603
- else {
5604
- if (!this.isLinkFakeRoute(view)) {
5605
- if (user.roles.super_admin) {
5606
- resolve(true);
5607
- }
5608
- else if (!this.isLinkPartialRoute(view) && !user.roles.groups.some(a => a.views.some(b => b === view))) {
5609
- if (user.roles.groups.some(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))) {
5610
- 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];
5611
- this._router.navigateByUrl(link);
5612
- }
5613
- else {
5614
- this._router.navigateByUrl('/home');
5615
- }
5616
- resolve(false);
5617
- }
5618
- else if (this.isLinkPartialRoute(view) && !user.roles.groups.some(a => a.views.some(b => b.startsWith(view) || view.startsWith(b)))) {
5619
- if (user.roles.groups.some(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))) {
5620
- 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];
5621
- this._router.navigateByUrl(link);
5622
- }
5623
- else {
5624
- this._router.navigateByUrl('/home');
5625
- }
5626
- resolve(false);
5627
- }
5628
- else {
5629
- resolve(true);
5630
- }
5596
+ if (!this.isLinkFakeRoute(view)) {
5597
+ if (user.roles.super_admin) {
5598
+ resolve(true);
5631
5599
  }
5632
- else if (!this.isLinkPartialRoute(view) && user.roles.groups.some(a => a.views.some(b => b === view))) {
5600
+ else if (!this.isLinkPartialRoute(view) && !user.roles.groups.some(a => a.views.some(b => b === view))) {
5633
5601
  if (user.roles.groups.some(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))) {
5634
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];
5635
5603
  this._router.navigateByUrl(link);
@@ -5639,7 +5607,7 @@ class AuthGuard {
5639
5607
  }
5640
5608
  resolve(false);
5641
5609
  }
5642
- 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(view) && !user.roles.groups.some(a => a.views.some(b => b.startsWith(view) || view.startsWith(b)))) {
5643
5611
  if (user.roles.groups.some(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))) {
5644
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];
5645
5613
  this._router.navigateByUrl(link);
@@ -5649,9 +5617,33 @@ class AuthGuard {
5649
5617
  }
5650
5618
  resolve(false);
5651
5619
  }
5620
+ else {
5621
+ resolve(true);
5622
+ }
5623
+ }
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');
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);
5638
+ }
5652
5639
  else {
5653
5640
  this._router.navigateByUrl('/home');
5654
5641
  }
5642
+ resolve(false);
5643
+ }
5644
+ else {
5645
+ this._router.navigateByUrl('/home');
5646
+ resolve(false);
5655
5647
  }
5656
5648
  }
5657
5649
  }