c2-http 1.0.96 → 1.0.98

package/dist/index.d.ts

@@ -11,9 +11,10 @@ import { HttpError } from "./model/HttpError";
 import { IControllerOptions } from "./model/IControllerOptions";
 import { ICrudControllerOptions } from "./model/ICrudControllerOptions";
 import { IServerConfig, Server } from "./model/Server";
+import GetTokenFlowItem from "./middleware/jwt-middlware/item/GetTokenFlowItem";
 export declare const convertErrorToHttpError: (error: any) => HttpError;
 export declare const prepareRequestParams: (options?: any) => {
     params: any;
     paramsSerializer: (params: any) => string;
 };
-export { Controller, ControllerRoleMiddleware, ControllerRoute, CrudController, GenerateTokenFlow, getMessage, HttpDispatchDownload, HttpDispatchHandling, IControllerOptions, ICrudControllerOptions, IHealthcheck, IJWTPayload, initializei18n, IOpenApiPath, IServerConfig, MiddlewareCheckScopesFlow, OpenApi, Server };
+export { Controller, ControllerRoleMiddleware, ControllerRoute, CrudController, GenerateTokenFlow, getMessage, HttpDispatchDownload, HttpDispatchHandling, IControllerOptions, ICrudControllerOptions, IHealthcheck, IJWTPayload, initializei18n, IOpenApiPath, IServerConfig, MiddlewareCheckScopesFlow, OpenApi, Server, GetTokenFlowItem };

package/dist/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Server = exports.OpenApi = exports.MiddlewareCheckScopesFlow = exports.initializei18n = exports.HttpDispatchHandling = exports.HttpDispatchDownload = exports.getMessage = exports.GenerateTokenFlow = exports.CrudController = exports.ControllerRoute = exports.ControllerRoleMiddleware = exports.Controller = exports.prepareRequestParams = exports.convertErrorToHttpError = void 0;
+exports.GetTokenFlowItem = exports.Server = exports.OpenApi = exports.MiddlewareCheckScopesFlow = exports.initializei18n = exports.HttpDispatchHandling = exports.HttpDispatchDownload = exports.getMessage = exports.GenerateTokenFlow = exports.CrudController = exports.ControllerRoute = exports.ControllerRoleMiddleware = exports.Controller = exports.prepareRequestParams = exports.convertErrorToHttpError = void 0;
 const axios_1 = __importDefault(require("axios"));
 const express_http_context_1 = __importDefault(require("express-http-context"));
 const http_status_1 = require("http-status");
@@ -31,6 +31,8 @@ Object.defineProperty(exports, "CrudController", { enumerable: true, get: functi
 const HttpError_1 = require("./model/HttpError");
 const Server_1 = require("./model/Server");
 Object.defineProperty(exports, "Server", { enumerable: true, get: function () { return Server_1.Server; } });
+const GetTokenFlowItem_1 = __importDefault(require("./middleware/jwt-middlware/item/GetTokenFlowItem"));
+exports.GetTokenFlowItem = GetTokenFlowItem_1.default;
 global.OPEN_API_DOC = {
     "openapi": "3.1.0",
     "info": {

package/dist/middleware/global-middleware/item/MiddlewareContext.js

@@ -9,6 +9,10 @@ class MiddlewareContext {
         expressApplication.use(express_http_context_1.default.middleware);
         expressApplication.use((request, response, next) => {
             express_http_context_1.default.set("headers", request.headers);
+            express_http_context_1.default.set("requestProtocol", request.protocol);
+            express_http_context_1.default.set("requestHost", request.hostname);
+            express_http_context_1.default.set("requestOriginalUrl", request.originalUrl);
+            express_http_context_1.default.set("request", request);
             next();
         });
     }

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

@@ -27,7 +27,7 @@ class MiddlewareCheckTokenFlow {
         let token = "";
         try {
             token = GetTokenFlowItem_1.default.get();
-            const tokenDecoded = ValidateTokenFlowItem_1.default.exec(token);
+            const tokenDecoded = await ValidateTokenFlowItem_1.default.exec(token);
             AddInContextFlowItem_1.default.exec(tokenDecoded);
             next();
         }

package/dist/middleware/jwt-middlware/item/ValidateTokenFlowItem.d.ts

@@ -1,6 +1,6 @@
 import { IJWTPayload } from "../../../dto/IJWTPayload";
 declare class ValidateTokenFlowItem {
-    exec(token: string): IJWTPayload;
+    exec(token: string): Promise<IJWTPayload>;
 }
 declare const _default: ValidateTokenFlowItem;
 export default _default;

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

@@ -22,18 +22,42 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __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 });
+/* eslint-disable @typescript-eslint/no-unused-vars */
 const http_status_1 = require("http-status");
 const jwt = __importStar(require("jsonwebtoken"));
-const i18n_1 = require("../../../i18n");
 const HttpError_1 = require("../../../model/HttpError");
+const express_http_context_1 = __importDefault(require("express-http-context"));
+const axios_1 = __importDefault(require("axios"));
 class ValidateTokenFlowItem {
-    exec(token) {
+    async exec(token) {
         try {
-            return jwt.verify(token, process.env.JWT_SECRET ?? "");
+            // if the origin api has JWT_SECRET, use it to verify the token
+            if (process.env.JWT_SECRET) {
+                return jwt.verify(token, process.env.JWT_SECRET ?? "");
+            }
+            // if the origin api has API_ACCOUNT, use it to validate the token
+            if (process.env.API_ACCOUNT) {
+                const res = await axios_1.default.get(`${process.env.API_ACCOUNT}/valid-token`, { headers: { Authorization: `Bearer ${token}` } });
+                if (res.status !== http_status_1.OK)
+                    throw new Error("Invalid token or expired");
+                return res.data;
+            }
+            // otherwise, construct the URL to validate the token based on the request context
+            const originUrl = `${express_http_context_1.default.get("requestProtocol")}://${express_http_context_1.default.get("requestHost")}${express_http_context_1.default.get("requestOriginalUrl")}`;
+            const newUrl = originUrl.replace(/\/api-([^\/]+)/, (_match, p1) => {
+                return "/api-account";
+            });
+            const res = await axios_1.default.get(`${newUrl}/valid-token`, { headers: { Authorization: `Bearer ${token}` } });
+            if (res.status !== http_status_1.OK)
+                throw new Error("Invalid token or expired");
+            return res.data;
         }
         catch (error) {
-            throw new HttpError_1.HttpError(http_status_1.FORBIDDEN, (0, i18n_1.getMessage)("message.authentication.authenticateIsRequired"));
+            throw new HttpError_1.HttpError(http_status_1.FORBIDDEN, `error validating token: ${error.message}`);
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-http",
-  "version": "1.0.96",
+  "version": "1.0.98",
   "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>",