@almatar/branding 0.1.1 → 0.1.3

package/lib/lib/BrandIdentifier.js

@@ -36,6 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.BrandIdentifier = void 0;
 var Boom = require("@hapi/boom");
 var BrandManager_1 = require("./BrandManager");
 var BrandIdentifier = /** @class */ (function () {

package/lib/lib/BrandManager.js

@@ -36,6 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 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");

package/lib/lib/Models/EmployeeBrandModel.js

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

package/lib/lib/TenantModel/MongooseModel.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.MongooseModel = void 0;
 var Storage_1 = require("../Storage");
 var MongooseModel = /** @class */ (function () {
     function MongooseModel(mongoose) {

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

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

package/lib/lib/TenantModel/NestMongoose/mongoose.providers.js

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var mongoose_utils_1 = require("../../../../node_modules/@nestjs/mongoose/dist/common/mongoose.utils");
+exports.createMongooseProviders = void 0;
 var MongooseModel_1 = require("../MongooseModel");
 function createMongooseProviders(connectionName, models) {
     if (models === void 0) { models = []; }
     var providers = (models || []).map(function (model) { return ({
-        provide: mongoose_utils_1.getModelToken(model.name),
+        provide: model.name + "Model",
         useFactory: function (connection) {
             var mongooseModel = new MongooseModel_1.MongooseModel(connection);
             return mongooseModel.createModel(model.name, model.schema, model.collection, {});
         },
-        inject: [mongoose_utils_1.getConnectionToken(connectionName)],
+        inject: [connectionName + "Connection"],
     }); });
     return providers;
 }

package/lib/lib/request/PromiseRequest.js

@@ -36,6 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.PromiseRequest = void 0;
 var request = require("request");
 var PromiseRequest = /** @class */ (function () {
     function PromiseRequest() {

package/lib/lib/request/TenantRequest.d.ts

@@ -1,4 +1,4 @@
 declare class TenantRequest {
-    static request(options: any, callback: any): void;
+    static request(options: any, callback: any): Promise<any>;
 }
 export default TenantRequest;

package/lib/lib/request/TenantRequest.js

@@ -1,19 +1,72 @@
 "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 (_) 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 };
+    }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 var Storage_1 = require("../Storage");
-var request = require("request");
+var node_fetch_1 = require("node-fetch");
 var TenantRequest = /** @class */ (function () {
     function TenantRequest() {
     }
     TenantRequest.request = function (options, callback) {
-        var brand = Storage_1.default.getBrand();
-        var employeeBrands = Storage_1.default.getEmployeeBrands();
-        if (!options.headers) {
-            options.headers = {};
-        }
-        options.headers['x-brand'] = brand;
-        options.headers['x-employee-brands'] = (employeeBrands) ? employeeBrands.join(',') : null;
-        request(options, callback);
+        return __awaiter(this, void 0, void 0, function () {
+            var brand, employeeBrands;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        brand = Storage_1.default.getBrand();
+                        employeeBrands = Storage_1.default.getEmployeeBrands();
+                        if (!options.reqObject.headers) {
+                            options.reqObject.headers = {};
+                        }
+                        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;
+                        return [4 /*yield*/, node_fetch_1.default(options.url, options.reqObject)
+                                .then(function (res) {
+                                return res.json();
+                            })
+                                .catch(function (e) {
+                                return null;
+                            })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
     };
     return TenantRequest;
 }());

package/package.json

@@ -1,54 +1,56 @@
-{
-  "name": "@almatar/branding",
-  "version": "0.1.1",
-  "description": "",
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
-  "files": [
-    "lib/**/*"
-  ],
-  "scripts": {
-    "build": "tsc",
-    "format": "prettier --write \"src/**/*.ts\" \"src/**/*.js\"",
-    "lint": "tslint -p tsconfig.json",
-    "test": "jest --config jestconfig.json",
-    "prepare": "npm run build",
-    "prepublishOnly": "npm test && npm run lint",
-    "preversion": "npm run lint",
-    "version": "npm run format && git add -A && git commit -m \"Setup Package\"",
-    "postversion": "git push && git push --tags"
-  },
-  "pre-commit": [
-    "lint"
-  ],
-  "dependencies": {
-    "@hapi/boom": "^8.0.1",
-    "@nestjs/common": "^6.8.2",
-    "@nestjs/core": "^6.8.2",
-    "@nestjs/mongoose": "^6.1.2",
-    "@types/mongoose": "^5.5.19",
-    "@types/request": "^2.48.3",
-    "cls-hooked": "^4.2.2",
-    "mongoose": "^5.7.3",
-    "reflect-metadata": "^0.1.13",
-    "request": "^2.88.0",
-    "rxjs": "^6.5.3"
-  },
-  "author": "",
-  "license": "ISC",
-  "devDependencies": {
-    "@babel/core": "^7.5.5",
-    "@babel/preset-env": "^7.5.5",
-    "@babel/register": "^7.5.5",
-    "@types/jest": "^24.0.18",
-    "@types/node": "^12.7.5",
-    "jest": "^24.9.0",
-    "pre-commit": "^1.2.2",
-    "npm-watch": "^0.6.0",
-    "prettier": "^1.18.2",
-    "ts-jest": "^24.1.0",
-    "tslint": "^5.20.0",
-    "tslint-config-prettier": "^1.18.0",
-    "typescript": "^3.6.3"
-  }
-}
+{
+  "name": "@almatar/branding",
+  "version": "0.1.3",
+  "description": "",
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
+  "files": [
+    "lib/**/*"
+  ],
+  "scripts": {
+    "build": "tsc",
+    "format": "prettier --write \"src/**/*.ts\" \"src/**/*.js\"",
+    "lint": "tslint -p tsconfig.json",
+    "test": "jest --config jestconfig.json",
+    "prepare": "npm run build",
+    "prepublishOnly": "npm test && npm run lint",
+    "preversion": "npm run lint",
+    "version": "npm run format && git add -A && git commit -m \"Setup Package\"",
+    "postversion": "git push && git push --tags"
+  },
+  "pre-commit": [
+    "lint"
+  ],
+  "dependencies": {
+    "@hapi/boom": "^8.0.1",
+    "@nestjs/common": "^6.8.2",
+    "@nestjs/core": "^6.8.2",
+    "@nestjs/mongoose": "^6.1.2",
+    "@types/mongoose": "^5.5.19",
+    "@types/request": "^2.48.3",
+    "cls-hooked": "^4.2.2",
+    "mongoose": "^5.7.3",
+    "node-fetch": "^2.6.1",
+    "reflect-metadata": "^0.1.13",
+    "request": "^2.88.0",
+    "rxjs": "^6.5.3"
+  },
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@babel/core": "^7.5.5",
+    "@babel/preset-env": "^7.5.5",
+    "@babel/register": "^7.5.5",
+    "@types/jest": "^24.0.18",
+    "@types/node": "^12.7.5",
+    "@types/node-fetch": "^2.5.10",
+    "jest": "^24.9.0",
+    "npm-watch": "^0.6.0",
+    "pre-commit": "^1.2.2",
+    "prettier": "^1.18.2",
+    "ts-jest": "^24.1.0",
+    "tslint": "^5.20.0",
+    "tslint-config-prettier": "^1.18.0",
+    "typescript": "^3.6.3"
+  }
+}

package/readme.md

@@ -4,6 +4,17 @@ this package make microservice able to handle different brands
 
 ## How It Works
 
+## Setup Branding Package
+
+```
+import { AlmatarBranding } from '@almatar/branding';
+
+AlmatarBranding.setup({
+  employeeAuthService: config.EMPLOYEE_AUTH_SERVICE
+});
+
+```
+
 ## Nest.js
 
 ### save brand on any request
@@ -133,14 +144,3 @@ TenantRequest.request(reqOptions, (error, response, body) => {
     console.log(body);
 });
 ```
-
-### Setup Branding Package
-
-```
-import { AlmatarBranding } from '@almatar/branding';
-
-AlmatarBranding.setup({
-  employeeAuthService: config.EMPLOYEE_AUTH_SERVICE
-});
-
-```