ngx-sp-auth 4.23.8 → 4.23.10

package/fesm2022/ngx-sp-auth.mjs

@@ -5,9 +5,9 @@ import { HTTP_INTERCEPTORS, HttpHeaders, HttpClient, HttpParams, HttpResponse }
 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 { take as take$1, tap as tap$1, map as map$1, switchMap as switchMap$1 } from 'rxjs/operators';
+import { take as take$1, tap as tap$1, map as map$1, filter as filter$1, switchMap as switchMap$1 } from 'rxjs/operators';
 import * as i1$1 from '@angular/router';
-import { RouterLink, NavigationEnd, RouterOutlet } from '@angular/router';
+import { RouterLink, NavigationEnd, RouterOutlet, Router, PRIMARY_OUTLET } from '@angular/router';
 import * as i3 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';
@@ -807,8 +807,8 @@ class AuthStorageService {
     /** Inicia a verificação do login. */
     startLoginCheck() {
         if (!this.__isCheckingAuth) {
-            this.checkAuthentication().subscribe((isLoggedIn) => {
-                if (isLoggedIn) {
+            this.checkAuthentication().subscribe((res) => {
+                if (res.isLoggedIn) {
                     // ERICK: Chamada do método custom movida para cá para chamar uma única vez ao invés de se repetir a cada validação do token no método reCheckLogin, 
                     // visto que o método storageInitializeAutoStorage tem como objetivo realizar inicializações diversas quando o Login é executado via Pré Portal,
                     // e não há necessidade de repetir essas inicializações a cada verificação do token.
@@ -820,10 +820,14 @@ class AuthStorageService {
     }
     checkAuthentication() {
         if (!this.__authenticationCheck$) {
+            let errorMessage = '';
             this.__authenticationCheck$ = this.verifyToken()
-                .pipe(map((response) => !response.Error), catchError(() => {
+                .pipe(map((response) => {
+                errorMessage = response.ErrorMessage;
+                return { error: response.ErrorMessage, isLoggedIn: !response.Error };
+            }), catchError((err) => {
                 this.isLoggedInSub.next(false);
-                return of(false);
+                return of({ error: err.error.ErrorMessage, isLoggedIn: false });
             }), finalize(() => this.__authenticationCheck$ = null), shareReplay({ bufferSize: 1, refCount: true }));
         }
         return this.__authenticationCheck$;
@@ -832,7 +836,7 @@ class AuthStorageService {
         const url = `${this._BASE_VERIFICATION_URL}`;
         const headers = this._HTTP_HEADERS.set('x-application', this._customEnvironmentService.product);
         return defer(() => {
-            this._toastr.info('Validando token do usuário.', 'Aguarde...', { timeOut: 3000, progressBar: true, progressAnimation: 'increasing', closeButton: true });
+            this._toastr.info('Validando token do usuário.', 'Aguarde...', { disableTimeOut: true, progressBar: true, progressAnimation: 'increasing', closeButton: true });
             const params = new HttpParams()
                 .set('ip', this.ip)
                 .set('browser', this._ipService.getDataBrowserUser().browser);
@@ -4510,16 +4514,21 @@ i0.ɵɵngDeclareClassMetadataAsync({ minVersion: "18.0.0", version: "19.2.25", n
             }], ctorParameters: () => [{ type: AuthUtilService }, { type: i4.BsModalService }, { type: MenuServicesService }, { type: i3.MessageService }, { type: MeuPerfilService }, { type: i1$1.Router }], propDecorators: null }) });
 
 class AuthGuard {
-    constructor(router, authStorageService) {
-        this.router = router;
-        this.authStorageService = authStorageService;
+    constructor(_router, _authStorage, _message) {
+        this._router = _router;
+        this._authStorage = _authStorage;
+        this._message = _message;
     }
-    IsUserAuth() {
-        return this.authStorageService.checkAuthentication()
-            .pipe(map$1((isLoggedIn) => {
-            if (!isLoggedIn || this.authStorageService.isExternalLogin) {
-                let login = this.router.parseUrl("/auth/login");
-                return login;
+    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();
+                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));
+                }
+                return this._router.parseUrl('/auth/login');
             }
             return true;
         }));
@@ -4528,21 +4537,21 @@ class AuthGuard {
         if (segments[0]?.path.toLowerCase() === 'auth') {
             return of(false);
         }
-        return this.IsUserAuth();
+        return this.IsUserAuth(`/${segments.map(segment => segment.path).join('/')}`);
     }
-    canActivate(_route, _state) {
-        return this.IsUserAuth();
+    canActivate(_route, state) {
+        return this.IsUserAuth(state.url);
     }
-    canLoad(_route) {
-        return this.IsUserAuth();
+    canLoad(_route, segments) {
+        return this.IsUserAuth(`/${segments.map(segment => segment.path).join('/')}`);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: AuthGuard, deps: [{ token: i1$1.Router }, { token: AuthStorageService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: AuthGuard, deps: [{ token: i1$1.Router }, { token: AuthStorageService }, { token: i3.MessageService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: AuthGuard, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: AuthGuard, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
-        }], ctorParameters: () => [{ type: i1$1.Router }, { type: AuthStorageService }] });
+        }], ctorParameters: () => [{ type: i1$1.Router }, { type: AuthStorageService }, { type: i3.MessageService }] });
 
 class ExternaLoginlGuard {
     constructor(router, authService, authStorageService) {
@@ -4688,6 +4697,81 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.25", ngImpo
             args: [{ providedIn: 'root' }]
         }], ctorParameters: () => [{ type: i1$1.Router }, { type: MenuServicesService }] });
 
+const IsMenuAllowedGuard = (_route, state) => {
+    const router = inject(Router);
+    const menuService = inject(MenuServicesService);
+    const navigateToError = () => {
+        return router.createUrlTree(['/error-menu-not-allowed']);
+    };
+    const permissionRoute = getPermissionRoute(state);
+    // console.log('permissionRoute:', permissionRoute);
+    return menuService.isMenuAllowed(permissionRoute).pipe(map(response => {
+        // console.log('isMenuAllowed.response:', response);
+        if (response.IsMenuAllowed)
+            return true;
+        return navigateToError();
+    }), catchError(() => {
+        return of(navigateToError());
+    }));
+};
+/**
+ * Obtém a rota utilizada para validar a permissão.
+ *
+ * Regras:
+ * - considera toda a rota ativa, inclusive rotas lazy-loaded;
+ * - ignora query parameters e fragments;
+ * - ignora parâmetros declarados com ":";
+ * - ignora qualquer segmento posterior ao primeiro parâmetro;
+ * - retorna a rota sem "/" inicial.
+ *
+ * Exemplos:
+ *
+ * movimentacoes/alteracao-cadastral-grupo
+ * => movimentacoes/alteracao-cadastral-grupo
+ *
+ * movimentacoes/fluxos-gerais/:id
+ * => movimentacoes/fluxos-gerais
+ *
+ * movimentacoes/fluxos-gerais/:id/editar
+ * => movimentacoes/fluxos-gerais
+*/
+const getPermissionRoute = (state) => {
+    const routeSegments = [];
+    let currentRoute = state.root;
+    // console.log('currentRoute:', currentRoute);
+    while (currentRoute) {
+        const configuredPath = currentRoute.routeConfig?.path;
+        // console.log('configuredPath:', configuredPath);
+        if (configuredPath) {
+            const configuredSegments = configuredPath.split('/');
+            for (const segment of configuredSegments) {
+                if (isRouteParameter(segment))
+                    return routeSegments.join('/');
+                routeSegments.push(segment);
+            }
+            // console.log('routeSegments:', routeSegments);
+        }
+        currentRoute = getPrimaryChild(currentRoute);
+        // console.log('currentRoute 2:', currentRoute);
+    }
+    return routeSegments.join('/');
+};
+/**
+ * Identifica parâmetros declarados na configuração da rota.
+ *
+ * Exemplos:
+ * :id
+ * :codigo
+ * :empresaId
+*/
+const isRouteParameter = (segment) => {
+    return segment.startsWith(':');
+};
+/** Obtém a próxima rota ativa no outlet principal */
+const getPrimaryChild = (route) => {
+    return route.children.find(child => child.outlet === PRIMARY_OUTLET);
+};
+
 /**
  * Protege a página de login de ser carregada quando o usuário já está logado,
  * redirecionando ele para a página home da aplicação.
@@ -5177,5 +5261,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.25", ngImpo
  * Generated bundle index. Do not edit.
  */
 
-export { AUTH_ROUTES, AuthAplicInterceptor, AuthGuard, AuthInfraInterceptor, AuthModule, AuthService, AuthStorageService, AuthUtilService, DynamicMenuComponent, ErrorMenuNotAllowed, ExternaLoginlGuard, FavoritarModel, IMenu, IndexedDBService, InfraEstabelecimentoFavoritoDefault, InfraUsuarioImg, IsMenuAllowedlGuard, LIB_CUSTOM_ENVIRONMENT_SERVICE, LIB_CUSTOM_LOGIN_SERVICE, LIB_CUSTOM_MENU_SERVICE, LIB_CUSTOM_STORAGE_SERVICE, LIB_MENU_CONFIG, LibCustomEnvironmentService, LibCustomLoginService, LibCustomMenuService, LibCustomStorageService, LibMenuConfigService, ListComponent, LoginComponent, LoginGuard, LoginOSComponent, LoginOSGuard, LoginProgress, MenuLateralComponent, MenuServicesService, MeuPerfilComponent, NavSubMenus, NavSubmenuCards, NavSubmenuSearchItem, NavTabsComponent, NotifSubmenuComponent, NovaSenhaComponent, PesquisaTelasGlobalService, PrimaryDropdownComponent, RetEstabelecimentosModal, RetInfraUsuarioImg, RetMenuItemStructure, RetMenuLateral, RetMenuPromise, RetNavSubMenu, RetSubmenuWithCards, SecondaryDropdownComponent, SelecaoEstabelecimentosModalComponent, SituacaoLogin, SubMenuCardComponent, SubMenuComponent, SubMenuItem, TelaItem };
+export { AUTH_ROUTES, AuthAplicInterceptor, AuthGuard, AuthInfraInterceptor, AuthModule, AuthService, AuthStorageService, AuthUtilService, DynamicMenuComponent, ErrorMenuNotAllowed, ExternaLoginlGuard, FavoritarModel, IMenu, IndexedDBService, InfraEstabelecimentoFavoritoDefault, InfraUsuarioImg, IsMenuAllowedGuard, IsMenuAllowedlGuard, LIB_CUSTOM_ENVIRONMENT_SERVICE, LIB_CUSTOM_LOGIN_SERVICE, LIB_CUSTOM_MENU_SERVICE, LIB_CUSTOM_STORAGE_SERVICE, LIB_MENU_CONFIG, LibCustomEnvironmentService, LibCustomLoginService, LibCustomMenuService, LibCustomStorageService, LibMenuConfigService, ListComponent, LoginComponent, LoginGuard, LoginOSComponent, LoginOSGuard, LoginProgress, MenuLateralComponent, MenuServicesService, MeuPerfilComponent, NavSubMenus, NavSubmenuCards, NavSubmenuSearchItem, NavTabsComponent, NotifSubmenuComponent, NovaSenhaComponent, PesquisaTelasGlobalService, PrimaryDropdownComponent, RetEstabelecimentosModal, RetInfraUsuarioImg, RetMenuItemStructure, RetMenuLateral, RetMenuPromise, RetNavSubMenu, RetSubmenuWithCards, SecondaryDropdownComponent, SelecaoEstabelecimentosModalComponent, SituacaoLogin, SubMenuCardComponent, SubMenuComponent, SubMenuItem, TelaItem };
 //# sourceMappingURL=ngx-sp-auth.mjs.map