@almatar/branding 0.2.0 → 1.0.0-beta.3

package/lib/index.d.ts

@@ -3,11 +3,17 @@ import MultiTenant from './lib/TenantModel/Mongoose/MultiTenant';
 import TenantMongooseModule from './lib/TenantModel/NestMongoose/TenantMongooseModule';
 import TenantRequest from './lib/request/TenantRequest';
 import AlmatarBranding from './lib/AlmatarBranding';
+import { TenantRepository } from './lib/TenantModel/TypeORM/TenantRepository';
+import { TenantEntitySubscriber } from './lib/TenantModel/TypeORM/TenantEntitySubscriber';
+import { TenantHttpInterceptor } from './lib/TenantModel/TypeORM/TenantHttpInterceptor';
 declare const _default: {
     ContextNamespace: typeof ContextNamespace;
     MultiTenant: typeof MultiTenant;
     TenantMongooseModule: typeof TenantMongooseModule;
     TenantRequest: typeof TenantRequest;
     AlmatarBranding: typeof AlmatarBranding;
+    TenantRepository: typeof TenantRepository;
+    TenantEntitySubscriber: typeof TenantEntitySubscriber;
+    TenantHttpInterceptor: typeof TenantHttpInterceptor;
 };
 export = _default;

package/lib/index.js

@@ -1,13 +1,22 @@
 "use strict";
-var Storage_1 = require("./lib/Storage");
-var MultiTenant_1 = require("./lib/TenantModel/Mongoose/MultiTenant");
-var TenantMongooseModule_1 = require("./lib/TenantModel/NestMongoose/TenantMongooseModule");
-var TenantRequest_1 = require("./lib/request/TenantRequest");
-var AlmatarBranding_1 = require("./lib/AlmatarBranding");
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+const Storage_1 = __importDefault(require("./lib/Storage"));
+const MultiTenant_1 = __importDefault(require("./lib/TenantModel/Mongoose/MultiTenant"));
+const TenantMongooseModule_1 = __importDefault(require("./lib/TenantModel/NestMongoose/TenantMongooseModule"));
+const TenantRequest_1 = __importDefault(require("./lib/request/TenantRequest"));
+const AlmatarBranding_1 = __importDefault(require("./lib/AlmatarBranding"));
+const TenantRepository_1 = require("./lib/TenantModel/TypeORM/TenantRepository");
+const TenantEntitySubscriber_1 = require("./lib/TenantModel/TypeORM/TenantEntitySubscriber");
+const TenantHttpInterceptor_1 = require("./lib/TenantModel/TypeORM/TenantHttpInterceptor");
 module.exports = {
     ContextNamespace: Storage_1.default,
     MultiTenant: MultiTenant_1.default,
     TenantMongooseModule: TenantMongooseModule_1.default,
     TenantRequest: TenantRequest_1.default,
     AlmatarBranding: AlmatarBranding_1.default,
+    TenantRepository: TenantRepository_1.TenantRepository,
+    TenantEntitySubscriber: TenantEntitySubscriber_1.TenantEntitySubscriber,
+    TenantHttpInterceptor: TenantHttpInterceptor_1.TenantHttpInterceptor,
 };

package/lib/lib/AlmatarBranding.js

@@ -1,14 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var AlmatarBranding = /** @class */ (function () {
-    function AlmatarBranding() {
-    }
-    AlmatarBranding.setup = function (configs) {
+class AlmatarBranding {
+    static setup(configs) {
         this.employeeAuthService = configs.employeeAuthService;
         this.dictionaryService = configs.dictionaryService;
-    };
-    AlmatarBranding.employeeAuthService = '';
-    AlmatarBranding.dictionaryService = '';
-    return AlmatarBranding;
-}());
+    }
+}
 exports.default = AlmatarBranding;
+AlmatarBranding.employeeAuthService = '';
+AlmatarBranding.dictionaryService = '';

package/lib/lib/BrandIdentifier.d.ts

@@ -1,8 +1,8 @@
 export declare class BrandIdentifier {
     private readonly type;
     constructor(type: string);
-    getBrand(req: any): Promise<string | string[] | null | Error>;
-    getBrands(): Promise<string[] | null | Error>;
+    getBrand(req: any): Promise<string | string[] | null>;
+    getBrands(): Promise<string[] | null>;
     getDefaultBrand(): string;
     private error;
 }

package/lib/lib/BrandIdentifier.js

@@ -1,97 +1,82 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
+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 });
 exports.BrandIdentifier = void 0;
-var Boom = require("@hapi/boom");
-var BrandManager_1 = require("./BrandManager");
-var BrandIdentifier = /** @class */ (function () {
-    function BrandIdentifier(type) {
+const Boom = __importStar(require("@hapi/boom"));
+const BrandManager_1 = require("./BrandManager");
+class BrandIdentifier {
+    constructor(type) {
         this.type = type;
     }
-    BrandIdentifier.prototype.getBrand = function (req) {
-        return __awaiter(this, void 0, void 0, function () {
-            var brandManager, brand;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        brandManager = new BrandManager_1.BrandManager(this.type);
-                        if (!req.headers['x-brand']) return [3 /*break*/, 1];
-                        return [2 /*return*/, brandManager.getB2CBrand(req)];
-                    case 1:
-                        if (!(req.headers.authorization || req.headers['x-employee-brands'])) return [3 /*break*/, 3];
-                        return [4 /*yield*/, brandManager.getConsoleBrands(req)];
-                    case 2:
-                        brand = _a.sent();
-                        if (brand) {
-                            if (brand.length) {
-                                return [2 /*return*/, brand];
-                            }
-                            return [2 /*return*/, brandManager.getDefaultBrand()];
-                        }
-                        return [2 /*return*/, this.error('Unauthorized!')];
-                    case 3: return [2 /*return*/, brandManager.getDefaultBrand()];
+    async getBrand(req) {
+        const brandManager = new BrandManager_1.BrandManager(this.type);
+        if (req.headers['x-brand']) {
+            return brandManager.getB2CBrand(req);
+        }
+        else if (req.headers.authorization || req.headers['x-employee-brands']) {
+            const brand = await brandManager.getConsoleBrands(req);
+            if (brand) {
+                if (brand.length) {
+                    return brand;
                 }
-            });
-        });
-    };
-    BrandIdentifier.prototype.getBrands = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var brandManager, brands;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        brandManager = new BrandManager_1.BrandManager(this.type);
-                        return [4 /*yield*/, brandManager.getBrands()];
-                    case 1:
-                        brands = _a.sent();
-                        if (!brands) {
-                            this.error('error while fetching brands list from dictionary service');
-                        }
-                        return [2 /*return*/, brands];
+                return brandManager.getDefaultBrand();
+            }
+            // 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) {
+                    return tokenBrands;
                 }
-            });
-        });
-    };
-    BrandIdentifier.prototype.getDefaultBrand = function () {
-        var brandManager = new BrandManager_1.BrandManager(this.type);
+            }
+            // Return empty array instead of null when no brand found in token
+            // tslint:disable-next-line no-console
+            console.log('[BrandIdentifier] No brand found in token, returning empty array');
+            return [];
+        }
+        else {
+            return brandManager.getDefaultBrand();
+        }
+    }
+    async getBrands() {
+        const brandManager = new BrandManager_1.BrandManager(this.type);
+        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');
+                return null;
+            }
+            return brands;
+        }
+        catch (err) {
+            // tslint:disable-next-line no-console
+            console.log('[BrandIdentifier] Error fetching brands list, continuing without it:', err);
+            return null;
+        }
+    }
+    getDefaultBrand() {
+        const brandManager = new BrandManager_1.BrandManager(this.type);
         return brandManager.getDefaultBrand();
-    };
-    BrandIdentifier.prototype.error = function (message) {
+    }
+    error(message) {
         switch (this.type) {
             case 'hapi':
                 return Boom.unauthorized(message);
@@ -102,7 +87,6 @@ var BrandIdentifier = /** @class */ (function () {
             default:
                 return new Error(message);
         }
-    };
-    return BrandIdentifier;
-}());
+    }
+}
 exports.BrandIdentifier = BrandIdentifier;

package/lib/lib/BrandManager.d.ts

@@ -3,6 +3,11 @@ export declare class BrandManager {
     private readonly defaultBrand;
     constructor(type: string);
     getB2CBrand(req: any): string;
+    /**
+     * Extract brand from JWT token payload
+     * @param token - JWT token string (with or without Bearer prefix)
+     */
+    extractBrandFromToken(token: string): string[] | null;
     getConsoleBrands(req: any): Promise<string[] | null>;
     loadBrands(req: any): Promise<string[] | null>;
     /**

package/lib/lib/BrandManager.js

@@ -1,149 +1,200 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BrandManager = void 0;
-var AlmatarBranding_1 = require("./AlmatarBranding");
-var Storage_1 = require("./Storage");
-var PromiseRequest_1 = require("./request/PromiseRequest");
-var BrandManager = /** @class */ (function () {
-    function BrandManager(type) {
+const AlmatarBranding_1 = __importDefault(require("./AlmatarBranding"));
+const Storage_1 = __importDefault(require("./Storage"));
+const PromiseRequest_1 = require("./request/PromiseRequest");
+class BrandManager {
+    constructor(type) {
         this.defaultBrand = 'almatar';
         this.type = type;
     }
-    BrandManager.prototype.getB2CBrand = function (req) {
+    getB2CBrand(req) {
         return req.headers['x-brand'];
-    };
-    BrandManager.prototype.getConsoleBrands = function (req) {
-        return __awaiter(this, void 0, void 0, function () {
-            var reqBody, brands;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (req.headers['x-employee-brands']) {
-                            return [2 /*return*/, req.headers['x-employee-brands'].split(',')];
-                        }
-                        reqBody = req.payload ? req.payload : req.body;
-                        return [4 /*yield*/, this.loadBrands(req)];
-                    case 1:
-                        brands = _a.sent();
-                        if (reqBody && reqBody.brand) {
-                            Storage_1.default.setBrand(reqBody.brand);
-                        }
-                        return [2 /*return*/, brands];
+    }
+    /**
+     * Extract brand from JWT token payload
+     * @param token - JWT token string (with or without Bearer prefix)
+     */
+    extractBrandFromToken(token) {
+        try {
+            // Remove 'Bearer ' prefix if present
+            const cleanToken = token.replace(/^Bearer\s+/i, '');
+            // 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');
+                return null;
+            }
+            // Decode payload (base64url)
+            const payload = parts[1];
+            // Replace URL-safe base64 characters
+            const base64 = payload.replace(/-/g, '+').replace(/_/g, '/');
+            // Add padding if needed
+            const padded = base64 + '='.repeat((4 - (base64.length % 4)) % 4);
+            const decoded = Buffer.from(padded, 'base64').toString('utf-8');
+            const tokenPayload = JSON.parse(decoded);
+            // Extract brand from token payload
+            if (tokenPayload.brand) {
+                // Brand can be array or single string
+                let brands;
+                if (Array.isArray(tokenPayload.brand)) {
+                    brands = tokenPayload.brand;
+                }
+                else if (typeof tokenPayload.brand === 'string') {
+                    brands = [tokenPayload.brand];
                 }
-            });
-        });
-    };
-    BrandManager.prototype.loadBrands = function (req) {
-        return __awaiter(this, void 0, void 0, function () {
-            var reqBody, options, employeeBrands, brands, err_1;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        _a.trys.push([0, 2, , 3]);
-                        reqBody = req.payload ? req.payload : req.body;
-                        options = {
-                            url: AlmatarBranding_1.default.employeeAuthService + '/v1/user/brands',
-                            headers: {
-                                authorization: req.headers.authorization,
-                            },
-                        };
-                        return [4 /*yield*/, PromiseRequest_1.PromiseRequest.request(options)];
-                    case 1:
-                        employeeBrands = _a.sent();
-                        if (employeeBrands.status === 200) {
-                            brands = employeeBrands.data.map(function (brand) { return brand.slug; });
-                            if (reqBody && reqBody.brand) {
-                                return [2 /*return*/, brands.indexOf(reqBody.brand) > -1 ? brands : null];
-                            }
-                            return [2 /*return*/, brands];
+                else {
+                    // tslint:disable-next-line no-console
+                    console.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);
+                return brands;
+            }
+            // tslint:disable-next-line no-console
+            console.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);
+            return null;
+        }
+    }
+    async getConsoleBrands(req) {
+        // 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);
+            if (brands.length > 0) {
+                return brands;
+            }
+        }
+        // Priority 2: Try to extract brand from JWT token
+        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);
+                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)');
+        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 [2 /*return*/, null];
-                    case 2:
-                        err_1 = _a.sent();
-                        // tslint:disable-next-line no-console
-                        console.log(err_1);
-                        return [2 /*return*/, null];
-                    case 3: return [2 /*return*/];
+                        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
      */
-    BrandManager.prototype.getBrands = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var option, brandsResponse, brands, err_2;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        _a.trys.push([0, 2, , 3]);
-                        option = {
-                            url: AlmatarBranding_1.default.dictionaryService + 'brands',
-                        };
-                        return [4 /*yield*/, PromiseRequest_1.PromiseRequest.request(option)];
-                    case 1:
-                        brandsResponse = _a.sent();
-                        if (brandsResponse.status === 200) {
-                            Storage_1.default.setBrandsList(brandsResponse.data.list);
-                            brands = brandsResponse.data.list.map(function (brand) { return brand.key; });
-                            Storage_1.default.setBrands(brands);
-                            return [2 /*return*/, brands];
+    async getBrands() {
+        var _a;
+        try {
+            const option = {
+                url: AlmatarBranding_1.default.dictionaryService + 'brands',
+                method: 'GET',
+            };
+            const brandsResponse = await PromiseRequest_1.PromiseRequest.request(option);
+            // Check if response is valid and has the expected structure
+            if (brandsResponse && brandsResponse.status === 200 && brandsResponse.data) {
+                // Handle different possible response structures
+                const brandsList = brandsResponse.data.list || ((_a = brandsResponse.data.data) === null || _a === void 0 ? void 0 : _a.list) || brandsResponse.data;
+                if (Array.isArray(brandsList) && brandsList.length > 0) {
+                    Storage_1.default.setBrandsList(brandsList);
+                    const brands = brandsList
+                        .map((brand) => {
+                        if (typeof brand === 'string') {
+                            return brand;
                         }
-                        return [2 /*return*/, null];
-                    case 2:
-                        err_2 = _a.sent();
-                        // tslint:disable-next-line:no-console
-                        console.log(err_2);
-                        return [2 /*return*/, null];
-                    case 3: return [2 /*return*/];
+                        return (brand === null || brand === void 0 ? void 0 : brand.key) || '';
+                    })
+                        .filter((b) => !!b);
+                    Storage_1.default.setBrands(brands);
+                    // tslint:disable-next-line:no-console
+                    console.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);
                 }
-            });
-        });
-    };
+            }
+            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);
+            }
+            return null;
+        }
+        catch (err) {
+            // tslint:disable-next-line:no-console
+            console.log('[BrandManager] Error getting brands from dictionary service:', err);
+            return null;
+        }
+    }
     /**
      * get default brand
      */
-    BrandManager.prototype.getDefaultBrand = function () {
+    getDefaultBrand() {
         return this.defaultBrand;
-    };
-    return BrandManager;
-}());
+    }
+}
 exports.BrandManager = BrandManager;

package/lib/lib/Models/BrandModel.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BrandModel = void 0;
-var BrandModel = /** @class */ (function () {
-    function BrandModel(init) {
+class BrandModel {
+    constructor(init) {
         Object.assign(this, init);
     }
-    return BrandModel;
-}());
+}
 exports.BrandModel = BrandModel;

package/lib/lib/Models/EmployeeBrandModel.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EmployeeBrandModel = void 0;
-var EmployeeBrandModel = /** @class */ (function () {
-    function EmployeeBrandModel(init) {
+class EmployeeBrandModel {
+    constructor(init) {
         Object.assign(this, init);
     }
-    return EmployeeBrandModel;
-}());
+}
 exports.EmployeeBrandModel = EmployeeBrandModel;