zek 17.3.39 → 17.3.42
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2022/lib/modules/numeric/numeric.directive.mjs +5 -5
- package/esm2022/lib/services/auth-guard.service.mjs +5 -35
- package/esm2022/lib/services/auth.service.mjs +4 -13
- package/esm2022/lib/services/crud.service.mjs +4 -2
- package/fesm2022/zek.mjs +13 -48
- package/fesm2022/zek.mjs.map +1 -1
- package/lib/modules/numeric/numeric.directive.d.ts +3 -3
- package/lib/services/auth-guard.service.d.ts +1 -12
- package/lib/services/auth.service.d.ts +1 -1
- package/lib/services/crud.service.d.ts +2 -2
- package/package.json +1 -1
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Directive, HostListener, Input } from "@angular/core";
|
|
2
2
|
import { Convert, MathHelper } from "../../utils";
|
|
3
3
|
import * as i0 from "@angular/core";
|
|
4
|
-
export class
|
|
4
|
+
export class ZekNumericDirective {
|
|
5
5
|
get digits() {
|
|
6
6
|
return this._digits;
|
|
7
7
|
}
|
|
@@ -69,10 +69,10 @@ export class NumericDirective {
|
|
|
69
69
|
onPaste(event) {
|
|
70
70
|
this.run(this.el.nativeElement.value);
|
|
71
71
|
}
|
|
72
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.4", ngImport: i0, type:
|
|
73
|
-
static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "17.3.4", type:
|
|
72
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.4", ngImport: i0, type: ZekNumericDirective, deps: [{ token: i0.ElementRef }], target: i0.ɵɵFactoryTarget.Directive }); }
|
|
73
|
+
static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "17.3.4", type: ZekNumericDirective, isStandalone: true, selector: "[numeric]", inputs: { digits: "digits", negative: "negative" }, host: { listeners: { "keydown": "onKeyDown($event)", "paste": "onPaste($event)" } }, ngImport: i0 }); }
|
|
74
74
|
}
|
|
75
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.4", ngImport: i0, type:
|
|
75
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.4", ngImport: i0, type: ZekNumericDirective, decorators: [{
|
|
76
76
|
type: Directive,
|
|
77
77
|
args: [{
|
|
78
78
|
standalone: true,
|
|
@@ -89,4 +89,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.4", ngImpor
|
|
|
89
89
|
type: HostListener,
|
|
90
90
|
args: ["paste", ["$event"]]
|
|
91
91
|
}] } });
|
|
92
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
92
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnVtZXJpYy5kaXJlY3RpdmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy96ZWsvc3JjL2xpYi9tb2R1bGVzL251bWVyaWMvbnVtZXJpYy5kaXJlY3RpdmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFNBQVMsRUFBYyxZQUFZLEVBQUUsS0FBSyxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRTNFLE9BQU8sRUFBRSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sYUFBYSxDQUFDOztBQU1sRCxNQUFNLE9BQU8sbUJBQW1CO0lBRTVCLElBQUksTUFBTTtRQUNOLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBQztJQUN4QixDQUFDO0lBQ0QsSUFDSSxNQUFNLENBQUMsQ0FBYztRQUNyQixNQUFNLEdBQUcsR0FBRyxVQUFVLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztRQUM5RCxJQUFJLENBQUMsT0FBTyxHQUFHLEdBQUcsQ0FBQztJQUN2QixDQUFDO0lBR0QsSUFBSSxRQUFRO1FBQ1IsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDO0lBQzFCLENBQUM7SUFDRCxJQUFhLFFBQVEsQ0FBQyxDQUFlO1FBQ2pDLElBQUksQ0FBQyxTQUFTLEdBQUcsT0FBTyxDQUFDLGlCQUFpQixDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ2xELENBQUM7SUFFTyxrQkFBa0IsQ0FBQyxLQUFhO1FBQ3BDLElBQUksSUFBSSxDQUFDLE9BQU8sSUFBSSxDQUFDLEVBQUUsQ0FBQztZQUNwQixPQUFPLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxLQUFLLENBQUMsSUFBSSxNQUFNLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQztRQUN0RCxDQUFDO2FBQU0sQ0FBQztZQUNKLE1BQU0sWUFBWSxHQUNkLHlCQUF5QjtnQkFDekIsSUFBSSxDQUFDLE9BQU87Z0JBQ1osdUJBQXVCO2dCQUN2QixJQUFJLENBQUMsT0FBTztnQkFDWixZQUFZLENBQUM7WUFDakIsT0FBTyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsS0FBSyxDQUFDLElBQUksTUFBTSxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUM7UUFDekQsQ0FBQztJQUNMLENBQUM7SUFFTyxLQUFLLENBQUMsS0FBYTtRQUN2QixJQUFJLElBQUksQ0FBQyxPQUFPLElBQUksQ0FBQyxFQUFFLENBQUM7WUFDcEIsT0FBTyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsS0FBSyxDQUFDLElBQUksTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUM7UUFDcEQsQ0FBQzthQUFNLENBQUM7WUFDSixNQUFNLFlBQVksR0FDZCx1QkFBdUI7Z0JBQ3ZCLElBQUksQ0FBQyxPQUFPO2dCQUNaLHVCQUF1QjtnQkFDdkIsSUFBSSxDQUFDLE9BQU87Z0JBQ1osWUFBWSxDQUFDO1lBQ2pCLE9BQU8sTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLEtBQUssQ0FBQyxJQUFJLE1BQU0sQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDO1FBQ3pELENBQUM7SUFDTCxDQUFDO0lBRU8sR0FBRyxDQUFDLFFBQWE7UUFDckIsVUFBVSxDQUFDLEdBQUcsRUFBRTtZQUNaLE1BQU0sWUFBWSxHQUFXLElBQUksQ0FBQyxFQUFFLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQztZQUN6RCxNQUFNLGFBQWEsR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDO1lBRXJDLElBQUksYUFBYSxFQUFFLENBQUM7Z0JBQ2hCLElBQ0ksQ0FBQyxDQUFDLEVBQUUsRUFBRSxHQUFHLENBQUMsQ0FBQyxRQUFRLENBQUMsWUFBWSxDQUFDO29CQUNqQyxDQUFDLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxZQUFZLENBQUMsRUFDeEMsQ0FBQztvQkFDQyxJQUFJLENBQUMsRUFBRSxDQUFDLGFBQWEsQ0FBQyxLQUFLLEdBQUcsUUFBUSxDQUFDO2dCQUMzQyxDQUFDO1lBQ0wsQ0FBQztpQkFBTSxDQUFDO2dCQUNKLElBQUksWUFBWSxLQUFLLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsWUFBWSxDQUFDLEVBQUUsQ0FBQztvQkFDbkQsSUFBSSxDQUFDLEVBQUUsQ0FBQyxhQUFhLENBQUMsS0FBSyxHQUFHLFFBQVEsQ0FBQztnQkFDM0MsQ0FBQztZQUNMLENBQUM7UUFDTCxDQUFDLENBQUMsQ0FBQztJQUNQLENBQUM7SUFHRCxZQUFvQixFQUFjO1FBQWQsT0FBRSxHQUFGLEVBQUUsQ0FBWTtRQW5FMUIsWUFBTyxHQUFHLENBQUMsQ0FBQztRQVVaLGNBQVMsR0FBRyxLQUFLLENBQUM7SUF5RFksQ0FBQztJQUd2QyxTQUFTLENBQUMsS0FBb0I7UUFDMUIsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUMxQyxDQUFDO0lBR0QsT0FBTyxDQUFDLEtBQXFCO1FBQ3pCLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLENBQUM7SUFDMUMsQ0FBQzs4R0E5RVEsbUJBQW1CO2tHQUFuQixtQkFBbUI7OzJGQUFuQixtQkFBbUI7a0JBSi9CLFNBQVM7bUJBQUM7b0JBQ1AsVUFBVSxFQUFFLElBQUk7b0JBQ2hCLFFBQVEsRUFBRSxXQUFXO2lCQUN4QjsrRUFPTyxNQUFNO3NCQURULEtBQUs7Z0JBVU8sUUFBUTtzQkFBcEIsS0FBSztnQkF3RE4sU0FBUztzQkFEUixZQUFZO3VCQUFDLFNBQVMsRUFBRSxDQUFDLFFBQVEsQ0FBQztnQkFNbkMsT0FBTztzQkFETixZQUFZO3VCQUFDLE9BQU8sRUFBRSxDQUFDLFFBQVEsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IERpcmVjdGl2ZSwgRWxlbWVudFJlZiwgSG9zdExpc3RlbmVyLCBJbnB1dCB9IGZyb20gXCJAYW5ndWxhci9jb3JlXCI7XHJcbmltcG9ydCB7IEJvb2xlYW5JbnB1dCwgTnVtYmVySW5wdXQgfSBmcm9tIFwiLi4vLi4vY29tcG9uZW50c1wiO1xyXG5pbXBvcnQgeyBDb252ZXJ0LCBNYXRoSGVscGVyIH0gZnJvbSBcIi4uLy4uL3V0aWxzXCI7XHJcblxyXG5ARGlyZWN0aXZlKHtcclxuICAgIHN0YW5kYWxvbmU6IHRydWUsXHJcbiAgICBzZWxlY3RvcjogXCJbbnVtZXJpY11cIixcclxufSlcclxuZXhwb3J0IGNsYXNzIFpla051bWVyaWNEaXJlY3RpdmUge1xyXG4gICAgcHJpdmF0ZSBfZGlnaXRzID0gMDtcclxuICAgIGdldCBkaWdpdHMoKSB7XHJcbiAgICAgICAgcmV0dXJuIHRoaXMuX2RpZ2l0cztcclxuICAgIH1cclxuICAgIEBJbnB1dCgpXHJcbiAgICBzZXQgZGlnaXRzKHY6IE51bWJlcklucHV0KSB7XHJcbiAgICAgICAgY29uc3QgdG1wID0gTWF0aEhlbHBlci5jbGFtcChDb252ZXJ0LnRvTnVtYmVyKHYpIHx8IDAsIDAsIDI5KTtcclxuICAgICAgICB0aGlzLl9kaWdpdHMgPSB0bXA7XHJcbiAgICB9XHJcblxyXG4gICAgcHJpdmF0ZSBfbmVnYXRpdmUgPSBmYWxzZTtcclxuICAgIGdldCBuZWdhdGl2ZSgpOiBib29sZWFuIHtcclxuICAgICAgICByZXR1cm4gdGhpcy5fbmVnYXRpdmU7XHJcbiAgICB9XHJcbiAgICBASW5wdXQoKSBzZXQgbmVnYXRpdmUodjogQm9vbGVhbklucHV0KSB7XHJcbiAgICAgICAgdGhpcy5fbmVnYXRpdmUgPSBDb252ZXJ0LnRvQm9vbGVhblByb3BlcnR5KHYpO1xyXG4gICAgfVxyXG5cclxuICAgIHByaXZhdGUgY2hlY2tBbGxvd05lZ2F0aXZlKHZhbHVlOiBzdHJpbmcpIHtcclxuICAgICAgICBpZiAodGhpcy5fZGlnaXRzIDw9IDApIHtcclxuICAgICAgICAgICAgcmV0dXJuIFN0cmluZyh2YWx1ZSkubWF0Y2gobmV3IFJlZ0V4cCgvXi0/XFxkKyQvKSk7XHJcbiAgICAgICAgfSBlbHNlIHtcclxuICAgICAgICAgICAgY29uc3QgcmVnRXhwU3RyaW5nID1cclxuICAgICAgICAgICAgICAgIFwiXi0/XFxcXHMqKChcXFxcZCsoXFxcXC5cXFxcZHswLFwiICtcclxuICAgICAgICAgICAgICAgIHRoaXMuX2RpZ2l0cyArXHJcbiAgICAgICAgICAgICAgICBcIn0pPyl8KChcXFxcZCooXFxcXC5cXFxcZHsxLFwiICtcclxuICAgICAgICAgICAgICAgIHRoaXMuX2RpZ2l0cyArXHJcbiAgICAgICAgICAgICAgICBcIn0pKSkpXFxcXHMqJFwiO1xyXG4gICAgICAgICAgICByZXR1cm4gU3RyaW5nKHZhbHVlKS5tYXRjaChuZXcgUmVnRXhwKHJlZ0V4cFN0cmluZykpO1xyXG4gICAgICAgIH1cclxuICAgIH1cclxuXHJcbiAgICBwcml2YXRlIGNoZWNrKHZhbHVlOiBzdHJpbmcpIHtcclxuICAgICAgICBpZiAodGhpcy5fZGlnaXRzIDw9IDApIHtcclxuICAgICAgICAgICAgcmV0dXJuIFN0cmluZyh2YWx1ZSkubWF0Y2gobmV3IFJlZ0V4cCgvXlxcZCskLykpO1xyXG4gICAgICAgIH0gZWxzZSB7XHJcbiAgICAgICAgICAgIGNvbnN0IHJlZ0V4cFN0cmluZyA9XHJcbiAgICAgICAgICAgICAgICBcIl5cXFxccyooKFxcXFxkKyhcXFxcLlxcXFxkezAsXCIgK1xyXG4gICAgICAgICAgICAgICAgdGhpcy5fZGlnaXRzICtcclxuICAgICAgICAgICAgICAgIFwifSk/KXwoKFxcXFxkKihcXFxcLlxcXFxkezEsXCIgK1xyXG4gICAgICAgICAgICAgICAgdGhpcy5fZGlnaXRzICtcclxuICAgICAgICAgICAgICAgIFwifSkpKSlcXFxccyokXCI7XHJcbiAgICAgICAgICAgIHJldHVybiBTdHJpbmcodmFsdWUpLm1hdGNoKG5ldyBSZWdFeHAocmVnRXhwU3RyaW5nKSk7XHJcbiAgICAgICAgfVxyXG4gICAgfVxyXG5cclxuICAgIHByaXZhdGUgcnVuKG9sZFZhbHVlOiBhbnkpIHtcclxuICAgICAgICBzZXRUaW1lb3V0KCgpID0+IHtcclxuICAgICAgICAgICAgY29uc3QgY3VycmVudFZhbHVlOiBzdHJpbmcgPSB0aGlzLmVsLm5hdGl2ZUVsZW1lbnQudmFsdWU7XHJcbiAgICAgICAgICAgIGNvbnN0IGFsbG93TmVnYXRpdmUgPSB0aGlzLl9uZWdhdGl2ZTtcclxuXHJcbiAgICAgICAgICAgIGlmIChhbGxvd05lZ2F0aXZlKSB7XHJcbiAgICAgICAgICAgICAgICBpZiAoXHJcbiAgICAgICAgICAgICAgICAgICAgIVtcIlwiLCBcIi1cIl0uaW5jbHVkZXMoY3VycmVudFZhbHVlKSAmJlxyXG4gICAgICAgICAgICAgICAgICAgICF0aGlzLmNoZWNrQWxsb3dOZWdhdGl2ZShjdXJyZW50VmFsdWUpXHJcbiAgICAgICAgICAgICAgICApIHtcclxuICAgICAgICAgICAgICAgICAgICB0aGlzLmVsLm5hdGl2ZUVsZW1lbnQudmFsdWUgPSBvbGRWYWx1ZTtcclxuICAgICAgICAgICAgICAgIH1cclxuICAgICAgICAgICAgfSBlbHNlIHtcclxuICAgICAgICAgICAgICAgIGlmIChjdXJyZW50VmFsdWUgIT09ICcnICYmICF0aGlzLmNoZWNrKGN1cnJlbnRWYWx1ZSkpIHtcclxuICAgICAgICAgICAgICAgICAgICB0aGlzLmVsLm5hdGl2ZUVsZW1lbnQudmFsdWUgPSBvbGRWYWx1ZTtcclxuICAgICAgICAgICAgICAgIH1cclxuICAgICAgICAgICAgfVxyXG4gICAgICAgIH0pO1xyXG4gICAgfVxyXG5cclxuXHJcbiAgICBjb25zdHJ1Y3Rvcihwcml2YXRlIGVsOiBFbGVtZW50UmVmKSB7IH1cclxuXHJcbiAgICBASG9zdExpc3RlbmVyKFwia2V5ZG93blwiLCBbXCIkZXZlbnRcIl0pXHJcbiAgICBvbktleURvd24oZXZlbnQ6IEtleWJvYXJkRXZlbnQpIHtcclxuICAgICAgICB0aGlzLnJ1bih0aGlzLmVsLm5hdGl2ZUVsZW1lbnQudmFsdWUpO1xyXG4gICAgfVxyXG5cclxuICAgIEBIb3N0TGlzdGVuZXIoXCJwYXN0ZVwiLCBbXCIkZXZlbnRcIl0pXHJcbiAgICBvblBhc3RlKGV2ZW50OiBDbGlwYm9hcmRFdmVudCkge1xyXG4gICAgICAgIHRoaXMucnVuKHRoaXMuZWwubmF0aXZlRWxlbWVudC52YWx1ZSk7XHJcbiAgICB9XHJcbn0iXX0=
|
|
@@ -1,43 +1,13 @@
|
|
|
1
|
-
import { inject
|
|
1
|
+
import { inject } from '@angular/core';
|
|
2
2
|
import { Router } from '@angular/router';
|
|
3
3
|
import { AuthService } from './auth.service';
|
|
4
|
-
import * as i0 from "@angular/core";
|
|
5
|
-
import * as i1 from "./auth.service";
|
|
6
|
-
import * as i2 from "@angular/router";
|
|
7
4
|
export const zekAuthGuard = (route, state) => {
|
|
8
|
-
const
|
|
5
|
+
const auth = inject(AuthService);
|
|
9
6
|
const router = inject(Router);
|
|
10
|
-
if (!
|
|
7
|
+
if (!auth.isAuthenticated()) {
|
|
11
8
|
router.navigate(['/login'], { queryParams: { returnUrl: state.url } });
|
|
12
9
|
return false;
|
|
13
10
|
}
|
|
14
|
-
return
|
|
11
|
+
return auth.hasDataPermission(route.data);
|
|
15
12
|
};
|
|
16
|
-
|
|
17
|
-
* @deprecated Please use canActivate
|
|
18
|
-
* @see {@link canActivate}
|
|
19
|
-
*/
|
|
20
|
-
export class AuthGuardService {
|
|
21
|
-
constructor(authService, router) {
|
|
22
|
-
this.authService = authService;
|
|
23
|
-
this.router = router;
|
|
24
|
-
}
|
|
25
|
-
canActivate(route, state) {
|
|
26
|
-
if (!this.authService.isAuthenticated()) {
|
|
27
|
-
this.router.navigate(['/login'], { queryParams: { returnUrl: state.url } });
|
|
28
|
-
return false;
|
|
29
|
-
}
|
|
30
|
-
return this.authService.hasDataPermission(route.data);
|
|
31
|
-
// const allowedRoles = route.data.roles;
|
|
32
|
-
// let isInRole = this.authService.isInRole(allowedRoles);
|
|
33
|
-
// const permission = route.data.permission;
|
|
34
|
-
// let hasPermission = this.authService.hasPermission(permission);
|
|
35
|
-
// return isInRole && hasPermission;
|
|
36
|
-
}
|
|
37
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.4", ngImport: i0, type: AuthGuardService, deps: [{ token: i1.AuthService }, { token: i2.Router }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
38
|
-
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.4", ngImport: i0, type: AuthGuardService }); }
|
|
39
|
-
}
|
|
40
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.4", ngImport: i0, type: AuthGuardService, decorators: [{
|
|
41
|
-
type: Injectable
|
|
42
|
-
}], ctorParameters: () => [{ type: i1.AuthService }, { type: i2.Router }] });
|
|
43
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC1ndWFyZC5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvemVrL3NyYy9saWIvc2VydmljZXMvYXV0aC1ndWFyZC5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ25ELE9BQU8sRUFBNEQsTUFBTSxFQUFpQixNQUFNLGlCQUFpQixDQUFDO0FBR2xILE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQzs7OztBQUc3QyxNQUFNLENBQUMsTUFBTSxZQUFZLEdBQWtCLENBQUMsS0FBNkIsRUFBRSxLQUEwQixFQUFFLEVBQUU7SUFDckcsTUFBTSxXQUFXLEdBQUcsTUFBTSxDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQ3hDLE1BQU0sTUFBTSxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUU5QixJQUFJLENBQUMsV0FBVyxDQUFDLGVBQWUsRUFBRSxFQUFFLENBQUM7UUFDakMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxFQUFFLEVBQUUsV0FBVyxFQUFFLEVBQUUsU0FBUyxFQUFFLEtBQUssQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDdkUsT0FBTyxLQUFLLENBQUM7SUFDakIsQ0FBQztJQUVELE9BQU8sV0FBVyxDQUFDLGlCQUFpQixDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQztBQUNyRCxDQUFDLENBQUE7QUFJRDs7O0dBR0c7QUFDSCxNQUFNLE9BQU8sZ0JBQWdCO0lBQ3pCLFlBQStCLFdBQXdCLEVBQXFCLE1BQWM7UUFBM0QsZ0JBQVcsR0FBWCxXQUFXLENBQWE7UUFBcUIsV0FBTSxHQUFOLE1BQU0sQ0FBUTtJQUFJLENBQUM7SUFFL0YsV0FBVyxDQUFDLEtBQTZCLEVBQUUsS0FBMEI7UUFDakUsSUFBSSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsZUFBZSxFQUFFLEVBQUUsQ0FBQztZQUN0QyxJQUFJLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxFQUFFLEVBQUUsV0FBVyxFQUFFLEVBQUUsU0FBUyxFQUFFLEtBQUssQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDLENBQUM7WUFDNUUsT0FBTyxLQUFLLENBQUM7UUFDakIsQ0FBQztRQUVELE9BQU8sSUFBSSxDQUFDLFdBQVcsQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7UUFFdEQseUNBQXlDO1FBQ3pDLDBEQUEwRDtRQUUxRCw0Q0FBNEM7UUFDNUMsa0VBQWtFO1FBRWxFLG9DQUFvQztJQUN4QyxDQUFDOzhHQWxCUSxnQkFBZ0I7a0hBQWhCLGdCQUFnQjs7MkZBQWhCLGdCQUFnQjtrQkFMNUIsVUFBVSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGluamVjdCwgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xyXG5pbXBvcnQgeyBDYW5BY3RpdmF0ZSwgQWN0aXZhdGVkUm91dGVTbmFwc2hvdCwgUm91dGVyU3RhdGVTbmFwc2hvdCwgUm91dGVyLCBDYW5BY3RpdmF0ZUZuIH0gZnJvbSAnQGFuZ3VsYXIvcm91dGVyJztcclxuaW1wb3J0IHsgT2JzZXJ2YWJsZSB9IGZyb20gJ3J4anMnO1xyXG5cclxuaW1wb3J0IHsgQXV0aFNlcnZpY2UgfSBmcm9tICcuL2F1dGguc2VydmljZSc7XHJcblxyXG5cclxuZXhwb3J0IGNvbnN0IHpla0F1dGhHdWFyZDogQ2FuQWN0aXZhdGVGbiA9IChyb3V0ZTogQWN0aXZhdGVkUm91dGVTbmFwc2hvdCwgc3RhdGU6IFJvdXRlclN0YXRlU25hcHNob3QpID0+IHtcclxuICAgIGNvbnN0IGF1dGhTZXJ2aWNlID0gaW5qZWN0KEF1dGhTZXJ2aWNlKTtcclxuICAgIGNvbnN0IHJvdXRlciA9IGluamVjdChSb3V0ZXIpO1xyXG5cclxuICAgIGlmICghYXV0aFNlcnZpY2UuaXNBdXRoZW50aWNhdGVkKCkpIHtcclxuICAgICAgICByb3V0ZXIubmF2aWdhdGUoWycvbG9naW4nXSwgeyBxdWVyeVBhcmFtczogeyByZXR1cm5Vcmw6IHN0YXRlLnVybCB9IH0pO1xyXG4gICAgICAgIHJldHVybiBmYWxzZTtcclxuICAgIH1cclxuXHJcbiAgICByZXR1cm4gYXV0aFNlcnZpY2UuaGFzRGF0YVBlcm1pc3Npb24ocm91dGUuZGF0YSk7XHJcbn1cclxuXHJcblxyXG5ASW5qZWN0YWJsZSgpXHJcbi8qKlxyXG4gKiBAZGVwcmVjYXRlZCBQbGVhc2UgdXNlIGNhbkFjdGl2YXRlXHJcbiAqIEBzZWUge0BsaW5rIGNhbkFjdGl2YXRlfVxyXG4gKi9cclxuZXhwb3J0IGNsYXNzIEF1dGhHdWFyZFNlcnZpY2UgaW1wbGVtZW50cyBDYW5BY3RpdmF0ZSB7XHJcbiAgICBjb25zdHJ1Y3Rvcihwcm90ZWN0ZWQgcmVhZG9ubHkgYXV0aFNlcnZpY2U6IEF1dGhTZXJ2aWNlLCBwcm90ZWN0ZWQgcmVhZG9ubHkgcm91dGVyOiBSb3V0ZXIpIHsgfVxyXG5cclxuICAgIGNhbkFjdGl2YXRlKHJvdXRlOiBBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90LCBzdGF0ZTogUm91dGVyU3RhdGVTbmFwc2hvdCk6IGJvb2xlYW4gfCBPYnNlcnZhYmxlPGJvb2xlYW4+IHwgUHJvbWlzZTxib29sZWFuPiB7XHJcbiAgICAgICAgaWYgKCF0aGlzLmF1dGhTZXJ2aWNlLmlzQXV0aGVudGljYXRlZCgpKSB7XHJcbiAgICAgICAgICAgIHRoaXMucm91dGVyLm5hdmlnYXRlKFsnL2xvZ2luJ10sIHsgcXVlcnlQYXJhbXM6IHsgcmV0dXJuVXJsOiBzdGF0ZS51cmwgfSB9KTtcclxuICAgICAgICAgICAgcmV0dXJuIGZhbHNlO1xyXG4gICAgICAgIH1cclxuXHJcbiAgICAgICAgcmV0dXJuIHRoaXMuYXV0aFNlcnZpY2UuaGFzRGF0YVBlcm1pc3Npb24ocm91dGUuZGF0YSk7XHJcblxyXG4gICAgICAgIC8vIGNvbnN0IGFsbG93ZWRSb2xlcyA9IHJvdXRlLmRhdGEucm9sZXM7XHJcbiAgICAgICAgLy8gbGV0IGlzSW5Sb2xlID0gdGhpcy5hdXRoU2VydmljZS5pc0luUm9sZShhbGxvd2VkUm9sZXMpO1xyXG5cclxuICAgICAgICAvLyBjb25zdCBwZXJtaXNzaW9uID0gcm91dGUuZGF0YS5wZXJtaXNzaW9uO1xyXG4gICAgICAgIC8vIGxldCBoYXNQZXJtaXNzaW9uID0gdGhpcy5hdXRoU2VydmljZS5oYXNQZXJtaXNzaW9uKHBlcm1pc3Npb24pO1xyXG5cclxuICAgICAgICAvLyByZXR1cm4gaXNJblJvbGUgJiYgaGFzUGVybWlzc2lvbjtcclxuICAgIH1cclxufVxyXG4iXX0=
|
|
13
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC1ndWFyZC5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvemVrL3NyYy9saWIvc2VydmljZXMvYXV0aC1ndWFyZC5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDdkMsT0FBTyxFQUErQyxNQUFNLEVBQWlCLE1BQU0saUJBQWlCLENBQUM7QUFFckcsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBRzdDLE1BQU0sQ0FBQyxNQUFNLFlBQVksR0FBa0IsQ0FBQyxLQUE2QixFQUFFLEtBQTBCLEVBQUUsRUFBRTtJQUNyRyxNQUFNLElBQUksR0FBRyxNQUFNLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDakMsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBRTlCLElBQUksQ0FBQyxJQUFJLENBQUMsZUFBZSxFQUFFLEVBQUUsQ0FBQztRQUMxQixNQUFNLENBQUMsUUFBUSxDQUFDLENBQUMsUUFBUSxDQUFDLEVBQUUsRUFBRSxXQUFXLEVBQUUsRUFBRSxTQUFTLEVBQUUsS0FBSyxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQUMsQ0FBQztRQUN2RSxPQUFPLEtBQUssQ0FBQztJQUNqQixDQUFDO0lBRUQsT0FBTyxJQUFJLENBQUMsaUJBQWlCLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO0FBQzlDLENBQUMsQ0FBQSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGluamVjdCB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xyXG5pbXBvcnQgeyBBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90LCBSb3V0ZXJTdGF0ZVNuYXBzaG90LCBSb3V0ZXIsIENhbkFjdGl2YXRlRm4gfSBmcm9tICdAYW5ndWxhci9yb3V0ZXInO1xyXG5cclxuaW1wb3J0IHsgQXV0aFNlcnZpY2UgfSBmcm9tICcuL2F1dGguc2VydmljZSc7XHJcblxyXG5cclxuZXhwb3J0IGNvbnN0IHpla0F1dGhHdWFyZDogQ2FuQWN0aXZhdGVGbiA9IChyb3V0ZTogQWN0aXZhdGVkUm91dGVTbmFwc2hvdCwgc3RhdGU6IFJvdXRlclN0YXRlU25hcHNob3QpID0+IHtcclxuICAgIGNvbnN0IGF1dGggPSBpbmplY3QoQXV0aFNlcnZpY2UpO1xyXG4gICAgY29uc3Qgcm91dGVyID0gaW5qZWN0KFJvdXRlcik7XHJcblxyXG4gICAgaWYgKCFhdXRoLmlzQXV0aGVudGljYXRlZCgpKSB7XHJcbiAgICAgICAgcm91dGVyLm5hdmlnYXRlKFsnL2xvZ2luJ10sIHsgcXVlcnlQYXJhbXM6IHsgcmV0dXJuVXJsOiBzdGF0ZS51cmwgfSB9KTtcclxuICAgICAgICByZXR1cm4gZmFsc2U7XHJcbiAgICB9XHJcblxyXG4gICAgcmV0dXJuIGF1dGguaGFzRGF0YVBlcm1pc3Npb24ocm91dGUuZGF0YSk7XHJcbn0iXX0=
|
|
@@ -32,14 +32,14 @@ export class AuthService {
|
|
|
32
32
|
if (user && user.refreshTokenTime) {
|
|
33
33
|
let timeout = user.refreshTokenTime.getTime() - Date.now(); // - (60 * 1000);
|
|
34
34
|
if (timeout < 0) {
|
|
35
|
-
this.
|
|
35
|
+
this.emitRefreshToken();
|
|
36
36
|
}
|
|
37
37
|
const minRefreshTime = 60000; //1 min;
|
|
38
38
|
if (timeout < minRefreshTime) {
|
|
39
39
|
timeout = minRefreshTime;
|
|
40
40
|
}
|
|
41
41
|
this._timerId = setInterval(() => {
|
|
42
|
-
this.
|
|
42
|
+
this.emitRefreshToken();
|
|
43
43
|
}, timeout);
|
|
44
44
|
}
|
|
45
45
|
}
|
|
@@ -48,7 +48,7 @@ export class AuthService {
|
|
|
48
48
|
clearInterval(this._timerId);
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
|
-
|
|
51
|
+
emitRefreshToken() {
|
|
52
52
|
if (this._onRefreshTokenSubject) {
|
|
53
53
|
this._onRefreshTokenSubject.next();
|
|
54
54
|
}
|
|
@@ -94,15 +94,6 @@ export class AuthService {
|
|
|
94
94
|
return this._onRefreshTokenObservable;
|
|
95
95
|
}
|
|
96
96
|
login(user) {
|
|
97
|
-
// if (user) {
|
|
98
|
-
// // I think we don't need this
|
|
99
|
-
// user.id = ObjectHelper.isDefined(user.id) ? Convert.parseNumber(user.id) : user.id;
|
|
100
|
-
// user.expired = ObjectHelper.isDefined(user.expired) ? DateHelper.parseDate(user.expired) : user.expired;
|
|
101
|
-
// user.refreshTokenTime = ObjectHelper.isDefined(user.refreshTokenTime) ? DateHelper.parseDate(user.refreshTokenTime) : user.refreshTokenTime;
|
|
102
|
-
// if (Array.isArray(user.roles)) {
|
|
103
|
-
// user.roles = user.roles.map(function (e) { return e.toUpperCase(); });
|
|
104
|
-
// }
|
|
105
|
-
// }
|
|
106
97
|
StorageHelper.set('login', user);
|
|
107
98
|
this._user = null;
|
|
108
99
|
this._isInitialized = false; //user get method will init user
|
|
@@ -200,4 +191,4 @@ export class AuthService {
|
|
|
200
191
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.4", ngImport: i0, type: AuthService, decorators: [{
|
|
201
192
|
type: Injectable
|
|
202
193
|
}] });
|
|
203
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../../../projects/zek/src/lib/services/auth.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, } from '@angular/core';\r\nimport { BehaviorSubject, Observable, Subject } from 'rxjs';\r\nimport { KeyPair, LoginToken, LoginUser } from '../models';\r\nimport { Convert, DateHelper, ObjectHelper, StorageHelper } from '../utils';\r\nimport { BitwiseHelper } from '../utils/bitwise-helper';\r\n\r\n@Injectable()\r\nexport class AuthService {\r\n    private _isInitialized = false;\r\n    private _oldValue = false;\r\n    private _user: LoginUser | null = null;\r\n\r\n    get user(): LoginUser | null {\r\n        if (!this._isInitialized) {\r\n            const user = StorageHelper.get('login');\r\n            if (user) {\r\n                user.id = ObjectHelper.isDefined(user.id) ? Convert.parseNumber(user.id) : user.id;\r\n                user.expired = ObjectHelper.isDefined(user.expired) ? DateHelper.parseDate(user.expired) : user.expired;\r\n                user.refreshTokenTime = ObjectHelper.isDefined(user.refreshTokenTime) ? DateHelper.parseDate(user.refreshTokenTime) : user.refreshTokenTime;\r\n\r\n                if (Array.isArray(user.roles)) {\r\n                    user.roles = user.roles.map(function (e: any) { return e ? e.toUpperCase() : e; });\r\n                }\r\n            }\r\n            this._user = user;\r\n            this._isInitialized = true;\r\n            this._starRefreshTokenTimer();\r\n        }\r\n        return this._user;\r\n    }\r\n\r\n\r\n    private _timerId: any;\r\n    private _starRefreshTokenTimer() {\r\n        this._stopRefreshTokenTimer();\r\n\r\n        const user = this._user;\r\n        if (user && user.refreshTokenTime) {\r\n            let timeout = user.refreshTokenTime.getTime() - Date.now();// - (60 * 1000);\r\n\r\n            if (timeout < 0) {\r\n                this._emitRefreshToken();\r\n            }\r\n\r\n            const minRefreshTime = 60_000//1 min;\r\n            if (timeout < minRefreshTime) {\r\n                timeout = minRefreshTime;\r\n            }\r\n\r\n            this._timerId = setInterval(() => {\r\n                this._emitRefreshToken();\r\n            }, timeout);\r\n        }\r\n    }\r\n    private _stopRefreshTokenTimer() {\r\n        if (typeof this._timerId === 'number') {\r\n            clearInterval(this._timerId);\r\n        }\r\n    }\r\n    private _emitRefreshToken() {\r\n        if (this._onRefreshTokenSubject) {\r\n            this._onRefreshTokenSubject.next();\r\n        }\r\n    }\r\n\r\n\r\n    isAuthenticated(): boolean {\r\n        const expired = this.getExpired() || new Date(0);// if getExpired is null return min JS date\r\n\r\n        const newValue = new Date() < expired;\r\n        if (this._oldValue !== newValue) {\r\n            this._oldValue = newValue;\r\n\r\n            this.emitOnSignedIn();\r\n            // if (this._onSignedInSubject) {\r\n            //     this._onSignedInSubject.next(newValue);\r\n            // }\r\n\r\n            //if user is signed in and expired we need to logout (remove from localStorage)\r\n            if (!newValue) {\r\n                this.logout();\r\n            }\r\n            return newValue;\r\n        }\r\n        return newValue;\r\n    }\r\n    emitOnSignedIn() {\r\n        if (this._onSignedInSubject) {\r\n            this._onSignedInSubject.next(this._oldValue);\r\n        }\r\n    }\r\n\r\n    private _onSignedInSubject?: BehaviorSubject<boolean>;//BehaviorSubject is for initial firt value = false\r\n    private _onSignedInObservable?: Observable<boolean>;\r\n    get onSignedIn(): Observable<boolean> {\r\n        if (!this._onSignedInSubject) {\r\n            this._onSignedInSubject = new BehaviorSubject<boolean>(false);\r\n            this._onSignedInObservable = this._onSignedInSubject.asObservable();\r\n        }\r\n\r\n        if (!this._onSignedInObservable)\r\n            throw new Error(\"_onExecuteObservable is undefined\");\r\n\r\n        return this._onSignedInObservable;\r\n    }\r\n\r\n\r\n    private _onRefreshTokenSubject?: Subject<void>;\r\n    private _onRefreshTokenObservable?: Observable<void>;\r\n    get onRefreshToken(): Observable<void> {\r\n        if (!this._onRefreshTokenSubject) {\r\n            this._onRefreshTokenSubject = new Subject<void>();\r\n            this._onRefreshTokenObservable = this._onRefreshTokenSubject.asObservable();\r\n        }\r\n\r\n        if (!this._onRefreshTokenObservable)\r\n            throw new Error(\"onRefreshTokenObservable is undefined\");\r\n\r\n        return this._onRefreshTokenObservable;\r\n    }\r\n\r\n\r\n\r\n    login(user: LoginToken | LoginUser | null) {\r\n        // if (user) {\r\n        //     // I think we don't need this\r\n        //     user.id = ObjectHelper.isDefined(user.id) ? Convert.parseNumber(user.id) : user.id;\r\n        //     user.expired = ObjectHelper.isDefined(user.expired) ?  DateHelper.parseDate(user.expired) : user.expired;\r\n        //     user.refreshTokenTime = ObjectHelper.isDefined(user.refreshTokenTime) ?  DateHelper.parseDate(user.refreshTokenTime) : user.refreshTokenTime;\r\n        //     if (Array.isArray(user.roles)) {\r\n        //         user.roles = user.roles.map(function (e) { return e.toUpperCase(); });\r\n        //     }\r\n        // }\r\n\r\n        StorageHelper.set('login', user);\r\n        this._user = null;\r\n        this._isInitialized = false;//user get method will init user\r\n        this.isAuthenticated();//this method need to execute subject.next();        \r\n    }\r\n    logout() {\r\n        this.login(null);\r\n    }\r\n\r\n\r\n\r\n    protected getExpired(): Date | null | undefined {\r\n        const user = this.user;\r\n        if (user) {\r\n            return user.expired;\r\n        }\r\n\r\n        return null;\r\n    }\r\n\r\n    protected getRefreshTokenExpired(): Date | null | undefined {\r\n        const user = this.user;\r\n        if (user) {\r\n            return user.refreshTokenTime;\r\n        }\r\n\r\n        return null;\r\n    }\r\n\r\n\r\n    // isInRole(allowedRoles: string[]): boolean {\r\n    //     if (!allowedRoles || allowedRoles.length === 0) {\r\n    //         return true;\r\n    //     }\r\n\r\n    //     const tmp = this.getUser();\r\n    //     const roles = tmp ? tmp.roles : null;\r\n    //     if (!roles || roles.length === 0) {\r\n    //         return false;\r\n    //     }\r\n\r\n    //     let isInRole = allowedRoles.some(role => roles.indexOf(role) !== -1);\r\n    //     return isInRole;\r\n    // }\r\n\r\n\r\n    hasPermission(permission?: KeyPair<number, number> | number | null): boolean {\r\n        if (!permission) {\r\n            return true;\r\n        }\r\n\r\n        let key = 0;\r\n        let value: number | null | undefined;\r\n        if (typeof permission === 'number' || typeof permission === 'string') {\r\n            key = +permission;\r\n        }// else if (Array.isArray(permission)) {\r\n        // }\r\n        else if (typeof permission === 'object') {\r\n            if (!permission.key)\r\n                return true;\r\n\r\n            key = permission.key;\r\n            value = permission.value;\r\n        }\r\n\r\n        return this.hasPermissions([key], value);\r\n    }\r\n\r\n\r\n    hasPermissions(permissions?: Array<number>, value?: number | null): boolean {\r\n        if (!permissions || permissions.length === 0) {\r\n            return true;\r\n        }\r\n\r\n        const user = this.user;\r\n        const userPermissions = user ? user.permissions : null;\r\n        if (!userPermissions) {\r\n            return false;\r\n        }\r\n\r\n        if (value) {\r\n            for (let i = 0; i < permissions.length; i++) {\r\n                const p = permissions[i];\r\n                const found = userPermissions[p];\r\n                if (found) {\r\n                    const hasPermission = BitwiseHelper.hasFlag(found, value);\r\n                    if (hasPermission)\r\n                        return true;\r\n                }\r\n            }\r\n        } else {\r\n            for (let i = 0; i < permissions.length; i++) {\r\n                const p = permissions[i];\r\n                const found = userPermissions[p];\r\n                if (found)\r\n                    return true;\r\n            }\r\n        }\r\n\r\n        return false;\r\n    }\r\n\r\n\r\n    hasDataPermission(data: any) {\r\n        //if (data === undefined || data === null) return true;\r\n        // const allowedRoles = data.roles;\r\n        // let isInRole = this.isInRole(allowedRoles);\r\n\r\n        const permission = data.permission;\r\n\r\n        const hasPermission = this.hasPermission(permission);\r\n\r\n        // return isInRole && hasPermission;\r\n        return hasPermission;\r\n    }\r\n}"]}
|
|
194
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../../../projects/zek/src/lib/services/auth.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable, } from '@angular/core';\r\nimport { BehaviorSubject, Observable, Subject } from 'rxjs';\r\nimport { KeyPair, LoginToken, LoginUser } from '../models';\r\nimport { Convert, DateHelper, ObjectHelper, StorageHelper } from '../utils';\r\nimport { BitwiseHelper } from '../utils/bitwise-helper';\r\n\r\n@Injectable()\r\nexport class AuthService {\r\n    private _isInitialized = false;\r\n    private _oldValue = false;\r\n    private _user: LoginUser | null = null;\r\n\r\n    get user(): LoginUser | null {\r\n        if (!this._isInitialized) {\r\n            const user = StorageHelper.get('login');\r\n            if (user) {\r\n                user.id = ObjectHelper.isDefined(user.id) ? Convert.parseNumber(user.id) : user.id;\r\n                user.expired = ObjectHelper.isDefined(user.expired) ? DateHelper.parseDate(user.expired) : user.expired;\r\n                user.refreshTokenTime = ObjectHelper.isDefined(user.refreshTokenTime) ? DateHelper.parseDate(user.refreshTokenTime) : user.refreshTokenTime;\r\n\r\n                if (Array.isArray(user.roles)) {\r\n                    user.roles = user.roles.map(function (e: any) { return e ? e.toUpperCase() : e; });\r\n                }\r\n            }\r\n            this._user = user;\r\n            this._isInitialized = true;\r\n            this._starRefreshTokenTimer();\r\n        }\r\n        return this._user;\r\n    }\r\n\r\n\r\n    private _timerId: any;\r\n    private _starRefreshTokenTimer() {\r\n        this._stopRefreshTokenTimer();\r\n\r\n        const user = this._user;\r\n        if (user && user.refreshTokenTime) {\r\n            let timeout = user.refreshTokenTime.getTime() - Date.now();// - (60 * 1000);\r\n\r\n            if (timeout < 0) {\r\n                this.emitRefreshToken();\r\n            }\r\n\r\n            const minRefreshTime = 60_000//1 min;\r\n            if (timeout < minRefreshTime) {\r\n                timeout = minRefreshTime;\r\n            }\r\n\r\n            this._timerId = setInterval(() => {\r\n                this.emitRefreshToken();\r\n            }, timeout);\r\n        }\r\n    }\r\n    private _stopRefreshTokenTimer() {\r\n        if (typeof this._timerId === 'number') {\r\n            clearInterval(this._timerId);\r\n        }\r\n    }\r\n    emitRefreshToken() {\r\n        if (this._onRefreshTokenSubject) {\r\n            this._onRefreshTokenSubject.next();\r\n        }\r\n    }\r\n\r\n\r\n    isAuthenticated(): boolean {\r\n        const expired = this.getExpired() || new Date(0);// if getExpired is null return min JS date\r\n\r\n        const newValue = new Date() < expired;\r\n        if (this._oldValue !== newValue) {\r\n            this._oldValue = newValue;\r\n\r\n            this.emitOnSignedIn();\r\n            // if (this._onSignedInSubject) {\r\n            //     this._onSignedInSubject.next(newValue);\r\n            // }\r\n\r\n            //if user is signed in and expired we need to logout (remove from localStorage)\r\n            if (!newValue) {\r\n                this.logout();\r\n            }\r\n            return newValue;\r\n        }\r\n        return newValue;\r\n    }\r\n    emitOnSignedIn() {\r\n        if (this._onSignedInSubject) {\r\n            this._onSignedInSubject.next(this._oldValue);\r\n        }\r\n    }\r\n\r\n    private _onSignedInSubject?: BehaviorSubject<boolean>;//BehaviorSubject is for initial firt value = false\r\n    private _onSignedInObservable?: Observable<boolean>;\r\n    get onSignedIn(): Observable<boolean> {\r\n        if (!this._onSignedInSubject) {\r\n            this._onSignedInSubject = new BehaviorSubject<boolean>(false);\r\n            this._onSignedInObservable = this._onSignedInSubject.asObservable();\r\n        }\r\n\r\n        if (!this._onSignedInObservable)\r\n            throw new Error(\"_onExecuteObservable is undefined\");\r\n\r\n        return this._onSignedInObservable;\r\n    }\r\n\r\n\r\n    private _onRefreshTokenSubject?: Subject<void>;\r\n    private _onRefreshTokenObservable?: Observable<void>;\r\n    get onRefreshToken(): Observable<void> {\r\n        if (!this._onRefreshTokenSubject) {\r\n            this._onRefreshTokenSubject = new Subject<void>();\r\n            this._onRefreshTokenObservable = this._onRefreshTokenSubject.asObservable();\r\n        }\r\n\r\n        if (!this._onRefreshTokenObservable)\r\n            throw new Error(\"onRefreshTokenObservable is undefined\");\r\n\r\n        return this._onRefreshTokenObservable;\r\n    }\r\n\r\n\r\n\r\n    login(user: LoginToken | LoginUser | null) {\r\n        StorageHelper.set('login', user);\r\n        this._user = null;\r\n        this._isInitialized = false;//user get method will init user\r\n        this.isAuthenticated();//this method need to execute subject.next();        \r\n    }\r\n    logout() {\r\n        this.login(null);\r\n    }\r\n\r\n\r\n\r\n    protected getExpired(): Date | null | undefined {\r\n        const user = this.user;\r\n        if (user) {\r\n            return user.expired;\r\n        }\r\n\r\n        return null;\r\n    }\r\n\r\n    protected getRefreshTokenExpired(): Date | null | undefined {\r\n        const user = this.user;\r\n        if (user) {\r\n            return user.refreshTokenTime;\r\n        }\r\n\r\n        return null;\r\n    }\r\n\r\n\r\n    // isInRole(allowedRoles: string[]): boolean {\r\n    //     if (!allowedRoles || allowedRoles.length === 0) {\r\n    //         return true;\r\n    //     }\r\n\r\n    //     const tmp = this.getUser();\r\n    //     const roles = tmp ? tmp.roles : null;\r\n    //     if (!roles || roles.length === 0) {\r\n    //         return false;\r\n    //     }\r\n\r\n    //     let isInRole = allowedRoles.some(role => roles.indexOf(role) !== -1);\r\n    //     return isInRole;\r\n    // }\r\n\r\n\r\n    hasPermission(permission?: KeyPair<number, number> | number | null): boolean {\r\n        if (!permission) {\r\n            return true;\r\n        }\r\n\r\n        let key = 0;\r\n        let value: number | null | undefined;\r\n        if (typeof permission === 'number' || typeof permission === 'string') {\r\n            key = +permission;\r\n        }// else if (Array.isArray(permission)) {\r\n        // }\r\n        else if (typeof permission === 'object') {\r\n            if (!permission.key)\r\n                return true;\r\n\r\n            key = permission.key;\r\n            value = permission.value;\r\n        }\r\n\r\n        return this.hasPermissions([key], value);\r\n    }\r\n\r\n\r\n    hasPermissions(permissions?: Array<number>, value?: number | null): boolean {\r\n        if (!permissions || permissions.length === 0) {\r\n            return true;\r\n        }\r\n\r\n        const user = this.user;\r\n        const userPermissions = user ? user.permissions : null;\r\n        if (!userPermissions) {\r\n            return false;\r\n        }\r\n\r\n        if (value) {\r\n            for (let i = 0; i < permissions.length; i++) {\r\n                const p = permissions[i];\r\n                const found = userPermissions[p];\r\n                if (found) {\r\n                    const hasPermission = BitwiseHelper.hasFlag(found, value);\r\n                    if (hasPermission)\r\n                        return true;\r\n                }\r\n            }\r\n        } else {\r\n            for (let i = 0; i < permissions.length; i++) {\r\n                const p = permissions[i];\r\n                const found = userPermissions[p];\r\n                if (found)\r\n                    return true;\r\n            }\r\n        }\r\n\r\n        return false;\r\n    }\r\n\r\n\r\n    hasDataPermission(data: any) {\r\n        //if (data === undefined || data === null) return true;\r\n        // const allowedRoles = data.roles;\r\n        // let isInRole = this.isInRole(allowedRoles);\r\n\r\n        const permission = data.permission;\r\n\r\n        const hasPermission = this.hasPermission(permission);\r\n\r\n        // return isInRole && hasPermission;\r\n        return hasPermission;\r\n    }\r\n}"]}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import { catchError } from "rxjs";
|
|
2
2
|
import { BaseService } from "./base.service";
|
|
3
|
+
import { UrlHelper } from "../utils";
|
|
3
4
|
export class CrudService extends BaseService {
|
|
4
5
|
constructor(controller, api, httpErrorHandler) {
|
|
5
6
|
super(controller, api, httpErrorHandler);
|
|
6
7
|
}
|
|
7
8
|
get(id) {
|
|
8
|
-
|
|
9
|
+
const url = UrlHelper.combine(`api/${this.controller}`, id);
|
|
10
|
+
return this.api.get(url).pipe(catchError(this.handleError(this.get.name, null)));
|
|
9
11
|
}
|
|
10
12
|
get2(id, id2) {
|
|
11
13
|
return this.api.get(`api/${this.controller}/${id}/${id2}`).pipe(catchError(this.handleError(this.get2.name, null)));
|
|
@@ -43,4 +45,4 @@ export class CrudService extends BaseService {
|
|
|
43
45
|
return this.api.getBlob(`api/${this.controller}/Export/${fileTypeId}`, model).pipe(catchError(this.handleError('export', null)));
|
|
44
46
|
}
|
|
45
47
|
}
|
|
46
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
48
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"crud.service.js","sourceRoot":"","sources":["../../../../../projects/zek/src/lib/services/crud.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { catchError, Observable } from \"rxjs\";\r\n\r\nimport { HttpErrorHandler } from \"./http-error-handler.service\";\r\nimport { PagedList } from \"../models\";\r\nimport { BaseService } from \"./base.service\";\r\nimport { WebApiClient } from \"./web.api\";\r\nimport { UrlHelper } from \"../utils\";\r\n\r\nexport interface IService {\r\n    getAll(filter: any): Observable<PagedList>;\r\n    delete(id: any): Observable<any>;\r\n    delete2(id: any, id2: any): Observable<any>;\r\n    export(filter: any, fileTypeId: any): Observable<Blob | null>;\r\n    sum(filter: any): Observable<any>;\r\n\r\n    get(id: any): Observable<any>;\r\n    get2(id: any, id2: any): Observable<any>;\r\n    save(model: any): Observable<any>;\r\n    restore(id: any): Observable<any>;\r\n    approve(model: any): Observable<any>;\r\n    disapprove(model: any): Observable<any>;\r\n    batch(model: any): Observable<any>;\r\n}\r\nexport class CrudService extends BaseService implements IService {\r\n    constructor(\r\n        controller: string,\r\n        api: WebApiClient,\r\n        httpErrorHandler: HttpErrorHandler) {\r\n        super(controller, api, httpErrorHandler);\r\n    }\r\n\r\n    get(id: any) {\r\n        const url = UrlHelper.combine(`api/${this.controller}`, id);\r\n        return this.api.get(url).pipe(catchError(this.handleError(this.get.name, null)));\r\n    }\r\n    get2(id: any, id2: any) {\r\n        return this.api.get(`api/${this.controller}/${id}/${id2}`).pipe(catchError(this.handleError(this.get2.name, null)));\r\n    }\r\n\r\n    getAll(filter?: any): Observable<PagedList> {\r\n        return this.api.get(`api/${this.controller}`, filter).pipe(catchError(this.handleError(this.getAll.name)));\r\n    }\r\n    sum(filter?: any) {\r\n        return this.api.get(`api/${this.controller}/Sum`, filter).pipe(catchError(this.handleError(this.sum.name)));\r\n    }\r\n\r\n    save(model: any) {\r\n        return !model.id\r\n            ? this.api.post<any>(`api/${this.controller}`, model).pipe(catchError(this.handleError(this.save.name, null)))\r\n            : this.api.put<any>(`api/${this.controller}/${model.id}`, model).pipe(catchError(this.handleError(this.save.name, null)));\r\n    }\r\n\r\n    delete(id: any) {\r\n        return this.api.delete(`api/${this.controller}/${id}`).pipe(catchError(this.handleError(this.delete.name, null)));\r\n    }\r\n    delete2(id: any, id2: any) {\r\n        return this.api.delete(`api/${this.controller}/${id}/${id2}`).pipe(catchError(this.handleError(this.delete2.name, null)));\r\n    }\r\n\r\n    restore(id: any) {\r\n        return this.api.patch(`api/${this.controller}/${id}/Restore`).pipe(catchError(this.handleError(this.restore.name, null)));\r\n    }\r\n\r\n    approve(model: any) {\r\n        return this.api.patch(`api/${this.controller}/Approve`, model).pipe(catchError(this.handleError(this.approve.name, null)));\r\n    }\r\n    disapprove(model: any) {\r\n        return this.api.patch(`api/${this.controller}/Disapprove`, model).pipe(catchError(this.handleError(this.disapprove.name, null)));\r\n    }\r\n\r\n    batch(model: any) {\r\n        return this.api.post(`api/${this.controller}/Batch`, model).pipe(catchError(this.handleError(this.batch.name, null)));\r\n    }\r\n\r\n\r\n    export(model: any, fileTypeId: any): Observable<Blob | null> {\r\n        return this.api.getBlob(`api/${this.controller}/Export/${fileTypeId}`, model).pipe(catchError(this.handleError('export', null)));\r\n    }\r\n}"]}
|
package/fesm2022/zek.mjs
CHANGED
|
@@ -1355,14 +1355,14 @@ class AuthService {
|
|
|
1355
1355
|
if (user && user.refreshTokenTime) {
|
|
1356
1356
|
let timeout = user.refreshTokenTime.getTime() - Date.now(); // - (60 * 1000);
|
|
1357
1357
|
if (timeout < 0) {
|
|
1358
|
-
this.
|
|
1358
|
+
this.emitRefreshToken();
|
|
1359
1359
|
}
|
|
1360
1360
|
const minRefreshTime = 60000; //1 min;
|
|
1361
1361
|
if (timeout < minRefreshTime) {
|
|
1362
1362
|
timeout = minRefreshTime;
|
|
1363
1363
|
}
|
|
1364
1364
|
this._timerId = setInterval(() => {
|
|
1365
|
-
this.
|
|
1365
|
+
this.emitRefreshToken();
|
|
1366
1366
|
}, timeout);
|
|
1367
1367
|
}
|
|
1368
1368
|
}
|
|
@@ -1371,7 +1371,7 @@ class AuthService {
|
|
|
1371
1371
|
clearInterval(this._timerId);
|
|
1372
1372
|
}
|
|
1373
1373
|
}
|
|
1374
|
-
|
|
1374
|
+
emitRefreshToken() {
|
|
1375
1375
|
if (this._onRefreshTokenSubject) {
|
|
1376
1376
|
this._onRefreshTokenSubject.next();
|
|
1377
1377
|
}
|
|
@@ -1417,15 +1417,6 @@ class AuthService {
|
|
|
1417
1417
|
return this._onRefreshTokenObservable;
|
|
1418
1418
|
}
|
|
1419
1419
|
login(user) {
|
|
1420
|
-
// if (user) {
|
|
1421
|
-
// // I think we don't need this
|
|
1422
|
-
// user.id = ObjectHelper.isDefined(user.id) ? Convert.parseNumber(user.id) : user.id;
|
|
1423
|
-
// user.expired = ObjectHelper.isDefined(user.expired) ? DateHelper.parseDate(user.expired) : user.expired;
|
|
1424
|
-
// user.refreshTokenTime = ObjectHelper.isDefined(user.refreshTokenTime) ? DateHelper.parseDate(user.refreshTokenTime) : user.refreshTokenTime;
|
|
1425
|
-
// if (Array.isArray(user.roles)) {
|
|
1426
|
-
// user.roles = user.roles.map(function (e) { return e.toUpperCase(); });
|
|
1427
|
-
// }
|
|
1428
|
-
// }
|
|
1429
1420
|
StorageHelper.set('login', user);
|
|
1430
1421
|
this._user = null;
|
|
1431
1422
|
this._isInitialized = false; //user get method will init user
|
|
@@ -1525,41 +1516,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.4", ngImpor
|
|
|
1525
1516
|
}] });
|
|
1526
1517
|
|
|
1527
1518
|
const zekAuthGuard = (route, state) => {
|
|
1528
|
-
const
|
|
1519
|
+
const auth = inject(AuthService);
|
|
1529
1520
|
const router = inject(Router);
|
|
1530
|
-
if (!
|
|
1521
|
+
if (!auth.isAuthenticated()) {
|
|
1531
1522
|
router.navigate(['/login'], { queryParams: { returnUrl: state.url } });
|
|
1532
1523
|
return false;
|
|
1533
1524
|
}
|
|
1534
|
-
return
|
|
1525
|
+
return auth.hasDataPermission(route.data);
|
|
1535
1526
|
};
|
|
1536
|
-
/**
|
|
1537
|
-
* @deprecated Please use canActivate
|
|
1538
|
-
* @see {@link canActivate}
|
|
1539
|
-
*/
|
|
1540
|
-
class AuthGuardService {
|
|
1541
|
-
constructor(authService, router) {
|
|
1542
|
-
this.authService = authService;
|
|
1543
|
-
this.router = router;
|
|
1544
|
-
}
|
|
1545
|
-
canActivate(route, state) {
|
|
1546
|
-
if (!this.authService.isAuthenticated()) {
|
|
1547
|
-
this.router.navigate(['/login'], { queryParams: { returnUrl: state.url } });
|
|
1548
|
-
return false;
|
|
1549
|
-
}
|
|
1550
|
-
return this.authService.hasDataPermission(route.data);
|
|
1551
|
-
// const allowedRoles = route.data.roles;
|
|
1552
|
-
// let isInRole = this.authService.isInRole(allowedRoles);
|
|
1553
|
-
// const permission = route.data.permission;
|
|
1554
|
-
// let hasPermission = this.authService.hasPermission(permission);
|
|
1555
|
-
// return isInRole && hasPermission;
|
|
1556
|
-
}
|
|
1557
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.4", ngImport: i0, type: AuthGuardService, deps: [{ token: AuthService }, { token: i1.Router }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
1558
|
-
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.4", ngImport: i0, type: AuthGuardService }); }
|
|
1559
|
-
}
|
|
1560
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.4", ngImport: i0, type: AuthGuardService, decorators: [{
|
|
1561
|
-
type: Injectable
|
|
1562
|
-
}], ctorParameters: () => [{ type: AuthService }, { type: i1.Router }] });
|
|
1563
1527
|
|
|
1564
1528
|
class BaseService {
|
|
1565
1529
|
constructor(controller, api, httpErrorHandler) {
|
|
@@ -1574,7 +1538,8 @@ class CrudService extends BaseService {
|
|
|
1574
1538
|
super(controller, api, httpErrorHandler);
|
|
1575
1539
|
}
|
|
1576
1540
|
get(id) {
|
|
1577
|
-
|
|
1541
|
+
const url = UrlHelper.combine(`api/${this.controller}`, id);
|
|
1542
|
+
return this.api.get(url).pipe(catchError(this.handleError(this.get.name, null)));
|
|
1578
1543
|
}
|
|
1579
1544
|
get2(id, id2) {
|
|
1580
1545
|
return this.api.get(`api/${this.controller}/${id}/${id2}`).pipe(catchError(this.handleError(this.get2.name, null)));
|
|
@@ -4934,7 +4899,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.4", ngImpor
|
|
|
4934
4899
|
|
|
4935
4900
|
// export * from './loading-interceptor';
|
|
4936
4901
|
|
|
4937
|
-
class
|
|
4902
|
+
class ZekNumericDirective {
|
|
4938
4903
|
get digits() {
|
|
4939
4904
|
return this._digits;
|
|
4940
4905
|
}
|
|
@@ -5002,10 +4967,10 @@ class NumericDirective {
|
|
|
5002
4967
|
onPaste(event) {
|
|
5003
4968
|
this.run(this.el.nativeElement.value);
|
|
5004
4969
|
}
|
|
5005
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.4", ngImport: i0, type:
|
|
5006
|
-
static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "17.3.4", type:
|
|
4970
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.4", ngImport: i0, type: ZekNumericDirective, deps: [{ token: i0.ElementRef }], target: i0.ɵɵFactoryTarget.Directive }); }
|
|
4971
|
+
static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "17.3.4", type: ZekNumericDirective, isStandalone: true, selector: "[numeric]", inputs: { digits: "digits", negative: "negative" }, host: { listeners: { "keydown": "onKeyDown($event)", "paste": "onPaste($event)" } }, ngImport: i0 }); }
|
|
5007
4972
|
}
|
|
5008
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.4", ngImport: i0, type:
|
|
4973
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.4", ngImport: i0, type: ZekNumericDirective, decorators: [{
|
|
5009
4974
|
type: Directive,
|
|
5010
4975
|
args: [{
|
|
5011
4976
|
standalone: true,
|
|
@@ -6815,5 +6780,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.4", ngImpor
|
|
|
6815
6780
|
* Generated bundle index. Do not edit.
|
|
6816
6781
|
*/
|
|
6817
6782
|
|
|
6818
|
-
export { API_BASE_URL, AgePipe, Alert, AlertService, ArrayHelper,
|
|
6783
|
+
export { API_BASE_URL, AgePipe, Alert, AlertService, ArrayHelper, AuthService, Base64Helper, BaseAlert, BaseComponent, BaseService, BitwiseHelper, BootstrapHelper, Color, ComponentType, Convert, CoreComponent, CoreUiComponent, CrudService, CssHelper, CustomHttpParamEncoder, DATE_FORMAT, DateHelper, DateValueAccessor, DatepickerModule, EditBase, EditBaseComponent, EditComponent, EditFormComponent, ErrorHelper, ExcelHelper, FileBase, FileBytes, FileHelper, FileString, FilterBase, FilterHelper, GOOGLE_CLIENT_ID, Gender, HtmlHelper, HttpErrorHandler, JwtHelper, KeyPair, KeyPairChecked, KeyPairEx, KeyPairRequired, LANGUAGE, ListBase, ListBaseComponent, MATCH_VALIDATOR, MatchValidator, MathHelper, Month, ObjectHelper, OverlapHelper, PagedList, Pager, PagerHelper, PeriodRelation, PrintType, RANGE_VALIDATOR, RECAPTCHA_SITE_KEY, RandomHelper, RangeValidator, ReCaptchaService, RecaptchaModule, StorageHelper, StringHelper, TimeHelper, TimeModule, TimePipe, TimerService, TmpHelper, Toast, Tree, UrlHelper, ValidEventArgs, ValidationHelper, Validators, ValidatorsModule, WebApiClient, WebApiModule, ZekAlert, ZekApproveModal, ZekAutoComplete, ZekButtonBrowse, ZekButtonBrowseModalBase, ZekButtonBrowseModalToolbar, ZekButtonBrowseModule, ZekCallbackPipe, ZekCard, ZekDateAgoPipe, ZekDeleteModal, ZekDisapproveModal, ZekEditToolbar, ZekFieldValidator, ZekFileSizePipe, ZekFileViewer, ZekFilterModal, ZekGoogleLoginButton, ZekGoogleLoginModule, ZekGridToolbar, ZekGridToolbarBar, ZekListToolbar, ZekLoading, ZekLoadingModule, ZekLocalToUtcModule, ZekLocalToUtcPipe, ZekModal, ZekModalModule, ZekNumericDirective, ZekPageTitle, ZekPager, ZekPassword, ZekProgress, ZekRadio, ZekReadOnlyDirective, ZekRestoreModal, ZekSafePipe, ZekSelect2, ZekSelect2Multiple, ZekSelectMultiple, ZekSort, ZekSortButtonGroup, ZekSubmitModal, ZekSumModal, ZekToast, ZekTooltip, ZekUtcToLocalModule, ZekUtcToLocalPipe, ZekValidation, ZekWizard, ZekWizard2, firstBy, handler, matchValidator, nullValidator, rangeValidator, zekAuthGuard };
|
|
6819
6784
|
//# sourceMappingURL=zek.mjs.map
|