zek 17.3.92 → 17.3.97

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.
@@ -1,60 +1,71 @@
1
1
  import { Injectable, } from '@angular/core';
2
- import { BehaviorSubject, Subject } from 'rxjs';
2
+ import { Subject } from 'rxjs';
3
3
  import { DateHelper, ObjectHelper, 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
+ static { this.USER_KEY = 'user'; }
8
+ static { this.REFRESH_TOKEN_INTERVAL = 15 * 60 * 1000; }
7
9
  constructor() {
8
- this._isInitialized = false;
9
10
  this._auth = false;
10
11
  this._user = null;
11
- }
12
- static { this.USER_KEY = 'user'; }
13
- // access_token
14
- get user() {
15
- if (!this._isInitialized) {
16
- const user = StorageHelper.get(AuthService.USER_KEY);
12
+ const user = StorageHelper.get(AuthService.USER_KEY);
13
+ if (user) {
17
14
  this._init(user);
18
15
  }
16
+ }
17
+ get _isAuthenticated() {
18
+ const expired = this.getExpired();
19
+ return new Date() < expired;
20
+ }
21
+ get user() {
19
22
  return this._user;
20
23
  }
21
- /**
22
- * Inits user (parses fields and starts refresh token timer if needed)
23
- * @param user user from json or storage
24
- */
25
- _init(user) {
26
- if (user) {
27
- //convert string to specified types
28
- user.expired = ObjectHelper.isDefined(user.expired) ? DateHelper.parseDate(user.expired) : user.expired;
29
- user.refreshTokenTime = ObjectHelper.isDefined(user.refreshTokenTime) ? DateHelper.parseDate(user.refreshTokenTime) : user.refreshTokenTime;
30
- if (Array.isArray(user.roles)) {
31
- user.roles = user.roles.map(function (e) { return e ? e.toUpperCase() : e; });
24
+ get isAuthenticated() {
25
+ return this._auth;
26
+ }
27
+ _starTimer() {
28
+ this._stopTimer();
29
+ let interval = this.getExpired().getTime() - new Date().getTime();
30
+ if (interval < 1000)
31
+ interval = 1000;
32
+ if (interval > 0 && this._user) {
33
+ this._refreshTimerId = setInterval(() => {
34
+ this.emitOnRefreshToken();
35
+ }, interval);
36
+ if (this._user) {
37
+ this._timerId = setInterval(() => {
38
+ this._onTick();
39
+ }, 1000);
40
+ }
41
+ }
42
+ }
43
+ _stopTimer() {
44
+ if (typeof this._timerId === 'number') {
45
+ clearInterval(this._timerId);
46
+ }
47
+ }
48
+ _onTick() {
49
+ const newValue = this._isAuthenticated;
50
+ if (this._auth !== newValue) {
51
+ this._auth = newValue;
52
+ if (!newValue) {
53
+ this.logout();
32
54
  }
33
55
  }
34
- this._user = user;
35
- this._isInitialized = true;
36
- this._starRefreshTokenTimer();
37
56
  }
38
57
  _starRefreshTokenTimer() {
39
58
  this._stopRefreshTokenTimer();
40
- const user = this._user;
41
- if (user && user.refreshTokenTime) {
42
- let timeout = user.refreshTokenTime.getTime() - Date.now(); // - (60 * 1000);
43
- if (timeout < 0) {
44
- this.emitOnRefreshToken();
45
- }
46
- const minRefreshTime = 60000; //1 min;
47
- if (timeout < minRefreshTime) {
48
- timeout = minRefreshTime;
49
- }
50
- this._timerId = setInterval(() => {
59
+ const interval = AuthService.REFRESH_TOKEN_INTERVAL;
60
+ if (interval > 0 && this._user) {
61
+ this._refreshTimerId = setInterval(() => {
51
62
  this.emitOnRefreshToken();
52
- }, timeout);
63
+ }, interval);
53
64
  }
54
65
  }
55
66
  _stopRefreshTokenTimer() {
56
- if (typeof this._timerId === 'number') {
57
- clearInterval(this._timerId);
67
+ if (typeof this._refreshTimerId === 'number') {
68
+ clearInterval(this._refreshTimerId);
58
69
  }
59
70
  }
60
71
  emitOnRefreshToken() {
@@ -62,29 +73,6 @@ export class AuthService {
62
73
  this._onRefreshTokenSubject.next();
63
74
  }
64
75
  }
65
- get _isAuthenticated() {
66
- const expired = this.getExpired();
67
- return new Date() < expired;
68
- }
69
- /**
70
- * Dynamic property. gets auth user and checks expired;
71
- */
72
- get isAuthenticated() {
73
- const newValue = this._isAuthenticated;
74
- if (this._auth !== newValue) {
75
- this._auth = newValue;
76
- //if user is signed in and expired we need to logout (remove from localStorage)
77
- if (!newValue) {
78
- this.logout(); //this executes emitOnSignedIn so we don't need here execute emitOnSignedIn
79
- }
80
- else {
81
- //this line need if you already logged in and refresh page. (System will init user from storage and verify)
82
- this.emitOnSignedIn();
83
- }
84
- return newValue;
85
- }
86
- return newValue;
87
- }
88
76
  emitOnSignedIn() {
89
77
  if (this._onSignedInSubject) {
90
78
  this._onSignedInSubject.next(this._auth);
@@ -92,7 +80,7 @@ export class AuthService {
92
80
  }
93
81
  get onSignedIn() {
94
82
  if (!this._onSignedInSubject) {
95
- this._onSignedInSubject = new BehaviorSubject(false);
83
+ this._onSignedInSubject = new Subject(); //(this.isAuthenticated);
96
84
  this._onSignedInObservable = this._onSignedInSubject.asObservable();
97
85
  }
98
86
  if (!this._onSignedInObservable)
@@ -108,41 +96,44 @@ export class AuthService {
108
96
  throw new Error("onRefreshTokenObservable is undefined");
109
97
  return this._onRefreshTokenObservable;
110
98
  }
111
- _login(user) {
99
+ login(user) {
112
100
  StorageHelper.set(AuthService.USER_KEY, user);
113
- this._isInitialized = false; //user get method will init user
114
101
  this._init(user);
115
- this._auth = ObjectHelper.isDefined(user);
116
- this.emitOnSignedIn();
117
102
  }
118
- login(user) {
119
- this._login(user);
103
+ _init(user) {
104
+ if (user) {
105
+ //convert string to local date/time
106
+ user.expired = ObjectHelper.isDefined(user.expired) ? DateHelper.parseDate(user.expired) : user.expired;
107
+ if (Array.isArray(user.roles)) {
108
+ user.roles = user.roles.map(function (e) { return e ? e.toUpperCase() : e; });
109
+ }
110
+ }
111
+ this._user = user;
112
+ //if old value was false and we set true then we need to emit
113
+ if (!this._auth) {
114
+ this._auth = true;
115
+ this.emitOnSignedIn();
116
+ }
117
+ this._starTimer();
118
+ this._starRefreshTokenTimer();
120
119
  }
121
120
  logout() {
122
- this._login(null);
121
+ StorageHelper.set(AuthService.USER_KEY, null);
122
+ this._user = null;
123
+ if (this._auth) {
124
+ this._auth = false;
125
+ this.emitOnSignedIn();
126
+ }
127
+ this._stopTimer();
128
+ this._stopRefreshTokenTimer();
123
129
  }
130
+ /**
131
+ *
132
+ * @returns user expiry date. if user is null returns min JS date
133
+ */
124
134
  getExpired() {
125
- return this.user?.expired ?? new Date(0); // if getExpired is null return min JS date;
126
- }
127
- // protected getRefreshTokenExpired(): Date | null | undefined {
128
- // const user = this.user;
129
- // if (user) {
130
- // return user.refreshTokenTime;
131
- // }
132
- // return null;
133
- // }
134
- // isInRole(allowedRoles: string[]): boolean {
135
- // if (!allowedRoles || allowedRoles.length === 0) {
136
- // return true;
137
- // }
138
- // const tmp = this.getUser();
139
- // const roles = tmp ? tmp.roles : null;
140
- // if (!roles || roles.length === 0) {
141
- // return false;
142
- // }
143
- // let isInRole = allowedRoles.some(role => roles.indexOf(role) !== -1);
144
- // return isInRole;
145
- // }
135
+ return this.user?.expired ?? new Date(0);
136
+ }
146
137
  hasPermission(permission) {
147
138
  if (!permission) {
148
139
  return true;
@@ -205,5 +196,5 @@ export class AuthService {
205
196
  }
206
197
  i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.4", ngImport: i0, type: AuthService, decorators: [{
207
198
  type: Injectable
208
- }] });
209
- //# 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 _auth = false;\r\n    private _user: LoginUser | null = null;\r\n\r\n    static USER_KEY = 'user';\r\n    // access_token\r\n\r\n    get user() {\r\n        if (!this._isInitialized) {\r\n            const user = StorageHelper.get(AuthService.USER_KEY);\r\n            this._init(user);\r\n        }\r\n        return this._user;\r\n    }\r\n\r\n    /**\r\n     * Inits user (parses fields and starts refresh token timer if needed)\r\n     * @param user user from json or storage\r\n     */\r\n    private _init(user: any) {\r\n        if (user) {\r\n            //convert string to specified types\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\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.emitOnRefreshToken();\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.emitOnRefreshToken();\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    emitOnRefreshToken() {\r\n        if (this._onRefreshTokenSubject) {\r\n            this._onRefreshTokenSubject.next();\r\n        }\r\n    }\r\n\r\n\r\n    private get _isAuthenticated() {\r\n        const expired = this.getExpired()\r\n        return new Date() < expired;\r\n    }\r\n    /**\r\n     * Dynamic property. gets auth user and checks expired;\r\n     */\r\n    get isAuthenticated() {\r\n        const newValue = this._isAuthenticated;\r\n        if (this._auth !== newValue) {\r\n            this._auth = 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();//this executes emitOnSignedIn so we don't need here execute emitOnSignedIn\r\n            }\r\n            else {\r\n                //this line need if you already logged in and refresh page. (System will init user from storage and verify)\r\n                this.emitOnSignedIn();\r\n            }\r\n            return newValue;\r\n        }\r\n        return newValue;\r\n    }\r\n\r\n    emitOnSignedIn() {\r\n        if (this._onSignedInSubject) {\r\n            this._onSignedInSubject.next(this._auth);\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    private _login(user: any) {\r\n        StorageHelper.set(AuthService.USER_KEY, user);\r\n        this._isInitialized = false;//user get method will init user\r\n        this._init(user);\r\n        this._auth = ObjectHelper.isDefined(user);\r\n        this.emitOnSignedIn();\r\n    }\r\n    login(user: LoginToken | LoginUser) {\r\n        this._login(user);\r\n    }\r\n    logout() {\r\n        this._login(null);\r\n    }\r\n\r\n\r\n    protected getExpired() {\r\n        return this.user?.expired ?? new Date(0);// if getExpired is null return min JS date;\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}"]}
199
+ }], ctorParameters: () => [] });
200
+ //# 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, ObjectHelper, StorageHelper } from '../utils';\r\nimport { BitwiseHelper } from '../utils/bitwise-helper';\r\n\r\n@Injectable()\r\nexport class AuthService {\r\n    static USER_KEY = 'user';\r\n    static REFRESH_TOKEN_INTERVAL = 15 * 60 * 1000;\r\n\r\n    private _auth = false;\r\n    private _user: LoginUser | null = null;\r\n    private _timerId: any;\r\n    private _refreshTimerId: any;\r\n\r\n    constructor() {\r\n        const user = StorageHelper.get(AuthService.USER_KEY);\r\n        if (user) {\r\n            this._init(user);\r\n        }\r\n    }\r\n\r\n\r\n    private get _isAuthenticated() {\r\n        const expired = this.getExpired()\r\n        return new Date() < expired;\r\n    }\r\n\r\n\r\n\r\n    get user() {\r\n        return this._user;\r\n    }\r\n    get isAuthenticated() {\r\n        return this._auth;\r\n    }\r\n\r\n\r\n\r\n    private _starTimer() {\r\n        this._stopTimer();      \r\n\r\n        let interval = this.getExpired().getTime() - new Date().getTime();\r\n        if (interval < 1000)\r\n            interval = 1000;\r\n        if (interval > 0 && this._user) {\r\n            this._refreshTimerId = setInterval(() => {\r\n                this.emitOnRefreshToken();\r\n            }, interval);\r\n            if (this._user) {\r\n                this._timerId = setInterval(() => {\r\n                    this._onTick();\r\n                }, 1000);\r\n            }\r\n        }\r\n    }\r\n    private _stopTimer() {\r\n        if (typeof this._timerId === 'number') {\r\n            clearInterval(this._timerId);\r\n        }\r\n    }\r\n\r\n    private _onTick() {\r\n        const newValue = this._isAuthenticated;\r\n        if (this._auth !== newValue) {\r\n            this._auth = newValue;\r\n            if (!newValue) {\r\n                this.logout();\r\n            }\r\n        }\r\n    }\r\n\r\n\r\n    private _starRefreshTokenTimer() {\r\n        this._stopRefreshTokenTimer();\r\n\r\n        const interval = AuthService.REFRESH_TOKEN_INTERVAL;\r\n        if (interval > 0 && this._user) {\r\n            this._refreshTimerId = setInterval(() => {\r\n                this.emitOnRefreshToken();\r\n            }, interval);\r\n        }\r\n    }\r\n    private _stopRefreshTokenTimer() {\r\n        if (typeof this._refreshTimerId === 'number') {\r\n            clearInterval(this._refreshTimerId);\r\n        }\r\n    }\r\n    emitOnRefreshToken() {\r\n        if (this._onRefreshTokenSubject) {\r\n            this._onRefreshTokenSubject.next();\r\n        }\r\n    }\r\n\r\n\r\n\r\n\r\n\r\n    emitOnSignedIn() {\r\n        if (this._onSignedInSubject) {\r\n            this._onSignedInSubject.next(this._auth);\r\n        }\r\n    }\r\n\r\n    private _onSignedInSubject?: Subject<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 Subject<boolean>();//(this.isAuthenticated);\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) {\r\n        StorageHelper.set(AuthService.USER_KEY, user);\r\n        this._init(user);\r\n    }\r\n    private _init(user: LoginToken | LoginUser) {\r\n        if (user) {\r\n            //convert string to local date/time\r\n            user.expired = ObjectHelper.isDefined(user.expired) ? DateHelper.parseDate(user.expired) : user.expired;\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 as any;\r\n        //if old value was false and we set true then we need to emit\r\n        if (!this._auth) {\r\n            this._auth = true;\r\n            this.emitOnSignedIn();\r\n        }\r\n\r\n        this._starTimer();\r\n        this._starRefreshTokenTimer();\r\n    }\r\n\r\n    logout() {\r\n        StorageHelper.set(AuthService.USER_KEY, null);\r\n        this._user = null;\r\n        if (this._auth) {\r\n            this._auth = false;\r\n            this.emitOnSignedIn();\r\n        }\r\n\r\n        this._stopTimer();\r\n        this._stopRefreshTokenTimer();\r\n    }\r\n\r\n    /**\r\n     *\r\n     * @returns user expiry date. if user is null returns min JS date\r\n     */\r\n    protected getExpired() {\r\n        return this.user?.expired ?? new Date(0);\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}"]}
package/fesm2022/zek.mjs CHANGED
@@ -2,7 +2,7 @@ import * as i0 from '@angular/core';
2
2
  import { Injectable, inject, InjectionToken, Inject, Directive, EventEmitter, Input, Output, ViewChild, Pipe, Component, forwardRef, NgModule, HostListener, ViewEncapsulation, ChangeDetectionStrategy, Optional } from '@angular/core';
3
3
  import * as i1 from '@angular/router';
4
4
  import { Router, NavigationStart, ActivatedRoute, RouterModule } from '@angular/router';
5
- import { BehaviorSubject, Subject, of, tap, catchError, firstValueFrom, interval, timer } from 'rxjs';
5
+ import { Subject, of, tap, catchError, firstValueFrom, interval, BehaviorSubject, timer } from 'rxjs';
6
6
  import * as i2 from '@ngx-translate/core';
7
7
  import { TranslateService, TranslateModule } from '@ngx-translate/core';
8
8
  import * as i1$1 from '@angular/common/http';
@@ -1434,57 +1434,68 @@ class ValidationHelper {
1434
1434
  }
1435
1435
 
1436
1436
  class AuthService {
1437
+ static { this.USER_KEY = 'user'; }
1438
+ static { this.REFRESH_TOKEN_INTERVAL = 15 * 60 * 1000; }
1437
1439
  constructor() {
1438
- this._isInitialized = false;
1439
1440
  this._auth = false;
1440
1441
  this._user = null;
1441
- }
1442
- static { this.USER_KEY = 'user'; }
1443
- // access_token
1444
- get user() {
1445
- if (!this._isInitialized) {
1446
- const user = StorageHelper.get(AuthService.USER_KEY);
1442
+ const user = StorageHelper.get(AuthService.USER_KEY);
1443
+ if (user) {
1447
1444
  this._init(user);
1448
1445
  }
1446
+ }
1447
+ get _isAuthenticated() {
1448
+ const expired = this.getExpired();
1449
+ return new Date() < expired;
1450
+ }
1451
+ get user() {
1449
1452
  return this._user;
1450
1453
  }
1451
- /**
1452
- * Inits user (parses fields and starts refresh token timer if needed)
1453
- * @param user user from json or storage
1454
- */
1455
- _init(user) {
1456
- if (user) {
1457
- //convert string to specified types
1458
- user.expired = ObjectHelper.isDefined(user.expired) ? DateHelper.parseDate(user.expired) : user.expired;
1459
- user.refreshTokenTime = ObjectHelper.isDefined(user.refreshTokenTime) ? DateHelper.parseDate(user.refreshTokenTime) : user.refreshTokenTime;
1460
- if (Array.isArray(user.roles)) {
1461
- user.roles = user.roles.map(function (e) { return e ? e.toUpperCase() : e; });
1454
+ get isAuthenticated() {
1455
+ return this._auth;
1456
+ }
1457
+ _starTimer() {
1458
+ this._stopTimer();
1459
+ let interval = this.getExpired().getTime() - new Date().getTime();
1460
+ if (interval < 1000)
1461
+ interval = 1000;
1462
+ if (interval > 0 && this._user) {
1463
+ this._refreshTimerId = setInterval(() => {
1464
+ this.emitOnRefreshToken();
1465
+ }, interval);
1466
+ if (this._user) {
1467
+ this._timerId = setInterval(() => {
1468
+ this._onTick();
1469
+ }, 1000);
1470
+ }
1471
+ }
1472
+ }
1473
+ _stopTimer() {
1474
+ if (typeof this._timerId === 'number') {
1475
+ clearInterval(this._timerId);
1476
+ }
1477
+ }
1478
+ _onTick() {
1479
+ const newValue = this._isAuthenticated;
1480
+ if (this._auth !== newValue) {
1481
+ this._auth = newValue;
1482
+ if (!newValue) {
1483
+ this.logout();
1462
1484
  }
1463
1485
  }
1464
- this._user = user;
1465
- this._isInitialized = true;
1466
- this._starRefreshTokenTimer();
1467
1486
  }
1468
1487
  _starRefreshTokenTimer() {
1469
1488
  this._stopRefreshTokenTimer();
1470
- const user = this._user;
1471
- if (user && user.refreshTokenTime) {
1472
- let timeout = user.refreshTokenTime.getTime() - Date.now(); // - (60 * 1000);
1473
- if (timeout < 0) {
1474
- this.emitOnRefreshToken();
1475
- }
1476
- const minRefreshTime = 60000; //1 min;
1477
- if (timeout < minRefreshTime) {
1478
- timeout = minRefreshTime;
1479
- }
1480
- this._timerId = setInterval(() => {
1489
+ const interval = AuthService.REFRESH_TOKEN_INTERVAL;
1490
+ if (interval > 0 && this._user) {
1491
+ this._refreshTimerId = setInterval(() => {
1481
1492
  this.emitOnRefreshToken();
1482
- }, timeout);
1493
+ }, interval);
1483
1494
  }
1484
1495
  }
1485
1496
  _stopRefreshTokenTimer() {
1486
- if (typeof this._timerId === 'number') {
1487
- clearInterval(this._timerId);
1497
+ if (typeof this._refreshTimerId === 'number') {
1498
+ clearInterval(this._refreshTimerId);
1488
1499
  }
1489
1500
  }
1490
1501
  emitOnRefreshToken() {
@@ -1492,29 +1503,6 @@ class AuthService {
1492
1503
  this._onRefreshTokenSubject.next();
1493
1504
  }
1494
1505
  }
1495
- get _isAuthenticated() {
1496
- const expired = this.getExpired();
1497
- return new Date() < expired;
1498
- }
1499
- /**
1500
- * Dynamic property. gets auth user and checks expired;
1501
- */
1502
- get isAuthenticated() {
1503
- const newValue = this._isAuthenticated;
1504
- if (this._auth !== newValue) {
1505
- this._auth = newValue;
1506
- //if user is signed in and expired we need to logout (remove from localStorage)
1507
- if (!newValue) {
1508
- this.logout(); //this executes emitOnSignedIn so we don't need here execute emitOnSignedIn
1509
- }
1510
- else {
1511
- //this line need if you already logged in and refresh page. (System will init user from storage and verify)
1512
- this.emitOnSignedIn();
1513
- }
1514
- return newValue;
1515
- }
1516
- return newValue;
1517
- }
1518
1506
  emitOnSignedIn() {
1519
1507
  if (this._onSignedInSubject) {
1520
1508
  this._onSignedInSubject.next(this._auth);
@@ -1522,7 +1510,7 @@ class AuthService {
1522
1510
  }
1523
1511
  get onSignedIn() {
1524
1512
  if (!this._onSignedInSubject) {
1525
- this._onSignedInSubject = new BehaviorSubject(false);
1513
+ this._onSignedInSubject = new Subject(); //(this.isAuthenticated);
1526
1514
  this._onSignedInObservable = this._onSignedInSubject.asObservable();
1527
1515
  }
1528
1516
  if (!this._onSignedInObservable)
@@ -1538,41 +1526,44 @@ class AuthService {
1538
1526
  throw new Error("onRefreshTokenObservable is undefined");
1539
1527
  return this._onRefreshTokenObservable;
1540
1528
  }
1541
- _login(user) {
1529
+ login(user) {
1542
1530
  StorageHelper.set(AuthService.USER_KEY, user);
1543
- this._isInitialized = false; //user get method will init user
1544
1531
  this._init(user);
1545
- this._auth = ObjectHelper.isDefined(user);
1546
- this.emitOnSignedIn();
1547
1532
  }
1548
- login(user) {
1549
- this._login(user);
1533
+ _init(user) {
1534
+ if (user) {
1535
+ //convert string to local date/time
1536
+ user.expired = ObjectHelper.isDefined(user.expired) ? DateHelper.parseDate(user.expired) : user.expired;
1537
+ if (Array.isArray(user.roles)) {
1538
+ user.roles = user.roles.map(function (e) { return e ? e.toUpperCase() : e; });
1539
+ }
1540
+ }
1541
+ this._user = user;
1542
+ //if old value was false and we set true then we need to emit
1543
+ if (!this._auth) {
1544
+ this._auth = true;
1545
+ this.emitOnSignedIn();
1546
+ }
1547
+ this._starTimer();
1548
+ this._starRefreshTokenTimer();
1550
1549
  }
1551
1550
  logout() {
1552
- this._login(null);
1551
+ StorageHelper.set(AuthService.USER_KEY, null);
1552
+ this._user = null;
1553
+ if (this._auth) {
1554
+ this._auth = false;
1555
+ this.emitOnSignedIn();
1556
+ }
1557
+ this._stopTimer();
1558
+ this._stopRefreshTokenTimer();
1553
1559
  }
1560
+ /**
1561
+ *
1562
+ * @returns user expiry date. if user is null returns min JS date
1563
+ */
1554
1564
  getExpired() {
1555
- return this.user?.expired ?? new Date(0); // if getExpired is null return min JS date;
1565
+ return this.user?.expired ?? new Date(0);
1556
1566
  }
1557
- // protected getRefreshTokenExpired(): Date | null | undefined {
1558
- // const user = this.user;
1559
- // if (user) {
1560
- // return user.refreshTokenTime;
1561
- // }
1562
- // return null;
1563
- // }
1564
- // isInRole(allowedRoles: string[]): boolean {
1565
- // if (!allowedRoles || allowedRoles.length === 0) {
1566
- // return true;
1567
- // }
1568
- // const tmp = this.getUser();
1569
- // const roles = tmp ? tmp.roles : null;
1570
- // if (!roles || roles.length === 0) {
1571
- // return false;
1572
- // }
1573
- // let isInRole = allowedRoles.some(role => roles.indexOf(role) !== -1);
1574
- // return isInRole;
1575
- // }
1576
1567
  hasPermission(permission) {
1577
1568
  if (!permission) {
1578
1569
  return true;
@@ -1635,7 +1626,7 @@ class AuthService {
1635
1626
  }
1636
1627
  i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.4", ngImport: i0, type: AuthService, decorators: [{
1637
1628
  type: Injectable
1638
- }] });
1629
+ }], ctorParameters: () => [] });
1639
1630
 
1640
1631
  const zekAuthGuard = (route, state) => {
1641
1632
  const auth = inject(AuthService);