ngx-sp-auth 4.20.7 → 4.20.8

package/fesm2022/ngx-sp-auth.mjs

@@ -5,10 +5,10 @@ import { HTTP_INTERCEPTORS, HttpClient, HttpHeaders, HttpParams } from '@angular
 import * as i1$2 from '@azure/msal-angular';
 import { MsalInterceptor, MsalGuard, MsalModule, MSAL_GUARD_CONFIG } from '@azure/msal-angular';
 import { LogLevel, PublicClientApplication, InteractionType } from '@azure/msal-browser';
+import { BehaviorSubject, take, tap, firstValueFrom, Subject, Subscription, debounceTime, distinctUntilChanged, filter, switchMap, timer, map as map$1, of, lastValueFrom, from } from 'rxjs';
 import { take as take$1, tap as tap$1, map, switchMap as switchMap$1 } from 'rxjs/operators';
 import * as i1$1 from '@angular/router';
 import { RouterLink, NavigationEnd, RouterOutlet } from '@angular/router';
-import { BehaviorSubject, take, tap, Subject, Subscription, debounceTime, distinctUntilChanged, filter, switchMap, timer, map as map$1, firstValueFrom, of, lastValueFrom, from } from 'rxjs';
 import * as i3 from 'ngx-sp-infra';
 import { Utils, SearchInputComponent, InfraModule, FormUtils, LibIconsComponent, ContentContainerComponent } from 'ngx-sp-infra';
 import { openDB, deleteDB } from 'idb';
@@ -1121,20 +1121,23 @@ class AuthService {
         // #region ==========> PROPERTIES <==========
         // #region PRIVATE
         this._pendingWarning = null;
-        this._BASE_URL = ''; // SpInfra2WS
         this._AUTH_BASE_URL = ''; // SpInfra2AuthWS
+        this._BASE_URL = ''; // SpInfra2WS
         this._BASE_OS_URL = ''; // SpInfra2LoginWS
+        this._LOGOUT_BASE_URL = ''; // SpInfra2LoginWS
         this._HTTP_HEADERS = new HttpHeaders().set('Content-Type', 'application/json');
         this.ip = "undefined";
         this.city = "undefined";
         this.state = "undefined";
         this.country = "undefined";
-        this._BASE_URL = `${this._customEnvironmentService.Sp2LocalhostInfra2LoginWS}/LoginSisproERP`; // SpInfra2WS
         this._AUTH_BASE_URL = `${this._customEnvironmentService.SpInfra2AuthWS}/Auth`; // SpInfra2AuthWS
+        this._BASE_URL = `${this._customEnvironmentService.Sp2LocalhostInfra2LoginWS}/LoginSisproERP`; // SpInfra2WS
         this._BASE_OS_URL = `${this._customEnvironmentService.SpInfra2LoginWS}/LoginIntegradoOS`; // SpInfra2LoginWS
-        this._BASE_URL = !this._customEnvironmentService.production ? this._BASE_URL : `${this._customEnvironmentService.SpInfra2LoginWS}/LoginSisproERP`;
+        this._LOGOUT_BASE_URL = `${this._customEnvironmentService.SpInfra2LoginWS}/LogoutSisproErp`; // SpInfra2LoginWS
         this._AUTH_BASE_URL = !this._customEnvironmentService.production ? this._AUTH_BASE_URL : `${this._customEnvironmentService.SpInfra2AuthWS}/Auth`;
+        this._BASE_URL = !this._customEnvironmentService.production ? this._BASE_URL : `${this._customEnvironmentService.SpInfra2LoginWS}/LoginSisproERP`;
         this._BASE_OS_URL = !this._customEnvironmentService.production ? this._BASE_OS_URL : `${this._customEnvironmentService.SpInfra2LoginWS}/LoginIntegradoOS`;
+        this._LOGOUT_BASE_URL = !this._customEnvironmentService.production ? this._BASE_OS_URL : `${this._customEnvironmentService.SpInfra2LoginWS}/LogoutSisproErp`;
         this.getParms();
     }
     // #region ==========> SERVICE METHODS <==========
@@ -1439,14 +1442,19 @@ class AuthService {
             }
         }));
     }
-    /** Realiza o logout do sistema, removendo tokens do localStorage e limpando cache */
+    /** Realiza o logout do sistema, consumindo o endpoint de logout para remover os cookies e limpando as informações de autenticação armazenadas no localStorage. */
     logout() {
-        this._authStorageService.logout();
-        localStorage.removeItem('configsServerUser');
-        localStorage.removeItem('configsServerPassword');
-        // Método com customizações para inicializações do Logout
-        this._customLoginService.authLogout();
-        this._router.navigate(["/auth/login"]);
+        // Consumo de endpoint de logout
+        const url = `${this._LOGOUT_BASE_URL}`;
+        firstValueFrom(this._httpClient.post(url, null, { 'headers': this._HTTP_HEADERS })).then(res => {
+            console.log(res);
+            this._authStorageService.logout();
+            localStorage.removeItem('configsServerUser');
+            localStorage.removeItem('configsServerPassword');
+            // Método com customizações para inicializações do Logout
+            this._customLoginService.authLogout();
+            this._router.navigate(["/auth/login"]);
+        });
     }
     validateAuthentication2Fa(code) {
         let Code2Fa = {