@resolveio/client-lib-core 1.3.7 → 1.3.9

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 +67 -57
  2. package/fesm2015/resolveio-client-lib-core.mjs +66 -56
  3. package/fesm2015/resolveio-client-lib-core.mjs.map +1 -1
  4. package/fesm2020/resolveio-client-lib-core.mjs +66 -56
  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,11 +5522,39 @@ 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 (!this.isLinkFakeRoute(view)) {
5526
- if (user.roles.super_admin) {
5527
- resolve(true);
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
+ }
5528
5556
  }
5529
- else if (!this.isLinkPartialRoute(view) && !user.roles.groups.some(a => a.views.some(b => b === view))) {
5557
+ else if (!this.isLinkPartialRoute(view) && user.roles.groups.some(a => a.views.some(b => b === view))) {
5530
5558
  if (user.roles.groups.some(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))) {
5531
5559
  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
5560
  this._router.navigateByUrl(link);
@@ -5536,7 +5564,7 @@ class AuthGuard {
5536
5564
  }
5537
5565
  resolve(false);
5538
5566
  }
5539
- else if (this.isLinkPartialRoute(view) && !user.roles.groups.some(a => a.views.some(b => view.startsWith(b)))) {
5567
+ else if (this.isLinkPartialRoute(view) && user.roles.groups.some(a => a.views.some(b => b.startsWith(view) || view.startsWith(b)))) {
5540
5568
  if (user.roles.groups.some(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))) {
5541
5569
  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
5570
  this._router.navigateByUrl(link);
@@ -5546,32 +5574,9 @@ class AuthGuard {
5546
5574
  }
5547
5575
  resolve(false);
5548
5576
  }
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
5577
  else {
5559
5578
  this._router.navigateByUrl('/home');
5560
5579
  }
5561
- resolve(false);
5562
- }
5563
- else if (this.isLinkPartialRoute(view) && !user.roles.groups.some(a => a.views.some(b => 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
- }
5568
- else {
5569
- this._router.navigateByUrl('/home');
5570
- }
5571
- resolve(false);
5572
- }
5573
- else {
5574
- this._router.navigateByUrl('/home');
5575
5580
  }
5576
5581
  }
5577
5582
  });
@@ -5592,11 +5597,39 @@ class AuthGuard {
5592
5597
  else {
5593
5598
  let view = state.url.replace(/^(\/[-a-z]+\/[^\/]+)\/.*$/, '$1').replace(/\?.+$/, '');
5594
5599
  let moduleView = view.replace(/^(\/[-a-z]+\/).*$/, '$1');
5595
- if (!this.isLinkFakeRoute(view)) {
5596
- if (user.roles.super_admin) {
5597
- resolve(true);
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
+ }
5598
5631
  }
5599
- else if (!this.isLinkPartialRoute(view) && !user.roles.groups.some(a => a.views.some(b => b === view))) {
5632
+ else if (!this.isLinkPartialRoute(view) && user.roles.groups.some(a => a.views.some(b => b === view))) {
5600
5633
  if (user.roles.groups.some(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))) {
5601
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];
5602
5635
  this._router.navigateByUrl(link);
@@ -5606,7 +5639,7 @@ class AuthGuard {
5606
5639
  }
5607
5640
  resolve(false);
5608
5641
  }
5609
- else if (this.isLinkPartialRoute(view) && !user.roles.groups.some(a => a.views.some(b => view.startsWith(b)))) {
5642
+ else if (this.isLinkPartialRoute(view) && user.roles.groups.some(a => a.views.some(b => b.startsWith(view) || view.startsWith(b)))) {
5610
5643
  if (user.roles.groups.some(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))) {
5611
5644
  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];
5612
5645
  this._router.navigateByUrl(link);
@@ -5616,32 +5649,9 @@ class AuthGuard {
5616
5649
  }
5617
5650
  resolve(false);
5618
5651
  }
5619
- else {
5620
- resolve(true);
5621
- }
5622
- }
5623
- else if (!this.isLinkPartialRoute(view) && !user.roles.groups.some(a => a.views.some(b => b === view))) {
5624
- if (user.roles.groups.some(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))) {
5625
- 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];
5626
- this._router.navigateByUrl(link);
5627
- }
5628
- else {
5629
- this._router.navigateByUrl('/home');
5630
- }
5631
- resolve(false);
5632
- }
5633
- else if (this.isLinkPartialRoute(view) && !user.roles.groups.some(a => a.views.some(b => view.startsWith(b)))) {
5634
- if (user.roles.groups.some(a => a.views.some(b => b.startsWith(moduleView) && !this.doesLinkHaveParameter(b) && !this.isLinkFakeRoute(b)))) {
5635
- 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];
5636
- this._router.navigateByUrl(link);
5637
- }
5638
5652
  else {
5639
5653
  this._router.navigateByUrl('/home');
5640
5654
  }
5641
- resolve(false);
5642
- }
5643
- else {
5644
- this._router.navigateByUrl('/home');
5645
5655
  }
5646
5656
  }
5647
5657
  }