@almatar/branding 0.1.5 → 0.1.6

package/lib/index.d.ts

@@ -2,7 +2,7 @@ import ContextNamespace from './lib/Storage';
 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 AlmatarBranding from './lib/AlmatarBranding';
 declare const _default: {
     ContextNamespace: typeof ContextNamespace;
     MultiTenant: typeof MultiTenant;

package/lib/index.js

@@ -9,5 +9,5 @@ module.exports = {
     MultiTenant: MultiTenant_1.default,
     TenantMongooseModule: TenantMongooseModule_1.default,
     TenantRequest: TenantRequest_1.default,
-    AlmatarBranding: AlmatarBranding_1.default
+    AlmatarBranding: AlmatarBranding_1.default,
 };

package/lib/lib/BrandManager.js

@@ -57,7 +57,7 @@ var BrandManager = /** @class */ (function () {
                         if (req.headers['x-employee-brands']) {
                             return [2 /*return*/, req.headers['x-employee-brands'].split(',')];
                         }
-                        reqBody = (req.payload) ? req.payload : req.body;
+                        reqBody = req.payload ? req.payload : req.body;
                         return [4 /*yield*/, this.loadBrands(req)];
                     case 1:
                         brands = _a.sent();
@@ -76,12 +76,12 @@ var BrandManager = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
-                        reqBody = (req.payload) ? req.payload : req.body;
+                        reqBody = req.payload ? req.payload : req.body;
                         options = {
                             url: AlmatarBranding_1.default.employeeAuthService + '/v1/user/brands',
                             headers: {
-                                authorization: req.headers.authorization
-                            }
+                                authorization: req.headers.authorization,
+                            },
                         };
                         return [4 /*yield*/, PromiseRequest_1.PromiseRequest.request(options)];
                     case 1:
@@ -89,7 +89,7 @@ var BrandManager = /** @class */ (function () {
                         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.indexOf(reqBody.brand) > -1 ? brands : null];
                             }
                             return [2 /*return*/, brands];
                         }
@@ -122,7 +122,7 @@ var BrandManager = /** @class */ (function () {
                     case 1:
                         brandsResponse = _a.sent();
                         if (brandsResponse.status === 200) {
-                            brands = brandsResponse.data.map.list.map(function (brand) { return brand.key; });
+                            brands = brandsResponse.data.list.map(function (brand) { return brand.key; });
                             Storage_1.default.setBrands(brands);
                             return [2 /*return*/, brands];
                         }

package/lib/lib/Models/BrandModel.d.ts

@@ -0,0 +1,8 @@
+export declare class BrandModel {
+    id: number;
+    key: string;
+    name: string;
+    description: string;
+    isActive: boolean;
+    constructor(init?: Partial<BrandModel>);
+}

package/lib/lib/Models/BrandModel.js

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

package/lib/lib/Storage.d.ts

@@ -7,7 +7,8 @@ export default class ContextNamespace {
     static getBrand(): any;
     static getEmployeeBrands(): any;
     static getNamespace(): any;
-    static setBrands(brands: any): any;
-    static getBrands(): Promise<any>;
-    static getDefaultBrand(): any;
+    static setBrands(brands: string[]): any;
+    static getBrands(): string[] | null;
+    static getDefaultBrand(): string | null;
+    static isValidBrand(brand: string): boolean;
 }

package/lib/lib/Storage.js

@@ -45,11 +45,23 @@ var ContextNamespace = /** @class */ (function () {
     }
     /* Express Start */
     ContextNamespace.bindENamespace = function (req, res, next) {
+        var _this = this;
         ns.bindEmitter(req);
         ns.bindEmitter(res);
-        ns.run(function () {
-            next();
-        });
+        ns.run(function () { return __awaiter(_this, void 0, void 0, function () {
+            var brandIdentifier;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        brandIdentifier = new BrandIdentifier_1.BrandIdentifier('hapi');
+                        return [4 /*yield*/, brandIdentifier.getBrands()];
+                    case 1:
+                        _a.sent();
+                        next();
+                        return [2 /*return*/];
+                }
+            });
+        }); });
     };
     ContextNamespace.setEBrand = function (req, res, next) {
         return __awaiter(this, void 0, void 0, function () {
@@ -80,11 +92,23 @@ var ContextNamespace = /** @class */ (function () {
     /* Express End */
     /* Hapi Start */
     ContextNamespace.bindHNamespace = function (req, reply) {
+        var _this = this;
         ns.bindEmitter(req.raw.req);
         ns.bindEmitter(req.raw.res);
-        ns.run(function () {
-            reply();
-        });
+        ns.run(function () { return __awaiter(_this, void 0, void 0, function () {
+            var brandIdentifier;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        brandIdentifier = new BrandIdentifier_1.BrandIdentifier('hapi');
+                        return [4 /*yield*/, brandIdentifier.getBrands()];
+                    case 1:
+                        _a.sent();
+                        reply();
+                        return [2 /*return*/];
+                }
+            });
+        }); });
     };
     ContextNamespace.setHBrand = function (req, reply) {
         return __awaiter(this, void 0, void 0, function () {
@@ -134,27 +158,15 @@ var ContextNamespace = /** @class */ (function () {
         return ns.set('brands', brands);
     };
     ContextNamespace.getBrands = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var brandIdentifier;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!!ns.get('brands')) return [3 /*break*/, 2];
-                        brandIdentifier = new BrandIdentifier_1.BrandIdentifier('hapi');
-                        return [4 /*yield*/, brandIdentifier.getBrands()];
-                    case 1:
-                        _a.sent();
-                        _a.label = 2;
-                    case 2: return [2 /*return*/, ns.get('brands')];
-                }
-            });
-        });
+        return ns.get('brands');
     };
     ContextNamespace.getDefaultBrand = function () {
         var brandIdentifier = new BrandIdentifier_1.BrandIdentifier('hapi');
-        var defaultBrand = brandIdentifier.getDefaultBrand();
-        ns.set('defaultBrand', defaultBrand);
-        return ns.get('defaultBrand');
+        return brandIdentifier.getDefaultBrand();
+    };
+    ContextNamespace.isValidBrand = function (brand) {
+        var _a;
+        return (_a = ns.get('brands')) === null || _a === void 0 ? void 0 : _a.includes(brand);
     };
     return ContextNamespace;
 }());

package/lib/lib/TenantModel/MongooseModel.js

@@ -9,21 +9,25 @@ var MongooseModel = /** @class */ (function () {
     MongooseModel.prototype.createModel = function (name, schema, options, existingModels, skipBrand) {
         var brands = [];
         if (!skipBrand) {
-            brands = (Storage_1.default.getEmployeeBrands()) ? Storage_1.default.getEmployeeBrands() : [Storage_1.default.getBrand()];
+            brands = Storage_1.default.getEmployeeBrands()
+                ? Storage_1.default.getEmployeeBrands()
+                : [Storage_1.default.getBrand()];
             schema.add({ brand: String });
             this.addPreReadQueries(schema);
             this.addPreAggregateQueries(schema);
             this.addPreSaveQueries(schema);
             this.addPreInsertManyQueries(schema);
         }
-        var modelName = (skipBrand || !Array.isArray(brands)) ? name : name + "-" + brands.join("-");
+        var modelName = skipBrand || !Array.isArray(brands) ? name : name + "-" + brands.join('-');
         if (!existingModels[modelName]) {
             existingModels[modelName] = this.mongoose.model(modelName, schema, options);
         }
         return existingModels[modelName];
     };
     MongooseModel.prototype.addPreCondition = function (next) {
-        var brands = (Storage_1.default.getEmployeeBrands()) ? Storage_1.default.getEmployeeBrands() : [Storage_1.default.getBrand()];
+        var brands = Storage_1.default.getEmployeeBrands()
+            ? Storage_1.default.getEmployeeBrands()
+            : [Storage_1.default.getBrand()];
         if (Array.isArray(brands)) {
             // @ts-ignore
             this.where({ brand: { $in: brands } });
@@ -45,7 +49,9 @@ var MongooseModel = /** @class */ (function () {
         schema.pre('remove', this.addPreCondition);
     };
     MongooseModel.prototype.addPreAggregate = function (next) {
-        var brands = (Storage_1.default.getEmployeeBrands()) ? Storage_1.default.getEmployeeBrands() : [Storage_1.default.getBrand()];
+        var brands = Storage_1.default.getEmployeeBrands()
+            ? Storage_1.default.getEmployeeBrands()
+            : [Storage_1.default.getBrand()];
         if (Array.isArray(brands)) {
             // @ts-ignore
             this.pipeline().unshift({ $match: { brand: { $in: brands } } });

package/lib/lib/TenantModel/NestMongoose/TenantMongooseModule.js

@@ -29,7 +29,7 @@ var TenantMongooseModule = /** @class */ (function (_super) {
     }
     TenantMongooseModule.forFeature = function (models, connectionName) {
         if (models === void 0) { models = []; }
-        connectionName = (connectionName) ? connectionName + "Connection" : 'MongooseConnectionName';
+        connectionName = connectionName ? connectionName + "Connection" : 'MongooseConnectionName';
         var modelProviders = mongoose_providers_1.createMongooseProviders(connectionName, models);
         return {
             module: mongoose_1.MongooseModule,

package/lib/lib/request/PromiseRequest.js

@@ -49,8 +49,7 @@ var PromiseRequest = /** @class */ (function () {
                             if (err) {
                                 reject(err);
                             }
-                            ;
-                            body = (body) ? JSON.parse(body) : null;
+                            body = body ? JSON.parse(body) : null;
                             resolve(body);
                         });
                     })];

package/lib/lib/request/TenantRequest.js

@@ -55,7 +55,7 @@ var TenantRequest = /** @class */ (function () {
                         options.reqObject.headers['Content-Type'] = 'application/json';
                         options.reqObject.headers['x-brand'] = brand;
                         // tslint:disable-next-line:no-unused-expression
-                        (employeeBrands) ? options.reqObject.headers['x-employee-brands'] = employeeBrands.join(',') : null;
+                        employeeBrands ? (options.reqObject.headers['x-employee-brands'] = employeeBrands.join(',')) : null;
                         return [4 /*yield*/, node_fetch_1.default(options.url, options.reqObject)
                                 .then(function (res) {
                                 return res.json();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@almatar/branding",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -10,7 +10,6 @@
   "scripts": {
     "build": "tsc",
     "format": "prettier --write \"src/**/*.ts\" \"src/**/*.js\"",
-    "format": "prettier --write \"src/**/*.ts\" \"src/**/*.js\"",
     "lint": "tslint -p tsconfig.json",
     "test": "jest --config jestconfig.json",
     "prepare": "npm run build",