c2-http 1.0.112 → 1.0.114

package/dist/dto/IJWTPayload.d.ts

@@ -1,5 +1,7 @@
 import { JwtPayload } from "jsonwebtoken";
 export interface IJWTPayload extends JwtPayload {
     account: string;
+    accountExpireDate: Date;
+    accountBlockDate: Date;
     scopes: string;
 }

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

@@ -9,6 +9,8 @@ class AddInContextFlowItem {
         express_http_context_1.default.set("token", token);
         express_http_context_1.default.set("userId", decode.sub);
         express_http_context_1.default.set("accountId", decode.account);
+        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);
     }
 }

package/dist/model/Controller.d.ts

@@ -21,5 +21,6 @@ export declare abstract class Controller {
     registerRoute(options: ISingleRouteParam): void;
 }
 export declare function HttpDispatchHandling(target: any, methodName: string, descriptor: PropertyDescriptor): PropertyDescriptor;
+export declare function HttpDispatchHandlingAdmin(target: any, methodName: string, descriptor: PropertyDescriptor): PropertyDescriptor;
 export declare function HttpDispatchDownload(target: any, methodName: string, descriptor: PropertyDescriptor): PropertyDescriptor;
 export declare function OpenApi(target: any): typeof target;

package/dist/model/Controller.js

@@ -1,8 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OpenApi = exports.HttpDispatchDownload = exports.HttpDispatchHandling = exports.Controller = void 0;
+exports.OpenApi = exports.HttpDispatchDownload = exports.HttpDispatchHandlingAdmin = exports.HttpDispatchHandling = exports.Controller = void 0;
 const express_1 = require("express");
+const express_http_context_1 = __importDefault(require("express-http-context"));
 const http_status_1 = require("http-status");
+const moment_1 = __importDefault(require("moment"));
 class Controller {
     router;
     normalizedPaths;
@@ -54,11 +59,11 @@ function HttpDispatchHandling(target, methodName, descriptor) {
     descriptor.value = async function (...args) {
         const response = args[1];
         try {
+            const blockedDate = express_http_context_1.default.get("accountBlockDate");
+            if (blockedDate && (0, moment_1.default)().isAfter((0, moment_1.default)(blockedDate))) {
+                return response.status(http_status_1.PAYMENT_REQUIRED);
+            }
             const returnHttp = await originalMethod.apply(this, args);
-            // const signatureValidation = await ValidateSignatureFlow.validate();
-            // if (signatureValidation.expired) {
-            //   returnHttp[0] = PAYMENT_REQUIRED;
-            // }
             return response.status(returnHttp[0]).json(returnHttp[1]);
         }
         catch (error) {
@@ -71,12 +76,34 @@ function HttpDispatchHandling(target, methodName, descriptor) {
     return descriptor;
 }
 exports.HttpDispatchHandling = HttpDispatchHandling;
+function HttpDispatchHandlingAdmin(target, methodName, descriptor) {
+    const originalMethod = descriptor.value;
+    descriptor.value = async function (...args) {
+        const response = args[1];
+        try {
+            const returnHttp = await originalMethod.apply(this, args);
+            return response.status(returnHttp[0]).json(returnHttp[1]);
+        }
+        catch (error) {
+            console.error(error);
+            response
+                .status(error.status || http_status_1.INTERNAL_SERVER_ERROR)
+                .json({ message: error.message, detail: error.detail?.data });
+        }
+    };
+    return descriptor;
+}
+exports.HttpDispatchHandlingAdmin = HttpDispatchHandlingAdmin;
 function HttpDispatchDownload(target, methodName, descriptor) {
     const originalMethod = descriptor.value;
     descriptor.value = async function (...args) {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         const [request, response] = args;
         try {
+            const blockedDate = express_http_context_1.default.get("accountBlockDate");
+            if (blockedDate && (0, moment_1.default)().isAfter((0, moment_1.default)(blockedDate))) {
+                return response.status(http_status_1.PAYMENT_REQUIRED);
+            }
             const [status, data] = await originalMethod.apply(this, args);
             return response.status(status).send(data);
         }

package/dist/model/Server.js

@@ -23,24 +23,25 @@ class Server {
         (0, i18n_1.initializei18n)(this.config.i18n);
         MiddlewareGlobals_1.default.config(this.app);
         let pathsToMetrics = [];
+        for (const controllers of [...this.config.openControllers, ...this.config.closeControllers]) {
+            pathsToMetrics = [...pathsToMetrics, ...controllers.normalizedPaths];
+        }
+        const metricsMiddleware = (0, express_prom_bundle_1.default)({
+            includeMethod: true,
+            includePath: true,
+            normalizePath: pathsToMetrics,
+            metricsPath: "/metrics"
+        });
+        this.app.use(metricsMiddleware);
         for (const openController of this.config.openControllers) {
             this.app.use(openController.router);
-            pathsToMetrics = [...pathsToMetrics, ...openController.normalizedPaths];
         }
         // this.app.use("/docs", swaggerUI.serve, swaggerUI.setup((global as any).OPEN_API_DOC))
         (0, c2_util_1.log)("LOG", "Rotas abertas OK");
         this.app.use(MiddlewareJwt_1.default.config);
         for (const closeRouter of this.config.closeControllers) {
             this.app.use(closeRouter.router);
-            pathsToMetrics = [...pathsToMetrics, ...closeRouter.normalizedPaths];
         }
-        const metricsMiddleware = (0, express_prom_bundle_1.default)({
-            includeMethod: true,
-            includePath: true,
-            normalizePath: pathsToMetrics,
-            metricsPath: "/metrics"
-        });
-        this.app.use(metricsMiddleware);
         (0, c2_util_1.log)("LOG", "Rotas fechadas OK");
         this.server = this.app.listen(this.config.port, async () => {
             (0, c2_util_1.log)("LOG_INIT_SERVER", `Server running on port ${this.config.port}`);

package/package.json

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