ngx-sp-auth 4.23.1 → 4.23.3

package/fesm2022/ngx-sp-auth.mjs

@@ -1,5 +1,5 @@
 import * as i0 from '@angular/core';
-import { importProvidersFrom, NgModule, InjectionToken, Inject, Injectable, ViewContainerRef, ViewChild, Component, EventEmitter, Output, Input, TemplateRef, ContentChild, inject } from '@angular/core';
+import { importProvidersFrom, NgModule, InjectionToken, Inject, Injectable, inject, ViewContainerRef, ViewChild, Component, EventEmitter, Output, Input, TemplateRef, ContentChild } from '@angular/core';
 import * as i1 from '@angular/common/http';
 import { HTTP_INTERCEPTORS, HttpHeaders, HttpClient, HttpParams, HttpResponse } from '@angular/common/http';
 import * as i1$2 from '@azure/msal-angular';
@@ -9,9 +9,9 @@ import { take as take$1, tap as tap$1, map as map$1, switchMap as switchMap$1 }
 import * as i1$1 from '@angular/router';
 import { RouterLink, NavigationEnd, RouterOutlet } from '@angular/router';
 import { BehaviorSubject, map, catchError, of, finalize, shareReplay, take, tap, firstValueFrom, Subject, Subscription, debounceTime, distinctUntilChanged, filter, switchMap, timer, lastValueFrom, from, throwError } from 'rxjs';
-import { openDB, deleteDB } from 'idb';
 import * as i3 from 'ngx-sp-infra';
-import { 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 { openDB, deleteDB } from 'idb';
 import * as i17 from '@angular/common';
 import { NgIf, CommonModule, NgClass } from '@angular/common';
 import * as i7 from '@angular/forms';
@@ -512,82 +512,16 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.25", ngImpo
                 }]
         }], ctorParameters: () => [{ type: LibCustomEnvironmentService }] });
 
-class LibCustomLoginService {
-    constructor(_customLoginService) {
-        this._customLoginService = _customLoginService;
-    }
-    // #region Propriedade Customizadas para o Componente login.component.ts
-    get loginTitle() {
-        return this._customLoginService.loginTitle;
-    }
-    get loginSubtitle() {
-        return this._customLoginService.loginSubtitle;
-    }
-    get loginBackground() {
-        return this._customLoginService.loginBackground;
-    }
-    get loginLogotipo() {
-        return this._customLoginService.loginLogotipo;
-    }
-    get loginAltLogotipo() {
-        return this._customLoginService.loginAltLogotipo;
-    }
-    get loginPageTitle() {
-        return this._customLoginService.loginPageTitle;
-    }
-    get loginDesenvDomain() {
-        return this._customLoginService.loginDesenvDomain;
-    }
-    get loginDesenvUser() {
-        return this._customLoginService.loginDesenvUser;
-    }
-    get loginDesenvPassword() {
-        return this._customLoginService.loginDesenvPassword;
-    }
-    // #endregion Propriedade Customizadas para o Componente login.component.ts
-    // #region Métodos Customizadas para o Componente auth.service.ts
-    /**
-     * Método executado no auth.service.ts - método: login ()
-     * Utilizado para inicializações diversas
-     */
-    authLogin() {
-        this._customLoginService.authLogin();
-    }
-    /**
-     * Método executado no auth.service.ts - método: logout ()
-     * Utilizado para inicializações diversas
-     */
-    authLogout() {
-        this._customLoginService.authLogout();
-    }
-    /**
-     * Método executado no auth.service.ts - método: login ()
-     * Utilizado para informar o redirecionamento para a tela inicial após o login ok
-     *
-     * @param router Objeto de Router que será utilizado
-     */
-    authNavigateToPage(router) {
-        this._customLoginService.authNavigateToPage(router);
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: LibCustomLoginService, deps: [{ token: LIB_CUSTOM_LOGIN_SERVICE }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: LibCustomLoginService, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: LibCustomLoginService, decorators: [{
-            type: Injectable,
-            args: [{ providedIn: 'root' }]
-        }], ctorParameters: () => [{ type: undefined, decorators: [{
-                    type: Inject,
-                    args: [LIB_CUSTOM_LOGIN_SERVICE]
-                }] }] });
-
 class AuthStorageService {
-    constructor(_httpBackend, _customStorageService, _indexedDBService, _customEnvironmentService, _customLoginService, _router) {
+    constructor(_httpBackend, _customStorageService, _indexedDBService, _customEnvironmentService, 
+    // private _customLoginService: LibCustomLoginService,
+    _router) {
         this._httpBackend = _httpBackend;
         this._customStorageService = _customStorageService;
         this._indexedDBService = _indexedDBService;
         this._customEnvironmentService = _customEnvironmentService;
-        this._customLoginService = _customLoginService;
         this._router = _router;
+        this._ipService = inject(IpServiceService);
         this._BASE_URL = ''; // SpInfra2LoginWS
         this._LOGOUT_BASE_URL = ''; // SpInfra2LoginWS
         this._BASE_VERIFICATION_URL = ''; // SpInfra2LoginWS
@@ -895,7 +829,10 @@ class AuthStorageService {
     verifyToken() {
         const url = `${this._BASE_VERIFICATION_URL}`;
         const headers = this._HTTP_HEADERS;
-        return this._httpClient.get(url, { 'headers': headers, withCredentials: true })
+        const params = new HttpParams()
+            .set('ip', this.ip)
+            .set('browser', this._ipService.getDataBrowserUser().browser);
+        return this._httpClient.get(url, { params, 'headers': headers, withCredentials: true })
             .pipe(take(1), tap(res => {
             if (res.Error)
                 this.isLoggedInSub.next(false);
@@ -958,7 +895,7 @@ class AuthStorageService {
             localStorage.removeItem('configServerPassword');
             this.onLogout();
             // Método com customizações para inicializações do Logout
-            this._customLoginService.authLogout();
+            // this._customLoginService.authLogout();
         });
         return this._router.navigate(["/auth/login"]);
     }
@@ -1065,13 +1002,81 @@ class AuthStorageService {
             return false;
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: AuthStorageService, deps: [{ token: i1.HttpBackend }, { token: LibCustomStorageService }, { token: IndexedDBService }, { token: LibCustomEnvironmentService }, { token: LibCustomLoginService }, { token: i1$1.Router }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: AuthStorageService, deps: [{ token: i1.HttpBackend }, { token: LibCustomStorageService }, { token: IndexedDBService }, { token: LibCustomEnvironmentService }, { token: i1$1.Router }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: AuthStorageService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: AuthStorageService, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
-        }], ctorParameters: () => [{ type: i1.HttpBackend }, { type: LibCustomStorageService }, { type: IndexedDBService }, { type: LibCustomEnvironmentService }, { type: LibCustomLoginService }, { type: i1$1.Router }] });
+        }], ctorParameters: () => [{ type: i1.HttpBackend }, { type: LibCustomStorageService }, { type: IndexedDBService }, { type: LibCustomEnvironmentService }, { type: i1$1.Router }] });
+
+class LibCustomLoginService {
+    constructor(_customLoginService) {
+        this._customLoginService = _customLoginService;
+    }
+    // #region Propriedade Customizadas para o Componente login.component.ts
+    get loginTitle() {
+        return this._customLoginService.loginTitle;
+    }
+    get loginSubtitle() {
+        return this._customLoginService.loginSubtitle;
+    }
+    get loginBackground() {
+        return this._customLoginService.loginBackground;
+    }
+    get loginLogotipo() {
+        return this._customLoginService.loginLogotipo;
+    }
+    get loginAltLogotipo() {
+        return this._customLoginService.loginAltLogotipo;
+    }
+    get loginPageTitle() {
+        return this._customLoginService.loginPageTitle;
+    }
+    get loginDesenvDomain() {
+        return this._customLoginService.loginDesenvDomain;
+    }
+    get loginDesenvUser() {
+        return this._customLoginService.loginDesenvUser;
+    }
+    get loginDesenvPassword() {
+        return this._customLoginService.loginDesenvPassword;
+    }
+    // #endregion Propriedade Customizadas para o Componente login.component.ts
+    // #region Métodos Customizadas para o Componente auth.service.ts
+    /**
+     * Método executado no auth.service.ts - método: login ()
+     * Utilizado para inicializações diversas
+     */
+    authLogin() {
+        this._customLoginService.authLogin();
+    }
+    /**
+     * Método executado no auth.service.ts - método: logout ()
+     * Utilizado para inicializações diversas
+     */
+    authLogout() {
+        this._customLoginService.authLogout();
+    }
+    /**
+     * Método executado no auth.service.ts - método: login ()
+     * Utilizado para informar o redirecionamento para a tela inicial após o login ok
+     *
+     * @param router Objeto de Router que será utilizado
+     */
+    authNavigateToPage(router) {
+        this._customLoginService.authNavigateToPage(router);
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: LibCustomLoginService, deps: [{ token: LIB_CUSTOM_LOGIN_SERVICE }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: LibCustomLoginService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: LibCustomLoginService, decorators: [{
+            type: Injectable,
+            args: [{ providedIn: 'root' }]
+        }], ctorParameters: () => [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: [LIB_CUSTOM_LOGIN_SERVICE]
+                }] }] });
 
 class AuthUtilService {
     constructor(_authStorageService, _checkUrlAndMethodService, _customEnvironmentService, _message, _router) {
@@ -4512,6 +4517,12 @@ class AuthGuard {
             return true;
         }));
     }
+    canMatch(_route, segments) {
+        if (segments[0]?.path.toLowerCase() === 'auth') {
+            return of(false);
+        }
+        return this.IsUserAuth();
+    }
     canActivate(_route, _state) {
         return this.IsUserAuth();
     }
@@ -4734,9 +4745,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.25", ngImpo
  * Depende do serviço de autenticação.
 */
 class AuthAplicInterceptor {
-    constructor(_authCheckService, _authStorage, _customEnvironmentService) {
+    constructor(_authCheckService, _customEnvironmentService) {
         this._authCheckService = _authCheckService;
-        this._authStorage = _authStorage;
         this._customEnvironmentService = _customEnvironmentService;
     }
     intercept(req, next) {
@@ -4766,13 +4776,13 @@ class AuthAplicInterceptor {
             return throwError(() => error);
         })));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: AuthAplicInterceptor, deps: [{ token: i3.CheckUrlAndMethodService }, { token: AuthStorageService }, { token: LibCustomEnvironmentService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: AuthAplicInterceptor, deps: [{ token: i3.CheckUrlAndMethodService }, { token: LibCustomEnvironmentService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: AuthAplicInterceptor, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: AuthAplicInterceptor, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
-        }], ctorParameters: () => [{ type: i3.CheckUrlAndMethodService }, { type: AuthStorageService }, { type: LibCustomEnvironmentService }] });
+        }], ctorParameters: () => [{ type: i3.CheckUrlAndMethodService }, { type: LibCustomEnvironmentService }] });
 
 /** Intercepta uma chamada HTTP para inserir a autenticação da básica das APIs nos Cookies (e no header, para compatibilidade) */
 class AuthInfraInterceptor {