@almatar/branding 1.0.0-beta.3.5 → 1.0.0-beta.3.7

package/lib/lib/AlmatarBranding.d.ts

@@ -1,5 +1,8 @@
 export default class AlmatarBranding {
-    static employeeAuthService: string;
     static dictionaryService: string;
+    /** Set to true to enable package debug logs. Default is false; set debug: true in setup() when needed. */
+    static debug: boolean;
     static setup(configs: any): void;
+    /** Logs only when AlmatarBranding.debug is true. Enable via setup({ debug: true }). */
+    static log(...args: any[]): void;
 }

package/lib/lib/AlmatarBranding.js

@@ -2,10 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 class AlmatarBranding {
     static setup(configs) {
-        this.employeeAuthService = configs.employeeAuthService;
-        this.dictionaryService = configs.dictionaryService;
+        var _a;
+        this.dictionaryService = (_a = configs.dictionaryService) !== null && _a !== void 0 ? _a : this.dictionaryService;
+        if (typeof configs.debug === 'boolean') {
+            this.debug = configs.debug;
+        }
+    }
+    /** Logs only when AlmatarBranding.debug is true. Enable via setup({ debug: true }). */
+    static log(...args) {
+        if (this.debug) {
+            // tslint:disable-next-line no-console
+            console.log(...args);
+        }
     }
 }
 exports.default = AlmatarBranding;
-AlmatarBranding.employeeAuthService = '';
 AlmatarBranding.dictionaryService = '';
+/** Set to true to enable package debug logs. Default is false; set debug: true in setup() when needed. */
+AlmatarBranding.debug = false;

package/lib/lib/BrandIdentifier.js

@@ -18,9 +18,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BrandIdentifier = void 0;
 const Boom = __importStar(require("@hapi/boom"));
+const AlmatarBranding_1 = __importDefault(require("./AlmatarBranding"));
 const BrandManager_1 = require("./BrandManager");
 const url = __importStar(require("url"));
 class BrandIdentifier {
@@ -32,9 +36,7 @@ class BrandIdentifier {
         const brandManager = new BrandManager_1.BrandManager(this.type);
         // Priority 1: Query parameter brand (super admin override)
         const queryBrand = this.getQueryBrand(req);
-        // Troubleshoot logs (keep while integrating across microservices)
-        // tslint:disable-next-line no-console
-        console.log('[BrandIdentifier] Query brand detection:', {
+        AlmatarBranding_1.default.log('[BrandIdentifier] Query brand detection:', {
             'req.query': req === null || req === void 0 ? void 0 : req.query,
             'req.query.brand': (_a = req === null || req === void 0 ? void 0 : req.query) === null || _a === void 0 ? void 0 : _a.brand,
             'req.url': req === null || req === void 0 ? void 0 : req.url,
@@ -42,8 +44,7 @@ class BrandIdentifier {
             'queryBrand (final)': queryBrand,
         });
         if (queryBrand) {
-            // tslint:disable-next-line no-console
-            console.log('[BrandIdentifier] Using query parameter brand (overriding token brands):', queryBrand);
+            AlmatarBranding_1.default.log('[BrandIdentifier] Using query parameter brand (overriding token brands):', queryBrand);
             // Return as array so ContextNamespace stores it as employeeBrands (used by filters)
             return [queryBrand];
         }
@@ -55,28 +56,24 @@ class BrandIdentifier {
             // Employee/Console scenario - extract from token or x-employee-brands header
             const brand = await brandManager.getConsoleBrands(req);
             if (brand && brand.length > 0) {
-                // tslint:disable-next-line no-console
-                console.log('[BrandIdentifier] Using console/token brands:', brand);
+                AlmatarBranding_1.default.log('[BrandIdentifier] Using console/token brands:', brand);
                 return brand;
             }
             // If no brand found but we have authorization, try extracting from token directly
             if (req.headers.authorization) {
                 const tokenBrands = brandManager.extractBrandFromToken(req.headers.authorization);
                 if (tokenBrands && tokenBrands.length > 0) {
-                    // tslint:disable-next-line no-console
-                    console.log('[BrandIdentifier] Using brands extracted directly from token:', tokenBrands);
+                    AlmatarBranding_1.default.log('[BrandIdentifier] Using brands extracted directly from token:', tokenBrands);
                     return tokenBrands;
                 }
             }
             // No brand found in token/headers - return null (don't use default brand)
-            // tslint:disable-next-line no-console
-            console.log('[BrandIdentifier] No brand found in token or headers, returning null');
+            AlmatarBranding_1.default.log('[BrandIdentifier] No brand found in token or headers, returning null');
             return null;
         }
         else {
             // No auth token and no x-brand header - return null (don't use default brand)
-            // tslint:disable-next-line no-console
-            console.log('[BrandIdentifier] No auth token or x-brand header, returning null');
+            AlmatarBranding_1.default.log('[BrandIdentifier] No auth token or x-brand header, returning null');
             return null;
         }
     }
@@ -85,15 +82,13 @@ class BrandIdentifier {
         try {
             const brands = await brandManager.getBrands();
             if (!brands) {
-                // tslint:disable-next-line no-console
-                console.log('[BrandIdentifier] Could not fetch brands list from dictionary service, continuing without it');
+                AlmatarBranding_1.default.log('[BrandIdentifier] Could not fetch brands list from dictionary service, continuing without it');
                 return null;
             }
             return brands;
         }
         catch (err) {
-            // tslint:disable-next-line no-console
-            console.log('[BrandIdentifier] Error fetching brands list, continuing without it:', err);
+            AlmatarBranding_1.default.log('[BrandIdentifier] Error fetching brands list, continuing without it:', err);
             return null;
         }
     }

package/lib/lib/BrandManager.d.ts

@@ -9,10 +9,8 @@ export declare class BrandManager {
      */
     extractBrandFromToken(token: string): string[] | null;
     getConsoleBrands(req: any): Promise<string[] | null>;
-    loadBrands(req: any): Promise<string[] | null>;
     /**
      * get all brands list
-     * @param req
      */
     getBrands(): Promise<string[] | null>;
     /**

package/lib/lib/BrandManager.js

@@ -26,8 +26,7 @@ class BrandManager {
             // JWT format: header.payload.signature
             const parts = cleanToken.split('.');
             if (parts.length !== 3) {
-                // tslint:disable-next-line no-console
-                console.log('[BrandManager] Invalid JWT token format - expected 3 parts');
+                AlmatarBranding_1.default.log('[BrandManager] Invalid JWT token format - expected 3 parts');
                 return null;
             }
             // Decode payload (base64url)
@@ -49,21 +48,17 @@ class BrandManager {
                     brands = [tokenPayload.brand];
                 }
                 else {
-                    // tslint:disable-next-line no-console
-                    console.log('[BrandManager] Brand in token is neither array nor string:', typeof tokenPayload.brand);
+                    AlmatarBranding_1.default.log('[BrandManager] Brand in token is neither array nor string:', typeof tokenPayload.brand);
                     return null;
                 }
-                // tslint:disable-next-line no-console
-                console.log('[BrandManager] Successfully extracted brands from token:', brands);
+                AlmatarBranding_1.default.log('[BrandManager] Successfully extracted brands from token:', brands);
                 return brands;
             }
-            // tslint:disable-next-line no-console
-            console.log('[BrandManager] No brand field found in token payload');
+            AlmatarBranding_1.default.log('[BrandManager] No brand field found in token payload');
             return null;
         }
         catch (err) {
-            // tslint:disable-next-line no-console
-            console.log('[BrandManager] Error extracting brand from token:', err);
+            AlmatarBranding_1.default.log('[BrandManager] Error extracting brand from token:', err);
             return null;
         }
     }
@@ -71,8 +66,7 @@ class BrandManager {
         // Priority 1: Check x-employee-brands header first
         if (req.headers['x-employee-brands']) {
             const brands = req.headers['x-employee-brands'].split(',').map((b) => b.trim()).filter((b) => b);
-            // tslint:disable-next-line no-console
-            console.log('[BrandManager] Extracted brands from x-employee-brands header:', brands);
+            AlmatarBranding_1.default.log('[BrandManager] Extracted brands from x-employee-brands header:', brands);
             if (brands.length > 0) {
                 return brands;
             }
@@ -81,78 +75,22 @@ class BrandManager {
         if (req.headers.authorization) {
             const tokenBrands = this.extractBrandFromToken(req.headers.authorization);
             if (tokenBrands && tokenBrands.length > 0) {
-                // tslint:disable-next-line no-console
-                console.log('[BrandManager] Using brands extracted from token:', tokenBrands);
+                AlmatarBranding_1.default.log('[BrandManager] Using brands extracted from token:', tokenBrands);
                 return tokenBrands;
             }
         }
-        // DO NOT call loadBrands() here - it makes HTTP requests that can cause infinite loops
-        // If we don't have brand from token/header, return null instead
-        // tslint:disable-next-line no-console
-        console.log('[BrandManager] No brand found in token or headers, returning null (skipping loadBrands to prevent loops)');
+        AlmatarBranding_1.default.log('[BrandManager] No brand found in token or headers, returning null');
         return null;
     }
-    async loadBrands(req) {
-        try {
-            const reqBody = req.payload ? req.payload : req.body;
-            const options = {
-                url: AlmatarBranding_1.default.employeeAuthService + '/v1/user/brands',
-                method: 'GET',
-                headers: {
-                    authorization: req.headers.authorization,
-                },
-            };
-            const employeeBrands = await PromiseRequest_1.PromiseRequest.request(options);
-            // Check if response is valid and has the expected structure
-            if (employeeBrands && employeeBrands.status === 200 && employeeBrands.data) {
-                // Handle different possible response structures
-                const brandsData = Array.isArray(employeeBrands.data)
-                    ? employeeBrands.data
-                    : (employeeBrands.data.data || employeeBrands.data.list || []);
-                if (Array.isArray(brandsData) && brandsData.length > 0) {
-                    const brands = brandsData
-                        .map((brand) => {
-                        if (typeof brand === 'string') {
-                            return brand;
-                        }
-                        return (brand === null || brand === void 0 ? void 0 : brand.slug) || '';
-                    })
-                        .filter((b) => !!b);
-                    if (reqBody && reqBody.brand) {
-                        return brands.indexOf(reqBody.brand) > -1 ? brands : null;
-                    }
-                    // tslint:disable-next-line no-console
-                    console.log('[BrandManager] Successfully loaded brands from employee auth service:', brands);
-                    return brands;
-                }
-                else {
-                    // tslint:disable-next-line no-console
-                    console.log('[BrandManager] Invalid response structure from employee auth service, expected array but got:', typeof brandsData);
-                }
-            }
-            else {
-                // tslint:disable-next-line no-console
-                console.log('[BrandManager] Failed to load brands from employee auth service, status:', employeeBrands === null || employeeBrands === void 0 ? void 0 : employeeBrands.status, 'data:', employeeBrands === null || employeeBrands === void 0 ? void 0 : employeeBrands.data);
-            }
-            return null;
-        }
-        catch (err) {
-            // tslint:disable-next-line no-console
-            console.log('[BrandManager] Error loading brands:', err);
-            return null;
-        }
-    }
     /**
      * get all brands list
-     * @param req
      */
     async getBrands() {
         var _a;
         try {
             // Check if dictionary service URL is configured
             if (!AlmatarBranding_1.default.dictionaryService || AlmatarBranding_1.default.dictionaryService.trim() === '') {
-                // tslint:disable-next-line no-console
-                console.log('[BrandManager] Dictionary service URL not configured, skipping brands fetch');
+                AlmatarBranding_1.default.log('[BrandManager] Dictionary service URL not configured, skipping brands fetch');
                 return null;
             }
             const option = {
@@ -175,24 +113,20 @@ class BrandManager {
                     })
                         .filter((b) => !!b);
                     Storage_1.default.setBrands(brands);
-                    // tslint:disable-next-line:no-console
-                    console.log('[BrandManager] Successfully loaded brands from dictionary service:', brands);
+                    AlmatarBranding_1.default.log('[BrandManager] Successfully loaded brands from dictionary service:', brands);
                     return brands;
                 }
                 else {
-                    // tslint:disable-next-line:no-console
-                    console.log('[BrandManager] Invalid response structure from dictionary service, expected array but got:', typeof brandsList);
+                    AlmatarBranding_1.default.log('[BrandManager] Invalid response structure from dictionary service, expected array but got:', typeof brandsList);
                 }
             }
             else {
-                // tslint:disable-next-line:no-console
-                console.log('[BrandManager] Failed to get brands from dictionary service, status:', brandsResponse === null || brandsResponse === void 0 ? void 0 : brandsResponse.status, 'data:', brandsResponse === null || brandsResponse === void 0 ? void 0 : brandsResponse.data);
+                AlmatarBranding_1.default.log('[BrandManager] Failed to get brands from dictionary service, status:', brandsResponse === null || brandsResponse === void 0 ? void 0 : brandsResponse.status, 'data:', brandsResponse === null || brandsResponse === void 0 ? void 0 : brandsResponse.data);
             }
             return null;
         }
         catch (err) {
-            // tslint:disable-next-line:no-console
-            console.log('[BrandManager] Error getting brands from dictionary service:', err);
+            AlmatarBranding_1.default.log('[BrandManager] Error getting brands from dictionary service:', err);
             return null;
         }
     }

package/lib/lib/Storage.js

@@ -18,7 +18,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+const AlmatarBranding_1 = __importDefault(require("./AlmatarBranding"));
 const BrandIdentifier_1 = require("./BrandIdentifier");
 const url = __importStar(require("url"));
 const createNamespace = require('cls-hooked').createNamespace;
@@ -42,9 +46,7 @@ class ContextNamespace {
         // Check if query parameter brand was used (allows super admin to query specific brand)
         const queryBrand = ContextNamespace.getQueryBrand(req);
         const isQueryParameterBrand = !!queryBrand;
-        // Troubleshoot logs (keep while integrating across microservices)
-        // tslint:disable-next-line no-console
-        console.log('[ContextNamespace] setEBrand request snapshot:', {
+        AlmatarBranding_1.default.log('[ContextNamespace] setEBrand request snapshot:', {
             'req.url': req === null || req === void 0 ? void 0 : req.url,
             'req.originalUrl': req === null || req === void 0 ? void 0 : req.originalUrl,
             'req.query': req === null || req === void 0 ? void 0 : req.query,
@@ -59,75 +61,63 @@ class ContextNamespace {
         const isEmployeeRequest = !!req.headers.authorization || !!req.headers['x-employee-brands'] || isQueryParameterBrand;
         if (Array.isArray(brand)) {
             // Employee/Console scenario with multiple brands (or query parameter brand)
-            // tslint:disable-next-line no-console
-            console.log('[ContextNamespace] Setting employeeBrands in context:', brand, isQueryParameterBrand ? '(from query parameter)' : '');
+            AlmatarBranding_1.default.log('[ContextNamespace] Setting employeeBrands in context:', brand, isQueryParameterBrand ? '(from query parameter)' : '');
             // IMPORTANT: If query parameter brand is used, clear any existing brand context first
             // This ensures query parameter brand takes absolute priority
             if (isQueryParameterBrand) {
                 // Clear any existing brand context to ensure query parameter brand is used
                 ns.set('brand', null);
-                // tslint:disable-next-line no-console
-                console.log('[ContextNamespace] Cleared existing brand context to prioritize query parameter brand');
+                AlmatarBranding_1.default.log('[ContextNamespace] Cleared existing brand context to prioritize query parameter brand');
             }
             // IMPORTANT: Set employeeBrands in context - this is what MongooseModel pre-hooks will read
             ns.set('employeeBrands', brand);
-            // Troubleshoot: verify it was set
-            // tslint:disable-next-line no-console
-            console.log('[ContextNamespace] employeeBrands in context now:', ns.get('employeeBrands'));
+            AlmatarBranding_1.default.log('[ContextNamespace] employeeBrands in context now:', ns.get('employeeBrands'));
             // If query parameter brand is used with authorization token, always set x-employee-brands header
             if (isQueryParameterBrand && req.headers.authorization && brand.length > 0) {
                 req.headers['x-employee-brands'] = brand.join(',');
-                // tslint:disable-next-line no-console
-                console.log('[ContextNamespace] Set x-employee-brands from query brand (with token):', req.headers['x-employee-brands']);
+                AlmatarBranding_1.default.log('[ContextNamespace] Set x-employee-brands from query brand (with token):', req.headers['x-employee-brands']);
             }
             else if (isEmployeeRequest && brand.length > 0) {
                 // Set x-employee-brands header for employee requests (normal flow)
                 req.headers['x-employee-brands'] = brand.join(',');
-                // tslint:disable-next-line no-console
-                console.log('[ContextNamespace] Setting x-employee-brands header on request:', req.headers['x-employee-brands']);
+                AlmatarBranding_1.default.log('[ContextNamespace] Setting x-employee-brands header on request:', req.headers['x-employee-brands']);
             }
             next();
         }
         else if (typeof brand === 'string') {
             if (isB2CRequest) {
                 // B2C scenario - set brand in context but NOT x-employee-brands header
-                // tslint:disable-next-line no-console
-                console.log('[ContextNamespace] Setting brand in context (B2C):', brand);
+                AlmatarBranding_1.default.log('[ContextNamespace] Setting brand in context (B2C):', brand);
                 ns.set('brand', brand);
                 // Don't set x-employee-brands for B2C requests
                 next();
             }
             else if (isEmployeeRequest) {
                 // Employee/Console scenario with single brand
-                // tslint:disable-next-line no-console
-                console.log('[ContextNamespace] Setting brand in context (Employee):', brand);
+                AlmatarBranding_1.default.log('[ContextNamespace] Setting brand in context (Employee):', brand);
                 ns.set('brand', brand);
                 // If query parameter brand is used with authorization token, always set x-employee-brands header
                 if (isQueryParameterBrand && req.headers.authorization) {
                     req.headers['x-employee-brands'] = brand;
-                    // tslint:disable-next-line no-console
-                    console.log('[ContextNamespace] Set x-employee-brands from query brand (with token):', req.headers['x-employee-brands']);
+                    AlmatarBranding_1.default.log('[ContextNamespace] Set x-employee-brands from query brand (with token):', req.headers['x-employee-brands']);
                 }
                 else {
                     // Set x-employee-brands header for employee requests (normal flow)
                     req.headers['x-employee-brands'] = brand;
-                    // tslint:disable-next-line no-console
-                    console.log('[ContextNamespace] Setting x-employee-brands header on request:', req.headers['x-employee-brands']);
+                    AlmatarBranding_1.default.log('[ContextNamespace] Setting x-employee-brands header on request:', req.headers['x-employee-brands']);
                 }
                 next();
             }
             else {
                 // Should not happen, but handle gracefully
-                // tslint:disable-next-line no-console
-                console.log('[ContextNamespace] Brand is string but no auth/x-brand detected, not setting headers');
+                AlmatarBranding_1.default.log('[ContextNamespace] Brand is string but no auth/x-brand detected, not setting headers');
                 ns.set('brand', brand);
                 next();
             }
         }
         else {
             // Brand is null or undefined - don't set anything
-            // tslint:disable-next-line no-console
-            console.log('[ContextNamespace] No brand found (no token/x-brand), not setting brand context or headers');
+            AlmatarBranding_1.default.log('[ContextNamespace] No brand found (no token/x-brand), not setting brand context or headers');
             // Don't set employeeBrands or x-employee-brands when no brand is found
             next();
         }
@@ -152,8 +142,7 @@ class ContextNamespace {
         const isQueryParameterBrand = !!queryBrand;
         if (Array.isArray(brand)) {
             // Employee/Console scenario with multiple brands (or query parameter brand)
-            // tslint:disable-next-line no-console
-            console.log('[ContextNamespace] Setting employeeBrands in context (Hapi):', brand, isQueryParameterBrand ? '(from query parameter)' : '');
+            AlmatarBranding_1.default.log('[ContextNamespace] Setting employeeBrands in context (Hapi):', brand, isQueryParameterBrand ? '(from query parameter)' : '');
             ns.set('employeeBrands', brand);
             reply();
         }

package/lib/lib/TenantModel/MongooseModel.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongooseModel = void 0;
+const AlmatarBranding_1 = __importDefault(require("../AlmatarBranding"));
 const Storage_1 = __importDefault(require("../Storage"));
 class MongooseModel {
     constructor(mongoose) {
@@ -38,9 +39,7 @@ class MongooseModel {
                 const employeeBrands = Storage_1.default.getEmployeeBrands();
                 const brand = Storage_1.default.getBrand();
                 const contextBrands = employeeBrands || (brand ? [brand] : null);
-                // Troubleshoot logs (keep while integrating across microservices)
-                // tslint:disable-next-line no-console
-                console.log('[MongooseModel] addPreCondition - Context:', {
+                AlmatarBranding_1.default.log('[MongooseModel] addPreCondition - Context:', {
                     employeeBrands,
                     brand,
                     contextBrands,
@@ -49,18 +48,15 @@ class MongooseModel {
                 if (contextBrands && contextBrands.length > 0) {
                     // Use $in to check if entity's brand is in the user's brands array
                     this.where({ brand: { $in: contextBrands } });
-                    // tslint:disable-next-line no-console
-                    console.log('[MongooseModel] addPreCondition - Applied brand filter:', { brand: { $in: contextBrands } });
+                    AlmatarBranding_1.default.log('[MongooseModel] addPreCondition - Applied brand filter:', { brand: { $in: contextBrands } });
                 }
                 else {
-                    // tslint:disable-next-line no-console
-                    console.log('[MongooseModel] addPreCondition - No brands in context, skipping filter');
+                    AlmatarBranding_1.default.log('[MongooseModel] addPreCondition - No brands in context, skipping filter');
                 }
                 next();
             }
             catch (err) {
-                // tslint:disable-next-line no-console
-                console.log('[MongooseModel] addPreCondition - Error in hook, continuing without filter:', err);
+                AlmatarBranding_1.default.log('[MongooseModel] addPreCondition - Error in hook, continuing without filter:', err);
                 next();
             }
         }
@@ -88,8 +84,7 @@ class MongooseModel {
                 // Only apply filter if brands are explicitly set (not null/undefined)
                 if (contextBrands && contextBrands.length > 0) {
                     const pipeline = this.pipeline();
-                    // tslint:disable-next-line no-console
-                    console.log('[MongooseModel] addPreAggregate - Current pipeline before brand filter:', JSON.stringify(pipeline, null, 2));
+                    AlmatarBranding_1.default.log('[MongooseModel] addPreAggregate - Current pipeline before brand filter:', JSON.stringify(pipeline, null, 2));
                     // Try to merge with existing $match stage if it exists
                     let mergedMatch = false;
                     for (const stage of pipeline) {
@@ -97,29 +92,24 @@ class MongooseModel {
                             // Merge brand filter with existing $match
                             stage.$match.brand = { $in: contextBrands };
                             mergedMatch = true;
-                            // tslint:disable-next-line no-console
-                            console.log('[MongooseModel] addPreAggregate - Merged brand filter with existing $match:', JSON.stringify(stage.$match, null, 2));
+                            AlmatarBranding_1.default.log('[MongooseModel] addPreAggregate - Merged brand filter with existing $match:', JSON.stringify(stage.$match, null, 2));
                             break;
                         }
                     }
                     // If no $match stage exists, add brand filter at the beginning
                     if (!mergedMatch) {
                         pipeline.unshift({ $match: { brand: { $in: contextBrands } } });
-                        // tslint:disable-next-line no-console
-                        console.log('[MongooseModel] addPreAggregate - Added brand filter to pipeline:', { brand: { $in: contextBrands } });
+                        AlmatarBranding_1.default.log('[MongooseModel] addPreAggregate - Added brand filter to pipeline:', { brand: { $in: contextBrands } });
                     }
-                    // tslint:disable-next-line no-console
-                    console.log('[MongooseModel] addPreAggregate - Final pipeline after brand filter:', JSON.stringify(pipeline, null, 2));
+                    AlmatarBranding_1.default.log('[MongooseModel] addPreAggregate - Final pipeline after brand filter:', JSON.stringify(pipeline, null, 2));
                 }
                 else {
-                    // tslint:disable-next-line no-console
-                    console.log('[MongooseModel] addPreAggregate - No brands in context, skipping filter');
+                    AlmatarBranding_1.default.log('[MongooseModel] addPreAggregate - No brands in context, skipping filter');
                 }
                 next();
             }
             catch (err) {
-                // tslint:disable-next-line no-console
-                console.log('[MongooseModel] addPreAggregate - Error in hook, continuing without filter:', err);
+                AlmatarBranding_1.default.log('[MongooseModel] addPreAggregate - Error in hook, continuing without filter:', err);
                 next();
             }
         }
@@ -138,14 +128,12 @@ class MongooseModel {
                 if (!this.brand && contextBrands && contextBrands.length > 0) {
                     // Use first brand from employeeBrands array if available, otherwise use single brand
                     this.brand = contextBrands[0];
-                    // tslint:disable-next-line no-console
-                    console.log('[MongooseModel] addPreSave - Set brand on document:', this.brand);
+                    AlmatarBranding_1.default.log('[MongooseModel] addPreSave - Set brand on document:', this.brand);
                 }
                 next();
             }
             catch (err) {
-                // tslint:disable-next-line no-console
-                console.log('[MongooseModel] addPreSave - Error in hook, continuing:', err);
+                AlmatarBranding_1.default.log('[MongooseModel] addPreSave - Error in hook, continuing:', err);
                 next();
             }
         }
@@ -167,14 +155,12 @@ class MongooseModel {
                             data.brand = brandToSet;
                         }
                     });
-                    // tslint:disable-next-line no-console
-                    console.log('[MongooseModel] addPreInsertMany - Set brand on documents:', brandToSet);
+                    AlmatarBranding_1.default.log('[MongooseModel] addPreInsertMany - Set brand on documents:', brandToSet);
                 }
                 next();
             }
             catch (err) {
-                // tslint:disable-next-line no-console
-                console.log('[MongooseModel] addPreInsertMany - Error in hook, continuing:', err);
+                AlmatarBranding_1.default.log('[MongooseModel] addPreInsertMany - Error in hook, continuing:', err);
                 next();
             }
         }

package/lib/lib/TenantModel/MongooseTenantHelper.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongooseTenantHelper = void 0;
+const AlmatarBranding_1 = __importDefault(require("../AlmatarBranding"));
 const Storage_1 = __importDefault(require("../Storage"));
 /**
  * Utility class for manually applying tenant scoping in Mongoose repositories
@@ -49,12 +50,10 @@ class MongooseTenantHelper {
                 // If query is empty, just add brand filter
                 query.brand = { $in: contextBrands };
             }
-            // tslint:disable-next-line no-console
-            console.log('[MongooseTenantHelper] Added brand filter to query:', { brand: { $in: contextBrands } });
+            AlmatarBranding_1.default.log('[MongooseTenantHelper] Added brand filter to query:', { brand: { $in: contextBrands } });
         }
         else {
-            // tslint:disable-next-line no-console
-            console.log('[MongooseTenantHelper] No brand context, skipping brand filter');
+            AlmatarBranding_1.default.log('[MongooseTenantHelper] No brand context, skipping brand filter');
         }
         return query;
     }
@@ -75,21 +74,18 @@ class MongooseTenantHelper {
                     // Merge brand filter with existing $match
                     stage.$match = Object.assign(Object.assign({}, stage.$match), brandFilter);
                     mergedMatch = true;
-                    // tslint:disable-next-line no-console
-                    console.log('[MongooseTenantHelper] Merged brand filter with existing $match:', stage.$match);
+                    AlmatarBranding_1.default.log('[MongooseTenantHelper] Merged brand filter with existing $match:', stage.$match);
                     break;
                 }
             }
             // If no $match stage exists, add brand filter at the beginning
             if (!mergedMatch) {
                 pipeline.unshift({ $match: brandFilter });
-                // tslint:disable-next-line no-console
-                console.log('[MongooseTenantHelper] Added brand filter to pipeline:', brandFilter);
+                AlmatarBranding_1.default.log('[MongooseTenantHelper] Added brand filter to pipeline:', brandFilter);
             }
         }
         else {
-            // tslint:disable-next-line no-console
-            console.log('[MongooseTenantHelper] No brand context, skipping brand filter in pipeline');
+            AlmatarBranding_1.default.log('[MongooseTenantHelper] No brand context, skipping brand filter in pipeline');
         }
         return pipeline;
     }
@@ -103,12 +99,10 @@ class MongooseTenantHelper {
         const brand = this.getBrandForDocument();
         if (brand && !document.brand) {
             document.brand = brand;
-            // tslint:disable-next-line no-console
-            console.log('[MongooseTenantHelper] Set brand on document:', brand);
+            AlmatarBranding_1.default.log('[MongooseTenantHelper] Set brand on document:', brand);
         }
         else if (!brand) {
-            // tslint:disable-next-line no-console
-            console.log('[MongooseTenantHelper] No brand context, skipping brand on document');
+            AlmatarBranding_1.default.log('[MongooseTenantHelper] No brand context, skipping brand on document');
         }
         return document;
     }
@@ -126,12 +120,10 @@ class MongooseTenantHelper {
                     doc.brand = brand;
                 }
             });
-            // tslint:disable-next-line no-console
-            console.log('[MongooseTenantHelper] Set brand on documents:', brand);
+            AlmatarBranding_1.default.log('[MongooseTenantHelper] Set brand on documents:', brand);
         }
         else {
-            // tslint:disable-next-line no-console
-            console.log('[MongooseTenantHelper] No brand context, skipping brand on documents');
+            AlmatarBranding_1.default.log('[MongooseTenantHelper] No brand context, skipping brand on documents');
         }
         return documents;
     }

package/lib/lib/TenantModel/TypeORM/TenantEntitySubscriber.js

@@ -11,6 +11,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TenantEntitySubscriber = void 0;
 const typeorm_1 = require("typeorm");
+const AlmatarBranding_1 = __importDefault(require("../../AlmatarBranding"));
 const Storage_1 = __importDefault(require("../../Storage"));
 /**
  * TypeORM EntitySubscriber that automatically handles brand in all entities
@@ -55,9 +56,7 @@ let TenantEntitySubscriber = class TenantEntitySubscriber {
             const hasMatchingBrand = contextBrands.some((b) => entityBrands.includes(b));
             if (!hasMatchingBrand) {
                 // Entity doesn't match brand - this shouldn't happen if TenantRepository is used
-                // Log for debugging (optional - can be removed)
-                // tslint:disable-next-line no-console
-                console.warn(`[TenantEntitySubscriber] Entity ${event.metadata.name} (id: ${entity.id}) doesn't match brand context`);
+                AlmatarBranding_1.default.log(`[TenantEntitySubscriber] Entity ${event.metadata.name} (id: ${entity.id}) doesn't match brand context`);
             }
         }
     }

package/lib/lib/TenantModel/TypeORM/TenantHttpInterceptor.js

@@ -11,6 +11,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TenantHttpInterceptor = void 0;
 const common_1 = require("@nestjs/common");
+const AlmatarBranding_1 = __importDefault(require("../../AlmatarBranding"));
 const Storage_1 = __importDefault(require("../../Storage"));
 /**
  * HTTP Interceptor that automatically adds x-brand and x-employee-brands headers
@@ -53,14 +54,12 @@ let TenantHttpInterceptor = class TenantHttpInterceptor {
             }
             catch (e) {
                 // HttpService not available - skip interceptor setup
-                // tslint:disable-next-line no-console
-                console.warn('[TenantHttpInterceptor] HttpService not available, skipping axios interceptor setup');
+                AlmatarBranding_1.default.log('[TenantHttpInterceptor] HttpService not available, skipping axios interceptor setup');
                 return;
             }
         }
         if (!httpService.axiosRef) {
-            // tslint:disable-next-line no-console
-            console.warn('[TenantHttpInterceptor] HttpService.axiosRef not available, skipping axios interceptor setup');
+            AlmatarBranding_1.default.log('[TenantHttpInterceptor] HttpService.axiosRef not available, skipping axios interceptor setup');
             return;
         }
         httpService.axiosRef.interceptors.request.use((config) => {

package/lib/lib/TenantModel/TypeORM/TenantRepository.d.ts

@@ -53,6 +53,7 @@ export declare class TenantRepository<T extends ObjectLiteral> extends Repositor
      * Apply brand filter to query builder
      * Handles both cases: brand as JSON array and brand as string
      * Uses $in equivalent for multiple brands from x-employee-brands
+     * When column is varchar/string, only IN clause is used (JSON_CONTAINS would fail on non-JSON).
      */
     private applyBrandFilter;
 }

package/lib/lib/TenantModel/TypeORM/TenantRepository.js

@@ -251,29 +251,33 @@ class TenantRepository extends typeorm_1.Repository {
      * Apply brand filter to query builder
      * Handles both cases: brand as JSON array and brand as string
      * Uses $in equivalent for multiple brands from x-employee-brands
+     * When column is varchar/string, only IN clause is used (JSON_CONTAINS would fail on non-JSON).
      */
     applyBrandFilter(query, tableAlias) {
         const brands = this.getBrandsFromContext();
         if (brands && brands.length > 0) {
-            // Handle both cases for multiple brands (x-employee-brands can have many):
-            // 1. Brand column is JSON array: Check if ANY of the user's brands exist in the entity's brand array
-            //    Using JSON_CONTAINS for each brand (equivalent to $in for arrays)
-            // 2. Brand column is string: Check if entity's brand is IN the user's brands array
-            //    Using IN clause (equivalent to $in for strings)
-            // For JSON array: Check if any user brand is contained in entity's brand array
-            const jsonArrayConditions = brands.map((brandItem, index) => {
-                return `JSON_CONTAINS(${tableAlias}.${this.brandColumn}, :brand${index})`;
-            }).join(' OR ');
-            // For string: Check if entity's brand is in user's brands (IN clause)
-            const stringInPlaceholders = brands.map((brandItem, index) => `:brandStr${index}`).join(', ');
-            // Combine both conditions: (JSON array match) OR (string IN match)
-            const brandConditions = `(${jsonArrayConditions}) OR (${tableAlias}.${this.brandColumn} IN (${stringInPlaceholders}))`;
+            const stringInPlaceholders = brands.map((_, index) => `:brandStr${index}`).join(', ');
             const brandParams = {};
             brands.forEach((brand, index) => {
-                brandParams[`brand${index}`] = JSON.stringify(brand);
                 brandParams[`brandStr${index}`] = brand;
             });
-            query.andWhere(`(${brandConditions})`, brandParams);
+            const brandColumnMeta = this.metadata.columns.find((c) => c.propertyName === this.brandColumn);
+            const isJsonColumn = brandColumnMeta && String(brandColumnMeta.type).toLowerCase() === 'json';
+            if (isJsonColumn) {
+                // JSON column: JSON_CONTAINS OR string IN (both for flexibility)
+                const jsonArrayConditions = brands.map((_, index) => {
+                    return `JSON_CONTAINS(${tableAlias}.${this.brandColumn}, :brand${index})`;
+                }).join(' OR ');
+                brands.forEach((brand, index) => {
+                    brandParams[`brand${index}`] = JSON.stringify(brand);
+                });
+                const brandConditions = `(${jsonArrayConditions}) OR (${tableAlias}.${this.brandColumn} IN (${stringInPlaceholders}))`;
+                query.andWhere(`(${brandConditions})`, brandParams);
+            }
+            else {
+                // String/varchar column: only IN clause (JSON_CONTAINS would fail)
+                query.andWhere(`${tableAlias}.${this.brandColumn} IN (${stringInPlaceholders})`, brandParams);
+            }
         }
         return query;
     }

package/lib/lib/request/PromiseRequest.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PromiseRequest = void 0;
+const AlmatarBranding_1 = __importDefault(require("../AlmatarBranding"));
 const Storage_1 = __importDefault(require("../Storage"));
 class PromiseRequest {
     static async request(options) {
@@ -24,8 +25,7 @@ class PromiseRequest {
             if (brand) {
                 headers['x-brand'] = brand;
             }
-            // tslint:disable-next-line no-console
-            console.log('[PromiseRequest] Making request:', { url, method, headers: Object.assign(Object.assign({}, headers), { authorization: headers.authorization ? 'Bearer ***' : undefined }) });
+            AlmatarBranding_1.default.log('[PromiseRequest] Making request:', { url, method, headers: Object.assign(Object.assign({}, headers), { authorization: headers.authorization ? 'Bearer ***' : undefined }) });
             const response = await fetch(url, {
                 method,
                 headers: Object.assign({ 'Content-Type': 'application/json' }, headers),
@@ -37,8 +37,7 @@ class PromiseRequest {
                 parsedBody = responseData ? JSON.parse(responseData) : null;
             }
             catch (parseError) {
-                // tslint:disable-next-line no-console
-                console.log('[PromiseRequest] Failed to parse response as JSON:', parseError);
+                AlmatarBranding_1.default.log('[PromiseRequest] Failed to parse response as JSON:', parseError);
                 parsedBody = responseData;
             }
             // Return in the same format as the old request library
@@ -49,8 +48,7 @@ class PromiseRequest {
             };
         }
         catch (err) {
-            // tslint:disable-next-line no-console
-            console.log('[PromiseRequest] Request error:', err);
+            AlmatarBranding_1.default.log('[PromiseRequest] Request error:', err);
             throw err;
         }
     }

package/lib/lib/request/TenantRequest.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const AlmatarBranding_1 = __importDefault(require("../AlmatarBranding"));
 const Storage_1 = __importDefault(require("../Storage"));
 class TenantRequest {
     static async request(options) {
@@ -34,8 +35,7 @@ class TenantRequest {
             };
         }
         catch (e) {
-            // tslint:disable-next-line no-console
-            console.log('[TenantRequest] Request error:', e);
+            AlmatarBranding_1.default.log('[TenantRequest] Request error:', e);
             return null;
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@almatar/branding",
-  "version": "1.0.0-beta.3.5",
+  "version": "1.0.0-beta.3.7",
   "description": "",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",