exodus-framework 2.0.66 → 2.0.68

package/lib/contracts/tenant.d.ts

@@ -0,0 +1 @@
+//# sourceMappingURL=tenant.d.ts.map

package/lib/contracts/tenant.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tenant.d.ts","sourceRoot":"","sources":["../../src/contracts/tenant.ts"],"names":[],"mappings":""}

package/lib/contracts/tenant.js

@@ -0,0 +1 @@
+"use strict";

package/lib/middlewares/access.d.ts

@@ -3,7 +3,7 @@ import HttpController from '../app/controller';
 import { TAccountType } from '../contracts';
 declare class AccessMiddleware extends HttpController {
     accessLevel: (level: TAccountType[]) => RequestHandler;
-    getConnection: RequestHandler;
+    getTenant: RequestHandler;
 }
 export default AccessMiddleware;
 //# sourceMappingURL=access.d.ts.map

package/lib/middlewares/access.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"access.d.ts","sourceRoot":"","sources":["../../src/middlewares/access.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,cAAc,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAK5C,cAAM,gBAAiB,SAAQ,cAAc;IAC3C,WAAW,UAAW,YAAY,EAAE,KAAG,cAAc,CAWnD;IAEF,aAAa,EAAE,cAAc,CAqB3B;CACH;AAED,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"access.d.ts","sourceRoot":"","sources":["../../src/middlewares/access.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,cAAc,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAK5C,cAAM,gBAAiB,SAAQ,cAAc;IAC3C,WAAW,UAAW,YAAY,EAAE,KAAG,cAAc,CAWnD;IAEF,SAAS,EAAE,cAAc,CAiBvB;CACH;AAED,eAAe,gBAAgB,CAAC"}

package/lib/middlewares/access.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _controller = _interopRequireDefault(require("../app/controller"));
 var _http = require("../contracts/http");
-var _services = require("../services");
 var _error = require("../services/error");
+var _app = require("../app");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class AccessMiddleware extends _controller.default {
   accessLevel = level => {
@@ -18,20 +18,17 @@ class AccessMiddleware extends _controller.default {
       next();
     };
   };
-  getConnection = async (req, res, next) => {
+  getTenant = async (req, res, next) => {
     const account = req.auth?.account;
-    const envToken = req.header('X-Exodus-Environment-Token');
-    const connUuid = req.header('X-Exodus-Connection');
+    const tenantId = req.header('X-Exodus-Tenant-ID');
     if (account && account.type != 'ADMINISTRATOR') {
-      if (!envToken || !connUuid) {
+      if (!tenantId) {
         throw new _error.ApplicationHttpException('Informações do ambiente incompletas', _http.EHttpResponseCode.incompleteRequest);
       }
-      const connection = await _services.SequelizeService.singleton().getDB(connUuid, envToken);
-      if (!connection) {
-        throw new _error.ApplicationHttpException('Não foi possível obter a conexão deste ambiente');
-      }
-      req.auth.connection = connection;
     }
+    req.tenant = {
+      id: tenantId || `root@${_app.Core.settings.getDatabase().service}`
+    };
     next();
   };
 }

package/lib/services/sequelize.d.ts

@@ -14,12 +14,16 @@ declare class SequelizeService extends Service implements IService {
     getMasterConnection(): Sequelize;
     createDB(connection_uuid: string, name: string): Promise<boolean>;
     deleteDB(connection_uuid: string, name: string): Promise<boolean>;
-    getDB(uuid: string, name: string): Promise<Sequelize>;
-    initDB(uuid: string, name: string): Promise<unknown>;
+    getDB(tenantId: string): Promise<Sequelize>;
+    initDB(tenantId: string): Promise<unknown>;
     registerModels(models: ModelStatic<any>[]): void;
     getModel<M extends typeof Model<any, any>>(model: typeof Model<any, any> & {
         initialize: (connection: Sequelize) => M;
-    }, conn_uuid: string, envToken: string): Promise<M>;
+    }, tenantId: string): Promise<M>;
+    parseDataInfoByTenantId(tenant: string): {
+        envToken: string;
+        con_uuid: string;
+    };
 }
 export default SequelizeService;
 //# sourceMappingURL=sequelize.d.ts.map

package/lib/services/sequelize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sequelize.d.ts","sourceRoot":"","sources":["../../src/services/sequelize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAE1D,OAAO,OAAO,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAahD,cAAM,gBAAiB,SAAQ,OAAQ,YAAW,QAAQ;IACxD,SAAS,EAAE,SAAS,CAAC;IACrB,QAAQ,EAAE,SAAS,CAAC;IACpB,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;IAC3B,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACpC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;;IAMjD,IAAI;IAMJ,mBAAmB;IA4BzB,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,SAAI;IAerC,mBAAmB;IAGb,QAAQ,CAAC,eAAe,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IA6C9C,QAAQ,CAAC,eAAe,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAwC9C,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAKhC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IA8CvC,cAAc,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE;IAInC,QAAQ,CAAC,CAAC,SAAS,OAAO,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,EAC7C,KAAK,EAAE,OAAO,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG;QAAE,UAAU,EAAE,CAAC,UAAU,EAAE,SAAS,KAAK,CAAC,CAAA;KAAE,EAC5E,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM;CAiBnB;AAED,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"sequelize.d.ts","sourceRoot":"","sources":["../../src/services/sequelize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAE1D,OAAO,OAAO,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAahD,cAAM,gBAAiB,SAAQ,OAAQ,YAAW,QAAQ;IACxD,SAAS,EAAE,SAAS,CAAC;IACrB,QAAQ,EAAE,SAAS,CAAC;IACpB,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;IAC3B,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACpC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;;IAMjD,IAAI;IAMJ,mBAAmB;IA4BzB,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,SAAI;IAerC,mBAAmB;IAGb,QAAQ,CAAC,eAAe,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IA6C9C,QAAQ,CAAC,eAAe,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAwC9C,KAAK,CAAC,QAAQ,EAAE,MAAM;IAYtB,MAAM,CAAC,QAAQ,EAAE,MAAM;IA+C7B,cAAc,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE;IAInC,QAAQ,CAAC,CAAC,SAAS,OAAO,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,EAC7C,KAAK,EAAE,OAAO,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG;QAAE,UAAU,EAAE,CAAC,UAAU,EAAE,SAAS,KAAK,CAAC,CAAA;KAAE,EAC5E,QAAQ,EAAE,MAAM;IAmBlB,uBAAuB,CAAC,MAAM,EAAE,MAAM;;;;CAMvC;AAED,eAAe,gBAAgB,CAAC"}

package/lib/services/sequelize.js

@@ -146,20 +146,33 @@ class SequelizeService extends _service.default {
       });
     });
   }
-  async getDB(uuid, name) {
-    const dbQueryName = `${_app.Core.settings.getDatabase().service.database}_${name}`;
-    const queryId = `${uuid}@${dbQueryName}`;
+  async getDB(tenantId) {
+    const {
+      con_uuid,
+      envToken
+    } = this.parseDataInfoByTenantId(tenantId);
+    if (con_uuid == _app.Core.settings.getDatabase().service.database) {
+      return _database.serviceDB;
+    } else if (con_uuid == _app.Core.settings.getDatabase().master.database) {
+      return _database.masterDB;
+    }
+    const dbQueryName = `${_app.Core.settings.getDatabase().service.database}_${envToken}`;
+    const queryId = `${con_uuid}@${dbQueryName}`;
     return this.connections.get(queryId);
   }
-  async initDB(uuid, name) {
-    const dbQueryName = `${_app.Core.settings.getDatabase().service.database}_${name}`;
-    const queryId = `${uuid}@${dbQueryName}`;
+  async initDB(tenantId) {
+    const {
+      con_uuid,
+      envToken
+    } = this.parseDataInfoByTenantId(tenantId);
+    const dbQueryName = `${_app.Core.settings.getDatabase().service.database}_${envToken}`;
+    const queryId = `${con_uuid}@${dbQueryName}`;
     if (this.connections.get(queryId)) {
       return false;
     }
-    const connData = await _Connection.Connection.findByPk(uuid);
+    const connData = await _Connection.Connection.findByPk(con_uuid);
     if (!connData) {
-      this.log('Connection data not found: ' + uuid);
+      this.log('Connection data not found: ' + con_uuid);
       return false;
     }
     const conn = new _sequelize.Sequelize({
@@ -183,22 +196,26 @@ class SequelizeService extends _service.default {
         this.connections.set(queryId, conn);
         resolve(true);
       }).catch(reason => {
-        this.log(`error trying to connect: ${dbQueryName}, UUID: ${uuid}`);
+        this.log(`error trying to connect: ${dbQueryName}, UUID: ${con_uuid}`);
         reject(reason);
-        new _error.ApplicationException(`error trying to connect: ${dbQueryName}, UUID: ${uuid}`, reason);
+        new _error.ApplicationException(`error trying to connect: ${dbQueryName}, UUID: ${con_uuid}`, reason);
       });
     });
   }
   registerModels(models) {
     this.models = models;
   }
-  async getModel(model, conn_uuid, envToken) {
-    const connection = await this.getDB(conn_uuid, envToken);
-    const query = `${envToken}@${conn_uuid}`;
+  async getModel(model, tenantId) {
+    const {
+      con_uuid,
+      envToken
+    } = this.parseDataInfoByTenantId(tenantId);
+    const query = `${envToken}@${con_uuid}`;
     const cache = this.initializedModels.get(query);
     if (cache) {
       return cache;
     }
+    const connection = await this.getDB(tenantId);
     if (connection) {
       const m = model.initialize(connection);
       this.initializedModels.set(query, m);
@@ -206,5 +223,14 @@ class SequelizeService extends _service.default {
     }
     return null;
   }
+  parseDataInfoByTenantId(tenant) {
+    const e = tenant.split('@');
+    const envToken = e[0];
+    const con_uuid = e[1];
+    return {
+      envToken,
+      con_uuid
+    };
+  }
 }
 var _default = exports.default = SequelizeService;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "exodus-framework",
-  "version": "2.0.66",
+  "version": "2.0.68",
   "description": "Exodus Framework",
   "author": "jhownpaixao",
   "license": "ISC",