@resolveio/client-lib-core 1.3.12 → 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 +87 -37
  2. package/fesm2015/resolveio-client-lib-core.mjs +86 -36
  3. package/fesm2015/resolveio-client-lib-core.mjs.map +1 -1
  4. package/fesm2020/resolveio-client-lib-core.mjs +86 -36
  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,58 @@ 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);
5532
5539
  }
5533
- else {
5534
- this._router.navigateByUrl('/home');
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);
5535
5549
  }
5536
- resolve(false);
5537
5550
  }
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);
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);
5561
+ }
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);
5542
5571
  }
5543
5572
  else {
5544
- this._router.navigateByUrl('/home');
5573
+ resolve(true);
5545
5574
  }
5546
- resolve(false);
5547
- }
5548
- else {
5549
- resolve(true);
5550
5575
  }
5551
5576
  }
5552
5577
  });
@@ -5565,33 +5590,58 @@ class AuthGuard {
5565
5590
  resolve(false);
5566
5591
  }
5567
5592
  else {
5568
- let view = state.url.replace(/^(\/[-a-z]+\/[^\/]+)\/.*$/, '$1').replace(/\?.+$/, '');
5569
- let moduleView = view.replace(/^(\/[-a-z]+\/).*$/, '$1');
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
5570
5596
  if (user.roles.super_admin) {
5571
5597
  resolve(true);
5572
5598
  }
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);
5599
+ else if (!this.isLinkFakeRoute(fullView)) {
5600
+ if (!this.isLinkPartialRoute(fullView) && !user.roles.groups.some(a => a.views.some(b => b === fullView))) {
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);
5577
5609
  }
5578
- else {
5579
- this._router.navigateByUrl('/home');
5610
+ else if (this.isLinkPartialRoute(fullView) && !user.roles.groups.some(a => a.views.some(b => b.startsWith(fullView) || fullView.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);
5580
5619
  }
5581
- resolve(false);
5582
5620
  }
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);
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
+ }
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);
5587
5641
  }
5588
5642
  else {
5589
- this._router.navigateByUrl('/home');
5643
+ resolve(true);
5590
5644
  }
5591
- resolve(false);
5592
- }
5593
- else {
5594
- resolve(true);
5595
5645
  }
5596
5646
  }
5597
5647
  }