@almatar/branding 1.0.0-beta.3.1 → 1.0.0-beta.3.3

package/lib/lib/BrandIdentifier.d.ts

@@ -4,5 +4,6 @@ export declare class BrandIdentifier {
     getBrand(req: any): Promise<string | string[] | null>;
     getBrands(): Promise<string[] | null>;
     getDefaultBrand(): string;
+    private getQueryBrand;
     private error;
 }

package/lib/lib/BrandIdentifier.js

@@ -22,12 +22,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BrandIdentifier = void 0;
 const Boom = __importStar(require("@hapi/boom"));
 const BrandManager_1 = require("./BrandManager");
+const url = __importStar(require("url"));
 class BrandIdentifier {
     constructor(type) {
         this.type = type;
     }
     async getBrand(req) {
+        var _a;
         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:', {
+            '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,
+            'req.originalUrl': req === null || req === void 0 ? void 0 : req.originalUrl,
+            'queryBrand (final)': queryBrand,
+        });
+        if (queryBrand) {
+            // tslint:disable-next-line no-console
+            console.log('[BrandIdentifier] Using query parameter brand (overriding token brands):', queryBrand);
+            // Return as array so ContextNamespace stores it as employeeBrands (used by filters)
+            return [queryBrand];
+        }
         if (req.headers['x-brand']) {
             // B2C scenario - return the brand from x-brand header
             return brandManager.getB2CBrand(req);
@@ -36,12 +55,16 @@ 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);
                 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);
                     return tokenBrands;
                 }
             }
@@ -78,6 +101,29 @@ class BrandIdentifier {
         const brandManager = new BrandManager_1.BrandManager(this.type);
         return brandManager.getDefaultBrand();
     }
+    getQueryBrand(req) {
+        var _a, _b;
+        try {
+            // Express/NestJS typically populates req.query
+            const fromQuery = (_a = req === null || req === void 0 ? void 0 : req.query) === null || _a === void 0 ? void 0 : _a.brand;
+            if (typeof fromQuery === 'string' && fromQuery.trim()) {
+                return fromQuery.trim();
+            }
+            // Fallback to parsing URLs if req.query isn't populated yet
+            const urlToParse = (req === null || req === void 0 ? void 0 : req.originalUrl) || (req === null || req === void 0 ? void 0 : req.url);
+            if (typeof urlToParse === 'string' && urlToParse.includes('?')) {
+                const parsedUrl = url.parse(urlToParse, true);
+                const parsedBrand = (_b = parsedUrl.query) === null || _b === void 0 ? void 0 : _b.brand;
+                if (typeof parsedBrand === 'string' && parsedBrand.trim()) {
+                    return parsedBrand.trim();
+                }
+            }
+        }
+        catch (err) {
+            // ignore - fall back to other brand sources
+        }
+        return null;
+    }
     error(message) {
         switch (this.type) {
             case 'hapi':

package/lib/lib/Storage.d.ts

@@ -14,4 +14,5 @@ export default class ContextNamespace {
     static getDefaultBrand(): string | null;
     static isValidBrand(brand: string): boolean;
     static isBrandIncludesProduct(brandKey: string, product: string): boolean;
+    private static getQueryBrand;
 }

package/lib/lib/Storage.js

@@ -1,6 +1,26 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const BrandIdentifier_1 = require("./BrandIdentifier");
+const url = __importStar(require("url"));
 const createNamespace = require('cls-hooked').createNamespace;
 const namespaceName = 'request';
 const ns = createNamespace(namespaceName);
@@ -16,19 +36,52 @@ class ContextNamespace {
         });
     }
     static async setEBrand(req, res, next) {
+        var _a, _b, _c;
         const brandIdentifier = new BrandIdentifier_1.BrandIdentifier('express');
         const brand = await brandIdentifier.getBrand(req);
+        // 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:', {
+            '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,
+            'queryBrand (final)': queryBrand,
+            'hasAuthorization': !!((_a = req === null || req === void 0 ? void 0 : req.headers) === null || _a === void 0 ? void 0 : _a.authorization),
+            'incoming x-brand': (_b = req === null || req === void 0 ? void 0 : req.headers) === null || _b === void 0 ? void 0 : _b['x-brand'],
+            'incoming x-employee-brands': (_c = req === null || req === void 0 ? void 0 : req.headers) === null || _c === void 0 ? void 0 : _c['x-employee-brands'],
+        });
         // Check if this is a B2C request (x-brand header) - don't set x-employee-brands for B2C
-        const isB2CRequest = !!req.headers['x-brand'];
-        // Check if this is an employee/console request (authorization token)
-        const isEmployeeRequest = !!req.headers.authorization || !!req.headers['x-employee-brands'];
+        const isB2CRequest = !!req.headers['x-brand'] && !isQueryParameterBrand;
+        // Check if this is an employee/console request (authorization token or query parameter brand)
+        const isEmployeeRequest = !!req.headers.authorization || !!req.headers['x-employee-brands'] || isQueryParameterBrand;
         if (Array.isArray(brand)) {
-            // Employee/Console scenario with multiple brands
+            // Employee/Console scenario with multiple brands (or query parameter brand)
             // tslint:disable-next-line no-console
-            console.log('[ContextNamespace] Setting employeeBrands in context:', brand);
+            console.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');
+            }
+            // IMPORTANT: Set employeeBrands in context - this is what MongooseModel pre-hooks will read
             ns.set('employeeBrands', brand);
-            // Only set x-employee-brands header for employee requests (not B2C)
-            if (isEmployeeRequest && brand.length > 0) {
+            // Troubleshoot: verify it was set
+            // tslint:disable-next-line no-console
+            console.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']);
+            }
+            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']);
@@ -49,10 +102,18 @@ class ContextNamespace {
                 // tslint:disable-next-line no-console
                 console.log('[ContextNamespace] Setting brand in context (Employee):', brand);
                 ns.set('brand', brand);
-                // Set x-employee-brands header for employee requests
-                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']);
+                // 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']);
+                }
+                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']);
+                }
                 next();
             }
             else {
@@ -83,9 +144,16 @@ class ContextNamespace {
         });
     }
     static async setHBrand(req, reply) {
+        var _a;
         const brandIdentifier = new BrandIdentifier_1.BrandIdentifier('hapi');
         const brand = await brandIdentifier.getBrand(req);
+        // Check if query parameter brand was used
+        const queryBrand = (_a = req.query) === null || _a === void 0 ? void 0 : _a.brand;
+        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)' : '');
             ns.set('employeeBrands', brand);
             reply();
         }
@@ -137,5 +205,26 @@ class ContextNamespace {
         const brand = (_a = ns.get('brandsList')) === null || _a === void 0 ? void 0 : _a.filter((b) => b.key === brandKey)[0];
         return (_b = brand.products) === null || _b === void 0 ? void 0 : _b.includes(product);
     }
+    static getQueryBrand(req) {
+        var _a, _b;
+        try {
+            const fromQuery = (_a = req === null || req === void 0 ? void 0 : req.query) === null || _a === void 0 ? void 0 : _a.brand;
+            if (typeof fromQuery === 'string' && fromQuery.trim()) {
+                return fromQuery.trim();
+            }
+            const urlToParse = (req === null || req === void 0 ? void 0 : req.originalUrl) || (req === null || req === void 0 ? void 0 : req.url);
+            if (typeof urlToParse === 'string' && urlToParse.includes('?')) {
+                const parsedUrl = url.parse(urlToParse, true);
+                const parsedBrand = (_b = parsedUrl.query) === null || _b === void 0 ? void 0 : _b.brand;
+                if (typeof parsedBrand === 'string' && parsedBrand.trim()) {
+                    return parsedBrand.trim();
+                }
+            }
+        }
+        catch (err) {
+            // ignore
+        }
+        return null;
+    }
 }
 exports.default = ContextNamespace;

package/lib/lib/TenantModel/MongooseModel.js

@@ -38,6 +38,13 @@ 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:', {
+                    employeeBrands,
+                    brand,
+                    contextBrands,
+                });
                 // Only apply filter if brands are explicitly set (not null/undefined)
                 if (contextBrands && contextBrands.length > 0) {
                     // Use $in to check if entity's brand is in the user's brands array

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@almatar/branding",
-  "version": "1.0.0-beta.3.1",
+  "version": "1.0.0-beta.3.3",
   "description": "",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -39,7 +39,7 @@
   },
   "peerDependencies": {
     "typeorm": "^0.3.0",
-    "@nestjs/axios": "^4.0.0"
+    "@nestjs/axios": "^3.0.0 || ^4.0.0"
   },
   "author": "",
   "license": "ISC",