@gipisistemas/ng-core 1.1.7 → 1.1.8

package/core/guards/auth.guard.d.ts

@@ -1,11 +1,13 @@
+import { MatDialog } from '@angular/material/dialog';
 import { ActivatedRouteSnapshot, CanActivate, CanActivateChild, Router, RouterStateSnapshot } from '@angular/router';
 import { Observable } from 'rxjs';
 import { BaseUser } from '../models/base-user.model';
 import { AuthenticationService } from '../services/authentication.service';
 export declare class AuthGuard implements CanActivate, CanActivateChild {
     private _router;
+    private _matDialog;
     private _authenticationService;
-    constructor(_router: Router, _authenticationService: AuthenticationService<BaseUser>);
+    constructor(_router: Router, _matDialog: MatDialog, _authenticationService: AuthenticationService<BaseUser>);
     canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean>;
     canActivateChild(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean>;
 }

package/core/guards/permission.guard.d.ts

@@ -1,14 +1,15 @@
+import { MatDialog } from '@angular/material/dialog';
 import { ActivatedRouteSnapshot, CanActivate, CanActivateChild, Router, RouterStateSnapshot } from '@angular/router';
 import { Observable } from 'rxjs';
 import { BaseUser } from '../models/base-user.model';
 import { AuthenticationService } from '../services/authentication.service';
-import { MenuDTO } from './../models/dto/menu.dto';
 export declare class PermissionGuard implements CanActivate, CanActivateChild {
     private _router;
+    private _matDialog;
     private _authenticationService;
-    constructor(_router: Router, _authenticationService: AuthenticationService<BaseUser>);
+    constructor(_router: Router, _matDialog: MatDialog, _authenticationService: AuthenticationService<BaseUser>);
+    private _hasAuthority;
+    private _hasPermission;
     canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean>;
-    hasAuthority(user: any, permission: string): boolean;
-    hasPermission(menuList: MenuDTO[], url: string): boolean;
     canActivateChild(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean>;
 }

package/core/interceptors/auth.interceptor.d.ts

@@ -3,7 +3,7 @@ import { Observable } from 'rxjs';
 import { BaseUser } from '../models/base-user.model';
 import { AuthenticationService } from '../services/authentication.service';
 export declare class AuthInterceptor implements HttpInterceptor {
-    private authenticationService;
-    constructor(authenticationService: AuthenticationService<BaseUser>);
+    private _authenticationService;
+    constructor(_authenticationService: AuthenticationService<BaseUser>);
     intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>>;
 }

package/core/services/authentication.service.d.ts

@@ -1,23 +1,22 @@
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Router } from '@angular/router';
-import { BehaviorSubject, Observable } from 'rxjs';
+import { Observable } from 'rxjs';
 import { BaseUser } from '../models/base-user.model';
 import { TokenDTO } from '../models/dto/token.dto';
 import { AbstractService } from './abstract.service';
 export declare class AuthenticationService<U extends BaseUser> extends AbstractService {
     protected router: Router;
     protected http: HttpClient;
-    protected tokenSubject: BehaviorSubject<TokenDTO<U>>;
-    token: Observable<TokenDTO<U>>;
+    private _tokenSubject$;
+    token$: Observable<TokenDTO<U>>;
     constructor(router: Router, http: HttpClient);
-    login(user: U): Observable<TokenDTO<U>>;
-    logout(): Promise<void>;
-    removeToken(): void;
+    login(username: string, password: string): Observable<TokenDTO<U>>;
+    logout(): void;
     refreshToken(additionalParams?: Map<any, any>): Observable<TokenDTO<U>>;
     revokeToken(token?: TokenDTO<U>): Observable<any>;
+    protected setSession(token: TokenDTO<U>): TokenDTO<U>;
+    removeSession(): void;
     isValidToken(token: TokenDTO<U>): boolean;
-    protected setCurrentUser(token: TokenDTO<U>): TokenDTO<U>;
-    get tokenValue(): TokenDTO<U>;
-    get tokenValueLocalStorage(): TokenDTO<U>;
+    get token(): TokenDTO<U>;
     protected buildHeaders(): HttpHeaders;
 }

package/core.d.ts

@@ -8,7 +8,6 @@ export * from './core/core.module';
 export * from './core/enums/local-time.enum';
 export * from './core/guards/auth.guard';
 export * from './core/guards/permission.guard';
-export * from './core/guards/public.guard';
 export * from './core/interceptors/auth.interceptor';
 export * from './core/interceptors/error.interceptor';
 export * from './core/models/abstract.model';

package/esm2015/core/guards/auth.guard.js

@@ -1,33 +1,28 @@
 import { __decorate, __metadata } from "tslib";
 import { Injectable } from '@angular/core';
+import { MatDialog } from '@angular/material/dialog';
 import { ActivatedRouteSnapshot, CanActivate, CanActivateChild, Router, RouterStateSnapshot } from '@angular/router';
 import { of } from 'rxjs';
-import { map } from 'rxjs/operators';
 import { AuthenticationService } from '../services/authentication.service';
-import { ObjectUtil } from '../utils/object.util';
 import * as i0 from "@angular/core";
 import * as i1 from "@angular/router";
-import * as i2 from "../services/authentication.service";
+import * as i2 from "@angular/material/dialog";
+import * as i3 from "../services/authentication.service";
 let AuthGuard = class AuthGuard {
-    constructor(_router, _authenticationService) {
+    constructor(_router, _matDialog, _authenticationService) {
         this._router = _router;
+        this._matDialog = _matDialog;
         this._authenticationService = _authenticationService;
     }
     canActivate(route, state) {
-        if (!ObjectUtil.isNull(this._authenticationService.tokenValueLocalStorage)) {
-            return this._authenticationService.token.pipe(map(token => {
-                if (this._authenticationService.isValidToken(token)) {
-                    return true;
-                }
-                else if (!ObjectUtil.isNull(token)) {
-                    this._authenticationService.removeToken();
-                }
-                this._router.navigate(['oauth/login'], { queryParams: { returnUrl: state.url } });
-                return false;
-            }));
+        const token = this._authenticationService.token;
+        if (!this._authenticationService.isValidToken(token)) {
+            this._authenticationService.removeSession();
+            this._matDialog.closeAll();
+            this._router.navigate(['oauth/login']);
+            return of(false);
         }
-        this._router.navigate(['oauth/login'], { queryParams: { returnUrl: state.url } });
-        return of(false);
+        return of(true);
     }
     canActivateChild(route, state) {
         return this.canActivate(route, state);
@@ -35,13 +30,15 @@ let AuthGuard = class AuthGuard {
 };
 AuthGuard.ctorParameters = () => [
     { type: Router },
+    { type: MatDialog },
     { type: AuthenticationService }
 ];
-AuthGuard.ngInjectableDef = i0.ɵɵdefineInjectable({ factory: function AuthGuard_Factory() { return new AuthGuard(i0.ɵɵinject(i1.Router), i0.ɵɵinject(i2.AuthenticationService)); }, token: AuthGuard, providedIn: "root" });
+AuthGuard.ngInjectableDef = i0.ɵɵdefineInjectable({ factory: function AuthGuard_Factory() { return new AuthGuard(i0.ɵɵinject(i1.Router), i0.ɵɵinject(i2.MatDialog), i0.ɵɵinject(i3.AuthenticationService)); }, token: AuthGuard, providedIn: "root" });
 AuthGuard = __decorate([
     Injectable({ providedIn: 'root' }),
     __metadata("design:paramtypes", [Router,
+        MatDialog,
         AuthenticationService])
 ], AuthGuard);
 export { AuthGuard };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5ndWFyZC5qcyIsInNvdXJjZVJvb3QiOiJuZzovL0BnaXBpc2lzdGVtYXMvbmctY29yZS8iLCJzb3VyY2VzIjpbImNvcmUvZ3VhcmRzL2F1dGguZ3VhcmQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDM0MsT0FBTyxFQUFFLHNCQUFzQixFQUFFLFdBQVcsRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUNySCxPQUFPLEVBQWMsRUFBRSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQ3RDLE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUdyQyxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQUMzRSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7Ozs7QUFHbEQsSUFBYSxTQUFTLEdBQXRCLE1BQWEsU0FBUztJQUVsQixZQUNZLE9BQWUsRUFDZixzQkFBdUQ7UUFEdkQsWUFBTyxHQUFQLE9BQU8sQ0FBUTtRQUNmLDJCQUFzQixHQUF0QixzQkFBc0IsQ0FBaUM7SUFDL0QsQ0FBQztJQUVMLFdBQVcsQ0FBQyxLQUE2QixFQUFFLEtBQTBCO1FBQ2pFLElBQUksQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxzQkFBc0IsQ0FBQyxFQUFFO1lBQ3hFLE9BQU8sSUFBSSxDQUFDLHNCQUFzQixDQUFDLEtBQUssQ0FBQyxJQUFJLENBQ3pDLEdBQUcsQ0FBQyxLQUFLLENBQUMsRUFBRTtnQkFDUixJQUFJLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDLEVBQUU7b0JBQ2pELE9BQU8sSUFBSSxDQUFDO2lCQUNmO3FCQUFNLElBQUksQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxFQUFFO29CQUNsQyxJQUFJLENBQUMsc0JBQXNCLENBQUMsV0FBVyxFQUFFLENBQUM7aUJBQzdDO2dCQUNELElBQUksQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUMsYUFBYSxDQUFDLEVBQUUsRUFBRSxXQUFXLEVBQUUsRUFBRSxTQUFTLEVBQUUsS0FBSyxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQUMsQ0FBQztnQkFDbEYsT0FBTyxLQUFLLENBQUM7WUFDakIsQ0FBQyxDQUFDLENBQ0wsQ0FBQztTQUNMO1FBQ0QsSUFBSSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQyxhQUFhLENBQUMsRUFBRSxFQUFFLFdBQVcsRUFBRSxFQUFFLFNBQVMsRUFBRSxLQUFLLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQ2xGLE9BQU8sRUFBRSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ3JCLENBQUM7SUFFRCxnQkFBZ0IsQ0FBQyxLQUE2QixFQUFFLEtBQTBCO1FBQ3RFLE9BQU8sSUFBSSxDQUFDLFdBQVcsQ0FBQyxLQUFLLEVBQUUsS0FBSyxDQUFDLENBQUM7SUFDMUMsQ0FBQztDQUNKLENBQUE7O1lBekJ3QixNQUFNO1lBQ1MscUJBQXFCOzs7QUFKaEQsU0FBUztJQURyQixVQUFVLENBQUMsRUFBRSxVQUFVLEVBQUUsTUFBTSxFQUFFLENBQUM7cUNBSVYsTUFBTTtRQUNTLHFCQUFxQjtHQUpoRCxTQUFTLENBNEJyQjtTQTVCWSxTQUFTIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgQWN0aXZhdGVkUm91dGVTbmFwc2hvdCwgQ2FuQWN0aXZhdGUsIENhbkFjdGl2YXRlQ2hpbGQsIFJvdXRlciwgUm91dGVyU3RhdGVTbmFwc2hvdCB9IGZyb20gJ0Bhbmd1bGFyL3JvdXRlcic7XG5pbXBvcnQgeyBPYnNlcnZhYmxlLCBvZiB9IGZyb20gJ3J4anMnO1xuaW1wb3J0IHsgbWFwIH0gZnJvbSAncnhqcy9vcGVyYXRvcnMnO1xuXG5pbXBvcnQgeyBCYXNlVXNlciB9IGZyb20gJy4uL21vZGVscy9iYXNlLXVzZXIubW9kZWwnO1xuaW1wb3J0IHsgQXV0aGVudGljYXRpb25TZXJ2aWNlIH0gZnJvbSAnLi4vc2VydmljZXMvYXV0aGVudGljYXRpb24uc2VydmljZSc7XG5pbXBvcnQgeyBPYmplY3RVdGlsIH0gZnJvbSAnLi4vdXRpbHMvb2JqZWN0LnV0aWwnO1xuXG5ASW5qZWN0YWJsZSh7IHByb3ZpZGVkSW46ICdyb290JyB9KVxuZXhwb3J0IGNsYXNzIEF1dGhHdWFyZCBpbXBsZW1lbnRzIENhbkFjdGl2YXRlLCBDYW5BY3RpdmF0ZUNoaWxkIHtcblxuICAgIGNvbnN0cnVjdG9yKFxuICAgICAgICBwcml2YXRlIF9yb3V0ZXI6IFJvdXRlcixcbiAgICAgICAgcHJpdmF0ZSBfYXV0aGVudGljYXRpb25TZXJ2aWNlOiBBdXRoZW50aWNhdGlvblNlcnZpY2U8QmFzZVVzZXI+XG4gICAgKSB7IH1cblxuICAgIGNhbkFjdGl2YXRlKHJvdXRlOiBBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90LCBzdGF0ZTogUm91dGVyU3RhdGVTbmFwc2hvdCk6IE9ic2VydmFibGU8Ym9vbGVhbj4ge1xuICAgICAgICBpZiAoIU9iamVjdFV0aWwuaXNOdWxsKHRoaXMuX2F1dGhlbnRpY2F0aW9uU2VydmljZS50b2tlblZhbHVlTG9jYWxTdG9yYWdlKSkge1xuICAgICAgICAgICAgcmV0dXJuIHRoaXMuX2F1dGhlbnRpY2F0aW9uU2VydmljZS50b2tlbi5waXBlKFxuICAgICAgICAgICAgICAgIG1hcCh0b2tlbiA9PiB7XG4gICAgICAgICAgICAgICAgICAgIGlmICh0aGlzLl9hdXRoZW50aWNhdGlvblNlcnZpY2UuaXNWYWxpZFRva2VuKHRva2VuKSkge1xuICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7XG4gICAgICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAoIU9iamVjdFV0aWwuaXNOdWxsKHRva2VuKSkge1xuICAgICAgICAgICAgICAgICAgICAgICAgdGhpcy5fYXV0aGVudGljYXRpb25TZXJ2aWNlLnJlbW92ZVRva2VuKCk7XG4gICAgICAgICAgICAgICAgICAgIH1cbiAgICAgICAgICAgICAgICAgICAgdGhpcy5fcm91dGVyLm5hdmlnYXRlKFsnb2F1dGgvbG9naW4nXSwgeyBxdWVyeVBhcmFtczogeyByZXR1cm5Vcmw6IHN0YXRlLnVybCB9IH0pO1xuICAgICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7XG4gICAgICAgICAgICAgICAgfSlcbiAgICAgICAgICAgICk7XG4gICAgICAgIH1cbiAgICAgICAgdGhpcy5fcm91dGVyLm5hdmlnYXRlKFsnb2F1dGgvbG9naW4nXSwgeyBxdWVyeVBhcmFtczogeyByZXR1cm5Vcmw6IHN0YXRlLnVybCB9IH0pO1xuICAgICAgICByZXR1cm4gb2YoZmFsc2UpO1xuICAgIH1cblxuICAgIGNhbkFjdGl2YXRlQ2hpbGQocm91dGU6IEFjdGl2YXRlZFJvdXRlU25hcHNob3QsIHN0YXRlOiBSb3V0ZXJTdGF0ZVNuYXBzaG90KTogT2JzZXJ2YWJsZTxib29sZWFuPiB7XG4gICAgICAgIHJldHVybiB0aGlzLmNhbkFjdGl2YXRlKHJvdXRlLCBzdGF0ZSk7XG4gICAgfVxufVxuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5ndWFyZC5qcyIsInNvdXJjZVJvb3QiOiJuZzovL0BnaXBpc2lzdGVtYXMvbmctY29yZS8iLCJzb3VyY2VzIjpbImNvcmUvZ3VhcmRzL2F1dGguZ3VhcmQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDM0MsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ3JELE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxXQUFXLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxFQUFFLG1CQUFtQixFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDckgsT0FBTyxFQUFjLEVBQUUsRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUl0QyxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQzs7Ozs7QUFFM0UsSUFBYSxTQUFTLEdBQXRCLE1BQWEsU0FBUztJQUVsQixZQUNZLE9BQWUsRUFDZixVQUFxQixFQUNyQixzQkFBdUQ7UUFGdkQsWUFBTyxHQUFQLE9BQU8sQ0FBUTtRQUNmLGVBQVUsR0FBVixVQUFVLENBQVc7UUFDckIsMkJBQXNCLEdBQXRCLHNCQUFzQixDQUFpQztJQUMvRCxDQUFDO0lBRUwsV0FBVyxDQUFDLEtBQTZCLEVBQUUsS0FBMEI7UUFDakUsTUFBTSxLQUFLLEdBQXVCLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxLQUFLLENBQUM7UUFDcEUsSUFBSSxDQUFDLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDLEVBQUU7WUFDbEQsSUFBSSxDQUFDLHNCQUFzQixDQUFDLGFBQWEsRUFBRSxDQUFDO1lBQzVDLElBQUksQ0FBQyxVQUFVLENBQUMsUUFBUSxFQUFFLENBQUM7WUFDM0IsSUFBSSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDO1lBQ3ZDLE9BQU8sRUFBRSxDQUFDLEtBQUssQ0FBQyxDQUFDO1NBQ3BCO1FBRUQsT0FBTyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDcEIsQ0FBQztJQUVELGdCQUFnQixDQUFDLEtBQTZCLEVBQUUsS0FBMEI7UUFDdEUsT0FBTyxJQUFJLENBQUMsV0FBVyxDQUFDLEtBQUssRUFBRSxLQUFLLENBQUMsQ0FBQztJQUMxQyxDQUFDO0NBRUosQ0FBQTs7WUFyQndCLE1BQU07WUFDSCxTQUFTO1lBQ0cscUJBQXFCOzs7QUFMaEQsU0FBUztJQURyQixVQUFVLENBQUMsRUFBRSxVQUFVLEVBQUUsTUFBTSxFQUFFLENBQUM7cUNBSVYsTUFBTTtRQUNILFNBQVM7UUFDRyxxQkFBcUI7R0FMaEQsU0FBUyxDQXdCckI7U0F4QlksU0FBUyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IE1hdERpYWxvZyB9IGZyb20gJ0Bhbmd1bGFyL21hdGVyaWFsL2RpYWxvZyc7XG5pbXBvcnQgeyBBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90LCBDYW5BY3RpdmF0ZSwgQ2FuQWN0aXZhdGVDaGlsZCwgUm91dGVyLCBSb3V0ZXJTdGF0ZVNuYXBzaG90IH0gZnJvbSAnQGFuZ3VsYXIvcm91dGVyJztcbmltcG9ydCB7IE9ic2VydmFibGUsIG9mIH0gZnJvbSAncnhqcyc7XG5cbmltcG9ydCB7IEJhc2VVc2VyIH0gZnJvbSAnLi4vbW9kZWxzL2Jhc2UtdXNlci5tb2RlbCc7XG5pbXBvcnQgeyBUb2tlbkRUTyB9IGZyb20gJy4uL21vZGVscy9kdG8vdG9rZW4uZHRvJztcbmltcG9ydCB7IEF1dGhlbnRpY2F0aW9uU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzL2F1dGhlbnRpY2F0aW9uLnNlcnZpY2UnO1xuQEluamVjdGFibGUoeyBwcm92aWRlZEluOiAncm9vdCcgfSlcbmV4cG9ydCBjbGFzcyBBdXRoR3VhcmQgaW1wbGVtZW50cyBDYW5BY3RpdmF0ZSwgQ2FuQWN0aXZhdGVDaGlsZCB7XG5cbiAgICBjb25zdHJ1Y3RvcihcbiAgICAgICAgcHJpdmF0ZSBfcm91dGVyOiBSb3V0ZXIsXG4gICAgICAgIHByaXZhdGUgX21hdERpYWxvZzogTWF0RGlhbG9nLFxuICAgICAgICBwcml2YXRlIF9hdXRoZW50aWNhdGlvblNlcnZpY2U6IEF1dGhlbnRpY2F0aW9uU2VydmljZTxCYXNlVXNlcj4sXG4gICAgKSB7IH1cblxuICAgIGNhbkFjdGl2YXRlKHJvdXRlOiBBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90LCBzdGF0ZTogUm91dGVyU3RhdGVTbmFwc2hvdCk6IE9ic2VydmFibGU8Ym9vbGVhbj4ge1xuICAgICAgICBjb25zdCB0b2tlbjogVG9rZW5EVE88QmFzZVVzZXI+ID0gdGhpcy5fYXV0aGVudGljYXRpb25TZXJ2aWNlLnRva2VuO1xuICAgICAgICBpZiAoIXRoaXMuX2F1dGhlbnRpY2F0aW9uU2VydmljZS5pc1ZhbGlkVG9rZW4odG9rZW4pKSB7XG4gICAgICAgICAgICB0aGlzLl9hdXRoZW50aWNhdGlvblNlcnZpY2UucmVtb3ZlU2Vzc2lvbigpO1xuICAgICAgICAgICAgdGhpcy5fbWF0RGlhbG9nLmNsb3NlQWxsKCk7XG4gICAgICAgICAgICB0aGlzLl9yb3V0ZXIubmF2aWdhdGUoWydvYXV0aC9sb2dpbiddKTtcbiAgICAgICAgICAgIHJldHVybiBvZihmYWxzZSk7XG4gICAgICAgIH1cblxuICAgICAgICByZXR1cm4gb2YodHJ1ZSk7XG4gICAgfVxuXG4gICAgY2FuQWN0aXZhdGVDaGlsZChyb3V0ZTogQWN0aXZhdGVkUm91dGVTbmFwc2hvdCwgc3RhdGU6IFJvdXRlclN0YXRlU25hcHNob3QpOiBPYnNlcnZhYmxlPGJvb2xlYW4+IHtcbiAgICAgICAgcmV0dXJuIHRoaXMuY2FuQWN0aXZhdGUocm91dGUsIHN0YXRlKTtcbiAgICB9XG5cbn1cbiJdfQ==

package/esm2015/core/guards/permission.guard.js

@@ -1,60 +1,69 @@
 import { __decorate, __metadata } from "tslib";
 import { Injectable } from '@angular/core';
+import { MatDialog } from '@angular/material/dialog';
 import { ActivatedRouteSnapshot, CanActivate, CanActivateChild, Router, RouterStateSnapshot } from '@angular/router';
 import { of } from 'rxjs';
-import { map } from 'rxjs/operators';
 import { AuthenticationService } from '../services/authentication.service';
+import { ArrayUtil } from '../utils/array.util';
 import { ObjectUtil } from '../utils/object.util';
-import { ArrayUtil } from './../utils/array.util';
+import { StringUtil } from '../utils/string.util';
 import * as i0 from "@angular/core";
 import * as i1 from "@angular/router";
-import * as i2 from "../services/authentication.service";
+import * as i2 from "@angular/material/dialog";
+import * as i3 from "../services/authentication.service";
 let PermissionGuard = class PermissionGuard {
-    constructor(_router, _authenticationService) {
+    constructor(_router, _matDialog, _authenticationService) {
         this._router = _router;
+        this._matDialog = _matDialog;
         this._authenticationService = _authenticationService;
     }
-    canActivate(route, state) {
-        if (!ObjectUtil.isNull(this._authenticationService.tokenValueLocalStorage)) {
-            return this._authenticationService.token.pipe(map(token => {
-                if (this._authenticationService.isValidToken(token)
-                    && (!this.hasPermission(token.user.menuList, state.url) && !this.hasAuthority(token.user, route.data.authority))) {
-                    this._router.navigate(['errors/403']);
-                    return false;
-                }
-                return true;
-            }));
+    _hasAuthority(user, permission) {
+        if (ObjectUtil.isNull(user) || StringUtil.isEmpty(permission)) {
+            return false;
         }
-        this._router.navigate(['errors/403']);
-        return of(false);
-    }
-    hasAuthority(user, permission) {
         return !!user.authorities.find(authority => authority.authority.match(permission));
     }
-    hasPermission(menuList, url) {
+    _hasPermission(menuList, url) {
         for (const menu of menuList) {
             if (url.split('/').pop() === menu.route) {
                 return true;
             }
             else if (!ArrayUtil.isEmpty(menu.menuList)) {
-                return this.hasPermission(menu.menuList, url);
+                return this._hasPermission(menu.menuList, url);
             }
         }
         return false;
     }
+    canActivate(route, state) {
+        const token = this._authenticationService.token;
+        if (!this._authenticationService.isValidToken(token)) {
+            this._authenticationService.removeSession();
+            this._matDialog.closeAll();
+            this._router.navigate(['oauth/login']);
+            return of(false);
+        }
+        const hasPermission = this._hasPermission(token.user.menuList, state.url) && this._hasAuthority(token.user, route.data.authority);
+        if (!hasPermission) {
+            this._router.navigate(['errors/403']);
+            return of(false);
+        }
+        return of(true);
+    }
     canActivateChild(route, state) {
         return this.canActivate(route, state);
     }
 };
 PermissionGuard.ctorParameters = () => [
     { type: Router },
+    { type: MatDialog },
     { type: AuthenticationService }
 ];
-PermissionGuard.ngInjectableDef = i0.ɵɵdefineInjectable({ factory: function PermissionGuard_Factory() { return new PermissionGuard(i0.ɵɵinject(i1.Router), i0.ɵɵinject(i2.AuthenticationService)); }, token: PermissionGuard, providedIn: "root" });
+PermissionGuard.ngInjectableDef = i0.ɵɵdefineInjectable({ factory: function PermissionGuard_Factory() { return new PermissionGuard(i0.ɵɵinject(i1.Router), i0.ɵɵinject(i2.MatDialog), i0.ɵɵinject(i3.AuthenticationService)); }, token: PermissionGuard, providedIn: "root" });
 PermissionGuard = __decorate([
     Injectable({ providedIn: 'root' }),
     __metadata("design:paramtypes", [Router,
+        MatDialog,
         AuthenticationService])
 ], PermissionGuard);
 export { PermissionGuard };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGVybWlzc2lvbi5ndWFyZC5qcyIsInNvdXJjZVJvb3QiOiJuZzovL0BnaXBpc2lzdGVtYXMvbmctY29yZS8iLCJzb3VyY2VzIjpbImNvcmUvZ3VhcmRzL3Blcm1pc3Npb24uZ3VhcmQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDM0MsT0FBTyxFQUFFLHNCQUFzQixFQUFFLFdBQVcsRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUNySCxPQUFPLEVBQWMsRUFBRSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQ3RDLE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUdyQyxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQUMzRSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFFbEQsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLHVCQUF1QixDQUFDOzs7O0FBR2xELElBQWEsZUFBZSxHQUE1QixNQUFhLGVBQWU7SUFFeEIsWUFDWSxPQUFlLEVBQ2Ysc0JBQXVEO1FBRHZELFlBQU8sR0FBUCxPQUFPLENBQVE7UUFDZiwyQkFBc0IsR0FBdEIsc0JBQXNCLENBQWlDO0lBQy9ELENBQUM7SUFFTCxXQUFXLENBQUMsS0FBNkIsRUFBRSxLQUEwQjtRQUNqRSxJQUFJLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsc0JBQXNCLENBQUMsc0JBQXNCLENBQUMsRUFBRTtZQUN4RSxPQUFPLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUN6QyxHQUFHLENBQUMsS0FBSyxDQUFDLEVBQUU7Z0JBQ1IsSUFBSSxJQUFJLENBQUMsc0JBQXNCLENBQUMsWUFBWSxDQUFDLEtBQUssQ0FBQzt1QkFDNUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsS0FBSyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFLEtBQUssQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUMsRUFBRTtvQkFDbEgsSUFBSSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDO29CQUN0QyxPQUFPLEtBQUssQ0FBQztpQkFDaEI7Z0JBQ0QsT0FBTyxJQUFJLENBQUM7WUFDaEIsQ0FBQyxDQUFDLENBQ0wsQ0FBQztTQUNMO1FBQ0QsSUFBSSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDO1FBQ3RDLE9BQU8sRUFBRSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ3JCLENBQUM7SUFFRCxZQUFZLENBQUMsSUFBUyxFQUFFLFVBQWtCO1FBQ3RDLE9BQU8sQ0FBQyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsU0FBUyxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztJQUN2RixDQUFDO0lBRUQsYUFBYSxDQUFDLFFBQW1CLEVBQUUsR0FBVztRQUMxQyxLQUFLLE1BQU0sSUFBSSxJQUFJLFFBQVEsRUFBRTtZQUN6QixJQUFJLEdBQUcsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxFQUFFLEtBQUssSUFBSSxDQUFDLEtBQUssRUFBRTtnQkFDckMsT0FBTyxJQUFJLENBQUM7YUFDZjtpQkFBTSxJQUFJLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLEVBQUU7Z0JBQzFDLE9BQU8sSUFBSSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLEdBQUcsQ0FBQyxDQUFDO2FBQ2pEO1NBQ0o7UUFDRCxPQUFPLEtBQUssQ0FBQztJQUNqQixDQUFDO0lBRUQsZ0JBQWdCLENBQUMsS0FBNkIsRUFBRSxLQUEwQjtRQUN0RSxPQUFPLElBQUksQ0FBQyxXQUFXLENBQUMsS0FBSyxFQUFFLEtBQUssQ0FBQyxDQUFDO0lBQzFDLENBQUM7Q0FFSixDQUFBOztZQXhDd0IsTUFBTTtZQUNTLHFCQUFxQjs7O0FBSmhELGVBQWU7SUFEM0IsVUFBVSxDQUFDLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSxDQUFDO3FDQUlWLE1BQU07UUFDUyxxQkFBcUI7R0FKaEQsZUFBZSxDQTJDM0I7U0EzQ1ksZUFBZSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IEFjdGl2YXRlZFJvdXRlU25hcHNob3QsIENhbkFjdGl2YXRlLCBDYW5BY3RpdmF0ZUNoaWxkLCBSb3V0ZXIsIFJvdXRlclN0YXRlU25hcHNob3QgfSBmcm9tICdAYW5ndWxhci9yb3V0ZXInO1xuaW1wb3J0IHsgT2JzZXJ2YWJsZSwgb2YgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IG1hcCB9IGZyb20gJ3J4anMvb3BlcmF0b3JzJztcblxuaW1wb3J0IHsgQmFzZVVzZXIgfSBmcm9tICcuLi9tb2RlbHMvYmFzZS11c2VyLm1vZGVsJztcbmltcG9ydCB7IEF1dGhlbnRpY2F0aW9uU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzL2F1dGhlbnRpY2F0aW9uLnNlcnZpY2UnO1xuaW1wb3J0IHsgT2JqZWN0VXRpbCB9IGZyb20gJy4uL3V0aWxzL29iamVjdC51dGlsJztcbmltcG9ydCB7IE1lbnVEVE8gfSBmcm9tICcuLy4uL21vZGVscy9kdG8vbWVudS5kdG8nO1xuaW1wb3J0IHsgQXJyYXlVdGlsIH0gZnJvbSAnLi8uLi91dGlscy9hcnJheS51dGlsJztcblxuQEluamVjdGFibGUoeyBwcm92aWRlZEluOiAncm9vdCcgfSlcbmV4cG9ydCBjbGFzcyBQZXJtaXNzaW9uR3VhcmQgaW1wbGVtZW50cyBDYW5BY3RpdmF0ZSwgQ2FuQWN0aXZhdGVDaGlsZCB7XG5cbiAgICBjb25zdHJ1Y3RvcihcbiAgICAgICAgcHJpdmF0ZSBfcm91dGVyOiBSb3V0ZXIsXG4gICAgICAgIHByaXZhdGUgX2F1dGhlbnRpY2F0aW9uU2VydmljZTogQXV0aGVudGljYXRpb25TZXJ2aWNlPEJhc2VVc2VyPlxuICAgICkgeyB9XG5cbiAgICBjYW5BY3RpdmF0ZShyb3V0ZTogQWN0aXZhdGVkUm91dGVTbmFwc2hvdCwgc3RhdGU6IFJvdXRlclN0YXRlU25hcHNob3QpOiBPYnNlcnZhYmxlPGJvb2xlYW4+IHtcbiAgICAgICAgaWYgKCFPYmplY3RVdGlsLmlzTnVsbCh0aGlzLl9hdXRoZW50aWNhdGlvblNlcnZpY2UudG9rZW5WYWx1ZUxvY2FsU3RvcmFnZSkpIHtcbiAgICAgICAgICAgIHJldHVybiB0aGlzLl9hdXRoZW50aWNhdGlvblNlcnZpY2UudG9rZW4ucGlwZShcbiAgICAgICAgICAgICAgICBtYXAodG9rZW4gPT4ge1xuICAgICAgICAgICAgICAgICAgICBpZiAodGhpcy5fYXV0aGVudGljYXRpb25TZXJ2aWNlLmlzVmFsaWRUb2tlbih0b2tlbilcbiAgICAgICAgICAgICAgICAgICAgICAgICYmICghdGhpcy5oYXNQZXJtaXNzaW9uKHRva2VuLnVzZXIubWVudUxpc3QsIHN0YXRlLnVybCkgJiYgIXRoaXMuaGFzQXV0aG9yaXR5KHRva2VuLnVzZXIsIHJvdXRlLmRhdGEuYXV0aG9yaXR5KSkpIHtcbiAgICAgICAgICAgICAgICAgICAgICAgIHRoaXMuX3JvdXRlci5uYXZpZ2F0ZShbJ2Vycm9ycy80MDMnXSk7XG4gICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7XG4gICAgICAgICAgICAgICAgICAgIH1cbiAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7XG4gICAgICAgICAgICAgICAgfSlcbiAgICAgICAgICAgICk7XG4gICAgICAgIH1cbiAgICAgICAgdGhpcy5fcm91dGVyLm5hdmlnYXRlKFsnZXJyb3JzLzQwMyddKTtcbiAgICAgICAgcmV0dXJuIG9mKGZhbHNlKTtcbiAgICB9XG5cbiAgICBoYXNBdXRob3JpdHkodXNlcjogYW55LCBwZXJtaXNzaW9uOiBzdHJpbmcpOiBib29sZWFuIHtcbiAgICAgICAgcmV0dXJuICEhdXNlci5hdXRob3JpdGllcy5maW5kKGF1dGhvcml0eSA9PiBhdXRob3JpdHkuYXV0aG9yaXR5Lm1hdGNoKHBlcm1pc3Npb24pKTtcbiAgICB9XG5cbiAgICBoYXNQZXJtaXNzaW9uKG1lbnVMaXN0OiBNZW51RFRPW10sIHVybDogc3RyaW5nKTogYm9vbGVhbiB7XG4gICAgICAgIGZvciAoY29uc3QgbWVudSBvZiBtZW51TGlzdCkge1xuICAgICAgICAgICAgaWYgKHVybC5zcGxpdCgnLycpLnBvcCgpID09PSBtZW51LnJvdXRlKSB7XG4gICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7XG4gICAgICAgICAgICB9IGVsc2UgaWYgKCFBcnJheVV0aWwuaXNFbXB0eShtZW51Lm1lbnVMaXN0KSkge1xuICAgICAgICAgICAgICAgIHJldHVybiB0aGlzLmhhc1Blcm1pc3Npb24obWVudS5tZW51TGlzdCwgdXJsKTtcbiAgICAgICAgICAgIH1cbiAgICAgICAgfVxuICAgICAgICByZXR1cm4gZmFsc2U7XG4gICAgfVxuXG4gICAgY2FuQWN0aXZhdGVDaGlsZChyb3V0ZTogQWN0aXZhdGVkUm91dGVTbmFwc2hvdCwgc3RhdGU6IFJvdXRlclN0YXRlU25hcHNob3QpOiBPYnNlcnZhYmxlPGJvb2xlYW4+IHtcbiAgICAgICAgcmV0dXJuIHRoaXMuY2FuQWN0aXZhdGUocm91dGUsIHN0YXRlKTtcbiAgICB9XG5cbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGVybWlzc2lvbi5ndWFyZC5qcyIsInNvdXJjZVJvb3QiOiJuZzovL0BnaXBpc2lzdGVtYXMvbmctY29yZS8iLCJzb3VyY2VzIjpbImNvcmUvZ3VhcmRzL3Blcm1pc3Npb24uZ3VhcmQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDM0MsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ3JELE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxXQUFXLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxFQUFFLG1CQUFtQixFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDckgsT0FBTyxFQUFjLEVBQUUsRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUt0QyxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQUMzRSxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDaEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2xELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQzs7Ozs7QUFFbEQsSUFBYSxlQUFlLEdBQTVCLE1BQWEsZUFBZTtJQUV4QixZQUNZLE9BQWUsRUFDZixVQUFxQixFQUNyQixzQkFBdUQ7UUFGdkQsWUFBTyxHQUFQLE9BQU8sQ0FBUTtRQUNmLGVBQVUsR0FBVixVQUFVLENBQVc7UUFDckIsMkJBQXNCLEdBQXRCLHNCQUFzQixDQUFpQztJQUMvRCxDQUFDO0lBRUcsYUFBYSxDQUFDLElBQWMsRUFBRSxVQUFrQjtRQUNwRCxJQUFJLFVBQVUsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksVUFBVSxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsRUFBRTtZQUMzRCxPQUFPLEtBQUssQ0FBQztTQUNoQjtRQUNELE9BQU8sQ0FBQyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsU0FBUyxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztJQUN2RixDQUFDO0lBRU8sY0FBYyxDQUFDLFFBQW1CLEVBQUUsR0FBVztRQUNuRCxLQUFLLE1BQU0sSUFBSSxJQUFJLFFBQVEsRUFBRTtZQUN6QixJQUFJLEdBQUcsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxFQUFFLEtBQUssSUFBSSxDQUFDLEtBQUssRUFBRTtnQkFDckMsT0FBTyxJQUFJLENBQUM7YUFDZjtpQkFBTSxJQUFJLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLEVBQUU7Z0JBQzFDLE9BQU8sSUFBSSxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLEdBQUcsQ0FBQyxDQUFDO2FBQ2xEO1NBQ0o7UUFDRCxPQUFPLEtBQUssQ0FBQztJQUNqQixDQUFDO0lBRUQsV0FBVyxDQUFDLEtBQTZCLEVBQUUsS0FBMEI7UUFDakUsTUFBTSxLQUFLLEdBQXVCLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxLQUFLLENBQUM7UUFDcEUsSUFBSSxDQUFDLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDLEVBQUU7WUFDbEQsSUFBSSxDQUFDLHNCQUFzQixDQUFDLGFBQWEsRUFBRSxDQUFDO1lBQzVDLElBQUksQ0FBQyxVQUFVLENBQUMsUUFBUSxFQUFFLENBQUM7WUFDM0IsSUFBSSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDO1lBQ3ZDLE9BQU8sRUFBRSxDQUFDLEtBQUssQ0FBQyxDQUFDO1NBQ3BCO1FBRUQsTUFBTSxhQUFhLEdBQVksSUFBSSxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxLQUFLLENBQUMsR0FBRyxDQUFDLElBQUksSUFBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFLEtBQUssQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDM0ksSUFBSSxDQUFDLGFBQWEsRUFBRTtZQUNoQixJQUFJLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUM7WUFDdEMsT0FBTyxFQUFFLENBQUMsS0FBSyxDQUFDLENBQUM7U0FDcEI7UUFFRCxPQUFPLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNwQixDQUFDO0lBRUQsZ0JBQWdCLENBQUMsS0FBNkIsRUFBRSxLQUEwQjtRQUN0RSxPQUFPLElBQUksQ0FBQyxXQUFXLENBQUMsS0FBSyxFQUFFLEtBQUssQ0FBQyxDQUFDO0lBQzFDLENBQUM7Q0FFSixDQUFBOztZQTdDd0IsTUFBTTtZQUNILFNBQVM7WUFDRyxxQkFBcUI7OztBQUxoRCxlQUFlO0lBRDNCLFVBQVUsQ0FBQyxFQUFFLFVBQVUsRUFBRSxNQUFNLEVBQUUsQ0FBQztxQ0FJVixNQUFNO1FBQ0gsU0FBUztRQUNHLHFCQUFxQjtHQUxoRCxlQUFlLENBZ0QzQjtTQWhEWSxlQUFlIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgTWF0RGlhbG9nIH0gZnJvbSAnQGFuZ3VsYXIvbWF0ZXJpYWwvZGlhbG9nJztcbmltcG9ydCB7IEFjdGl2YXRlZFJvdXRlU25hcHNob3QsIENhbkFjdGl2YXRlLCBDYW5BY3RpdmF0ZUNoaWxkLCBSb3V0ZXIsIFJvdXRlclN0YXRlU25hcHNob3QgfSBmcm9tICdAYW5ndWxhci9yb3V0ZXInO1xuaW1wb3J0IHsgT2JzZXJ2YWJsZSwgb2YgfSBmcm9tICdyeGpzJztcblxuaW1wb3J0IHsgQmFzZVVzZXIgfSBmcm9tICcuLi9tb2RlbHMvYmFzZS11c2VyLm1vZGVsJztcbmltcG9ydCB7IE1lbnVEVE8gfSBmcm9tICcuLi9tb2RlbHMvZHRvL21lbnUuZHRvJztcbmltcG9ydCB7IFRva2VuRFRPIH0gZnJvbSAnLi4vbW9kZWxzL2R0by90b2tlbi5kdG8nO1xuaW1wb3J0IHsgQXV0aGVudGljYXRpb25TZXJ2aWNlIH0gZnJvbSAnLi4vc2VydmljZXMvYXV0aGVudGljYXRpb24uc2VydmljZSc7XG5pbXBvcnQgeyBBcnJheVV0aWwgfSBmcm9tICcuLi91dGlscy9hcnJheS51dGlsJztcbmltcG9ydCB7IE9iamVjdFV0aWwgfSBmcm9tICcuLi91dGlscy9vYmplY3QudXRpbCc7XG5pbXBvcnQgeyBTdHJpbmdVdGlsIH0gZnJvbSAnLi4vdXRpbHMvc3RyaW5nLnV0aWwnO1xuQEluamVjdGFibGUoeyBwcm92aWRlZEluOiAncm9vdCcgfSlcbmV4cG9ydCBjbGFzcyBQZXJtaXNzaW9uR3VhcmQgaW1wbGVtZW50cyBDYW5BY3RpdmF0ZSwgQ2FuQWN0aXZhdGVDaGlsZCB7XG5cbiAgICBjb25zdHJ1Y3RvcihcbiAgICAgICAgcHJpdmF0ZSBfcm91dGVyOiBSb3V0ZXIsXG4gICAgICAgIHByaXZhdGUgX21hdERpYWxvZzogTWF0RGlhbG9nLFxuICAgICAgICBwcml2YXRlIF9hdXRoZW50aWNhdGlvblNlcnZpY2U6IEF1dGhlbnRpY2F0aW9uU2VydmljZTxCYXNlVXNlcj5cbiAgICApIHsgfVxuXG4gICAgcHJpdmF0ZSBfaGFzQXV0aG9yaXR5KHVzZXI6IEJhc2VVc2VyLCBwZXJtaXNzaW9uOiBzdHJpbmcpOiBib29sZWFuIHtcbiAgICAgICAgaWYgKE9iamVjdFV0aWwuaXNOdWxsKHVzZXIpIHx8IFN0cmluZ1V0aWwuaXNFbXB0eShwZXJtaXNzaW9uKSkge1xuICAgICAgICAgICAgcmV0dXJuIGZhbHNlO1xuICAgICAgICB9XG4gICAgICAgIHJldHVybiAhIXVzZXIuYXV0aG9yaXRpZXMuZmluZChhdXRob3JpdHkgPT4gYXV0aG9yaXR5LmF1dGhvcml0eS5tYXRjaChwZXJtaXNzaW9uKSk7XG4gICAgfVxuXG4gICAgcHJpdmF0ZSBfaGFzUGVybWlzc2lvbihtZW51TGlzdDogTWVudURUT1tdLCB1cmw6IHN0cmluZyk6IGJvb2xlYW4ge1xuICAgICAgICBmb3IgKGNvbnN0IG1lbnUgb2YgbWVudUxpc3QpIHtcbiAgICAgICAgICAgIGlmICh1cmwuc3BsaXQoJy8nKS5wb3AoKSA9PT0gbWVudS5yb3V0ZSkge1xuICAgICAgICAgICAgICAgIHJldHVybiB0cnVlO1xuICAgICAgICAgICAgfSBlbHNlIGlmICghQXJyYXlVdGlsLmlzRW1wdHkobWVudS5tZW51TGlzdCkpIHtcbiAgICAgICAgICAgICAgICByZXR1cm4gdGhpcy5faGFzUGVybWlzc2lvbihtZW51Lm1lbnVMaXN0LCB1cmwpO1xuICAgICAgICAgICAgfVxuICAgICAgICB9XG4gICAgICAgIHJldHVybiBmYWxzZTtcbiAgICB9XG5cbiAgICBjYW5BY3RpdmF0ZShyb3V0ZTogQWN0aXZhdGVkUm91dGVTbmFwc2hvdCwgc3RhdGU6IFJvdXRlclN0YXRlU25hcHNob3QpOiBPYnNlcnZhYmxlPGJvb2xlYW4+IHtcbiAgICAgICAgY29uc3QgdG9rZW46IFRva2VuRFRPPEJhc2VVc2VyPiA9IHRoaXMuX2F1dGhlbnRpY2F0aW9uU2VydmljZS50b2tlbjtcbiAgICAgICAgaWYgKCF0aGlzLl9hdXRoZW50aWNhdGlvblNlcnZpY2UuaXNWYWxpZFRva2VuKHRva2VuKSkge1xuICAgICAgICAgICAgdGhpcy5fYXV0aGVudGljYXRpb25TZXJ2aWNlLnJlbW92ZVNlc3Npb24oKTtcbiAgICAgICAgICAgIHRoaXMuX21hdERpYWxvZy5jbG9zZUFsbCgpO1xuICAgICAgICAgICAgdGhpcy5fcm91dGVyLm5hdmlnYXRlKFsnb2F1dGgvbG9naW4nXSk7XG4gICAgICAgICAgICByZXR1cm4gb2YoZmFsc2UpO1xuICAgICAgICB9XG5cbiAgICAgICAgY29uc3QgaGFzUGVybWlzc2lvbjogYm9vbGVhbiA9IHRoaXMuX2hhc1Blcm1pc3Npb24odG9rZW4udXNlci5tZW51TGlzdCwgc3RhdGUudXJsKSAmJiB0aGlzLl9oYXNBdXRob3JpdHkodG9rZW4udXNlciwgcm91dGUuZGF0YS5hdXRob3JpdHkpO1xuICAgICAgICBpZiAoIWhhc1Blcm1pc3Npb24pIHtcbiAgICAgICAgICAgIHRoaXMuX3JvdXRlci5uYXZpZ2F0ZShbJ2Vycm9ycy80MDMnXSk7XG4gICAgICAgICAgICByZXR1cm4gb2YoZmFsc2UpO1xuICAgICAgICB9XG5cbiAgICAgICAgcmV0dXJuIG9mKHRydWUpO1xuICAgIH1cblxuICAgIGNhbkFjdGl2YXRlQ2hpbGQocm91dGU6IEFjdGl2YXRlZFJvdXRlU25hcHNob3QsIHN0YXRlOiBSb3V0ZXJTdGF0ZVNuYXBzaG90KTogT2JzZXJ2YWJsZTxib29sZWFuPiB7XG4gICAgICAgIHJldHVybiB0aGlzLmNhbkFjdGl2YXRlKHJvdXRlLCBzdGF0ZSk7XG4gICAgfVxuXG59XG4iXX0=

package/esm2015/core/interceptors/auth.interceptor.js

@@ -1,13 +1,15 @@
 import { __decorate, __metadata } from "tslib";
 import { Injectable } from '@angular/core';
 import { AuthenticationService } from '../services/authentication.service';
+import { ObjectUtil } from '../utils/object.util';
+import { StringUtil } from '../utils/string.util';
 let AuthInterceptor = class AuthInterceptor {
-    constructor(authenticationService) {
-        this.authenticationService = authenticationService;
+    constructor(_authenticationService) {
+        this._authenticationService = _authenticationService;
     }
     intercept(request, next) {
-        const token = this.authenticationService.tokenValue;
-        if (token && token.accessToken && !request.headers.get('skip')) {
+        const token = this._authenticationService.token;
+        if (!ObjectUtil.isNull(token) && !StringUtil.isEmpty(token.accessToken) && !request.headers.get('skip')) {
             request = request.clone({
                 setHeaders: {
                     Authorization: `Bearer ${token.accessToken}`
@@ -25,4 +27,4 @@ AuthInterceptor = __decorate([
     __metadata("design:paramtypes", [AuthenticationService])
 ], AuthInterceptor);
 export { AuthInterceptor };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5pbnRlcmNlcHRvci5qcyIsInNvdXJjZVJvb3QiOiJuZzovL0BnaXBpc2lzdGVtYXMvbmctY29yZS8iLCJzb3VyY2VzIjpbImNvcmUvaW50ZXJjZXB0b3JzL2F1dGguaW50ZXJjZXB0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUNBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFLM0MsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sb0NBQW9DLENBQUM7QUFHM0UsSUFBYSxlQUFlLEdBQTVCLE1BQWEsZUFBZTtJQUV4QixZQUFvQixxQkFBc0Q7UUFBdEQsMEJBQXFCLEdBQXJCLHFCQUFxQixDQUFpQztJQUMxRSxDQUFDO0lBRUQsU0FBUyxDQUFDLE9BQXlCLEVBQUUsSUFBaUI7UUFDbEQsTUFBTSxLQUFLLEdBQXVCLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxVQUFVLENBQUM7UUFFeEUsSUFBSSxLQUFLLElBQUksS0FBSyxDQUFDLFdBQVcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxFQUFFO1lBQzVELE9BQU8sR0FBRyxPQUFPLENBQUMsS0FBSyxDQUFDO2dCQUNwQixVQUFVLEVBQUU7b0JBQ1IsYUFBYSxFQUFFLFVBQVUsS0FBSyxDQUFDLFdBQVcsRUFBRTtpQkFDL0M7YUFDSixDQUFDLENBQUM7U0FDTjtRQUVELE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUNoQyxDQUFDO0NBQ0osQ0FBQTs7WUFoQjhDLHFCQUFxQjs7QUFGdkQsZUFBZTtJQUQzQixVQUFVLEVBQUU7cUNBR2tDLHFCQUFxQjtHQUZ2RCxlQUFlLENBa0IzQjtTQWxCWSxlQUFlIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSHR0cEV2ZW50LCBIdHRwSGFuZGxlciwgSHR0cEludGVyY2VwdG9yLCBIdHRwUmVxdWVzdCB9IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcbmltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IE9ic2VydmFibGUgfSBmcm9tICdyeGpzJztcblxuaW1wb3J0IHsgQmFzZVVzZXIgfSBmcm9tICcuLi9tb2RlbHMvYmFzZS11c2VyLm1vZGVsJztcbmltcG9ydCB7IFRva2VuRFRPIH0gZnJvbSAnLi4vbW9kZWxzL2R0by90b2tlbi5kdG8nO1xuaW1wb3J0IHsgQXV0aGVudGljYXRpb25TZXJ2aWNlIH0gZnJvbSAnLi4vc2VydmljZXMvYXV0aGVudGljYXRpb24uc2VydmljZSc7XG5cbkBJbmplY3RhYmxlKClcbmV4cG9ydCBjbGFzcyBBdXRoSW50ZXJjZXB0b3IgaW1wbGVtZW50cyBIdHRwSW50ZXJjZXB0b3Ige1xuXG4gICAgY29uc3RydWN0b3IocHJpdmF0ZSBhdXRoZW50aWNhdGlvblNlcnZpY2U6IEF1dGhlbnRpY2F0aW9uU2VydmljZTxCYXNlVXNlcj4pIHtcbiAgICB9XG5cbiAgICBpbnRlcmNlcHQocmVxdWVzdDogSHR0cFJlcXVlc3Q8YW55PiwgbmV4dDogSHR0cEhhbmRsZXIpOiBPYnNlcnZhYmxlPEh0dHBFdmVudDxhbnk+PiB7XG4gICAgICAgIGNvbnN0IHRva2VuOiBUb2tlbkRUTzxCYXNlVXNlcj4gPSB0aGlzLmF1dGhlbnRpY2F0aW9uU2VydmljZS50b2tlblZhbHVlO1xuXG4gICAgICAgIGlmICh0b2tlbiAmJiB0b2tlbi5hY2Nlc3NUb2tlbiAmJiAhcmVxdWVzdC5oZWFkZXJzLmdldCgnc2tpcCcpKSB7XG4gICAgICAgICAgICByZXF1ZXN0ID0gcmVxdWVzdC5jbG9uZSh7XG4gICAgICAgICAgICAgICAgc2V0SGVhZGVyczoge1xuICAgICAgICAgICAgICAgICAgICBBdXRob3JpemF0aW9uOiBgQmVhcmVyICR7dG9rZW4uYWNjZXNzVG9rZW59YFxuICAgICAgICAgICAgICAgIH1cbiAgICAgICAgICAgIH0pO1xuICAgICAgICB9XG5cbiAgICAgICAgcmV0dXJuIG5leHQuaGFuZGxlKHJlcXVlc3QpO1xuICAgIH1cbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5pbnRlcmNlcHRvci5qcyIsInNvdXJjZVJvb3QiOiJuZzovL0BnaXBpc2lzdGVtYXMvbmctY29yZS8iLCJzb3VyY2VzIjpbImNvcmUvaW50ZXJjZXB0b3JzL2F1dGguaW50ZXJjZXB0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUNBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFLM0MsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sb0NBQW9DLENBQUM7QUFDM0UsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2xELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUdsRCxJQUFhLGVBQWUsR0FBNUIsTUFBYSxlQUFlO0lBRXhCLFlBQW9CLHNCQUF1RDtRQUF2RCwyQkFBc0IsR0FBdEIsc0JBQXNCLENBQWlDO0lBQUksQ0FBQztJQUVoRixTQUFTLENBQUMsT0FBeUIsRUFBRSxJQUFpQjtRQUNsRCxNQUFNLEtBQUssR0FBdUIsSUFBSSxDQUFDLHNCQUFzQixDQUFDLEtBQUssQ0FBQztRQUNwRSxJQUFJLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLEVBQUU7WUFDckcsT0FBTyxHQUFHLE9BQU8sQ0FBQyxLQUFLLENBQUM7Z0JBQ3BCLFVBQVUsRUFBRTtvQkFDUixhQUFhLEVBQUUsVUFBVSxLQUFLLENBQUMsV0FBVyxFQUFFO2lCQUMvQzthQUNKLENBQUMsQ0FBQztTQUNOO1FBRUQsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ2hDLENBQUM7Q0FDSixDQUFBOztZQWQrQyxxQkFBcUI7O0FBRnhELGVBQWU7SUFEM0IsVUFBVSxFQUFFO3FDQUdtQyxxQkFBcUI7R0FGeEQsZUFBZSxDQWdCM0I7U0FoQlksZUFBZSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEh0dHBFdmVudCwgSHR0cEhhbmRsZXIsIEh0dHBJbnRlcmNlcHRvciwgSHR0cFJlcXVlc3QgfSBmcm9tICdAYW5ndWxhci9jb21tb24vaHR0cCc7XG5pbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBPYnNlcnZhYmxlIH0gZnJvbSAncnhqcyc7XG5cbmltcG9ydCB7IEJhc2VVc2VyIH0gZnJvbSAnLi4vbW9kZWxzL2Jhc2UtdXNlci5tb2RlbCc7XG5pbXBvcnQgeyBUb2tlbkRUTyB9IGZyb20gJy4uL21vZGVscy9kdG8vdG9rZW4uZHRvJztcbmltcG9ydCB7IEF1dGhlbnRpY2F0aW9uU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzL2F1dGhlbnRpY2F0aW9uLnNlcnZpY2UnO1xuaW1wb3J0IHsgT2JqZWN0VXRpbCB9IGZyb20gJy4uL3V0aWxzL29iamVjdC51dGlsJztcbmltcG9ydCB7IFN0cmluZ1V0aWwgfSBmcm9tICcuLi91dGlscy9zdHJpbmcudXRpbCc7XG5cbkBJbmplY3RhYmxlKClcbmV4cG9ydCBjbGFzcyBBdXRoSW50ZXJjZXB0b3IgaW1wbGVtZW50cyBIdHRwSW50ZXJjZXB0b3Ige1xuXG4gICAgY29uc3RydWN0b3IocHJpdmF0ZSBfYXV0aGVudGljYXRpb25TZXJ2aWNlOiBBdXRoZW50aWNhdGlvblNlcnZpY2U8QmFzZVVzZXI+KSB7IH1cblxuICAgIGludGVyY2VwdChyZXF1ZXN0OiBIdHRwUmVxdWVzdDxhbnk+LCBuZXh0OiBIdHRwSGFuZGxlcik6IE9ic2VydmFibGU8SHR0cEV2ZW50PGFueT4+IHtcbiAgICAgICAgY29uc3QgdG9rZW46IFRva2VuRFRPPEJhc2VVc2VyPiA9IHRoaXMuX2F1dGhlbnRpY2F0aW9uU2VydmljZS50b2tlbjtcbiAgICAgICAgaWYgKCFPYmplY3RVdGlsLmlzTnVsbCh0b2tlbikgJiYgIVN0cmluZ1V0aWwuaXNFbXB0eSh0b2tlbi5hY2Nlc3NUb2tlbikgJiYgIXJlcXVlc3QuaGVhZGVycy5nZXQoJ3NraXAnKSkge1xuICAgICAgICAgICAgcmVxdWVzdCA9IHJlcXVlc3QuY2xvbmUoe1xuICAgICAgICAgICAgICAgIHNldEhlYWRlcnM6IHtcbiAgICAgICAgICAgICAgICAgICAgQXV0aG9yaXphdGlvbjogYEJlYXJlciAke3Rva2VuLmFjY2Vzc1Rva2VufWBcbiAgICAgICAgICAgICAgICB9XG4gICAgICAgICAgICB9KTtcbiAgICAgICAgfVxuXG4gICAgICAgIHJldHVybiBuZXh0LmhhbmRsZShyZXF1ZXN0KTtcbiAgICB9XG59XG4iXX0=

package/esm2015/core/services/authentication.service.js

@@ -1,9 +1,9 @@
-import { __awaiter, __decorate, __metadata } from "tslib";
+import { __decorate, __metadata } from "tslib";
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Router } from '@angular/router';
 import { BehaviorSubject } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { catchError, map, takeUntil } from 'rxjs/operators';
 import * as moment_ from 'moment';
 import * as i0 from "@angular/core";
 import * as i1 from "@angular/router";
@@ -17,36 +17,37 @@ let AuthenticationService = class AuthenticationService extends AbstractService
         super();
         this.router = router;
         this.http = http;
-        this.tokenSubject = new BehaviorSubject(JSON.parse(localStorage.getItem('token')));
-        this.token = this.tokenSubject.asObservable();
+        this._tokenSubject$ = new BehaviorSubject(JSON.parse(localStorage.getItem('token')));
+        this.token$ = this._tokenSubject$.asObservable();
     }
-    login(user) {
+    login(username, password) {
         const body = new HttpParams()
             .set('grant_type', 'password')
-            .set('username', user.username)
-            .set('password', user.password);
-        return this.http.post('api/authenticator/oauth/token', body, this.options()).pipe(map(accessToken => this.setCurrentUser(accessToken)));
+            .set('username', username)
+            .set('password', password);
+        return this.http.post('api/authenticator/oauth/token', body, this.options(this.buildParams(), this.buildHeaders().append('skip', String(true)))).pipe(map((token) => {
+            if (this.isValidToken(token)) {
+                this.setSession(token);
+            }
+            return token;
+        }), takeUntil(this.onDestroy), catchError(this.handleError));
     }
     logout() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.revokeToken().toPromise().then(() => {
-                this.removeToken();
-                this.router.navigate(['/oauth/login'], { queryParams: { returnUrl: this.router.routerState.snapshot.url } });
-            });
+        this.revokeToken().subscribe(_ => {
+            this.removeSession();
+            this.router.navigate(['/oauth/login'], { queryParams: { returnUrl: this.router.routerState.snapshot.url } });
+        }, error => {
+            throw new Error(error);
         });
     }
-    removeToken() {
-        localStorage.removeItem('token');
-        this.tokenSubject.next(null);
-    }
     refreshToken(additionalParams) {
         let body = new HttpParams()
             .set('grant_type', 'refresh_token')
-            .set('refresh_token', this.tokenValue.refreshToken);
+            .set('refresh_token', this.token.refreshToken);
         if (!ObjectUtil.isNull(additionalParams)) {
             additionalParams.forEach((value, key) => body = body.append(key, value));
         }
-        return this.http.post('api/authenticator/oauth/token', body, this.options(this.buildParams(), this.buildHeaders().append('skip', 'true'))).pipe(map(accessToken => this.setCurrentUser(accessToken)));
+        return this.http.post('api/authenticator/oauth/token', body, this.options(this.buildParams(), this.buildHeaders().append('skip', 'true'))).pipe(map(accessToken => this.setSession(accessToken)), takeUntil(this.onDestroy), catchError(this.handleError));
     }
     revokeToken(token) {
         let lHttpHeaders = null;
@@ -55,27 +56,32 @@ let AuthenticationService = class AuthenticationService extends AbstractService
                 .append('Authorization', token.accessToken)
                 .append('skip', 'true');
         }
-        return this.http.post('api/authenticator/oauth/token/revoke', {}, this.options(null, lHttpHeaders));
-    }
-    isValidToken(token) {
-        if (!ObjectUtil.isNull(token) && !ObjectUtil.isNull(token.expiration)) {
-            return new Date(token.expiration).valueOf() > new Date().valueOf();
-        }
-        return false;
+        return this.http.post('api/authenticator/oauth/token/revoke', {}, this.options(null, lHttpHeaders)).pipe(takeUntil(this.onDestroy), catchError(this.handleError));
     }
-    setCurrentUser(token) {
-        if (token && token.accessToken) {
+    setSession(token) {
+        if (this.isValidToken(token)) {
             localStorage.setItem('token', JSON.stringify(token));
-            this.tokenSubject.next(token);
+            this._tokenSubject$.next(token);
         }
         return token;
     }
-    get tokenValue() {
-        return this.tokenSubject.value;
+    removeSession() {
+        localStorage.removeItem('token');
+        sessionStorage.clear();
     }
-    get tokenValueLocalStorage() {
+    isValidToken(token) {
+        if (!ObjectUtil.isNull(token) && !ObjectUtil.isNull(token.expiration)) {
+            const tokenExpiration = moment(token.expiration);
+            return moment().isBefore(tokenExpiration);
+        }
+        return false;
+    }
+    get token() {
         const token = localStorage.getItem('token');
-        return !StringUtil.isEmpty(token) ? JSON.parse(token) : null;
+        if (StringUtil.isEmpty(token)) {
+            return null;
+        }
+        return JSON.parse(token);
     }
     buildHeaders() {
         return new HttpHeaders()
@@ -96,4 +102,4 @@ AuthenticationService = __decorate([
         HttpClient])
 ], AuthenticationService);
 export { AuthenticationService };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"authentication.service.js","sourceRoot":"ng://@gipisistemas/ng-core/","sources":["core/services/authentication.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';\nimport { Injectable } from '@angular/core';\nimport { Router } from '@angular/router';\nimport { BehaviorSubject, Observable } from 'rxjs';\nimport { map } from 'rxjs/operators';\n\nimport * as moment_ from 'moment';\nconst moment = moment_;\n\nimport { BaseUser } from '../models/base-user.model';\nimport { TokenDTO } from '../models/dto/token.dto';\nimport { ObjectUtil } from '../utils/object.util';\nimport { StringUtil } from '../utils/string.util';\nimport { AbstractService } from './abstract.service';\n\n@Injectable({ providedIn: 'root' })\nexport class AuthenticationService<U extends BaseUser> extends AbstractService {\n\n    protected tokenSubject: BehaviorSubject<TokenDTO<U>>;\n\n    token: Observable<TokenDTO<U>>;\n\n    constructor(\n        protected router: Router,\n        protected http: HttpClient,\n    ) {\n        super();\n        this.tokenSubject = new BehaviorSubject<TokenDTO<U>>(JSON.parse(localStorage.getItem('token')));\n        this.token = this.tokenSubject.asObservable();\n    }\n\n    login(user: U): Observable<TokenDTO<U>> {\n        const body: HttpParams = new HttpParams()\n            .set('grant_type', 'password')\n            .set('username', user.username)\n            .set('password', user.password);\n\n        return this.http.post<TokenDTO<U>>('api/authenticator/oauth/token', body, this.options()).pipe(\n            map(accessToken => this.setCurrentUser(accessToken))\n        );\n    }\n\n    async logout(): Promise<void> {\n        await this.revokeToken().toPromise().then(() => {\n            this.removeToken();\n            this.router.navigate(['/oauth/login'], { queryParams: { returnUrl: this.router.routerState.snapshot.url } });\n        });\n    }\n\n    removeToken(): void {\n        localStorage.removeItem('token');\n        this.tokenSubject.next(null);\n    }\n\n    refreshToken(additionalParams?: Map<any, any>): Observable<TokenDTO<U>> {\n        let body: HttpParams = new HttpParams()\n            .set('grant_type', 'refresh_token')\n            .set('refresh_token', this.tokenValue.refreshToken);\n\n        if (!ObjectUtil.isNull(additionalParams)) {\n            additionalParams.forEach((value, key) => body = body.append(key, value));\n        }\n\n        return this.http.post<TokenDTO<U>>('api/authenticator/oauth/token', body, this.options(this.buildParams(), this.buildHeaders().append('skip', 'true'))).pipe(\n            map(accessToken => this.setCurrentUser(accessToken))\n        );\n    }\n\n    revokeToken(token?: TokenDTO<U>): Observable<any> {\n        let lHttpHeaders: HttpHeaders = null;\n        if (!ObjectUtil.isNull(token)) {\n            lHttpHeaders = new HttpHeaders()\n                .append('Authorization', token.accessToken)\n                .append('skip', 'true');\n        }\n        return this.http.post('api/authenticator/oauth/token/revoke', {}, this.options(null, lHttpHeaders));\n    }\n\n    isValidToken(token: TokenDTO<U>): boolean {\n        if (!ObjectUtil.isNull(token) && !ObjectUtil.isNull(token.expiration)) {\n            return new Date(token.expiration).valueOf() > new Date().valueOf();\n        }\n        return false;\n    }\n\n    protected setCurrentUser(token: TokenDTO<U>): TokenDTO<U> {\n        if (token && token.accessToken) {\n            localStorage.setItem('token', JSON.stringify(token));\n            this.tokenSubject.next(token);\n        }\n        return token;\n    }\n\n    get tokenValue(): TokenDTO<U> {\n        return this.tokenSubject.value;\n    }\n\n    get tokenValueLocalStorage(): TokenDTO<U> {\n        const token: string = localStorage.getItem('token');\n        return !StringUtil.isEmpty(token) ? JSON.parse(token) : null;\n    }\n\n    protected buildHeaders(): HttpHeaders {\n        return new HttpHeaders()\n            .append('Authorization', 'Basic ' + btoa('CONVENANT_MANAGEMENT:123'))\n            .append('Content-Type', 'application/x-www-form-urlencoded')\n            .append('accessType', 'WEB')\n            .append('timeZone', moment(new Date()).format('ZZ'));\n    }\n\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"authentication.service.js","sourceRoot":"ng://@gipisistemas/ng-core/","sources":["core/services/authentication.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';\nimport { Injectable } from '@angular/core';\nimport { Router } from '@angular/router';\nimport { BehaviorSubject, Observable } from 'rxjs';\nimport { catchError, map, takeUntil } from 'rxjs/operators';\n\nimport * as moment_ from 'moment';\nconst moment = moment_;\n\nimport { BaseUser } from '../models/base-user.model';\nimport { TokenDTO } from '../models/dto/token.dto';\nimport { ObjectUtil } from '../utils/object.util';\nimport { StringUtil } from '../utils/string.util';\nimport { AbstractService } from './abstract.service';\n\n@Injectable({ providedIn: 'root' })\nexport class AuthenticationService<U extends BaseUser> extends AbstractService {\n\n    private _tokenSubject$: BehaviorSubject<TokenDTO<U>>;\n    public token$: Observable<TokenDTO<U>>;\n\n    constructor(\n        protected router: Router,\n        protected http: HttpClient,\n    ) {\n        super();\n        this._tokenSubject$ = new BehaviorSubject(JSON.parse(localStorage.getItem('token')));\n        this.token$ = this._tokenSubject$.asObservable();\n    }\n\n    public login(username: string, password: string): Observable<TokenDTO<U>> {\n        const body: HttpParams = new HttpParams()\n            .set('grant_type', 'password')\n            .set('username', username)\n            .set('password', password);\n\n        return this.http.post<TokenDTO<U>>(\n            'api/authenticator/oauth/token',\n            body,\n            this.options(this.buildParams(), this.buildHeaders().append('skip', String(true)))\n        ).pipe(\n            map((token: TokenDTO<U>) => {\n                if (this.isValidToken(token)) {\n                    this.setSession(token);\n                }\n                return token;\n            }),\n            takeUntil(this.onDestroy),\n            catchError(this.handleError),\n        );\n    }\n\n    public logout(): void {\n        this.revokeToken().subscribe(_ => {\n            this.removeSession();\n            this.router.navigate(['/oauth/login'], { queryParams: { returnUrl: this.router.routerState.snapshot.url } });\n        }, error => {\n            throw new Error(error);\n        });\n    }\n\n    public refreshToken(additionalParams?: Map<any, any>): Observable<TokenDTO<U>> {\n        let body: HttpParams = new HttpParams()\n            .set('grant_type', 'refresh_token')\n            .set('refresh_token', this.token.refreshToken);\n\n        if (!ObjectUtil.isNull(additionalParams)) {\n            additionalParams.forEach((value, key) => body = body.append(key, value));\n        }\n\n        return this.http.post<TokenDTO<U>>('api/authenticator/oauth/token', body, this.options(this.buildParams(), this.buildHeaders().append('skip', 'true'))).pipe(\n            map(accessToken => this.setSession(accessToken)),\n            takeUntil(this.onDestroy),\n            catchError(this.handleError),\n        );\n    }\n\n    public revokeToken(token?: TokenDTO<U>): Observable<any> {\n        let lHttpHeaders: HttpHeaders = null;\n        if (!ObjectUtil.isNull(token)) {\n            lHttpHeaders = new HttpHeaders()\n                .append('Authorization', token.accessToken)\n                .append('skip', 'true');\n        }\n        return this.http.post('api/authenticator/oauth/token/revoke', {}, this.options(null, lHttpHeaders)).pipe(\n            takeUntil(this.onDestroy),\n            catchError(this.handleError),\n        );\n    }\n\n    protected setSession(token: TokenDTO<U>): TokenDTO<U> {\n        if (this.isValidToken(token)) {\n            localStorage.setItem('token', JSON.stringify(token));\n            this._tokenSubject$.next(token);\n        }\n        return token;\n    }\n\n    public removeSession(): void {\n        localStorage.removeItem('token');\n        sessionStorage.clear();\n    }\n\n    public isValidToken(token: TokenDTO<U>): boolean {\n        if (!ObjectUtil.isNull(token) && !ObjectUtil.isNull(token.expiration)) {\n            const tokenExpiration: moment.Moment = moment(token.expiration);\n            return moment().isBefore(tokenExpiration);\n        }\n        return false;\n    }\n\n    public get token(): TokenDTO<U> {\n        const token: string = localStorage.getItem('token');\n        if (StringUtil.isEmpty(token)) {\n            return null;\n        }\n        return JSON.parse(token);\n    }\n\n    protected buildHeaders(): HttpHeaders {\n        return new HttpHeaders()\n            .append('Authorization', 'Basic ' + btoa('CONVENANT_MANAGEMENT:123'))\n            .append('Content-Type', 'application/x-www-form-urlencoded')\n            .append('accessType', 'WEB')\n            .append('timeZone', moment(new Date()).format('ZZ'));\n    }\n\n}\n"]}

package/esm2015/core.js

@@ -8,7 +8,6 @@ export * from './core/core.module';
 export * from './core/enums/local-time.enum';
 export * from './core/guards/auth.guard';
 export * from './core/guards/permission.guard';
-export * from './core/guards/public.guard';
 export * from './core/interceptors/auth.interceptor';
 export * from './core/interceptors/error.interceptor';
 export * from './core/models/abstract.model';
@@ -86,4 +85,4 @@ export * from './core/gipi-components/services/file.service';
 export * from './core/gipi-components/services/session-storage.service';
 export * from './core/gipi-components/types/generic.type';
 export * from './core/gipi-components/types/uuid.type';
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"core.js","sourceRoot":"ng://@gipisistemas/ng-core/","sources":["core.ts"],"names":[],"mappings":"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","sourcesContent":["export * from './core/app-messages';\nexport * from './core/app.messages';\nexport * from './core/components/abstract-crud.component';\nexport * from './core/components/abstract-find.component';\nexport * from './core/components/abstract.component';\nexport * from './core/components/alert/alert.component';\nexport * from './core/core.module';\nexport * from './core/enums/local-time.enum';\nexport * from './core/guards/auth.guard';\nexport * from './core/guards/permission.guard';\nexport * from './core/guards/public.guard';\nexport * from './core/interceptors/auth.interceptor';\nexport * from './core/interceptors/error.interceptor';\nexport * from './core/models/abstract.model';\nexport * from './core/models/archive.model';\nexport * from './core/models/base-user.model';\nexport * from './core/models/dto/abstract.dto';\nexport * from './core/models/dto/chart.dto';\nexport * from './core/models/dto/confirmation.dto';\nexport * from './core/models/dto/dialog.dto';\nexport * from './core/models/dto/filter.dto';\nexport * from './core/models/dto/input-listbox.dto';\nexport * from './core/models/dto/menu.dto';\nexport * from './core/models/dto/message.dto';\nexport * from './core/models/dto/page.dto';\nexport * from './core/models/dto/sort.dto';\nexport * from './core/models/dto/tab.dto';\nexport * from './core/models/dto/table-column.dto';\nexport * from './core/models/dto/token.dto';\nexport * from './core/models/enums/criteria-operation.enum';\nexport * from './core/models/enums/criteria-sort-direction.enum';\nexport * from './core/models/enums/menu-type.enum';\nexport * from './core/models/enums/radio-button.enum';\nexport * from './core/models/enums/sort-direction.enum';\nexport * from './core/models/multitenant.model';\nexport * from './core/models/permission.model';\nexport * from './core/models/role.model';\nexport * from './core/pipes/local-time.pipe';\nexport * from './core/services/abstract-crud.service';\nexport * from './core/services/abstract-find.service';\nexport * from './core/services/abstract.service';\nexport * from './core/services/authentication.service';\nexport * from './core/services/breakpoint-observer.service';\nexport * from './core/services/confirmation.service';\nexport * from './core/services/dialog.service';\nexport * from './core/services/message.service';\nexport * from './core/services/nav.service';\nexport * from './core/services/svg-register.service';\nexport * from './core/types/local-time.type';\nexport * from './core/utils/array.util';\nexport * from './core/utils/browser.util';\nexport * from './core/utils/currency.util';\nexport * from './core/utils/date.util';\nexport * from './core/utils/document.util';\nexport * from './core/utils/email.util';\nexport * from './core/utils/number.util';\nexport * from './core/utils/object.util';\nexport * from './core/utils/password.util';\nexport * from './core/utils/phone.util';\nexport * from './core/utils/string.util';\nexport * from './core/utils/table-column-builder';\nexport * from './core/utils/time.util';\nexport * from './core/utils/url-params.util';\nexport * from './core/utils/uuid.util';\nexport * from './core/utils/zindex.util';\n\nexport * from './core/custom-breakpoints';\n\nexport * from './core/gipi-components/components/abstract-crud.component';\nexport * from './core/gipi-components/components/abstract-find.component';\nexport * from './core/gipi-components/components/abstract.component';\nexport * from './core/gipi-components/decorators/autowired.decorator';\nexport * from './core/gipi-components/enums/sort-direction.enum';\nexport * from './core/gipi-components/interface/abstract-crud.interface';\nexport * from './core/gipi-components/interface/abstract-find.interface';\nexport * from './core/gipi-components/interface/abstract.interface';\nexport * from './core/gipi-components/models/abstract-filter.model';\nexport * from './core/gipi-components/models/abstract.model';\nexport * from './core/gipi-components/models/applied-filter.model';\nexport * from './core/gipi-components/models/dto/abstract.dto';\nexport * from './core/gipi-components/models/page-event.model';\nexport * from './core/gipi-components/models/page.model';\nexport * from './core/gipi-components/models/sort.model';\nexport * from './core/gipi-components/services/abstract-crud.service';\nexport * from './core/gipi-components/services/abstract.service';\nexport * from './core/gipi-components/services/base.service';\nexport * from './core/gipi-components/services/file.service';\nexport * from './core/gipi-components/services/session-storage.service';\nexport * from './core/gipi-components/types/generic.type';\nexport * from './core/gipi-components/types/uuid.type';\n\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"core.js","sourceRoot":"ng://@gipisistemas/ng-core/","sources":["core.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,2CAA2C,CAAC;AAC1D,cAAc,2CAA2C,CAAC;AAC1D,cAAc,sCAAsC,CAAC;AACrD,cAAc,yCAAyC,CAAC;AACxD,cAAc,oBAAoB,CAAC;AACnC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,0BAA0B,CAAC;AACzC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,sCAAsC,CAAC;AACrD,cAAc,uCAAuC,CAAC;AACtD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,oCAAoC,CAAC;AACnD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,qCAAqC,CAAC;AACpD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oCAAoC,CAAC;AACnD,cAAc,6BAA6B,CAAC;AAC5C,cAAc,6CAA6C,CAAC;AAC5D,cAAc,kDAAkD,CAAC;AACjE,cAAc,oCAAoC,CAAC;AACnD,cAAc,uCAAuC,CAAC;AACtD,cAAc,yCAAyC,CAAC;AACxD,cAAc,iCAAiC,CAAC;AAChD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,0BAA0B,CAAC;AACzC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uCAAuC,CAAC;AACtD,cAAc,uCAAuC,CAAC;AACtD,cAAc,kCAAkC,CAAC;AACjD,cAAc,wCAAwC,CAAC;AACvD,cAAc,6CAA6C,CAAC;AAC5D,cAAc,sCAAsC,CAAC;AACrD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,iCAAiC,CAAC;AAChD,cAAc,6BAA6B,CAAC;AAC5C,cAAc,sCAAsC,CAAC;AACrD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,yBAAyB,CAAC;AACxC,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC;AACzC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,yBAAyB,CAAC;AACxC,cAAc,0BAA0B,CAAC;AACzC,cAAc,mCAAmC,CAAC;AAClD,cAAc,wBAAwB,CAAC;AACvC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,wBAAwB,CAAC;AACvC,cAAc,0BAA0B,CAAC;AAEzC,cAAc,2BAA2B,CAAC;AAE1C,cAAc,2DAA2D,CAAC;AAC1E,cAAc,2DAA2D,CAAC;AAC1E,cAAc,sDAAsD,CAAC;AACrE,cAAc,uDAAuD,CAAC;AACtE,cAAc,kDAAkD,CAAC;AACjE,cAAc,0DAA0D,CAAC;AACzE,cAAc,0DAA0D,CAAC;AACzE,cAAc,qDAAqD,CAAC;AACpE,cAAc,qDAAqD,CAAC;AACpE,cAAc,8CAA8C,CAAC;AAC7D,cAAc,oDAAoD,CAAC;AACnE,cAAc,gDAAgD,CAAC;AAC/D,cAAc,gDAAgD,CAAC;AAC/D,cAAc,0CAA0C,CAAC;AACzD,cAAc,0CAA0C,CAAC;AACzD,cAAc,uDAAuD,CAAC;AACtE,cAAc,kDAAkD,CAAC;AACjE,cAAc,8CAA8C,CAAC;AAC7D,cAAc,8CAA8C,CAAC;AAC7D,cAAc,yDAAyD,CAAC;AACxE,cAAc,2CAA2C,CAAC;AAC1D,cAAc,wCAAwC,CAAC","sourcesContent":["export * from './core/app-messages';\nexport * from './core/app.messages';\nexport * from './core/components/abstract-crud.component';\nexport * from './core/components/abstract-find.component';\nexport * from './core/components/abstract.component';\nexport * from './core/components/alert/alert.component';\nexport * from './core/core.module';\nexport * from './core/enums/local-time.enum';\nexport * from './core/guards/auth.guard';\nexport * from './core/guards/permission.guard';\nexport * from './core/interceptors/auth.interceptor';\nexport * from './core/interceptors/error.interceptor';\nexport * from './core/models/abstract.model';\nexport * from './core/models/archive.model';\nexport * from './core/models/base-user.model';\nexport * from './core/models/dto/abstract.dto';\nexport * from './core/models/dto/chart.dto';\nexport * from './core/models/dto/confirmation.dto';\nexport * from './core/models/dto/dialog.dto';\nexport * from './core/models/dto/filter.dto';\nexport * from './core/models/dto/input-listbox.dto';\nexport * from './core/models/dto/menu.dto';\nexport * from './core/models/dto/message.dto';\nexport * from './core/models/dto/page.dto';\nexport * from './core/models/dto/sort.dto';\nexport * from './core/models/dto/tab.dto';\nexport * from './core/models/dto/table-column.dto';\nexport * from './core/models/dto/token.dto';\nexport * from './core/models/enums/criteria-operation.enum';\nexport * from './core/models/enums/criteria-sort-direction.enum';\nexport * from './core/models/enums/menu-type.enum';\nexport * from './core/models/enums/radio-button.enum';\nexport * from './core/models/enums/sort-direction.enum';\nexport * from './core/models/multitenant.model';\nexport * from './core/models/permission.model';\nexport * from './core/models/role.model';\nexport * from './core/pipes/local-time.pipe';\nexport * from './core/services/abstract-crud.service';\nexport * from './core/services/abstract-find.service';\nexport * from './core/services/abstract.service';\nexport * from './core/services/authentication.service';\nexport * from './core/services/breakpoint-observer.service';\nexport * from './core/services/confirmation.service';\nexport * from './core/services/dialog.service';\nexport * from './core/services/message.service';\nexport * from './core/services/nav.service';\nexport * from './core/services/svg-register.service';\nexport * from './core/types/local-time.type';\nexport * from './core/utils/array.util';\nexport * from './core/utils/browser.util';\nexport * from './core/utils/currency.util';\nexport * from './core/utils/date.util';\nexport * from './core/utils/document.util';\nexport * from './core/utils/email.util';\nexport * from './core/utils/number.util';\nexport * from './core/utils/object.util';\nexport * from './core/utils/password.util';\nexport * from './core/utils/phone.util';\nexport * from './core/utils/string.util';\nexport * from './core/utils/table-column-builder';\nexport * from './core/utils/time.util';\nexport * from './core/utils/url-params.util';\nexport * from './core/utils/uuid.util';\nexport * from './core/utils/zindex.util';\n\nexport * from './core/custom-breakpoints';\n\nexport * from './core/gipi-components/components/abstract-crud.component';\nexport * from './core/gipi-components/components/abstract-find.component';\nexport * from './core/gipi-components/components/abstract.component';\nexport * from './core/gipi-components/decorators/autowired.decorator';\nexport * from './core/gipi-components/enums/sort-direction.enum';\nexport * from './core/gipi-components/interface/abstract-crud.interface';\nexport * from './core/gipi-components/interface/abstract-find.interface';\nexport * from './core/gipi-components/interface/abstract.interface';\nexport * from './core/gipi-components/models/abstract-filter.model';\nexport * from './core/gipi-components/models/abstract.model';\nexport * from './core/gipi-components/models/applied-filter.model';\nexport * from './core/gipi-components/models/dto/abstract.dto';\nexport * from './core/gipi-components/models/page-event.model';\nexport * from './core/gipi-components/models/page.model';\nexport * from './core/gipi-components/models/sort.model';\nexport * from './core/gipi-components/services/abstract-crud.service';\nexport * from './core/gipi-components/services/abstract.service';\nexport * from './core/gipi-components/services/base.service';\nexport * from './core/gipi-components/services/file.service';\nexport * from './core/gipi-components/services/session-storage.service';\nexport * from './core/gipi-components/types/generic.type';\nexport * from './core/gipi-components/types/uuid.type';\n\n"]}