ngx-sp-auth 4.23.13 → 4.23.15

package/fesm2022/ngx-sp-auth.mjs

@@ -2318,6 +2318,40 @@ class LoginOSModel {
     }
 }
 
+class LoginOSUtilsService {
+    // #endregion PRIVATE
+    // #endregion ==========> PROPERTIES <==========
+    constructor() {
+        // #region ==========> PROPERTIES <==========
+        // #region PRIVATE
+        this._http = inject(HttpClient);
+        this._customEnvironment = inject(LibCustomEnvironmentService);
+        this._BASE_URL = `${this._customEnvironment.SpInfra2ErpWS}`; // SpInfra2ErpWS
+        this._HTTP_HEADERS = new HttpHeaders().set('Content-Type', 'application/json');
+        this._BASE_URL = !this._customEnvironment.production ? this._BASE_URL : `${this._customEnvironment.SpInfra2ErpWS}`;
+    }
+    // #region ==========> API <==========
+    // #region GET
+    getEstabelecimentoSession(estabID) {
+        const params = new HttpParams().set('id', estabID);
+        const url = `${this._BASE_URL}/InfraEstabelecimento/GetEstabelecimentoSession`;
+        return this._http.get(url, { 'params': params, 'headers': this._HTTP_HEADERS })
+            .pipe(take(1), tap(response => {
+            if (response.Error) {
+                throw Error(response.ErrorMessage);
+            }
+        }));
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: LoginOSUtilsService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: LoginOSUtilsService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: LoginOSUtilsService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: () => [] });
+
 class LoginOSComponent {
     // #endregion PUBLIC
     // #endregion ==========> PROPERTIES <==========
@@ -2329,13 +2363,21 @@ class LoginOSComponent {
         this._router = _router;
         this._storageService = _storageService;
         this._messageService = _messageService;
+        // #region ==========> PROPERTIES <==========
+        // #region PRIVATE
+        this._loginOSUtils = inject(LoginOSUtilsService);
         // #endregion PRIVATE
         // #region PUBLIC
         this.loginStatus = "loading";
         this.timer = 3;
     }
     ngOnInit() {
-        this._storageService.logout();
+        this._storageService.isLoggedInSub.subscribe(async (isLoggedIn) => {
+            if (isLoggedIn) {
+                // Comentado até encontrar uma maneira melhor de realizar o logout, pois o logout atual está causando problemas de redirecionamento e perda de sessão.
+                // await this._storageService.logout();
+            }
+        });
         this.getParams();
         this.logOn();
     }
@@ -2350,9 +2392,24 @@ class LoginOSComponent {
         this._authService.getAuthentication(this._loginOSModel.dominio).subscribe({
             next: () => {
                 if (currDominio === this._loginOSModel.dominio && currUsuario === this._loginOSModel.usuario) {
-                    status = "keep";
-                    this.redirect();
-                    return;
+                    // VALIDAR ÚLTIMO ESTAB LOGADO
+                    this._loginOSUtils.getEstabelecimentoSession('').subscribe({
+                        next: res => {
+                            // Atualiza os dados do estabelecimento na sessão
+                            this._storageService.infraEstabId = res.InfraEstabId;
+                            this._storageService.infraEstabNome = res.InfraEstabNome;
+                            this._storageService.infraEmpresaId = res.InfraEmpresaId;
+                            this._storageService.infraEmpresaNome = res.InfraEmpresaNome;
+                            // Após, redireciona para a URL de destino
+                            status = "keep";
+                            this.redirect();
+                            return;
+                        },
+                        error: error => {
+                            this.loginStatus = "error";
+                            this._authUtilService.showHTTPErrorOS(error);
+                        }
+                    });
                 }
                 status = (!currDominio || !currUsuario) ? "none" : "updated";
                 this._authService.loginOS(this._parmsLogin, this._loginOSModel.serialV6).subscribe({
@@ -3658,6 +3715,8 @@ class MenuLateralComponent {
         this._menuServices.getEstabelecimentoSession(estabID).subscribe({
             next: response => {
                 this.nomeEstabelecimento = response.InfraEstabNome;
+                this._authStorageService.infraEstabId = response.InfraEstabId;
+                this._authStorageService.infraEstabNome = response.InfraEstabNome;
                 this._authStorageService.infraEmpresaId = response.InfraEmpresaId;
                 this._authStorageService.infraEmpresaNome = response.InfraEmpresaNome;
             },
@@ -4538,8 +4597,9 @@ class AuthGuard {
     IsUserAuth(targetUrl = this._router.url) {
         return this._authStorage.checkAuthentication()
             .pipe(map$1(({ error, isLoggedIn }) => {
-            if (!isLoggedIn || this._authStorage.isExternalLogin) {
-                const targetPath = targetUrl.split(/[?#]/, 1)[0].replace(/\/+$/, '').toLowerCase();
+            const targetPath = targetUrl.split(/[?#]/, 1)[0].replace(/\/+$/, '').toLowerCase();
+            const isPublicRoute = ['/auth/login', '/senha-config', '/login-os', '/error-404'].includes(targetPath);
+            if ((!isLoggedIn || this._authStorage.isExternalLogin) && !isPublicRoute) {
                 if (error.trim() && (targetPath !== '/auth/login' && targetPath !== '')) {
                     this._router.events.pipe(filter$1((event) => event instanceof NavigationEnd), filter$1(event => event.urlAfterRedirects.split(/[?#]/, 1)[0] === '/auth/login'), take$1(1))
                         .subscribe(() => this._message.showAlertWarning(error));