zek 14.2.60 → 14.2.62
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/esm2020/lib/models/login.model.mjs +1 -1
- package/esm2020/lib/services/auth.service.mjs +49 -30
- package/esm2020/lib/utils/convert.mjs +7 -1
- package/fesm2015/zek.mjs +53 -28
- package/fesm2015/zek.mjs.map +1 -1
- package/fesm2020/zek.mjs +53 -28
- package/fesm2020/zek.mjs.map +1 -1
- package/lib/models/login.model.d.ts +2 -2
- package/lib/services/auth.service.d.ts +11 -10
- package/lib/utils/convert.d.ts +1 -0
- package/package.json +1 -1
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export {};
|
|
2
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9naW4ubW9kZWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy96ZWsvc3JjL2xpYi9tb2RlbHMvbG9naW4ubW9kZWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IENhcHRjaGEgfSBmcm9tICcuL2NhcHRjaGEubW9kZWwnO1xyXG5cclxuZXhwb3J0IGludGVyZmFjZSBMb2dpbkJhc2Uge1xyXG4gICAgaWQ/OiBudW1iZXIgfCBudWxsO1xyXG4gICAgdXNlck5hbWU/OiBzdHJpbmcgfCBudWxsO1xyXG4gICAgcm9sZXM/OiBzdHJpbmdbXSB8IG51bGw7XHJcbiAgICBwZXJtaXNzaW9ucz86IHsgW2lkOiBudW1iZXJdOiBudW1iZXI7IH0gfCBudWxsO1xyXG4gICAgdG9rZW4/OiBzdHJpbmcgfCBudWxsO1xyXG4gICAgZmlyc3ROYW1lPzogc3RyaW5nIHwgbnVsbDtcclxuICAgIGxhc3ROYW1lPzogc3RyaW5nIHwgbnVsbDtcclxuICAgIGZ1bGxOYW1lPzogc3RyaW5nIHwgbnVsbDtcclxuICAgIHBvc2l0aW9uPzogc3RyaW5nIHwgbnVsbDtcclxuICAgIGNvbXBhbnk/OiBzdHJpbmcgfCBudWxsO1xyXG59XHJcbmV4cG9ydCBpbnRlcmZhY2UgTG9naW5Ub2tlbiBleHRlbmRzIExvZ2luQmFzZSB7XHJcbiAgICBleHBpcmVkPzogc3RyaW5nIHwgbnVsbDtcclxuICAgIHJlZnJlc2hUb2tlblRpbWU/
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9naW4ubW9kZWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy96ZWsvc3JjL2xpYi9tb2RlbHMvbG9naW4ubW9kZWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IENhcHRjaGEgfSBmcm9tICcuL2NhcHRjaGEubW9kZWwnO1xyXG5cclxuZXhwb3J0IGludGVyZmFjZSBMb2dpbkJhc2Uge1xyXG4gICAgaWQ/OiBudW1iZXIgfCBudWxsO1xyXG4gICAgdXNlck5hbWU/OiBzdHJpbmcgfCBudWxsO1xyXG4gICAgcm9sZXM/OiBzdHJpbmdbXSB8IG51bGw7XHJcbiAgICBwZXJtaXNzaW9ucz86IHsgW2lkOiBudW1iZXJdOiBudW1iZXI7IH0gfCBudWxsO1xyXG4gICAgdG9rZW4/OiBzdHJpbmcgfCBudWxsO1xyXG4gICAgZmlyc3ROYW1lPzogc3RyaW5nIHwgbnVsbDtcclxuICAgIGxhc3ROYW1lPzogc3RyaW5nIHwgbnVsbDtcclxuICAgIGZ1bGxOYW1lPzogc3RyaW5nIHwgbnVsbDtcclxuICAgIHBvc2l0aW9uPzogc3RyaW5nIHwgbnVsbDtcclxuICAgIGNvbXBhbnk/OiBzdHJpbmcgfCBudWxsO1xyXG59XHJcbmV4cG9ydCBpbnRlcmZhY2UgTG9naW5Ub2tlbiBleHRlbmRzIExvZ2luQmFzZSB7XHJcbiAgICBleHBpcmVkPzogc3RyaW5nIHwgbnVsbDtcclxuICAgIHJlZnJlc2hUb2tlblRpbWU/OiBzdHJpbmcgfCBudWxsO1xyXG59XHJcbmV4cG9ydCBpbnRlcmZhY2UgTG9naW5Vc2VyIGV4dGVuZHMgTG9naW5CYXNlIHtcclxuICAgIGV4cGlyZWQ/OiBEYXRlIHwgbnVsbDtcclxuICAgIHJlZnJlc2hUb2tlblRpbWU/OiBEYXRlIHwgbnVsbDtcclxufVxyXG5cclxuZXhwb3J0IGludGVyZmFjZSBMb2dpbiBleHRlbmRzIENhcHRjaGEge1xyXG4gICAgdXNlck5hbWU/OiBzdHJpbmc7XHJcbiAgICByZW1lbWJlck1lPzogYm9vbGVhbjtcclxuICAgIHBhc3N3b3JkPzogc3RyaW5nO1xyXG59Il19
|
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
import { Injectable, } from '@angular/core';
|
|
2
|
-
import { BehaviorSubject } from 'rxjs';
|
|
3
|
-
import { DateHelper, StorageHelper } from '../utils';
|
|
2
|
+
import { BehaviorSubject, Subject } from 'rxjs';
|
|
3
|
+
import { Convert, DateHelper, StorageHelper } from '../utils';
|
|
4
4
|
import { BitwiseHelper } from '../utils/bitwise-helper';
|
|
5
5
|
import * as i0 from "@angular/core";
|
|
6
6
|
export class AuthService {
|
|
7
7
|
constructor() {
|
|
8
8
|
this._isInitialized = false;
|
|
9
|
-
this._subject = new BehaviorSubject(false); //todo check if need BehaviorSubject
|
|
10
9
|
this._oldValueIsAuthenticated = false;
|
|
11
10
|
this._user = null;
|
|
12
11
|
}
|
|
@@ -14,25 +13,45 @@ export class AuthService {
|
|
|
14
13
|
if (!this._isInitialized) {
|
|
15
14
|
let tmp = StorageHelper.get('login');
|
|
16
15
|
if (tmp) {
|
|
16
|
+
// let user:LoginUser = {
|
|
17
|
+
// id: +tmp.id,
|
|
18
|
+
// expired: DateHelper.parseDate(tmp.expired)
|
|
19
|
+
// }
|
|
20
|
+
tmp.id = Convert.parseNumber(tmp.id);
|
|
17
21
|
tmp.expired = DateHelper.parseDate(tmp.expired);
|
|
18
22
|
tmp.refreshTokenTime = DateHelper.parseDate(tmp.refreshTokenTime);
|
|
19
23
|
}
|
|
20
24
|
this._user = tmp;
|
|
21
25
|
this._isInitialized = true;
|
|
26
|
+
this._starRefreshTokenTimer();
|
|
22
27
|
}
|
|
23
28
|
return this._user;
|
|
24
29
|
}
|
|
25
|
-
|
|
26
|
-
|
|
30
|
+
_starRefreshTokenTimer() {
|
|
31
|
+
this._stopRefreshTokenTimer();
|
|
32
|
+
let user = this.user;
|
|
33
|
+
if (user && user.refreshTokenTime) {
|
|
34
|
+
const timeout = user.refreshTokenTime.getTime() - Date.now(); // - (60 * 1000);
|
|
35
|
+
this._refreshTokenTimeout = setTimeout(() => {
|
|
36
|
+
if (this._onRefreshTokenSubject) {
|
|
37
|
+
this._onRefreshTokenSubject.next();
|
|
38
|
+
}
|
|
39
|
+
}, timeout);
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
_stopRefreshTokenTimer() {
|
|
43
|
+
if (typeof this._refreshTokenTimeout === 'number') {
|
|
44
|
+
clearTimeout(this._refreshTokenTimeout);
|
|
45
|
+
}
|
|
46
|
+
}
|
|
27
47
|
isAuthenticated() {
|
|
28
48
|
let expired = this.getExpired() || new Date(0);
|
|
29
49
|
const newValue = new Date() < expired;
|
|
30
|
-
if (this._oldValueIsAuthenticated
|
|
50
|
+
if (this._oldValueIsAuthenticated !== newValue) {
|
|
31
51
|
this._oldValueIsAuthenticated = newValue;
|
|
32
|
-
if (this.
|
|
33
|
-
this.
|
|
52
|
+
if (this._onSignedInSubject) {
|
|
53
|
+
this._onSignedInSubject.next(newValue);
|
|
34
54
|
}
|
|
35
|
-
this._subject.next(newValue);
|
|
36
55
|
//if user is signed in and expired we need to logout (remove from localStorage)
|
|
37
56
|
if (!newValue) {
|
|
38
57
|
this.logout();
|
|
@@ -41,41 +60,41 @@ export class AuthService {
|
|
|
41
60
|
}
|
|
42
61
|
return newValue;
|
|
43
62
|
}
|
|
44
|
-
/**
|
|
45
|
-
* @deprecated The method should not be used. please use onSignedIn
|
|
46
|
-
*/
|
|
47
|
-
isSignedIn() {
|
|
48
|
-
return this._subject.asObservable();
|
|
49
|
-
}
|
|
50
63
|
get onSignedIn() {
|
|
51
|
-
if (!this.
|
|
52
|
-
this.
|
|
53
|
-
this.
|
|
64
|
+
if (!this._onSignedInSubject) {
|
|
65
|
+
this._onSignedInSubject = new BehaviorSubject(false);
|
|
66
|
+
this._onSignedInObservable = this._onSignedInSubject.asObservable();
|
|
67
|
+
}
|
|
68
|
+
if (!this._onSignedInObservable)
|
|
69
|
+
throw new Error("_onExecuteObservable is undefined");
|
|
70
|
+
return this._onSignedInObservable;
|
|
71
|
+
}
|
|
72
|
+
get onRefreshToken() {
|
|
73
|
+
if (!this._onRefreshTokenSubject) {
|
|
74
|
+
this._onRefreshTokenSubject = new Subject();
|
|
75
|
+
this._onRefreshTokenObservable = this._onRefreshTokenSubject.asObservable();
|
|
54
76
|
}
|
|
55
|
-
if (!this.
|
|
56
|
-
throw new Error("
|
|
57
|
-
return this.
|
|
77
|
+
if (!this._onRefreshTokenObservable)
|
|
78
|
+
throw new Error("onRefreshTokenObservable is undefined");
|
|
79
|
+
return this._onRefreshTokenObservable;
|
|
58
80
|
}
|
|
59
81
|
login(user) {
|
|
60
82
|
if (user) {
|
|
83
|
+
user.id = Convert.parseNumber(user.id);
|
|
84
|
+
user.expired = DateHelper.parseDate(user.expired);
|
|
85
|
+
user.refreshTokenTime = DateHelper.parseDate(user.refreshTokenTime);
|
|
61
86
|
if (Array.isArray(user.roles)) {
|
|
62
87
|
user.roles = user.roles.map(function (e) { return e.toUpperCase(); });
|
|
63
88
|
}
|
|
64
89
|
}
|
|
65
90
|
StorageHelper.set('login', user);
|
|
66
91
|
this._user = null;
|
|
67
|
-
this._isInitialized = false;
|
|
68
|
-
this.isAuthenticated(); //this method need to execute subject.next();
|
|
92
|
+
this._isInitialized = false; //user get method will init user
|
|
93
|
+
this.isAuthenticated(); //this method need to execute subject.next();
|
|
69
94
|
}
|
|
70
95
|
logout() {
|
|
71
96
|
this.login(null);
|
|
72
97
|
}
|
|
73
|
-
// getUser(): LoginToken | null {
|
|
74
|
-
// if (!this.model) {
|
|
75
|
-
// this.model = StorageHelper.get('login');
|
|
76
|
-
// }
|
|
77
|
-
// return this.model;
|
|
78
|
-
// }
|
|
79
98
|
getExpired() {
|
|
80
99
|
let user = this.user;
|
|
81
100
|
if (user) {
|
|
@@ -165,4 +184,4 @@ AuthService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version:
|
|
|
165
184
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0", ngImport: i0, type: AuthService, decorators: [{
|
|
166
185
|
type: Injectable
|
|
167
186
|
}] });
|
|
168
|
-
//# 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 { DateHelper, StorageHelper } from '../utils';\r\nimport { BitwiseHelper } from '../utils/bitwise-helper';\r\n\r\n@Injectable()\r\nexport class AuthService {\r\n    private _isInitialized: boolean = false;\r\n    private _subject = new BehaviorSubject<boolean>(false);//todo check if need BehaviorSubject\r\n    private _oldValueIsAuthenticated: boolean = false;\r\n\r\n\r\n    private _user: LoginUser | null = null;\r\n    public get user(): LoginUser | null {\r\n        if (!this._isInitialized) {\r\n            let tmp = StorageHelper.get('login');\r\n            if (tmp) {\r\n                tmp.expired = DateHelper.parseDate(tmp.expired);\r\n                tmp.refreshTokenTime = DateHelper.parseDate(tmp.refreshTokenTime);\r\n            }\r\n            this._user = tmp;\r\n            this._isInitialized = true;\r\n        }\r\n        return this._user;\r\n    }\r\n    \r\n\r\n\r\n    // private _expired: Date | null = null;\r\n    // private _refreshTokenExpired: Date | null = null;\r\n\r\n    isAuthenticated(): boolean {\r\n        let expired = this.getExpired() || new Date(0);\r\n\r\n        const newValue = new Date() < expired;\r\n        if (this._oldValueIsAuthenticated != newValue) {\r\n            this._oldValueIsAuthenticated = newValue;\r\n\r\n            if (this.onSignedInSubject) {\r\n                this.onSignedInSubject.next(newValue);\r\n            }\r\n            this._subject.next(newValue);\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\r\n    /**\r\n    * @deprecated The method should not be used. please use onSignedIn\r\n    */\r\n    isSignedIn() {\r\n        return this._subject.asObservable();\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    public 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    login(user: LoginToken | null) {\r\n        if (user) {\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;\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    // getUser(): LoginToken | null {\r\n    //     if (!this.model) {\r\n    //         this.model = StorageHelper.get('login');\r\n    //     }\r\n    //     return this.model;\r\n    // }\r\n\r\n    protected getExpired(): Date | null {\r\n        let 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 {\r\n        let 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                let found = userPermissions[p];\r\n                if (found) {\r\n                    let 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                let 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        let hasPermission = this.hasPermission(permission);\r\n\r\n        // return isInRole && hasPermission;\r\n        return hasPermission;\r\n    }\r\n}"]}
|
|
187
|
+
//# 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: boolean = false;\r\n    private _oldValueIsAuthenticated: boolean = false;\r\n    private _user: LoginUser | null = null;\r\n\r\n\r\n\r\n    get user(): LoginUser | null {\r\n        if (!this._isInitialized) {\r\n            let tmp = StorageHelper.get('login');\r\n            if (tmp) {\r\n                // let user:LoginUser = {\r\n                //     id: +tmp.id,\r\n                //     expired: DateHelper.parseDate(tmp.expired)\r\n                // }\r\n                tmp.id = Convert.parseNumber(tmp.id);\r\n                tmp.expired = DateHelper.parseDate(tmp.expired);\r\n                tmp.refreshTokenTime = DateHelper.parseDate(tmp.refreshTokenTime);\r\n            }\r\n            this._user = tmp;\r\n            this._isInitialized = true;\r\n            this._starRefreshTokenTimer();\r\n        }\r\n        return this._user;\r\n    }\r\n\r\n    private _refreshTokenTimeout: any;\r\n    private _starRefreshTokenTimer() {\r\n        this._stopRefreshTokenTimer();\r\n\r\n        let user = this.user;\r\n        if (user && user.refreshTokenTime) {\r\n            const timeout = user.refreshTokenTime.getTime() - Date.now();// - (60 * 1000);\r\n\r\n            this._refreshTokenTimeout = setTimeout(() => {\r\n                if (this._onRefreshTokenSubject) {\r\n                    this._onRefreshTokenSubject.next();\r\n                }\r\n            }, timeout);\r\n        }\r\n\r\n    }\r\n    private _stopRefreshTokenTimer() {\r\n        if (typeof this._refreshTokenTimeout === 'number') {\r\n            clearTimeout(this._refreshTokenTimeout);\r\n        }\r\n    }\r\n\r\n    isAuthenticated(): boolean {\r\n        let expired = this.getExpired() || new Date(0);\r\n\r\n        const newValue = new Date() < expired;\r\n        if (this._oldValueIsAuthenticated !== newValue) {\r\n            this._oldValueIsAuthenticated = newValue;\r\n\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\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            user.id = Convert.parseNumber(user.id);\r\n            user.expired = DateHelper.parseDate(user.expired);\r\n            user.refreshTokenTime = DateHelper.parseDate(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\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        let 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        let 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                let found = userPermissions[p];\r\n                if (found) {\r\n                    let 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                let 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        let hasPermission = this.hasPermission(permission);\r\n\r\n        // return isInRole && hasPermission;\r\n        return hasPermission;\r\n    }\r\n}"]}
|
|
@@ -13,6 +13,12 @@ export class Convert {
|
|
|
13
13
|
}
|
|
14
14
|
return false;
|
|
15
15
|
}
|
|
16
|
+
static parseNumber(value) {
|
|
17
|
+
if (typeof value === 'undefined' || value == null || (typeof value === 'string' && value.length === 0))
|
|
18
|
+
return null;
|
|
19
|
+
let n = Number(value);
|
|
20
|
+
return !isNaN(n) ? n : null;
|
|
21
|
+
}
|
|
16
22
|
static toNumber(value, defaultValue = 0) {
|
|
17
23
|
return this.isNumber(value) ? Number(value) : defaultValue;
|
|
18
24
|
}
|
|
@@ -23,4 +29,4 @@ export class Convert {
|
|
|
23
29
|
return !isNaN(parseFloat(value)) && !isNaN(Number(value));
|
|
24
30
|
}
|
|
25
31
|
}
|
|
26
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
32
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udmVydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3play9zcmMvbGliL3V0aWxzL2NvbnZlcnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxPQUFPLE9BQU87SUFDaEIsTUFBTSxDQUFDLFNBQVMsQ0FBQyxLQUFVO1FBQ3ZCLElBQUksT0FBTyxLQUFLLEtBQUssV0FBVyxJQUFJLEtBQUssS0FBSyxJQUFJLElBQUksS0FBSyxLQUFLLEVBQUUsRUFBRTtZQUNoRSxRQUFRLEdBQUcsS0FBSyxFQUFFLENBQUMsV0FBVyxFQUFFLEVBQUU7Z0JBQzlCLEtBQUssTUFBTSxDQUFDO2dCQUNaLEtBQUssS0FBSyxDQUFDO2dCQUNYLEtBQUssR0FBRyxDQUFDO2dCQUNULEtBQUssSUFBSTtvQkFDTCxPQUFPLElBQUksQ0FBQztnQkFFaEI7b0JBQ0ksT0FBTyxLQUFLLENBQUM7YUFDcEI7U0FDSjtRQUVELE9BQU8sS0FBSyxDQUFDO0lBQ2pCLENBQUM7SUFFRCxNQUFNLENBQUMsV0FBVyxDQUFDLEtBQVU7UUFDekIsSUFBSSxPQUFPLEtBQUssS0FBSyxXQUFXLElBQUksS0FBSyxJQUFJLElBQUksSUFBSSxDQUFDLE9BQU8sS0FBSyxLQUFLLFFBQVEsSUFBSSxLQUFLLENBQUMsTUFBTSxLQUFLLENBQUMsQ0FBQztZQUFFLE9BQU8sSUFBSSxDQUFDO1FBQ3BILElBQUksQ0FBQyxHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUN0QixPQUFPLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQztJQUNoQyxDQUFDO0lBQ0QsTUFBTSxDQUFDLFFBQVEsQ0FBQyxLQUFVLEVBQUUsWUFBWSxHQUFHLENBQUM7UUFDeEMsT0FBTyxJQUFJLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLFlBQVksQ0FBQztJQUMvRCxDQUFDO0lBRUQsTUFBTSxDQUFDLFFBQVEsQ0FBQyxLQUFVO1FBQ3RCLGlHQUFpRztRQUNqRyw0RkFBNEY7UUFDNUYsb0ZBQW9GO1FBQ3BGLE9BQU8sQ0FBQyxLQUFLLENBQUMsVUFBVSxDQUFDLEtBQVksQ0FBQyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7SUFDckUsQ0FBQztDQVNKIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGNsYXNzIENvbnZlcnQge1xyXG4gICAgc3RhdGljIHRvQm9vbGVhbih2YWx1ZTogYW55KSB7XHJcbiAgICAgICAgaWYgKHR5cGVvZiB2YWx1ZSAhPT0gJ3VuZGVmaW5lZCcgJiYgdmFsdWUgIT09IG51bGwgJiYgdmFsdWUgIT09ICcnKSB7XHJcbiAgICAgICAgICAgIHN3aXRjaCAoYCR7dmFsdWV9YC50b1VwcGVyQ2FzZSgpKSB7XHJcbiAgICAgICAgICAgICAgICBjYXNlIFwiVFJVRVwiOlxyXG4gICAgICAgICAgICAgICAgY2FzZSBcIllFU1wiOlxyXG4gICAgICAgICAgICAgICAgY2FzZSBcIjFcIjpcclxuICAgICAgICAgICAgICAgIGNhc2UgXCJPTlwiOlxyXG4gICAgICAgICAgICAgICAgICAgIHJldHVybiB0cnVlO1xyXG5cclxuICAgICAgICAgICAgICAgIGRlZmF1bHQ6XHJcbiAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlO1xyXG4gICAgICAgICAgICB9XHJcbiAgICAgICAgfVxyXG5cclxuICAgICAgICByZXR1cm4gZmFsc2U7XHJcbiAgICB9XHJcblxyXG4gICAgc3RhdGljIHBhcnNlTnVtYmVyKHZhbHVlOiBhbnkpIHtcclxuICAgICAgICBpZiAodHlwZW9mIHZhbHVlID09PSAndW5kZWZpbmVkJyB8fCB2YWx1ZSA9PSBudWxsIHx8ICh0eXBlb2YgdmFsdWUgPT09ICdzdHJpbmcnICYmIHZhbHVlLmxlbmd0aCA9PT0gMCkpIHJldHVybiBudWxsO1xyXG4gICAgICAgIGxldCBuID0gTnVtYmVyKHZhbHVlKTtcclxuICAgICAgICByZXR1cm4gIWlzTmFOKG4pID8gbiA6IG51bGw7XHJcbiAgICB9XHJcbiAgICBzdGF0aWMgdG9OdW1iZXIodmFsdWU6IGFueSwgZGVmYXVsdFZhbHVlID0gMCkge1xyXG4gICAgICAgIHJldHVybiB0aGlzLmlzTnVtYmVyKHZhbHVlKSA/IE51bWJlcih2YWx1ZSkgOiBkZWZhdWx0VmFsdWU7XHJcbiAgICB9XHJcblxyXG4gICAgc3RhdGljIGlzTnVtYmVyKHZhbHVlOiBhbnkpOiBib29sZWFuIHtcclxuICAgICAgICAvLyBwYXJzZUZsb2F0KHZhbHVlKSBoYW5kbGVzIG1vc3Qgb2YgdGhlIGNhc2VzIHdlJ3JlIGludGVyZXN0ZWQgaW4gKGl0IHRyZWF0cyBudWxsLCBlbXB0eSBzdHJpbmcsXHJcbiAgICAgICAgLy8gYW5kIG90aGVyIG5vbi1udW1iZXIgdmFsdWVzIGFzIE5hTiwgd2hlcmUgTnVtYmVyIGp1c3QgdXNlcyAwKSBidXQgaXQgY29uc2lkZXJzIHRoZSBzdHJpbmdcclxuICAgICAgICAvLyAnMTIzaGVsbG8nIHRvIGJlIGEgdmFsaWQgbnVtYmVyLiBUaGVyZWZvcmUgd2UgYWxzbyBjaGVjayBpZiBOdW1iZXIodmFsdWUpIGlzIE5hTi5cclxuICAgICAgICByZXR1cm4gIWlzTmFOKHBhcnNlRmxvYXQodmFsdWUgYXMgYW55KSkgJiYgIWlzTmFOKE51bWJlcih2YWx1ZSkpO1xyXG4gICAgfVxyXG5cclxuICAgIC8vIHN0YXRpYyB0b051bWJlcih2YWx1ZTogYW55KXtcclxuICAgIC8vICAgICBpZiAodHlwZW9mIHZhbHVlICE9PSAndW5kZWZpbmVkJyAmJiB2YWx1ZSAhPT0gbnVsbCAmJiB2YWx1ZSAhPT0gJycpIHtcclxuICAgIC8vICAgICAgICAgcmV0dXJuICt2YWx1ZTtcclxuICAgIC8vICAgICB9XHJcblxyXG4gICAgLy8gICAgIHJldHVybiAwO1xyXG4gICAgLy8gfVxyXG59Il19
|
package/fesm2015/zek.mjs
CHANGED
|
@@ -2,7 +2,7 @@ import * as i0 from '@angular/core';
|
|
|
2
2
|
import { Injectable, InjectionToken, Inject, NgModule, Directive, Input, EventEmitter, Output, ViewChild, Pipe, Component, forwardRef, ViewEncapsulation, ChangeDetectionStrategy, Optional, HostListener } from '@angular/core';
|
|
3
3
|
import * as i1 from '@angular/router';
|
|
4
4
|
import { NavigationStart, PRIMARY_OUTLET, RouterModule } from '@angular/router';
|
|
5
|
-
import { BehaviorSubject,
|
|
5
|
+
import { BehaviorSubject, Subject, catchError, of, firstValueFrom, ReplaySubject, timer } from 'rxjs';
|
|
6
6
|
import * as i1$1 from '@ngx-translate/core';
|
|
7
7
|
import { TranslateModule } from '@ngx-translate/core';
|
|
8
8
|
import * as i1$2 from '@angular/common/http';
|
|
@@ -336,6 +336,12 @@ class Convert {
|
|
|
336
336
|
}
|
|
337
337
|
return false;
|
|
338
338
|
}
|
|
339
|
+
static parseNumber(value) {
|
|
340
|
+
if (typeof value === 'undefined' || value == null || (typeof value === 'string' && value.length === 0))
|
|
341
|
+
return null;
|
|
342
|
+
let n = Number(value);
|
|
343
|
+
return !isNaN(n) ? n : null;
|
|
344
|
+
}
|
|
339
345
|
static toNumber(value, defaultValue = 0) {
|
|
340
346
|
return this.isNumber(value) ? Number(value) : defaultValue;
|
|
341
347
|
}
|
|
@@ -1111,7 +1117,6 @@ class UrlHelper {
|
|
|
1111
1117
|
class AuthService {
|
|
1112
1118
|
constructor() {
|
|
1113
1119
|
this._isInitialized = false;
|
|
1114
|
-
this._subject = new BehaviorSubject(false); //todo check if need BehaviorSubject
|
|
1115
1120
|
this._oldValueIsAuthenticated = false;
|
|
1116
1121
|
this._user = null;
|
|
1117
1122
|
}
|
|
@@ -1119,25 +1124,45 @@ class AuthService {
|
|
|
1119
1124
|
if (!this._isInitialized) {
|
|
1120
1125
|
let tmp = StorageHelper.get('login');
|
|
1121
1126
|
if (tmp) {
|
|
1127
|
+
// let user:LoginUser = {
|
|
1128
|
+
// id: +tmp.id,
|
|
1129
|
+
// expired: DateHelper.parseDate(tmp.expired)
|
|
1130
|
+
// }
|
|
1131
|
+
tmp.id = Convert.parseNumber(tmp.id);
|
|
1122
1132
|
tmp.expired = DateHelper.parseDate(tmp.expired);
|
|
1123
1133
|
tmp.refreshTokenTime = DateHelper.parseDate(tmp.refreshTokenTime);
|
|
1124
1134
|
}
|
|
1125
1135
|
this._user = tmp;
|
|
1126
1136
|
this._isInitialized = true;
|
|
1137
|
+
this._starRefreshTokenTimer();
|
|
1127
1138
|
}
|
|
1128
1139
|
return this._user;
|
|
1129
1140
|
}
|
|
1130
|
-
|
|
1131
|
-
|
|
1141
|
+
_starRefreshTokenTimer() {
|
|
1142
|
+
this._stopRefreshTokenTimer();
|
|
1143
|
+
let user = this.user;
|
|
1144
|
+
if (user && user.refreshTokenTime) {
|
|
1145
|
+
const timeout = user.refreshTokenTime.getTime() - Date.now(); // - (60 * 1000);
|
|
1146
|
+
this._refreshTokenTimeout = setTimeout(() => {
|
|
1147
|
+
if (this._onRefreshTokenSubject) {
|
|
1148
|
+
this._onRefreshTokenSubject.next();
|
|
1149
|
+
}
|
|
1150
|
+
}, timeout);
|
|
1151
|
+
}
|
|
1152
|
+
}
|
|
1153
|
+
_stopRefreshTokenTimer() {
|
|
1154
|
+
if (typeof this._refreshTokenTimeout === 'number') {
|
|
1155
|
+
clearTimeout(this._refreshTokenTimeout);
|
|
1156
|
+
}
|
|
1157
|
+
}
|
|
1132
1158
|
isAuthenticated() {
|
|
1133
1159
|
let expired = this.getExpired() || new Date(0);
|
|
1134
1160
|
const newValue = new Date() < expired;
|
|
1135
|
-
if (this._oldValueIsAuthenticated
|
|
1161
|
+
if (this._oldValueIsAuthenticated !== newValue) {
|
|
1136
1162
|
this._oldValueIsAuthenticated = newValue;
|
|
1137
|
-
if (this.
|
|
1138
|
-
this.
|
|
1163
|
+
if (this._onSignedInSubject) {
|
|
1164
|
+
this._onSignedInSubject.next(newValue);
|
|
1139
1165
|
}
|
|
1140
|
-
this._subject.next(newValue);
|
|
1141
1166
|
//if user is signed in and expired we need to logout (remove from localStorage)
|
|
1142
1167
|
if (!newValue) {
|
|
1143
1168
|
this.logout();
|
|
@@ -1146,41 +1171,41 @@ class AuthService {
|
|
|
1146
1171
|
}
|
|
1147
1172
|
return newValue;
|
|
1148
1173
|
}
|
|
1149
|
-
/**
|
|
1150
|
-
* @deprecated The method should not be used. please use onSignedIn
|
|
1151
|
-
*/
|
|
1152
|
-
isSignedIn() {
|
|
1153
|
-
return this._subject.asObservable();
|
|
1154
|
-
}
|
|
1155
1174
|
get onSignedIn() {
|
|
1156
|
-
if (!this.
|
|
1157
|
-
this.
|
|
1158
|
-
this.
|
|
1175
|
+
if (!this._onSignedInSubject) {
|
|
1176
|
+
this._onSignedInSubject = new BehaviorSubject(false);
|
|
1177
|
+
this._onSignedInObservable = this._onSignedInSubject.asObservable();
|
|
1159
1178
|
}
|
|
1160
|
-
if (!this.
|
|
1161
|
-
throw new Error("
|
|
1162
|
-
return this.
|
|
1179
|
+
if (!this._onSignedInObservable)
|
|
1180
|
+
throw new Error("_onExecuteObservable is undefined");
|
|
1181
|
+
return this._onSignedInObservable;
|
|
1182
|
+
}
|
|
1183
|
+
get onRefreshToken() {
|
|
1184
|
+
if (!this._onRefreshTokenSubject) {
|
|
1185
|
+
this._onRefreshTokenSubject = new Subject();
|
|
1186
|
+
this._onRefreshTokenObservable = this._onRefreshTokenSubject.asObservable();
|
|
1187
|
+
}
|
|
1188
|
+
if (!this._onRefreshTokenObservable)
|
|
1189
|
+
throw new Error("onRefreshTokenObservable is undefined");
|
|
1190
|
+
return this._onRefreshTokenObservable;
|
|
1163
1191
|
}
|
|
1164
1192
|
login(user) {
|
|
1165
1193
|
if (user) {
|
|
1194
|
+
user.id = Convert.parseNumber(user.id);
|
|
1195
|
+
user.expired = DateHelper.parseDate(user.expired);
|
|
1196
|
+
user.refreshTokenTime = DateHelper.parseDate(user.refreshTokenTime);
|
|
1166
1197
|
if (Array.isArray(user.roles)) {
|
|
1167
1198
|
user.roles = user.roles.map(function (e) { return e.toUpperCase(); });
|
|
1168
1199
|
}
|
|
1169
1200
|
}
|
|
1170
1201
|
StorageHelper.set('login', user);
|
|
1171
1202
|
this._user = null;
|
|
1172
|
-
this._isInitialized = false;
|
|
1173
|
-
this.isAuthenticated(); //this method need to execute subject.next();
|
|
1203
|
+
this._isInitialized = false; //user get method will init user
|
|
1204
|
+
this.isAuthenticated(); //this method need to execute subject.next();
|
|
1174
1205
|
}
|
|
1175
1206
|
logout() {
|
|
1176
1207
|
this.login(null);
|
|
1177
1208
|
}
|
|
1178
|
-
// getUser(): LoginToken | null {
|
|
1179
|
-
// if (!this.model) {
|
|
1180
|
-
// this.model = StorageHelper.get('login');
|
|
1181
|
-
// }
|
|
1182
|
-
// return this.model;
|
|
1183
|
-
// }
|
|
1184
1209
|
getExpired() {
|
|
1185
1210
|
let user = this.user;
|
|
1186
1211
|
if (user) {
|