zek 17.3.86 → 17.3.92

package/fesm2022/zek.mjs

@@ -97,54 +97,56 @@ class ArrayHelper {
             return array;
         return array.filter(x => x !== undefined && x !== null && x[key] === filterValue);
     }
-    static flattenArray(array) {
+    static flatten(array, indent = 0) {
         let result = [];
-        if (array) {
-            array.forEach(tree => {
-                tree.indent = 0;
-                result.push(tree);
-                result = result.concat(this.getChildren(tree));
-            });
-        }
-        return result;
-    }
-    static getChildren(tree, indent = 1) {
-        let result = [];
-        if (tree.children) {
-            tree.childrenCount = tree.children.length;
-            tree.children.forEach(child => {
-                child.indent = indent;
-                result.push(child);
-                result = result.concat(this.getChildren(child, indent + 1));
-            });
+        // If the input is an array of trees, we process each one
+        if (Array.isArray(array)) {
+            for (const item of array) {
+                result = result.concat(this.flatten(item, indent));
+            }
         }
         else {
-            tree.childrenCount = 0;
+            // Add the current tree node to the result
+            const item = Object.assign({}, array);
+            item.indent = indent;
+            item.count = Array.isArray(array.children)
+                ? array.children.length
+                : 0;
+            delete item.children;
+            delete item.childrenIds;
+            result.push(item);
+            // If there are children, recursively flatten them
+            if (Array.isArray(array.children)) {
+                for (const child of array.children) {
+                    result = result.concat(this.flatten(child, indent + 1));
+                }
+            }
         }
-        delete tree.children;
-        delete tree.childrenIds;
-        //delete tree.childrenCount;
-        //delete tree.indent;
         return result;
     }
-    static treeToKeyPairArray(array) {
+    static flattenDropDownList(tree, indent = 0) {
         let result = [];
-        if (array) {
-            array.forEach(tree => {
-                result.push({ key: tree.key, value: tree.value });
-                result = result.concat(this.getIndentChildren(tree));
-            });
+        // If the input is an array of trees, we process each one
+        if (Array.isArray(tree)) {
+            for (const item of tree) {
+                result = result.concat(this.flattenDropDownList(item, indent));
+            }
         }
-        return result;
-    }
-    static getIndentChildren(tree, indent = 1) {
-        let result = [];
-        if (tree.children) {
-            tree.children.forEach(child => {
-                //result.push({ key: child.key, value: '└' + '─'.repeat(indent) + child.value });
-                result.push({ key: child.key, value: ' '.repeat(indent) + child.value });
-                result = result.concat(this.getChildren(child, indent + 1));
-            });
+        else {
+            // Add the current tree node to the result
+            let item = {
+                key: tree.key,
+                value: ' '.repeat(indent) + tree.value,
+                indent: indent,
+                count: Array.isArray(tree.children) ? tree.children.length : 0
+            };
+            result.push(item);
+            // If there are children, recursively flatten them
+            if (Array.isArray(tree.children)) {
+                for (const child of tree.children) {
+                    result = result.concat(this.flattenDropDownList(child, indent + 1));
+                }
+            }
         }
         return result;
     }
@@ -1434,7 +1436,7 @@ class ValidationHelper {
 class AuthService {
     constructor() {
         this._isInitialized = false;
-        this._oldValue = false;
+        this._auth = false;
         this._user = null;
     }
     static { this.USER_KEY = 'user'; }
@@ -1442,20 +1444,27 @@ class AuthService {
     get user() {
         if (!this._isInitialized) {
             const user = StorageHelper.get(AuthService.USER_KEY);
-            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 = user;
-            this._isInitialized = true;
-            this._starRefreshTokenTimer();
+            this._init(user);
         }
         return this._user;
     }
+    /**
+     * Inits user (parses fields and starts refresh token timer if needed)
+     * @param user user from json or storage
+     */
+    _init(user) {
+        if (user) {
+            //convert string to specified types
+            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 = user;
+        this._isInitialized = true;
+        this._starRefreshTokenTimer();
+    }
     _starRefreshTokenTimer() {
         this._stopRefreshTokenTimer();
         const user = this._user;
@@ -1483,15 +1492,24 @@ class AuthService {
             this._onRefreshTokenSubject.next();
         }
     }
-    isAuthenticated() {
-        const expired = this.getExpired() || new Date(0); // if getExpired is null return min JS date
-        const newValue = new Date() < expired;
-        if (this._oldValue !== newValue) {
-            this._oldValue = newValue;
-            this.emitOnSignedIn();
+    get _isAuthenticated() {
+        const expired = this.getExpired();
+        return new Date() < expired;
+    }
+    /**
+     * Dynamic property. gets auth user and checks expired;
+     */
+    get isAuthenticated() {
+        const newValue = this._isAuthenticated;
+        if (this._auth !== newValue) {
+            this._auth = newValue;
             //if user is signed in and expired we need to logout (remove from localStorage)
             if (!newValue) {
-                this.logout();
+                this.logout(); //this executes emitOnSignedIn so we don't need here execute emitOnSignedIn
+            }
+            else {
+                //this line need if you already logged in and refresh page. (System will init user from storage and verify)
+                this.emitOnSignedIn();
             }
             return newValue;
         }
@@ -1499,7 +1517,7 @@ class AuthService {
     }
     emitOnSignedIn() {
         if (this._onSignedInSubject) {
-            this._onSignedInSubject.next(this._oldValue);
+            this._onSignedInSubject.next(this._auth);
         }
     }
     get onSignedIn() {
@@ -1520,29 +1538,29 @@ class AuthService {
             throw new Error("onRefreshTokenObservable is undefined");
         return this._onRefreshTokenObservable;
     }
-    login(user) {
+    _login(user) {
         StorageHelper.set(AuthService.USER_KEY, user);
-        this._user = null;
         this._isInitialized = false; //user get method will init user
-        this.isAuthenticated(); //this method need to execute subject.next();        
+        this._init(user);
+        this._auth = ObjectHelper.isDefined(user);
+        this.emitOnSignedIn();
+    }
+    login(user) {
+        this._login(user);
     }
     logout() {
-        this.login(null);
+        this._login(null);
     }
     getExpired() {
-        const user = this.user;
-        if (user) {
-            return user.expired;
-        }
-        return null;
-    }
-    getRefreshTokenExpired() {
-        const user = this.user;
-        if (user) {
-            return user.refreshTokenTime;
-        }
-        return null;
+        return this.user?.expired ?? new Date(0); // if getExpired is null return min JS date;
     }
+    // protected getRefreshTokenExpired(): Date | null | undefined {
+    //     const user = this.user;
+    //     if (user) {
+    //         return user.refreshTokenTime;
+    //     }
+    //     return null;
+    // }
     // isInRole(allowedRoles: string[]): boolean {
     //     if (!allowedRoles || allowedRoles.length === 0) {
     //         return true;
@@ -1622,7 +1640,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.4", ngImpor
 const zekAuthGuard = (route, state) => {
     const auth = inject(AuthService);
     const router = inject(Router);
-    if (!auth.isAuthenticated()) {
+    if (!auth.isAuthenticated) {
         router.navigate(['/login'], { queryParams: { returnUrl: state.url } });
         return false;
     }
@@ -1932,7 +1950,8 @@ class WebApiClient {
         this.baseUrl = baseUrl;
     }
     get(url, params) {
-        return this.http.get(this.baseUrl + url, { headers: this.getHeaders(), params: this.toHttpParams(params) });
+        const combinedUrl = UrlHelper.combine(this.baseUrl, url);
+        return this.http.get(combinedUrl, { headers: this.getHeaders(), params: this.toHttpParams(params) });
         /*.catch(catchError(this.handleError(url)))
         .do((res: Response) => {
             // Handle success, maybe display notification
@@ -1945,16 +1964,20 @@ class WebApiClient {
     */
     }
     getString(url, params) {
-        return this.http.get(this.baseUrl + url, { headers: this.getHeaders(), responseType: 'text', params: this.toHttpParams(params) });
+        const combinedUrl = UrlHelper.combine(this.baseUrl, url);
+        return this.http.get(combinedUrl, { headers: this.getHeaders(), responseType: 'text', params: this.toHttpParams(params) });
     }
     getBytes(url, params) {
-        return this.http.get(this.baseUrl + url, { headers: this.getHeaders(), responseType: 'arraybuffer', params: this.toHttpParams(params) });
+        const combinedUrl = UrlHelper.combine(this.baseUrl, url);
+        return this.http.get(combinedUrl, { headers: this.getHeaders(), responseType: 'arraybuffer', params: this.toHttpParams(params) });
     }
     getBlob(url, params) {
-        return this.http.get(this.baseUrl + url, { headers: this.getHeaders(), responseType: 'blob', params: this.toHttpParams(params) });
+        const combinedUrl = UrlHelper.combine(this.baseUrl, url);
+        return this.http.get(combinedUrl, { headers: this.getHeaders(), responseType: 'blob', params: this.toHttpParams(params) });
     }
     postBlob(url, body) {
-        return this.http.post(this.baseUrl + url, body, { headers: this.getHeaders(), responseType: 'blob' });
+        const combinedUrl = UrlHelper.combine(this.baseUrl, url);
+        return this.http.post(combinedUrl, body, { headers: this.getHeaders(), responseType: 'blob' });
     }
     toHttpParams(obj) {
         if (!obj)
@@ -1997,26 +2020,26 @@ class WebApiClient {
     //    return undefined;
     //}
     post(url, body) {
-        return this.http.post(this.baseUrl + url, body, { headers: this.getHeaders(body) });
+        return this.http.post(UrlHelper.combine(this.baseUrl, url), body, { headers: this.getHeaders(body) });
         //.pipe(
         //catchError(this.handleError(url))
         //);
     }
     put(url, body) {
-        return this.http.put(this.baseUrl + url, body, { headers: this.getHeaders(body) });
+        return this.http.put(UrlHelper.combine(this.baseUrl, url), body, { headers: this.getHeaders(body) });
         //.pipe(
         //catchError(this.handleError(url))
         //);
     }
     delete(url, body) {
-        return this.http.request('delete', this.baseUrl + url, { body, headers: this.getHeaders(body) });
+        return this.http.request('delete', UrlHelper.combine(this.baseUrl, url), { body, headers: this.getHeaders(body) });
         //return this.http.delete(environment.url + url, { headers: this.getHeaders() });
         //.pipe(
         //catchError(this.handleError(url))
         //);
     }
     patch(url, body) {
-        return this.http.patch(this.baseUrl + url, body, { headers: this.getHeaders(body) });
+        return this.http.patch(UrlHelper.combine(this.baseUrl, url), body, { headers: this.getHeaders(body) });
     }
     getHeaders(body) {
         let httpHeaders = new HttpHeaders();