zek 14.2.69 → 14.2.71

package/fesm2020/zek.mjs

@@ -1116,7 +1116,7 @@ class UrlHelper {
 class AuthService {
     constructor() {
         this._isInitialized = false;
-        this._oldValueIsAuthenticated = false;
+        this._oldValue = false;
         this._user = null;
     }
     get user() {
@@ -1166,11 +1166,12 @@ class AuthService {
     isAuthenticated() {
         let expired = this.getExpired() || new Date(0); // if getExpired is null return min JS date
         const newValue = new Date() < expired;
-        if (this._oldValueIsAuthenticated !== newValue) {
-            this._oldValueIsAuthenticated = newValue;
-            if (this._onSignedInSubject) {
-                this._onSignedInSubject.next(newValue);
-            }
+        if (this._oldValue !== newValue) {
+            this._oldValue = newValue;
+            this.emitOnSignedIn();
+            // if (this._onSignedInSubject) {
+            //     this._onSignedInSubject.next(newValue);
+            // }
             //if user is signed in and expired we need to logout (remove from localStorage)
             if (!newValue) {
                 this.logout();
@@ -1179,6 +1180,11 @@ class AuthService {
         }
         return newValue;
     }
+    emitOnSignedIn() {
+        if (this._onSignedInSubject) {
+            this._onSignedInSubject.next(this._oldValue);
+        }
+    }
     get onSignedIn() {
         if (!this._onSignedInSubject) {
             this._onSignedInSubject = new BehaviorSubject(false);
@@ -1579,12 +1585,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0", ngImpor
 
 /** Handles HttpClient errors */
 class HttpErrorHandler {
-    constructor(alertService, translateService, router) {
-        this.alertService = alertService;
-        this.translateService = translateService;
+    constructor(alert, translate, router) {
+        this.alert = alert;
+        this.translate = translate;
         this.router = router;
         /** Create curried handleError function that already knows the service name */
         this.createHandleError = (serviceName = '') => (operation = 'operation', result = {}, show = true) => this.handleError(serviceName, operation, result, show);
+        this.createHandleErrorJson = (serviceName = '') => (operation = 'operation', show = true) => this.handleErrorJson(serviceName, operation, show);
     }
     /**
      * Returns a function that handles Http operation failures.
@@ -1592,84 +1599,124 @@ class HttpErrorHandler {
      * @param serviceName = name of the data service that attempted the operation
      * @param operation - name of the operation that failed
      * @param result - optional value to return as the observable result
+     * @param show - optional value to show error
      */
     handleError(serviceName = '', operation = 'operation', result = {}, show) {
         return (response) => {
             console.error(response);
             if (show) {
-                switch (response.status) {
-                    case 0: //No Connection
-                        this.alertService.error(`Can't connect to api server.`);
-                        break;
-                    case 400: //Bad Request
-                        let error;
-                        if (typeof response.error === 'string' && response.error[0] === '{') {
-                            error = JSON.parse(response.error);
-                        }
-                        else {
-                            error = response.error;
-                        }
-                        if (error instanceof ErrorEvent) {
-                            this.alertService.error(`${serviceName}: ${operation} failed: ${response.error.message}`);
-                        }
-                        if (error === 'string') {
-                            this.alertService.error(response.error);
-                        }
-                        else if (error instanceof Object) {
-                            const errors = error.traceId || error.success === false
-                                ? error.errors
-                                : error;
-                            const errorMessages = [];
-                            const properties = Object.getOwnPropertyNames(errors);
-                            for (let property of properties) {
-                                const messages = errors[property];
-                                if (messages instanceof Array) {
-                                    for (let message of messages) {
-                                        const messageKey = `Validation.${message}`;
-                                        let translatedMessage = this.translateService.instant(messageKey);
-                                        // if translation not found then use message
-                                        if (messageKey == translatedMessage) {
-                                            translatedMessage = message;
-                                        }
-                                        if (property) {
-                                            const propertyKey = `Fields.${property}`;
-                                            let translatedProperty = this.translateService.instant(`Fields.${property}`);
-                                            // if translation not found then use property
-                                            if (propertyKey == translatedProperty) {
-                                                translatedProperty = property;
-                                            }
-                                            errorMessages.push(translatedProperty + ' - ' + translatedMessage);
-                                        }
-                                        else {
-                                            errorMessages.push(translatedMessage);
-                                        }
+                this.showError(serviceName, operation, response);
+            }
+            //return throwError('Error! please try again later.');
+            return of(result);
+        };
+    }
+    showError(serviceName, operation, response) {
+        switch (response.status) {
+            case 0: //No Connection
+                this.alert.error(`Can't connect to api server.`);
+                break;
+            case 400: //Bad Request
+                let error;
+                if (typeof response.error === 'string' && response.error[0] === '{') {
+                    error = JSON.parse(response.error);
+                }
+                else {
+                    error = response.error;
+                }
+                if (error instanceof ErrorEvent) {
+                    this.alert.error(`${serviceName}: ${operation} failed: ${response.error.message}`);
+                }
+                if (typeof error === 'string') {
+                    this.alert.error(response.error);
+                }
+                else if (typeof error === 'object') {
+                    const errors = error.traceId || error.success === false
+                        ? error.errors
+                        : error;
+                    const errorMessages = [];
+                    const properties = Object.getOwnPropertyNames(errors);
+                    for (let property of properties) {
+                        const messages = errors[property];
+                        if (messages instanceof Array) {
+                            for (let message of messages) {
+                                const messageKey = `Validation.${message}`;
+                                let translatedMessage = this.translate.instant(messageKey);
+                                // if translation not found then use message
+                                if (messageKey == translatedMessage) {
+                                    translatedMessage = message;
+                                }
+                                if (property) {
+                                    const propertyKey = `Fields.${property}`;
+                                    let translatedProperty = this.translate.instant(`Fields.${property}`);
+                                    // if translation not found then use property
+                                    if (propertyKey == translatedProperty) {
+                                        translatedProperty = property;
                                     }
+                                    errorMessages.push(translatedProperty + ' - ' + translatedMessage);
+                                }
+                                else {
+                                    errorMessages.push(translatedMessage);
                                 }
                             }
-                            this.alertService.addRange(AlertType.Danger, errorMessages);
                         }
-                        break;
-                    case 401: //Unauthorized
-                        this.alertService.error('Unauthorized');
-                        this.router.navigate(['/login']);
-                        break;
-                    case 403: //Forbidden
-                        this.alertService.error('Forbidden');
-                        break;
-                    case 404: //Not Found
-                        this.alertService.error('Not Found');
-                        break;
-                    case 402: //Payment Required
-                        this.alertService.error('License Payment Required');
-                        break;
-                    case 500: //Internal Server Error
-                        this.alertService.error('Internal Server Error');
-                        break;
-                    default:
-                        break;
+                    }
+                    this.alert.addRange(AlertType.Danger, errorMessages);
                 }
+                break;
+            case 401: //Unauthorized
+                this.alert.error('Unauthorized');
+                this.router.navigate(['/login']);
+                break;
+            case 403: //Forbidden
+                this.alert.error('Forbidden');
+                break;
+            case 404: //Not Found
+                this.alert.error('Not Found');
+                break;
+            case 402: //Payment Required
+                this.alert.error('License Payment Required');
+                break;
+            case 500: //Internal Server Error
+                this.alert.error('Internal Server Error');
+                break;
+            default:
+                break;
+        }
+    }
+    /**
+     * Returns a function that handles Http operation failures.
+     * This error handler lets the app continue to run as if no error occurred.
+     * @param serviceName = name of the data service that attempted the operation
+     * @param operation - name of the operation that failed
+     * @param show - optional value to show error
+     */
+    handleErrorJson(serviceName = '', operation = 'operation', show) {
+        return (response) => {
+            console.error(response);
+            if (show) {
+                this.showError(serviceName, operation, response);
+            }
+            let error;
+            if (typeof response.error === 'string' && response.error[0] === '{') {
+                error = JSON.parse(response.error);
+            }
+            else {
+                error = response.error;
+            }
+            let result;
+            if (error instanceof ErrorEvent) {
+                result = { '': [response.error.message] };
+            }
+            if (typeof error === 'string') {
+                result = { '': [response.error] };
+            }
+            else if (typeof error === 'object') {
+                const errors = error.traceId || error.success === false
+                    ? error.errors
+                    : error;
+                result = errors;
             }
-            //return throwError('Error! please try again later.');
             return of(result);
         };
     }