http-request-manager 15.0.9 → 15.0.11

package/esm2022/lib/services/utils/object-merger.service.mjs

@@ -8,11 +8,11 @@ export class ObjectMergerService {
                 const value = options[key];
                 if (value !== null &&
                     value !== undefined &&
-                    !(typeof value === 'number') &&
-                    !(typeof value === 'boolean') &&
+                    !(typeof value === 'number') ||
+                    !(typeof value === 'boolean') ||
                     !(this.isNonEmptyString(value)) &&
-                    !(Array.isArray(value) && value.length === 0) &&
-                    !(typeof value === 'object' && !Array.isArray(value))) {
+                        !(Array.isArray(value) && value.length === 0) &&
+                        !(typeof value === 'object' && !Array.isArray(value))) {
                     merged[key] = value;
                 }
             }
@@ -31,4 +31,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
                     providedIn: 'root'
                 }]
         }] });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib2JqZWN0LW1lcmdlci5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvaHR0cC1yZXF1ZXN0LW1hbmFnZXIvc3JjL2xpYi9zZXJ2aWNlcy91dGlscy9vYmplY3QtbWVyZ2VyLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQzs7QUFLM0MsTUFBTSxPQUFPLG1CQUFtQjtJQUU5QixZQUFZLENBQUksT0FBbUIsRUFBRSxhQUFtQjtRQUV0RCxNQUFNLE1BQU0sR0FBTSxhQUFhLENBQUMsQ0FBQyxDQUFDLEVBQUUsR0FBRyxhQUFhLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBTyxDQUFBO1FBRWhFLEtBQUssTUFBTSxHQUFHLElBQUksT0FBTyxFQUFFO1lBRXpCLElBQUksTUFBTSxDQUFDLFNBQVMsQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxHQUFHLENBQUMsRUFBRTtnQkFFdEQsTUFBTSxLQUFLLEdBQUcsT0FBTyxDQUFDLEdBQWMsQ0FBQyxDQUFBO2dCQUVyQyxJQUNFLEtBQUssS0FBSyxJQUFJO29CQUNkLEtBQUssS0FBSyxTQUFTO29CQUNuQixDQUFDLENBQUMsT0FBTyxLQUFLLEtBQUssUUFBUSxDQUFDO29CQUM1QixDQUFDLENBQUMsT0FBTyxLQUFLLEtBQUssU0FBUyxDQUFDO29CQUM3QixDQUFDLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLEtBQUssQ0FBQyxDQUFDO29CQUMvQixDQUFDLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsSUFBSSxLQUFLLENBQUMsTUFBTSxLQUFLLENBQUMsQ0FBQztvQkFDN0MsQ0FBQyxDQUFDLE9BQU8sS0FBSyxLQUFLLFFBQVEsSUFBSSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUMsRUFDckQ7b0JBQ0MsTUFBYyxDQUFDLEdBQUcsQ0FBQyxHQUFHLEtBQUssQ0FBQTtpQkFDN0I7YUFDRjtTQUVGO1FBQ0QsT0FBTyxNQUFNLENBQUM7SUFDaEIsQ0FBQztJQUVELGdCQUFnQixDQUFDLEtBQWM7UUFDN0IsT0FBTyxPQUFPLEtBQUssS0FBSyxRQUFRLElBQUksS0FBSyxDQUFDLE1BQU0sS0FBSyxDQUFDLENBQUM7SUFDekQsQ0FBQzsrR0EvQlUsbUJBQW1CO21IQUFuQixtQkFBbUIsY0FGbEIsTUFBTTs7NEZBRVAsbUJBQW1CO2tCQUgvQixVQUFVO21CQUFDO29CQUNWLFVBQVUsRUFBRSxNQUFNO2lCQUNuQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcblxuQEluamVjdGFibGUoe1xuICBwcm92aWRlZEluOiAncm9vdCdcbn0pXG5leHBvcnQgY2xhc3MgT2JqZWN0TWVyZ2VyU2VydmljZSB7XG5cbiAgbWVyZ2VPcHRpb25zPFQ+KG9wdGlvbnM6IFBhcnRpYWw8VD4sIGNvbmZpZ0ZvclJvb3Q/OiBhbnkpOiBUIHtcblxuICAgIGNvbnN0IG1lcmdlZDogVCA9IGNvbmZpZ0ZvclJvb3QgPyB7IC4uLmNvbmZpZ0ZvclJvb3QgfSA6IHt9IGFzIFRcblxuICAgIGZvciAoY29uc3Qga2V5IGluIG9wdGlvbnMpIHtcblxuICAgICAgaWYgKE9iamVjdC5wcm90b3R5cGUuaGFzT3duUHJvcGVydHkuY2FsbChvcHRpb25zLCBrZXkpKSB7XG5cbiAgICAgICAgY29uc3QgdmFsdWUgPSBvcHRpb25zW2tleSBhcyBrZXlvZiBUXVxuXG4gICAgICAgIGlmIChcbiAgICAgICAgICB2YWx1ZSAhPT0gbnVsbCAmJlxuICAgICAgICAgIHZhbHVlICE9PSB1bmRlZmluZWQgJiZcbiAgICAgICAgICAhKHR5cGVvZiB2YWx1ZSA9PT0gJ251bWJlcicpICYmXG4gICAgICAgICAgISh0eXBlb2YgdmFsdWUgPT09ICdib29sZWFuJykgJiZcbiAgICAgICAgICAhKHRoaXMuaXNOb25FbXB0eVN0cmluZyh2YWx1ZSkpICYmXG4gICAgICAgICAgIShBcnJheS5pc0FycmF5KHZhbHVlKSAmJiB2YWx1ZS5sZW5ndGggPT09IDApICYmXG4gICAgICAgICAgISh0eXBlb2YgdmFsdWUgPT09ICdvYmplY3QnICYmICFBcnJheS5pc0FycmF5KHZhbHVlKSlcbiAgICAgICAgKSB7XG4gICAgICAgICAgKG1lcmdlZCBhcyBhbnkpW2tleV0gPSB2YWx1ZVxuICAgICAgICB9XG4gICAgICB9XG5cbiAgICB9XG4gICAgcmV0dXJuIG1lcmdlZDtcbiAgfVxuXG4gIGlzTm9uRW1wdHlTdHJpbmcodmFsdWU6IHVua25vd24pOiB2YWx1ZSBpcyBzdHJpbmcge1xuICAgIHJldHVybiB0eXBlb2YgdmFsdWUgPT09ICdzdHJpbmcnICYmIHZhbHVlLmxlbmd0aCA9PT0gMDtcbiAgfVxuXG59XG4iXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib2JqZWN0LW1lcmdlci5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvaHR0cC1yZXF1ZXN0LW1hbmFnZXIvc3JjL2xpYi9zZXJ2aWNlcy91dGlscy9vYmplY3QtbWVyZ2VyLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQzs7QUFLM0MsTUFBTSxPQUFPLG1CQUFtQjtJQUU5QixZQUFZLENBQUksT0FBbUIsRUFBRSxhQUFtQjtRQUV0RCxNQUFNLE1BQU0sR0FBTSxhQUFhLENBQUMsQ0FBQyxDQUFDLEVBQUUsR0FBRyxhQUFhLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBTyxDQUFBO1FBRWhFLEtBQUssTUFBTSxHQUFHLElBQUksT0FBTyxFQUFFO1lBRXpCLElBQUksTUFBTSxDQUFDLFNBQVMsQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxHQUFHLENBQUMsRUFBRTtnQkFFdEQsTUFBTSxLQUFLLEdBQUcsT0FBTyxDQUFDLEdBQWMsQ0FBQyxDQUFBO2dCQUVyQyxJQUNFLEtBQUssS0FBSyxJQUFJO29CQUNkLEtBQUssS0FBSyxTQUFTO29CQUNuQixDQUFDLENBQUMsT0FBTyxLQUFLLEtBQUssUUFBUSxDQUFDO29CQUM1QixDQUFDLENBQUMsT0FBTyxLQUFLLEtBQUssU0FBUyxDQUFDO29CQUM3QixDQUFDLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLEtBQUssQ0FBQyxDQUFDO3dCQUMvQixDQUFDLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsSUFBSSxLQUFLLENBQUMsTUFBTSxLQUFLLENBQUMsQ0FBQzt3QkFDN0MsQ0FBQyxDQUFDLE9BQU8sS0FBSyxLQUFLLFFBQVEsSUFBSSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUMsRUFDckQ7b0JBQ0MsTUFBYyxDQUFDLEdBQUcsQ0FBQyxHQUFHLEtBQUssQ0FBQTtpQkFDN0I7YUFDRjtTQUVGO1FBQ0QsT0FBTyxNQUFNLENBQUM7SUFDaEIsQ0FBQztJQUVELGdCQUFnQixDQUFDLEtBQWM7UUFDN0IsT0FBTyxPQUFPLEtBQUssS0FBSyxRQUFRLElBQUksS0FBSyxDQUFDLE1BQU0sS0FBSyxDQUFDLENBQUM7SUFDekQsQ0FBQzsrR0EvQlUsbUJBQW1CO21IQUFuQixtQkFBbUIsY0FGbEIsTUFBTTs7NEZBRVAsbUJBQW1CO2tCQUgvQixVQUFVO21CQUFDO29CQUNWLFVBQVUsRUFBRSxNQUFNO2lCQUNuQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcblxuQEluamVjdGFibGUoe1xuICBwcm92aWRlZEluOiAncm9vdCdcbn0pXG5leHBvcnQgY2xhc3MgT2JqZWN0TWVyZ2VyU2VydmljZSB7XG5cbiAgbWVyZ2VPcHRpb25zPFQ+KG9wdGlvbnM6IFBhcnRpYWw8VD4sIGNvbmZpZ0ZvclJvb3Q/OiBhbnkpOiBUIHtcblxuICAgIGNvbnN0IG1lcmdlZDogVCA9IGNvbmZpZ0ZvclJvb3QgPyB7IC4uLmNvbmZpZ0ZvclJvb3QgfSA6IHt9IGFzIFRcblxuICAgIGZvciAoY29uc3Qga2V5IGluIG9wdGlvbnMpIHtcblxuICAgICAgaWYgKE9iamVjdC5wcm90b3R5cGUuaGFzT3duUHJvcGVydHkuY2FsbChvcHRpb25zLCBrZXkpKSB7XG5cbiAgICAgICAgY29uc3QgdmFsdWUgPSBvcHRpb25zW2tleSBhcyBrZXlvZiBUXVxuXG4gICAgICAgIGlmIChcbiAgICAgICAgICB2YWx1ZSAhPT0gbnVsbCAmJlxuICAgICAgICAgIHZhbHVlICE9PSB1bmRlZmluZWQgJiZcbiAgICAgICAgICAhKHR5cGVvZiB2YWx1ZSA9PT0gJ251bWJlcicpIHx8XG4gICAgICAgICAgISh0eXBlb2YgdmFsdWUgPT09ICdib29sZWFuJykgfHxcbiAgICAgICAgICAhKHRoaXMuaXNOb25FbXB0eVN0cmluZyh2YWx1ZSkpICYmXG4gICAgICAgICAgIShBcnJheS5pc0FycmF5KHZhbHVlKSAmJiB2YWx1ZS5sZW5ndGggPT09IDApICYmXG4gICAgICAgICAgISh0eXBlb2YgdmFsdWUgPT09ICdvYmplY3QnICYmICFBcnJheS5pc0FycmF5KHZhbHVlKSlcbiAgICAgICAgKSB7XG4gICAgICAgICAgKG1lcmdlZCBhcyBhbnkpW2tleV0gPSB2YWx1ZVxuICAgICAgICB9XG4gICAgICB9XG5cbiAgICB9XG4gICAgcmV0dXJuIG1lcmdlZDtcbiAgfVxuXG4gIGlzTm9uRW1wdHlTdHJpbmcodmFsdWU6IHVua25vd24pOiB2YWx1ZSBpcyBzdHJpbmcge1xuICAgIHJldHVybiB0eXBlb2YgdmFsdWUgPT09ICdzdHJpbmcnICYmIHZhbHVlLmxlbmd0aCA9PT0gMDtcbiAgfVxuXG59XG4iXX0=

package/fesm2022/http-request-manager.mjs

@@ -3,6 +3,7 @@ import { inject, Injectable, APP_ID, Inject, InjectionToken, Injector, Optional,
 import { ComponentStore } from '@ngrx/component-store';
 import { map, catchError, filter, finalize, takeWhile, retry, startWith, tap, mergeMap, takeUntil, withLatestFrom, switchMap, concatMap, scan, distinctUntilChanged } from 'rxjs/operators';
 import { HttpClient, HttpHeaders, HttpEventType, HttpErrorResponse, HTTP_INTERCEPTORS } from '@angular/common/http';
+import * as CryptoJS from 'crypto-js';
 import { from, BehaviorSubject, EMPTY, throwError, defer, interval, timer, Subject, of, Subscription, catchError as catchError$1 } from 'rxjs';
 import { ToastMessageDisplayService, ToastDisplay, ToastColors, ToastMessageDisplayModule } from 'toast-message-display';
 import * as i1 from '@ngx-translate/core';
@@ -57,7 +58,7 @@ class SettingOptions {
         this.encrypted = encrypted;
     }
     static adapt(item) {
-        return new SettingOptions((item?.storage) ? item.storage : StorageType.GLOBAL, (item?.expires) ? item.expires : 0, (item?.expiresIn) ? item.expiresIn : '', (item?.encrypted) ? item?.encrypted : false);
+        return new SettingOptions((item?.storage) ? item.storage : StorageType.GLOBAL, (item?.expires) ? item.expires : 0, (item?.expiresIn) ? item.expiresIn : '', (item?.encrypted) ? item.encrypted : false);
     }
 }
 
@@ -333,193 +334,56 @@ class SymmetricalEncryptionService {
     generateCipherKey() {
         return (RandomSignature().toString() + RandomSignature().toString()).substring(0, 8);
     }
-    // Synchronous encrypt method to maintain compatibility
     encrypt(str, key = this.appID) {
         if (!str || key === '')
             return '';
+        let _key = CryptoJS.enc.Utf8.parse(key);
+        let _iv = CryptoJS.enc.Utf8.parse(key);
         try {
-            // Convert the string to encrypt to a Uint8Array
-            const encoder = new TextEncoder();
-            const data = encoder.encode(JSON.stringify(str));
-            // Create a simple key from the provided string
-            const keyBytes = encoder.encode(key.padEnd(16, key).substring(0, 16));
-            // Synchronous AES encryption using the SubtleCrypto polyfill approach
-            const encrypted = this.aesEncryptSync(data, keyBytes);
-            // Convert encrypted data to base64 string
-            return this.arrayBufferToBase64(encrypted);
+            const encrypted = CryptoJS.AES.encrypt(JSON.stringify(str), _key, {
+                keySize: 16,
+                iv: _iv,
+                mode: CryptoJS.mode.ECB,
+                padding: CryptoJS.pad.Pkcs7
+            });
+            return encrypted.toString();
         }
         catch (error) {
             console.log(error);
-            return '';
         }
+        return;
     }
-    // Synchronous decrypt method to maintain compatibility
     decrypt(str, key = this.appID) {
         if (!str || key === '')
-            return undefined;
+            return;
+        let _key = CryptoJS.enc.Utf8.parse(key);
+        let _iv = CryptoJS.enc.Utf8.parse(key);
         try {
-            // Convert the base64 string to ArrayBuffer
-            const encryptedData = this.base64ToArrayBuffer(str);
-            // Create a simple key from the provided string
-            const keyBytes = new TextEncoder().encode(key.padEnd(16, key).substring(0, 16));
-            // Synchronous AES decryption
-            const decryptedBuffer = this.aesDecryptSync(new Uint8Array(encryptedData), keyBytes);
-            // Convert decrypted data to string
-            return new TextDecoder().decode(decryptedBuffer);
+            return CryptoJS.AES.decrypt(str, _key, {
+                keySize: 16,
+                iv: _iv,
+                mode: CryptoJS.mode.ECB,
+                padding: CryptoJS.pad.Pkcs7
+            }).toString(CryptoJS.enc.Utf8);
         }
         catch (error) {
             console.log(error);
-            return undefined;
         }
+        return;
     }
     createSignature(url, len = 16) {
-        const signature = this.generateSignatureSync(url);
-        return signature.substring(0, len).toUpperCase();
+        const sig = CryptoJS.SHA256(url).toString(CryptoJS.enc.Hex);
+        return sig.substring(0, len).toUpperCase();
     }
     normalizeURL(url) {
         const normalizedURL = url.replace(/(https?:\/\/)?(www\.)?/, '').replace(/\/+$/, '');
         return normalizedURL;
     }
     generateSignature(url) {
-        return this.generateSignatureSync(url);
-    }
-    // Helper methods
-    generateSignatureSync(url) {
         const normalizedURL = this.normalizeURL(url);
-        // Using a synchronous SHA-256 implementation
-        const encoder = new TextEncoder();
-        const data = encoder.encode(normalizedURL);
-        // Create a hash using the SubtleCrypto interface if available, otherwise fallback
-        let hashArray;
-        try {
-            // Create a synchronous hash
-            hashArray = this.sha256Sync(data);
-        }
-        catch (error) {
-            console.error('Sync hashing failed, using fallback', error);
-            // Simple fallback hash (less secure)
-            hashArray = this.simpleHash(data);
-        }
-        return Array.from(hashArray)
-            .map(b => b.toString(16).padStart(2, '0'))
-            .join('');
-    }
-    // Synchronous SHA-256 implementation
-    sha256Sync(data) {
-        // This is a simplified version for compatibility
-        // It's not as secure as the Web Crypto API but maintains the synchronous API
-        const result = new Uint8Array(32); // 256 bits = 32 bytes
-        // Simple hash function (for demonstration - not cryptographically strong)
-        let h = 0x12345678;
-        for (let i = 0; i < data.length; i++) {
-            h = ((h << 5) - h) + data[i];
-            h |= 0; // Convert to 32bit integer
-        }
-        // Fill the result with derived values
-        for (let i = 0; i < 32; i++) {
-            result[i] = ((h >> (i % 4 * 8)) & 0xFF);
-            h = Math.imul(h, 2654435761); // Prime number multiplication
-        }
-        return result;
-    }
-    // Simple hash function
-    simpleHash(data) {
-        const result = new Uint8Array(32);
-        let h1 = 0x2fd4e1c6;
-        let h2 = 0x7b23c6d8;
-        for (let i = 0; i < data.length; i++) {
-            h1 = ((h1 << 5) - h1 + data[i]) | 0;
-            h2 = ((h2 << 5) - h2 + (h1 ^ data[i])) | 0;
-        }
-        for (let i = 0; i < 16; i++) {
-            result[i] = (h1 >> (i * 2)) & 0xFF;
-            result[i + 16] = (h2 >> (i * 2)) & 0xFF;
-        }
-        return result;
-    }
-    // Synchronous AES encryption (simplified)
-    aesEncryptSync(data, key) {
-        // This is a simplified implementation for compatibility
-        // It's not as secure as the Web Crypto API
-        const result = new Uint8Array(data.length);
-        // XOR-based cipher (not actual AES, just for compatibility)
-        for (let i = 0; i < data.length; i++) {
-            result[i] = data[i] ^ key[i % key.length];
-        }
-        return result;
-    }
-    // Synchronous AES decryption (simplified)
-    aesDecryptSync(data, key) {
-        // For a simple XOR cipher, encryption and decryption are the same operation
-        return this.aesEncryptSync(data, key);
-    }
-    arrayBufferToBase64(buffer) {
-        const bytes = buffer instanceof Uint8Array ? buffer : new Uint8Array(buffer);
-        let binary = '';
-        for (let i = 0; i < bytes.byteLength; i++) {
-            binary += String.fromCharCode(bytes[i]);
-        }
-        return btoa(binary);
-    }
-    base64ToArrayBuffer(base64) {
-        const binaryString = atob(base64);
-        const bytes = new Uint8Array(binaryString.length);
-        for (let i = 0; i < binaryString.length; i++) {
-            bytes[i] = binaryString.charCodeAt(i);
-        }
-        return bytes.buffer;
-    }
-    // Async versions of the methods for future use
-    async encryptAsync(str, key = this.appID) {
-        if (!str || key === '')
-            return '';
-        try {
-            const encoder = new TextEncoder();
-            const data = encoder.encode(JSON.stringify(str));
-            const keyMaterial = await this.getKeyMaterial(key);
-            const derivedKey = await this.deriveKey(keyMaterial, encoder.encode(key));
-            const iv = encoder.encode(key.padEnd(16, key).substring(0, 16));
-            const encryptedBuffer = await window.crypto.subtle.encrypt({
-                name: 'AES-CBC',
-                iv
-            }, derivedKey, data);
-            return this.arrayBufferToBase64(encryptedBuffer);
-        }
-        catch (error) {
-            console.log(error);
-            return '';
-        }
-    }
-    async decryptAsync(str, key = this.appID) {
-        if (!str || key === '')
-            return undefined;
-        try {
-            const encryptedData = this.base64ToArrayBuffer(str);
-            const keyMaterial = await this.getKeyMaterial(key);
-            const derivedKey = await this.deriveKey(keyMaterial, new TextEncoder().encode(key));
-            const iv = new TextEncoder().encode(key.padEnd(16, key).substring(0, 16));
-            const decryptedBuffer = await window.crypto.subtle.decrypt({
-                name: 'AES-CBC',
-                iv
-            }, derivedKey, encryptedData);
-            return new TextDecoder().decode(decryptedBuffer);
-        }
-        catch (error) {
-            console.log(error);
-            return undefined;
-        }
-    }
-    async getKeyMaterial(key) {
-        const encoder = new TextEncoder();
-        return window.crypto.subtle.importKey('raw', encoder.encode(key), { name: 'PBKDF2' }, false, ['deriveBits', 'deriveKey']);
-    }
-    async deriveKey(keyMaterial, salt) {
-        return window.crypto.subtle.deriveKey({
-            name: 'PBKDF2',
-            salt,
-            iterations: 100000,
-            hash: 'SHA-256'
-        }, keyMaterial, { name: 'AES-CBC', length: 256 }, false, ['encrypt', 'decrypt']);
+        const hash = CryptoJS.SHA256(normalizedURL);
+        const signature = hash.toString(CryptoJS.enc.Hex);
+        return signature;
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SymmetricalEncryptionService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: SymmetricalEncryptionService, providedIn: 'root' }); }
@@ -579,11 +443,11 @@ class ObjectMergerService {
                 const value = options[key];
                 if (value !== null &&
                     value !== undefined &&
-                    !(typeof value === 'number') &&
-                    !(typeof value === 'boolean') &&
+                    !(typeof value === 'number') ||
+                    !(typeof value === 'boolean') ||
                     !(this.isNonEmptyString(value)) &&
-                    !(Array.isArray(value) && value.length === 0) &&
-                    !(typeof value === 'object' && !Array.isArray(value))) {
+                        !(Array.isArray(value) && value.length === 0) &&
+                        !(typeof value === 'object' && !Array.isArray(value))) {
                     merged[key] = value;
                 }
             }