ngx-sp-auth 4.23.5 → 4.23.7

package/fesm2022/ngx-sp-auth.mjs

@@ -8,16 +8,17 @@ import { LogLevel, PublicClientApplication, InteractionType } from '@azure/msal-
 import { take as take$1, tap as tap$1, map as map$1, switchMap as switchMap$1 } from 'rxjs/operators';
 import * as i1$1 from '@angular/router';
 import { RouterLink, NavigationEnd, RouterOutlet } from '@angular/router';
-import { BehaviorSubject, map, catchError, of, finalize, shareReplay, defer, take, tap, firstValueFrom, Subject, Subscription, debounceTime, distinctUntilChanged, filter, switchMap, timer, lastValueFrom, from, throwError } from 'rxjs';
 import * as i3 from 'ngx-sp-infra';
-import { IpServiceService, GlobalLoadingService, Utils, SearchInputComponent, InfraModule, FormUtils, Usuario, RetPasswordPolicy, RetCheckPassword, CheckPasswordRecord, PasswordPolicyComponent, LibIconsComponent, ContentContainerComponent } from 'ngx-sp-infra';
+import { IpServiceService, Utils, SearchInputComponent, InfraModule, FormUtils, Usuario, RetPasswordPolicy, RetCheckPassword, CheckPasswordRecord, PasswordPolicyComponent, LibIconsComponent, ContentContainerComponent } from 'ngx-sp-infra';
+import * as i10 from 'ngx-toastr';
+import { ToastrService } from 'ngx-toastr';
+import { BehaviorSubject, map, catchError, of, finalize, shareReplay, defer, take, tap, firstValueFrom, Subject, Subscription, debounceTime, distinctUntilChanged, filter, switchMap, timer, lastValueFrom, from, throwError } from 'rxjs';
 import { openDB, deleteDB } from 'idb';
 import * as i17 from '@angular/common';
 import { NgIf, CommonModule, NgClass } from '@angular/common';
 import * as i7 from '@angular/forms';
 import { Validators, ReactiveFormsModule, FormGroup, FormControl, FormsModule } from '@angular/forms';
 import * as i8 from '@angular/platform-browser';
-import * as i10 from 'ngx-toastr';
 import * as i11 from '@angular/cdk/layout';
 import { Breakpoints } from '@angular/cdk/layout';
 import * as i15 from 'ngx-bootstrap/popover';
@@ -522,7 +523,7 @@ class AuthStorageService {
         this._customEnvironmentService = _customEnvironmentService;
         this._router = _router;
         this._ipService = inject(IpServiceService);
-        this._globalLoadingService = inject(GlobalLoadingService);
+        this._toastr = inject(ToastrService);
         this._BASE_URL = ''; // SpInfra2LoginWS
         this._LOGOUT_BASE_URL = ''; // SpInfra2LoginWS
         this._BASE_VERIFICATION_URL = ''; // SpInfra2LoginWS
@@ -831,7 +832,7 @@ class AuthStorageService {
         const url = `${this._BASE_VERIFICATION_URL}`;
         const headers = this._HTTP_HEADERS;
         return defer(() => {
-            this._globalLoadingService.show(false, 'Validando token do usuário.');
+            this._toastr.info('Validando token do usuário.', 'Aguarde...', { timeOut: 3000, progressBar: true, progressAnimation: 'increasing', closeButton: true });
             const params = new HttpParams()
                 .set('ip', this.ip)
                 .set('browser', this._ipService.getDataBrowserUser().browser);
@@ -842,7 +843,9 @@ class AuthStorageService {
                 else
                     this.isLoggedInSub.next(true);
             }));
-        }).pipe(finalize(() => this._globalLoadingService.hide()));
+        }).pipe(finalize(() => {
+            this._toastr.clear();
+        }));
     }
     /** Verifica a cada diferença de tempo entre a data atual e a data do token. */
     // public async reCheckLogin(renew: boolean) {
@@ -4701,7 +4704,7 @@ class LoginGuard {
      * @param route Rota atual
      * @param segments Segmentos.
      * @returns
-     */
+    */
     canLoad(_route, _segments) {
         return this.authStorageService.checkAuthentication()
             .pipe(map(() => {
@@ -4711,6 +4714,15 @@ class LoginGuard {
             return true;
         }));
     }
+    canMatch(_route, segments) {
+        return this.authStorageService.checkAuthentication()
+            .pipe(map(() => {
+            if ((_route.path === "auth/login" && this.authStorageService.isLoggedInSub.value && !this.authStorageService.isExternalLogin)) {
+                return this.router.createUrlTree(["/home"]);
+            }
+            return true;
+        }));
+    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: LoginGuard, deps: [{ token: i1$1.Router }, { token: AuthStorageService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: LoginGuard, providedIn: 'root' }); }
 }