zek 14.2.60 → 14.2.64

package/fesm2020/zek.mjs

@@ -2,7 +2,7 @@ import * as i0 from '@angular/core';
 import { Injectable, InjectionToken, Inject, NgModule, Directive, Input, EventEmitter, Output, ViewChild, Pipe, Component, forwardRef, ViewEncapsulation, ChangeDetectionStrategy, Optional, HostListener } from '@angular/core';
 import * as i1 from '@angular/router';
 import { NavigationStart, PRIMARY_OUTLET, RouterModule } from '@angular/router';
-import { BehaviorSubject, catchError, Subject, of, firstValueFrom, ReplaySubject, timer } from 'rxjs';
+import { BehaviorSubject, Subject, catchError, of, firstValueFrom, ReplaySubject, timer } from 'rxjs';
 import * as i1$1 from '@ngx-translate/core';
 import { TranslateModule } from '@ngx-translate/core';
 import * as i1$2 from '@angular/common/http';
@@ -335,6 +335,12 @@ class Convert {
         }
         return false;
     }
+    static parseNumber(value) {
+        if (typeof value === 'undefined' || value == null || (typeof value === 'string' && value.length === 0))
+            return null;
+        let n = Number(value);
+        return !isNaN(n) ? n : null;
+    }
     static toNumber(value, defaultValue = 0) {
         return this.isNumber(value) ? Number(value) : defaultValue;
     }
@@ -1110,33 +1116,51 @@ class UrlHelper {
 class AuthService {
     constructor() {
         this._isInitialized = false;
-        this._subject = new BehaviorSubject(false); //todo check if need BehaviorSubject
         this._oldValueIsAuthenticated = false;
         this._user = null;
     }
     get user() {
         if (!this._isInitialized) {
-            let tmp = StorageHelper.get('login');
-            if (tmp) {
-                tmp.expired = DateHelper.parseDate(tmp.expired);
-                tmp.refreshTokenTime = DateHelper.parseDate(tmp.refreshTokenTime);
+            let user = StorageHelper.get('login');
+            if (user) {
+                user.id = ObjectHelper.isDefined(user.id) ? Convert.parseNumber(user.id) : user.id;
+                user.expired = ObjectHelper.isDefined(user.expired) ? DateHelper.parseDate(user.expired) : user.expired;
+                user.refreshTokenTime = ObjectHelper.isDefined(user.refreshTokenTime) ? DateHelper.parseDate(user.refreshTokenTime) : user.refreshTokenTime;
+                if (Array.isArray(user.roles)) {
+                    user.roles = user.roles.map(function (e) { return e ? e.toUpperCase() : e; });
+                }
             }
-            this._user = tmp;
+            this._user = user;
             this._isInitialized = true;
+            this._starRefreshTokenTimer();
         }
         return this._user;
     }
-    // private _expired: Date | null = null;
-    // private _refreshTokenExpired: Date | null = null;
+    _starRefreshTokenTimer() {
+        this._stopRefreshTokenTimer();
+        let user = this.user;
+        if (user && user.refreshTokenTime) {
+            const timeout = user.refreshTokenTime.getTime() - Date.now(); // - (60 * 1000);
+            this._refreshTokenTimeout = setTimeout(() => {
+                if (this._onRefreshTokenSubject) {
+                    this._onRefreshTokenSubject.next();
+                }
+            }, timeout);
+        }
+    }
+    _stopRefreshTokenTimer() {
+        if (typeof this._refreshTokenTimeout === 'number') {
+            clearTimeout(this._refreshTokenTimeout);
+        }
+    }
     isAuthenticated() {
         let expired = this.getExpired() || new Date(0);
         const newValue = new Date() < expired;
-        if (this._oldValueIsAuthenticated != newValue) {
+        if (this._oldValueIsAuthenticated !== newValue) {
             this._oldValueIsAuthenticated = newValue;
-            if (this.onSignedInSubject) {
-                this.onSignedInSubject.next(newValue);
+            if (this._onSignedInSubject) {
+                this._onSignedInSubject.next(newValue);
             }
-            this._subject.next(newValue);
             //if user is signed in and expired we need to logout (remove from localStorage)
             if (!newValue) {
                 this.logout();
@@ -1145,41 +1169,42 @@ class AuthService {
         }
         return newValue;
     }
-    /**
-    * @deprecated The method should not be used. please use onSignedIn
-    */
-    isSignedIn() {
-        return this._subject.asObservable();
-    }
     get onSignedIn() {
-        if (!this.onSignedInSubject) {
-            this.onSignedInSubject = new BehaviorSubject(false);
-            this.onSignedInObservable = this.onSignedInSubject.asObservable();
+        if (!this._onSignedInSubject) {
+            this._onSignedInSubject = new BehaviorSubject(false);
+            this._onSignedInObservable = this._onSignedInSubject.asObservable();
         }
-        if (!this.onSignedInObservable)
-            throw new Error("onExecuteObservable is undefined");
-        return this.onSignedInObservable;
+        if (!this._onSignedInObservable)
+            throw new Error("_onExecuteObservable is undefined");
+        return this._onSignedInObservable;
     }
-    login(user) {
-        if (user) {
-            if (Array.isArray(user.roles)) {
-                user.roles = user.roles.map(function (e) { return e.toUpperCase(); });
-            }
+    get onRefreshToken() {
+        if (!this._onRefreshTokenSubject) {
+            this._onRefreshTokenSubject = new Subject();
+            this._onRefreshTokenObservable = this._onRefreshTokenSubject.asObservable();
         }
+        if (!this._onRefreshTokenObservable)
+            throw new Error("onRefreshTokenObservable is undefined");
+        return this._onRefreshTokenObservable;
+    }
+    login(user) {
+        // if (user) {
+        //     // I think we don't need this
+        //     user.id = ObjectHelper.isDefined(user.id) ? Convert.parseNumber(user.id) : user.id;
+        //     user.expired = ObjectHelper.isDefined(user.expired) ?  DateHelper.parseDate(user.expired) : user.expired;
+        //     user.refreshTokenTime = ObjectHelper.isDefined(user.refreshTokenTime) ?  DateHelper.parseDate(user.refreshTokenTime) : user.refreshTokenTime;
+        //     if (Array.isArray(user.roles)) {
+        //         user.roles = user.roles.map(function (e) { return e.toUpperCase(); });
+        //     }
+        // }
         StorageHelper.set('login', user);
         this._user = null;
-        this._isInitialized = false;
-        this.isAuthenticated(); //this method need to execute subject.next();
+        this._isInitialized = false; //user get method will init user
+        this.isAuthenticated(); //this method need to execute subject.next();        
     }
     logout() {
         this.login(null);
     }
-    // getUser(): LoginToken | null {
-    //     if (!this.model) {
-    //         this.model = StorageHelper.get('login');
-    //     }
-    //     return this.model;
-    // }
     getExpired() {
         let user = this.user;
         if (user) {