c2-http 1.0.144 → 1.0.146

package/dist/middleware/jwt-middlware/MiddlewareCheckTokenFlow.d.ts

@@ -1,6 +1,7 @@
 import { NextFunction, Request, Response } from "express";
 declare class MiddlewareCheckTokenFlow {
     execute(): Promise<(request: Request, response: Response, next: NextFunction) => Promise<void>>;
+    config: (request: Request, response: Response, next: NextFunction) => Promise<void>;
     checkToken(): Promise<void>;
 }
 declare const _default: MiddlewareCheckTokenFlow;

package/dist/middleware/jwt-middlware/MiddlewareCheckTokenFlow.js

@@ -1,14 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (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.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const c2_util_1 = require("c2-util");
 const http_status_1 = require("http-status");
+const jwt = __importStar(require("jsonwebtoken"));
 const __1 = require("../..");
 const AddInContextFlowItem_1 = __importDefault(require("./item/AddInContextFlowItem"));
 const GetTokenFlowItem_1 = __importDefault(require("./item/GetTokenFlowItem"));
-const ValidateTokenFlowItem_1 = __importDefault(require("./item/ValidateTokenFlowItem"));
-const c2_util_1 = require("c2-util");
 class MiddlewareCheckTokenFlow {
     async execute() {
         return async (request, response, next) => {
@@ -37,41 +60,40 @@ class MiddlewareCheckTokenFlow {
             }
         };
     }
-    // public config = async (request: Request, response: Response, next: NextFunction) => {
-    //   log("LOG_CHECK_TOKEN", "Checking token");
-    //   try {
-    //     if (
-    //       (
-    //         request.path === "/metrics" ||
-    //         request.path.startsWith("/metrics") ||
-    //         request.path?.includes("/docs")
-    //       )
-    //       && request.method === "GET") {
-    //       next();
-    //       return;
-    //     }
-    //     if (request.headers["x-api-key"]) {
-    //       next();
-    //       return;
-    //     }
-    //     await this.checkToken()
-    //     log("LOG_CHECK_TOKEN", "Token checked");
-    //     return next()
-    //   } catch (error: any) {
-    //     log("LOG_ERROR_CHECK_TOKEN", error);
-    //     response
-    //       .status(error.status || INTERNAL_SERVER_ERROR)
-    //       .json({ message: error.message, detail: error.detail?.data });
-    //   }
-    // }
+    config = async (request, response, next) => {
+        (0, c2_util_1.log)("LOG_CHECK_TOKEN", "Checking token");
+        try {
+            if ((request.path === "/metrics" ||
+                request.path.startsWith("/metrics") ||
+                request.path?.includes("/docs"))
+                && request.method === "GET") {
+                next();
+                return;
+            }
+            if (request.headers["x-api-key"]) {
+                next();
+                return;
+            }
+            await this.checkToken();
+            (0, c2_util_1.log)("LOG_CHECK_TOKEN", "Token checked");
+            return next();
+        }
+        catch (error) {
+            (0, c2_util_1.log)("LOG_ERROR_CHECK_TOKEN", error);
+            response
+                .status(error.status || http_status_1.INTERNAL_SERVER_ERROR)
+                .json({ message: error.message, detail: error.detail?.data });
+        }
+    };
     async checkToken() {
         let token = "";
         try {
             token = GetTokenFlowItem_1.default.get();
-            const tokenDecoded = await ValidateTokenFlowItem_1.default.exec(token);
+            const tokenDecoded = jwt.verify(token, process.env.JWT_SECRET ?? ""); //await ValidateTokenFlowItem.exec(token)
             AddInContextFlowItem_1.default.exec(tokenDecoded, token);
         }
         catch (error) {
+            (0, c2_util_1.log)("LOG_ERROR_CHECK_TOKEN_CHECK_TOKEN", error);
             throw (0, __1.convertErrorToHttpError)(error);
         }
     }

package/dist/middleware/jwt-middlware/item/AddInContextFlowItem.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const express_http_context_1 = __importDefault(require("express-http-context"));
+const c2_util_1 = require("c2-util");
 class AddInContextFlowItem {
     exec(decode, token) {
         express_http_context_1.default.set("token", token);
@@ -16,6 +17,17 @@ class AddInContextFlowItem {
         express_http_context_1.default.set("accountBlockDate", decode.accountBlockDate);
         express_http_context_1.default.set("accountExpireDate", decode.accountExpireDate);
         express_http_context_1.default.set("scopes", decode.scopes);
+        (0, c2_util_1.log)("LOG_ADD_IN_CONTEXT", "Adding in context");
+        (0, c2_util_1.log)("LOG_ADD_IN_CONTEXT_TOKEN", express_http_context_1.default.get("token"));
+        (0, c2_util_1.log)("LOG_ADD_IN_CONTEXT_USER_ID", express_http_context_1.default.get("userId"));
+        (0, c2_util_1.log)("LOG_ADD_IN_CONTEXT_USER_PROFILE_ID", express_http_context_1.default.get("userProfileId"));
+        (0, c2_util_1.log)("LOG_ADD_IN_CONTEXT_USER_IS_ADMIN", express_http_context_1.default.get("userIsAdmin"));
+        (0, c2_util_1.log)("LOG_ADD_IN_CONTEXT_USER_EMAIL", express_http_context_1.default.get("userEmail"));
+        (0, c2_util_1.log)("LOG_ADD_IN_CONTEXT_USER_NAME", express_http_context_1.default.get("userName"));
+        (0, c2_util_1.log)("LOG_ADD_IN_CONTEXT_ACCOUNT_ID", express_http_context_1.default.get("accountId"));
+        (0, c2_util_1.log)("LOG_ADD_IN_CONTEXT_ACCOUNT_BLOCK_DATE", express_http_context_1.default.get("accountBlockDate"));
+        (0, c2_util_1.log)("LOG_ADD_IN_CONTEXT_ACCOUNT_EXPIRE_DATE", express_http_context_1.default.get("accountExpireDate"));
+        (0, c2_util_1.log)("LOG_ADD_IN_CONTEXT_SCOPES", express_http_context_1.default.get("scopes"));
     }
 }
 exports.default = new AddInContextFlowItem;

package/dist/model/Server.js

@@ -40,7 +40,7 @@ class Server {
         // this.app.use("/docs", swaggerUI.serve, swaggerUI.setup((global as any).OPEN_API_DOC))
         (0, c2_util_1.log)("LOG", "Rotas abertas OK");
         //middlewares de checagem de token obrigatorio
-        this.app.use(MiddlewareCheckTokenFlow_1.default.execute);
+        this.app.use(MiddlewareCheckTokenFlow_1.default.config);
         //middlewares de checagem de token opcional
         // this.config.middlewaresCloseControllers?.forEach((middl: RequestHandler) => {
         //   this.app.use(middl)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-http",
-  "version": "1.0.144",
+  "version": "1.0.146",
   "description": "Biblioteca Typescript para API NodeJS",
   "repository": "https://cabralsilva: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@github.com/cabralsilva/c2-http.git",
   "author": "Daniel Cabral <cabralconsultoriaemsoftware@gmail.com>",