@resolveio/client-lib-core 1.3.12 → 1.3.14

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