exodus-framework 2.0.804 → 2.0.806

package/lib/app/controller.js

@@ -70,10 +70,10 @@ class SocketRequest extends _core.default {
     super();
     this.socket = socket;
     this.event = event;
-    this.auth = this.socket.request.auth;
-    this.tenant = this.socket.request.tenant;
-    this.requestor = this.socket.request.requestor;
-    this.isApplication = this.socket.request.isApplication;
+    this.auth = this.socket.auth;
+    this.tenant = this.socket.tenant;
+    this.requestor = this.socket.requestor;
+    this.isApplication = this.socket.isApplication;
   }
   send(event, ...data) {
     this.socket.emit(event, ...data);

package/lib/middlewares/authentication.d.ts

@@ -1,11 +1,11 @@
 import { RequestHandler } from 'express';
+import { Socket } from 'socket.io';
+import { ExtendedError } from 'socket.io/dist/namespace';
 import HttpController, { SocketController } from '../app/controller';
-import { IncomingMessage } from 'http';
-import { ServerResponse } from 'http';
 export declare class AuthenticationMiddleware extends HttpController {
     decryptToken(required?: boolean): RequestHandler;
 }
 export declare class SocketAuthenticationMiddleware extends SocketController {
-    decryptToken: (req: IncomingMessage, res: ServerResponse, next: (err?: any) => void) => Promise<void>;
+    decryptToken: (socket: Socket, next: (err?: ExtendedError) => void) => Promise<void>;
 }
 //# sourceMappingURL=authentication.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"authentication.d.ts","sourceRoot":"","sources":["../../src/middlewares/authentication.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAGzC,OAAO,cAAc,EAAE,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAErE,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAMtC,qBAAa,wBAAyB,SAAQ,cAAc;IAC1D,YAAY,CAAC,QAAQ,GAAE,OAAc,GAAG,cAAc;CAUvD;AAED,qBAAa,8BAA+B,SAAQ,gBAAgB;IAClE,YAAY,QAAe,eAAe,OAAO,cAAc,QAAQ,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,IAAI,mBAgGxF;CACH"}
+{"version":3,"file":"authentication.d.ts","sourceRoot":"","sources":["../../src/middlewares/authentication.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEzC,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,OAAO,cAAc,EAAE,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAMrE,qBAAa,wBAAyB,SAAQ,cAAc;IAC1D,YAAY,CAAC,QAAQ,GAAE,OAAc,GAAG,cAAc;CAUvD;AAED,qBAAa,8BAA+B,SAAQ,gBAAgB;IAClE,YAAY,WAAkB,MAAM,QAAQ,CAAC,GAAG,CAAC,EAAE,aAAa,KAAK,IAAI,mBAoFvE;CACH"}

package/lib/middlewares/authentication.js

@@ -4,12 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.SocketAuthenticationMiddleware = exports.AuthenticationMiddleware = void 0;
+var _dateFns = require("date-fns");
 var _expressJwt = require("express-jwt");
 var _app = require("../app");
 var _controller = _interopRequireWildcard(require("../app/controller"));
-var _security = _interopRequireDefault(require("../services/security"));
 var _models = require("../models");
-var _dateFns = require("date-fns");
+var _security = _interopRequireDefault(require("../services/security"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -27,27 +27,22 @@ class AuthenticationMiddleware extends _controller.default {
 }
 exports.AuthenticationMiddleware = AuthenticationMiddleware;
 class SocketAuthenticationMiddleware extends _controller.SocketController {
-  decryptToken = async (req, res, next) => {
-    const token = req.headers.authorization ? req.headers.authorization.replace('Bearer ', '') : '';
-    const tenantId = req.headers['X-Exodus-Tenant-ID'];
-    const applicationId = req.headers['X-Exodus-Application-ID'];
+  decryptToken = async (socket, next) => {
+    const token = socket.handshake.auth['bearer'] ? socket.handshake.auth['bearer'].replace('Bearer ', '') : '';
+    const tenantId = socket.handshake.auth['X-Exodus-Tenant-ID'];
+    const applicationId = socket.handshake.auth['X-Exodus-Application-ID'];
     let isApplication = false;
     let envUuid = '';
     try {
       if (!token) {
-        const error = new Error('Token ausente');
-        res.statusCode = 401;
-        return res.writeContinue();
-        // return next(error);
+        return next(new Error('Token ausente'));
       }
       const data = await _security.default.getService().verifySignature(token, _security.default.singleton().getServicePublicKey());
       if (!data) {
-        const error = new Error('Token inválido');
-        res.statusCode = 401;
-        return res.writeContinue();
+        return next(new Error('Token inválido'));
       }
       const account = data['account'];
-      req.auth = {
+      socket.auth = {
         account: account,
         exp: data.exp || 0,
         iat: 0,
@@ -70,24 +65,16 @@ class SocketAuthenticationMiddleware extends _controller.SocketController {
           }
         });
         if (!application) {
-          const error = new Error('Token de aplicação inválido');
-          res.statusCode = 401;
-          return res.writeContinue();
+          return next(new Error('Token de aplicação inválido'));
         } else if (!application.active) {
-          const error = new Error('Token de aplicação desativado');
-          res.statusCode = 403;
-          return res.writeContinue();
+          return next(new Error('Token de aplicação desativado'));
         } else if ((0, _dateFns.isBefore)(application.expiresAt, new Date())) {
-          const error = new Error('Token de aplicação expirado');
-          res.statusCode = 403;
-          return res.writeContinue();
+          return next(new Error('Token de aplicação expirado'));
         } else {
           //valido
           const data = await _security.default.singleton().verifySignature(applicationId, _security.default.singleton().getServicePublicKey());
           if (!data) {
-            const error = new Error('Token de aplicação sem autênticidade');
-            res.statusCode = 401;
-            return res.writeContinue();
+            return next(new Error('Token de aplicação sem autênticidade'));
           }
           requestor.database = data.payload.database;
           requestor.environmentId = data.payload.envUuid;
@@ -103,15 +90,14 @@ class SocketAuthenticationMiddleware extends _controller.SocketController {
         requestor.environmentId = account.envUuid;
         envUuid = account.envUuid;
       }
-      req.tenant = {
+      socket.tenant = {
         id: envUuid || _app.Core.settings.getDatabase().service.database
       };
-      req.requestor = requestor;
-      req.isApplication = isApplication;
+      socket.requestor = requestor;
+      socket.isApplication = isApplication;
       next();
     } catch (error) {
-      res.statusCode = 500;
-      return res.writeContinue();
+      return next(error);
     }
   };
 }

package/lib/services/socket.js

@@ -49,7 +49,7 @@ class SocketIOService extends _service.default {
       cors
     });
     const middleware = new _authentication.SocketAuthenticationMiddleware();
-    this.server.engine.use(middleware.decryptToken);
+    this.server.use(middleware.decryptToken);
   }
   static registerRouter(router) {
     this.getService().mainRouter = router;

package/lib/socket.d.js

@@ -1,3 +1,3 @@
 "use strict";
 
-var _http = require("http");
+var _socket = require("socket.io");

package/package.json

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