zek 14.2.68 → 14.2.70
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/services/auth.service.mjs +16 -10
- package/fesm2015/zek.mjs +15 -9
- package/fesm2015/zek.mjs.map +1 -1
- package/fesm2020/zek.mjs +15 -9
- package/fesm2020/zek.mjs.map +1 -1
- package/lib/services/auth.service.d.ts +2 -1
- package/package.json +1 -1
|
@@ -6,7 +6,7 @@ import * as i0 from "@angular/core";
|
|
|
6
6
|
export class AuthService {
|
|
7
7
|
constructor() {
|
|
8
8
|
this._isInitialized = false;
|
|
9
|
-
this.
|
|
9
|
+
this._oldValue = false;
|
|
10
10
|
this._user = null;
|
|
11
11
|
}
|
|
12
12
|
get user() {
|
|
@@ -38,13 +38,13 @@ export class AuthService {
|
|
|
38
38
|
if (timeout < minRefreshTime) {
|
|
39
39
|
timeout = minRefreshTime;
|
|
40
40
|
}
|
|
41
|
-
|
|
42
|
-
|
|
41
|
+
this._timerId = setInterval(() => {
|
|
42
|
+
this._emitRefreshToken();
|
|
43
|
+
}, timeout);
|
|
43
44
|
}
|
|
44
45
|
}
|
|
45
46
|
_stopRefreshTokenTimer() {
|
|
46
47
|
if (typeof this._timerId === 'number') {
|
|
47
|
-
console.log('clearInterval timerId', this._timerId);
|
|
48
48
|
clearInterval(this._timerId);
|
|
49
49
|
}
|
|
50
50
|
}
|
|
@@ -56,11 +56,12 @@ export class AuthService {
|
|
|
56
56
|
isAuthenticated() {
|
|
57
57
|
let expired = this.getExpired() || new Date(0); // if getExpired is null return min JS date
|
|
58
58
|
const newValue = new Date() < expired;
|
|
59
|
-
if (this.
|
|
60
|
-
this.
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
59
|
+
if (this._oldValue !== newValue) {
|
|
60
|
+
this._oldValue = newValue;
|
|
61
|
+
this.emitOnSignedIn();
|
|
62
|
+
// if (this._onSignedInSubject) {
|
|
63
|
+
// this._onSignedInSubject.next(newValue);
|
|
64
|
+
// }
|
|
64
65
|
//if user is signed in and expired we need to logout (remove from localStorage)
|
|
65
66
|
if (!newValue) {
|
|
66
67
|
this.logout();
|
|
@@ -69,6 +70,11 @@ export class AuthService {
|
|
|
69
70
|
}
|
|
70
71
|
return newValue;
|
|
71
72
|
}
|
|
73
|
+
emitOnSignedIn() {
|
|
74
|
+
if (this._onSignedInSubject) {
|
|
75
|
+
this._onSignedInSubject.next(this._oldValue);
|
|
76
|
+
}
|
|
77
|
+
}
|
|
72
78
|
get onSignedIn() {
|
|
73
79
|
if (!this._onSignedInSubject) {
|
|
74
80
|
this._onSignedInSubject = new BehaviorSubject(false);
|
|
@@ -194,4 +200,4 @@ AuthService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version:
|
|
|
194
200
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0", ngImport: i0, type: AuthService, decorators: [{
|
|
195
201
|
type: Injectable
|
|
196
202
|
}] });
|
|
197
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../../../projects/zek/src/lib/services/auth.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,GAAG,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAc,OAAO,EAAE,MAAM,MAAM,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;;AAGxD,MAAM,OAAO,WAAW;IADxB;QAEY,mBAAc,GAAY,KAAK,CAAC;QAChC,6BAAwB,GAAY,KAAK,CAAC;QAC1C,UAAK,GAAqB,IAAI,CAAC;KA2O1C;IAvOG,IAAI,IAAI;QACJ,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;YACtB,IAAI,IAAI,GAAG,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACtC,IAAI,IAAI,EAAE;gBACN,IAAI,CAAC,EAAE,GAAG,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;gBACnF,IAAI,CAAC,OAAO,GAAG,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;gBACxG,IAAI,CAAC,gBAAgB,GAAG,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC;gBAE5I,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;oBAC3B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAM,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;iBACtF;aACJ;YACD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;YAClB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;YAC3B,IAAI,CAAC,sBAAsB,EAAE,CAAC;SACjC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAIO,sBAAsB;QAC1B,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAE9B,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;QACtB,IAAI,IAAI,IAAI,IAAI,CAAC,gBAAgB,EAAE;YAC/B,IAAI,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAA,iBAAiB;YAE5E,IAAI,OAAO,GAAG,CAAC,EAAE;gBACb,IAAI,CAAC,iBAAiB,EAAE,CAAC;aAC5B;YAED,MAAM,cAAc,GAAG,KAAM,CAAA,CAAA,QAAQ;YACrC,IAAI,OAAO,GAAG,cAAc,EAAE;gBAC1B,OAAO,GAAG,cAAc,CAAC;aAC5B;YACD,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,OAAO,CAAC,CAAC;YAE5C,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;SAChE;IACL,CAAC;IACO,sBAAsB;QAC1B,IAAI,OAAO,IAAI,CAAC,QAAQ,KAAK,QAAQ,EAAE;YACnC,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YACpD,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAChC;IACL,CAAC;IACO,iBAAiB;QACrB,IAAI,IAAI,CAAC,sBAAsB,EAAE;YAC7B,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,CAAC;SACtC;IACL,CAAC;IAGD,eAAe;QACX,IAAI,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA,2CAA2C;QAE1F,MAAM,QAAQ,GAAG,IAAI,IAAI,EAAE,GAAG,OAAO,CAAC;QACtC,IAAI,IAAI,CAAC,wBAAwB,KAAK,QAAQ,EAAE;YAC5C,IAAI,CAAC,wBAAwB,GAAG,QAAQ,CAAC;YAEzC,IAAI,IAAI,CAAC,kBAAkB,EAAE;gBACzB,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;aAC1C;YAED,+EAA+E;YAC/E,IAAI,CAAC,QAAQ,EAAE;gBACX,IAAI,CAAC,MAAM,EAAE,CAAC;aACjB;YACD,OAAO,QAAQ,CAAC;SACnB;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC;IAID,IAAI,UAAU;QACV,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE;YAC1B,IAAI,CAAC,kBAAkB,GAAG,IAAI,eAAe,CAAU,KAAK,CAAC,CAAC;YAC9D,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,kBAAkB,CAAC,YAAY,EAAE,CAAC;SACvE;QAED,IAAI,CAAC,IAAI,CAAC,qBAAqB;YAC3B,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QAEzD,OAAO,IAAI,CAAC,qBAAqB,CAAC;IACtC,CAAC;IAKD,IAAI,cAAc;QACd,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE;YAC9B,IAAI,CAAC,sBAAsB,GAAG,IAAI,OAAO,EAAQ,CAAC;YAClD,IAAI,CAAC,yBAAyB,GAAG,IAAI,CAAC,sBAAsB,CAAC,YAAY,EAAE,CAAC;SAC/E;QAED,IAAI,CAAC,IAAI,CAAC,yBAAyB;YAC/B,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;QAE7D,OAAO,IAAI,CAAC,yBAAyB,CAAC;IAC1C,CAAC;IAID,KAAK,CAAC,IAAmC;QACrC,cAAc;QACd,oCAAoC;QACpC,0FAA0F;QAC1F,gHAAgH;QAChH,oJAAoJ;QACpJ,uCAAuC;QACvC,iFAAiF;QACjF,QAAQ;QACR,IAAI;QAEJ,aAAa,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC,CAAA,gCAAgC;QAC5D,IAAI,CAAC,eAAe,EAAE,CAAC,CAAA,qDAAqD;IAChF,CAAC;IACD,MAAM;QACF,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACrB,CAAC;IAIS,UAAU;QAChB,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACrB,IAAI,IAAI,EAAE;YACN,OAAO,IAAI,CAAC,OAAO,CAAC;SACvB;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAES,sBAAsB;QAC5B,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACrB,IAAI,IAAI,EAAE;YACN,OAAO,IAAI,CAAC,gBAAgB,CAAC;SAChC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAGD,8CAA8C;IAC9C,wDAAwD;IACxD,uBAAuB;IACvB,QAAQ;IAER,kCAAkC;IAClC,4CAA4C;IAC5C,0CAA0C;IAC1C,wBAAwB;IACxB,QAAQ;IAER,4EAA4E;IAC5E,uBAAuB;IACvB,IAAI;IAGJ,aAAa,CAAC,UAAoD;QAC9D,IAAI,CAAC,UAAU,EAAE;YACb,OAAO,IAAI,CAAC;SACf;QAED,IAAI,GAAG,GAAG,CAAC,CAAC;QACZ,IAAI,KAAgC,CAAC;QACrC,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;YAClE,GAAG,GAAG,CAAC,UAAU,CAAC;SACrB,CAAA,wCAAwC;QACzC,IAAI;aACC,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;YACrC,IAAI,CAAC,UAAU,CAAC,GAAG;gBACf,OAAO,IAAI,CAAC;YAEhB,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC;YACrB,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC;SAC5B;QAED,OAAO,IAAI,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC;IAC7C,CAAC;IAGD,cAAc,CAAC,WAA2B,EAAE,KAAqB;QAC7D,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;YAC1C,OAAO,IAAI,CAAC;SACf;QAED,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACvB,MAAM,eAAe,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC;QACvD,IAAI,CAAC,eAAe,EAAE;YAClB,OAAO,KAAK,CAAC;SAChB;QAED,IAAI,KAAK,EAAE;YACP,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACzC,MAAM,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;gBACzB,IAAI,KAAK,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;gBAC/B,IAAI,KAAK,EAAE;oBACP,IAAI,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;oBACxD,IAAI,aAAa;wBACb,OAAO,IAAI,CAAC;iBACnB;aACJ;SACJ;aAAM;YACH,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACzC,MAAM,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;gBACzB,IAAI,KAAK,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;gBAC/B,IAAI,KAAK;oBACL,OAAO,IAAI,CAAC;aACnB;SACJ;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAGD,iBAAiB,CAAC,IAAS;QACvB,uDAAuD;QACvD,mCAAmC;QACnC,8CAA8C;QAE9C,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QAEnC,IAAI,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAEnD,oCAAoC;QACpC,OAAO,aAAa,CAAC;IACzB,CAAC;;wGA7OQ,WAAW;4GAAX,WAAW;2FAAX,WAAW;kBADvB,UAAU","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 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        let 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            console.log('setInterval timeout', timeout);\r\n            \r\n            this._timerId = setInterval(this._emitRefreshToken, timeout);\r\n        }\r\n    }\r\n    private _stopRefreshTokenTimer() {\r\n        if (typeof this._timerId === 'number') {\r\n            console.log('clearInterval timerId', this._timerId);\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        let 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._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        //     // 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        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}"]}
|
|
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: boolean = false;\r\n    private _oldValue: boolean = false;\r\n    private _user: LoginUser | null = null;\r\n\r\n    get user(): LoginUser | null {\r\n        if (!this._isInitialized) {\r\n            let 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        let 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        let 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        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}"]}
|
package/fesm2015/zek.mjs
CHANGED
|
@@ -1117,7 +1117,7 @@ class UrlHelper {
|
|
|
1117
1117
|
class AuthService {
|
|
1118
1118
|
constructor() {
|
|
1119
1119
|
this._isInitialized = false;
|
|
1120
|
-
this.
|
|
1120
|
+
this._oldValue = false;
|
|
1121
1121
|
this._user = null;
|
|
1122
1122
|
}
|
|
1123
1123
|
get user() {
|
|
@@ -1149,13 +1149,13 @@ class AuthService {
|
|
|
1149
1149
|
if (timeout < minRefreshTime) {
|
|
1150
1150
|
timeout = minRefreshTime;
|
|
1151
1151
|
}
|
|
1152
|
-
|
|
1153
|
-
|
|
1152
|
+
this._timerId = setInterval(() => {
|
|
1153
|
+
this._emitRefreshToken();
|
|
1154
|
+
}, timeout);
|
|
1154
1155
|
}
|
|
1155
1156
|
}
|
|
1156
1157
|
_stopRefreshTokenTimer() {
|
|
1157
1158
|
if (typeof this._timerId === 'number') {
|
|
1158
|
-
console.log('clearInterval timerId', this._timerId);
|
|
1159
1159
|
clearInterval(this._timerId);
|
|
1160
1160
|
}
|
|
1161
1161
|
}
|
|
@@ -1167,11 +1167,12 @@ class AuthService {
|
|
|
1167
1167
|
isAuthenticated() {
|
|
1168
1168
|
let expired = this.getExpired() || new Date(0); // if getExpired is null return min JS date
|
|
1169
1169
|
const newValue = new Date() < expired;
|
|
1170
|
-
if (this.
|
|
1171
|
-
this.
|
|
1172
|
-
|
|
1173
|
-
|
|
1174
|
-
|
|
1170
|
+
if (this._oldValue !== newValue) {
|
|
1171
|
+
this._oldValue = newValue;
|
|
1172
|
+
this.emitOnSignedIn();
|
|
1173
|
+
// if (this._onSignedInSubject) {
|
|
1174
|
+
// this._onSignedInSubject.next(newValue);
|
|
1175
|
+
// }
|
|
1175
1176
|
//if user is signed in and expired we need to logout (remove from localStorage)
|
|
1176
1177
|
if (!newValue) {
|
|
1177
1178
|
this.logout();
|
|
@@ -1180,6 +1181,11 @@ class AuthService {
|
|
|
1180
1181
|
}
|
|
1181
1182
|
return newValue;
|
|
1182
1183
|
}
|
|
1184
|
+
emitOnSignedIn() {
|
|
1185
|
+
if (this._onSignedInSubject) {
|
|
1186
|
+
this._onSignedInSubject.next(this._oldValue);
|
|
1187
|
+
}
|
|
1188
|
+
}
|
|
1183
1189
|
get onSignedIn() {
|
|
1184
1190
|
if (!this._onSignedInSubject) {
|
|
1185
1191
|
this._onSignedInSubject = new BehaviorSubject(false);
|