ngx-sp-auth 4.23.2 → 4.23.4

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';
@@ -521,6 +521,7 @@ class AuthStorageService {
         this._indexedDBService = _indexedDBService;
         this._customEnvironmentService = _customEnvironmentService;
         this._router = _router;
+        this._ipService = inject(IpServiceService);
         this._BASE_URL = ''; // SpInfra2LoginWS
         this._LOGOUT_BASE_URL = ''; // SpInfra2LoginWS
         this._BASE_VERIFICATION_URL = ''; // SpInfra2LoginWS
@@ -828,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);
@@ -1248,7 +1252,7 @@ class AuthService {
         const url = `${this._AUTH_BASE_URL}/GetAuthentication`;
         const headers = this._HTTP_HEADERS;
         return this._httpClient
-            .post(url, null, { 'params': params, 'headers': headers })
+            .post(url, null, { 'params': params, 'headers': headers, withCredentials: true })
             .pipe(take$1(1), tap$1((response) => {
             if (response.Error) {
                 throw Error(response.ErrorMessage);
@@ -1288,7 +1292,7 @@ class AuthService {
         const url = `${this._BASE_URL}/ValidateLogin`;
         const headers = this._HTTP_HEADERS;
         return this._httpClient
-            .post(url, login, { 'params': params, 'headers': headers })
+            .post(url, login, { 'params': params, 'headers': headers, withCredentials: true })
             .pipe(take$1(1), tap$1((response) => {
             // Limnpa o armazenamento local do navegador que contém os filtros de um produto específico (com base na prop 'product' do environment)
             this._indexedDBService.closeOpenConnection()
@@ -1368,7 +1372,7 @@ class AuthService {
         const url = `${this._BASE_URL}/ValidateLogin`;
         const headers = this._HTTP_HEADERS;
         return this._httpClient
-            .post(url, login, { 'params': params, 'headers': headers })
+            .post(url, login, { 'params': params, 'headers': headers, withCredentials: true })
             .pipe(take$1(1), tap$1((response) => {
             if (response.FeedbackMessage != "") {
                 return;
@@ -1412,7 +1416,7 @@ class AuthService {
         const url = `${this._BASE_URL}/ValidateExternalLogin`;
         const headers = this._HTTP_HEADERS;
         return this._httpClient
-            .post(url, login, { 'params': params, 'headers': headers })
+            .post(url, login, { 'params': params, 'headers': headers, withCredentials: true })
             .pipe(take$1(1), tap$1((response) => {
             if (!response.Error) {
                 this._authStorageService.isLoggedInSub.next(true);
@@ -1458,7 +1462,7 @@ class AuthService {
         const url = `${this._BASE_OS_URL}/ValidateOSLogin`;
         const headers = this._HTTP_HEADERS;
         return this._httpClient
-            .post(url, login, { 'params': params, 'headers': headers })
+            .post(url, login, { 'params': params, 'headers': headers, withCredentials: true })
             .pipe(take$1(1), tap$1((response) => {
             if (response.FeedbackMessage != "" && response.FeedbackMessage != null) {
                 return;
@@ -1512,7 +1516,7 @@ class AuthService {
         const url = `${this._BASE_URL}/ValidadeLogin2FaWithEmail`;
         const headers = this._HTTP_HEADERS;
         return this._httpClient
-            .post(url, Code2Fa, { 'params': params, 'headers': headers })
+            .post(url, Code2Fa, { 'params': params, 'headers': headers, withCredentials: true })
             .pipe(take$1(1), tap$1((response) => {
             if (response.Error) {
                 throw Error(response.ErrorMessage);
@@ -1553,7 +1557,7 @@ class AuthService {
         const url = `${this._BASE_URL}/GetNewCode2FaWithEmail`;
         const headers = this._HTTP_HEADERS;
         return this._httpClient
-            .post(url, null, { 'params': params, 'headers': headers })
+            .post(url, null, { 'params': params, 'headers': headers, withCredentials: true })
             .pipe(take$1(1), tap$1((response) => {
             if (response.Error) {
                 throw Error(response.ErrorMessage);
@@ -1572,7 +1576,7 @@ class AuthService {
         const headers = this._HTTP_HEADERS;
         const url = `${this._BASE_URL}/ForgottenPassword`;
         return this._httpClient
-            .post(url, null, { 'params': params, 'headers': headers })
+            .post(url, null, { 'params': params, 'headers': headers, withCredentials: true })
             .pipe(take$1(1), tap$1((response) => {
             if (response.Error) {
                 throw Error(response.ErrorMessage);
@@ -1591,7 +1595,7 @@ class AuthService {
         const headers = this._HTTP_HEADERS;
         const url = `${this._BASE_URL}/RecoverPassword`;
         return this._httpClient
-            .post(url, recupPassword, { 'params': params, 'headers': headers })
+            .post(url, recupPassword, { 'params': params, 'headers': headers, withCredentials: true })
             .pipe(take$1(1), tap$1((response) => {
             if (response.Error) {
                 throw Error(response.ErrorMessage);
@@ -1610,7 +1614,7 @@ class AuthService {
         const headers = this._HTTP_HEADERS;
         const url = `${this._BASE_URL}/CreatePassword`;
         return this._httpClient
-            .post(url, recupPassword, { 'params': params, 'headers': headers })
+            .post(url, recupPassword, { 'params': params, 'headers': headers, withCredentials: true })
             .pipe(take$1(1), tap$1((response) => {
             if (response.Error) {
                 throw Error(response.ErrorMessage);
@@ -4513,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();
     }