zek 14.2.58 → 14.2.60

package/fesm2015/zek.mjs

@@ -1110,22 +1110,34 @@ class UrlHelper {
 
 class AuthService {
     constructor() {
-        this.subject = new BehaviorSubject(false); //todo check if need BehaviorSubject
-        this.model = null;
-        this.expired = null;
-        this.oldValueIsAuthenticated = false;
+        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);
+            }
+            this._user = tmp;
+            this._isInitialized = true;
+        }
+        return this._user;
     }
+    // private _expired: Date | null = null;
+    // private _refreshTokenExpired: Date | null = null;
     isAuthenticated() {
-        let expired = this.getExpired();
-        if (!expired)
-            expired = new Date(0);
+        let expired = this.getExpired() || new Date(0);
         const newValue = new Date() < expired;
-        if (this.oldValueIsAuthenticated != newValue) {
-            this.oldValueIsAuthenticated = newValue;
+        if (this._oldValueIsAuthenticated != newValue) {
+            this._oldValueIsAuthenticated = newValue;
             if (this.onSignedInSubject) {
                 this.onSignedInSubject.next(newValue);
             }
-            this.subject.next(newValue);
+            this._subject.next(newValue);
             //if user is signed in and expired we need to logout (remove from localStorage)
             if (!newValue) {
                 this.logout();
@@ -1138,7 +1150,7 @@ class AuthService {
     * @deprecated The method should not be used. please use onSignedIn
     */
     isSignedIn() {
-        return this.subject.asObservable();
+        return this._subject.asObservable();
     }
     get onSignedIn() {
         if (!this.onSignedInSubject) {
@@ -1149,39 +1161,39 @@ class AuthService {
             throw new Error("onExecuteObservable is undefined");
         return this.onSignedInObservable;
     }
-    login(tmp) {
-        this.model = undefined;
-        if (tmp) {
-            //Globals.setServerDate(tmpModel.currentDateTime);
-            //this.permissionsService.flushPermissions();
-            if (tmp.roles) {
-                tmp.roles = tmp.roles.map(function (e) { return e.toUpperCase(); });
-                //this.permissionsService.loadPermissions(model.roles);
+    login(user) {
+        if (user) {
+            if (Array.isArray(user.roles)) {
+                user.roles = user.roles.map(function (e) { return e.toUpperCase(); });
             }
         }
-        //delete tmpModel.currentDateTime;
-        this.model = tmp;
-        this.expired = null;
-        StorageHelper.set('login', this.model);
+        StorageHelper.set('login', user);
+        this._user = null;
+        this._isInitialized = false;
         this.isAuthenticated(); //this method need to execute subject.next();
     }
     logout() {
         this.login(null);
     }
-    getUser() {
-        if (!this.model) {
-            this.model = StorageHelper.get('login');
+    // getUser(): LoginToken | null {
+    //     if (!this.model) {
+    //         this.model = StorageHelper.get('login');
+    //     }
+    //     return this.model;
+    // }
+    getExpired() {
+        let user = this.user;
+        if (user) {
+            return user.expired;
         }
-        return this.model;
+        return null;
     }
-    getExpired() {
-        if (!this.expired) {
-            const tmp = this.getUser();
-            if (tmp && tmp.expired) {
-                this.expired = new Date(tmp.expired);
-            }
+    getRefreshTokenExpired() {
+        let user = this.user;
+        if (user) {
+            return user.refreshTokenTime;
         }
-        return this.expired;
+        return null;
     }
     // isInRole(allowedRoles: string[]): boolean {
     //     if (!allowedRoles || allowedRoles.length === 0) {
@@ -1217,8 +1229,8 @@ class AuthService {
         if (!permissions || permissions.length === 0) {
             return true;
         }
-        const tmp = this.getUser();
-        const userPermissions = tmp ? tmp.permissions : null;
+        const user = this.user;
+        const userPermissions = user ? user.permissions : null;
         if (!userPermissions) {
             return false;
         }
@@ -1729,7 +1741,7 @@ class WebApiClient {
     getHeaders() {
         let httpHeaders = new HttpHeaders();
         httpHeaders = httpHeaders.set('Content-Type', 'application/json');
-        const tmp = this.authService.getUser();
+        const tmp = this.authService.user;
         const token = tmp ? tmp.token : undefined;
         if (token)
             httpHeaders = httpHeaders.set('Authorization', token);
@@ -1847,7 +1859,7 @@ class BaseComponent extends CoreComponent {
     }
     get url() {
         if (!this._url)
-            this._url = this.router.url.split(';')[0];
+            this._url = UrlHelper.getNoParam(this.router.url);
         return this._url;
     }
     getParam(name) {
@@ -2457,7 +2469,7 @@ class ListBaseComponent extends BaseComponent {
         this.bindModel();
     }
     create() {
-        const url = this.router.url.split(';')[0];
+        const url = UrlHelper.getNoParam(this.router.url);
         this.router.navigate([url, 'create', { returnUrl: url + ';filter=1' }]);
     }
     delete(id) {
@@ -4538,7 +4550,7 @@ class ListToolbarComponent {
         this.onRefresh.emit();
     }
     create() {
-        const url = this.router.url.split(';')[0];
+        const url = UrlHelper.getNoParam(this.router.url);
         this.router.navigate([url, 'create', { returnUrl: url + ';filter=1' }]);
     }
     filter() {