c2-http 1.0.155 → 1.0.157

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/middleware/jwt-middlware/MiddlewareCheckTokenFlow.d.ts +1 -2
  2. package/dist/middleware/jwt-middlware/MiddlewareCheckTokenFlow.js +6 -74
  3. package/dist/middleware/jwt-middlware/item/AddInContextFlowItem.js +0 -12
  4. package/dist/model/Server.js +1 -5
  5. package/package.json +2 -2
package/dist/middleware/jwt-middlware/MiddlewareCheckTokenFlow.d.ts CHANGED
@@ -1,8 +1,7 @@
1
1
  import { NextFunction, Request, Response } from "express";
2
2
  declare class MiddlewareCheckTokenFlow {
3
3
  execute(): Promise<(request: Request, response: Response, next: NextFunction) => Promise<void>>;
4
- config: (request: Request, response: Response, next: NextFunction) => void;
5
- checkToken(): void;
4
+ checkToken(): Promise<void>;
6
5
  }
7
6
  declare const _default: MiddlewareCheckTokenFlow;
8
7
  export default _default;
package/dist/middleware/jwt-middlware/MiddlewareCheckTokenFlow.js CHANGED
@@ -1,41 +1,17 @@
1
1
  "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
25
2
  var __importDefault = (this && this.__importDefault) || function (mod) {
26
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
27
4
  };
28
5
  Object.defineProperty(exports, "__esModule", { value: true });
29
- const c2_util_1 = require("c2-util");
30
- const express_http_context_1 = __importDefault(require("express-http-context"));
31
6
  const http_status_1 = require("http-status");
32
- const jwt = __importStar(require("jsonwebtoken"));
33
7
  const __1 = require("../..");
8
+ const AddInContextFlowItem_1 = __importDefault(require("./item/AddInContextFlowItem"));
34
9
  const GetTokenFlowItem_1 = __importDefault(require("./item/GetTokenFlowItem"));
10
+ const ValidateTokenFlowItem_1 = __importDefault(require("./item/ValidateTokenFlowItem"));
11
+ const c2_util_1 = require("c2-util");
35
12
  class MiddlewareCheckTokenFlow {
36
13
  async execute() {
37
14
  return async (request, response, next) => {
38
- (0, c2_util_1.log)("LOG_CHECK_TOKEN", "Checking token");
39
15
  try {
40
16
  if ((request.path === "/metrics" ||
41
17
  request.path.startsWith("/metrics") ||
@@ -49,7 +25,6 @@ class MiddlewareCheckTokenFlow {
49
25
  return;
50
26
  }
51
27
  await this.checkToken();
52
- (0, c2_util_1.log)("LOG_CHECK_TOKEN", "Token checked");
53
28
  return next();
54
29
  }
55
30
  catch (error) {
@@ -60,57 +35,14 @@ class MiddlewareCheckTokenFlow {
60
35
  }
61
36
  };
62
37
  }
63
- config = (request, response, next) => {
64
- (0, c2_util_1.log)("LOG_CHECK_TOKEN", "Checking token");
65
- try {
66
- if ((request.path === "/metrics" ||
67
- request.path.startsWith("/metrics") ||
68
- request.path?.includes("/docs"))
69
- && request.method === "GET") {
70
- next();
71
- return;
72
- }
73
- if (request.headers["x-api-key"]) {
74
- next();
75
- return;
76
- }
77
- this.checkToken();
78
- (0, c2_util_1.log)("LOG_CHECK_TOKEN", "Token checked");
79
- return next();
80
- }
81
- catch (error) {
82
- (0, c2_util_1.log)("LOG_ERROR_CHECK_TOKEN", error);
83
- response
84
- .status(error.status || http_status_1.INTERNAL_SERVER_ERROR)
85
- .json({ message: error.message, detail: error.detail?.data });
86
- }
87
- };
88
- checkToken() {
38
+ async checkToken() {
89
39
  let token = "";
90
40
  try {
91
41
  token = GetTokenFlowItem_1.default.get();
92
- (0, c2_util_1.log)("LOG_CHECK_TOKEN_TOKEN", token);
93
- const decoded = jwt.decode(token, { complete: false });
94
- (0, c2_util_1.log)("LOG_CHECK_TOKEN_DECODED", decoded);
95
- const verify = jwt.verify(token, process.env.JWT_SECRET ?? "");
96
- (0, c2_util_1.log)("LOG_CHECK_TOKEN_VERIFY", verify);
97
- express_http_context_1.default.set("token", token);
98
- express_http_context_1.default.set("userId", verify.sub);
99
- express_http_context_1.default.set("userProfileId", verify.subProfile);
100
- express_http_context_1.default.set("userIsAdmin", verify.subIsAdmin);
101
- express_http_context_1.default.set("userEmail", verify.subEmail);
102
- express_http_context_1.default.set("userName", verify.subName);
103
- express_http_context_1.default.set("accountId", verify.account);
104
- express_http_context_1.default.set("accountBlockDate", verify.accountBlockDate);
105
- express_http_context_1.default.set("accountExpireDate", verify.accountExpireDate);
106
- // httpContext.set("scopes", verify.scopes)
107
- // const tokenDecoded = await ValidateTokenFlowItem.exec(token)
108
- // AddInContextFlowItem.exec(tokenDecoded, token)
109
- // const tokenDecoded = jwt.verify(token, process.env.JWT_SECRET ?? "") as unknown as IJWTPayload//await ValidateTokenFlowItem.exec(token)
110
- // AddInContextFlowItem.exec(tokenDecoded, token)
42
+ const tokenDecoded = await ValidateTokenFlowItem_1.default.exec(token);
43
+ AddInContextFlowItem_1.default.exec(tokenDecoded, token);
111
44
  }
112
45
  catch (error) {
113
- (0, c2_util_1.log)("LOG_ERROR_CHECK_TOKEN_CHECK_TOKEN", error);
114
46
  throw (0, __1.convertErrorToHttpError)(error);
115
47
  }
116
48
  }
package/dist/middleware/jwt-middlware/item/AddInContextFlowItem.js CHANGED
@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  const express_http_context_1 = __importDefault(require("express-http-context"));
7
- const c2_util_1 = require("c2-util");
8
7
  class AddInContextFlowItem {
9
8
  exec(decode, token) {
10
9
  express_http_context_1.default.set("token", token);
@@ -17,17 +16,6 @@ class AddInContextFlowItem {
17
16
  express_http_context_1.default.set("accountBlockDate", decode.accountBlockDate);
18
17
  express_http_context_1.default.set("accountExpireDate", decode.accountExpireDate);
19
18
  express_http_context_1.default.set("scopes", decode.scopes);
20
- (0, c2_util_1.log)("LOG_ADD_IN_CONTEXT", "Adding in context");
21
- (0, c2_util_1.log)("LOG_ADD_IN_CONTEXT_TOKEN", express_http_context_1.default.get("token"));
22
- (0, c2_util_1.log)("LOG_ADD_IN_CONTEXT_USER_ID", express_http_context_1.default.get("userId"));
23
- (0, c2_util_1.log)("LOG_ADD_IN_CONTEXT_USER_PROFILE_ID", express_http_context_1.default.get("userProfileId"));
24
- (0, c2_util_1.log)("LOG_ADD_IN_CONTEXT_USER_IS_ADMIN", express_http_context_1.default.get("userIsAdmin"));
25
- (0, c2_util_1.log)("LOG_ADD_IN_CONTEXT_USER_EMAIL", express_http_context_1.default.get("userEmail"));
26
- (0, c2_util_1.log)("LOG_ADD_IN_CONTEXT_USER_NAME", express_http_context_1.default.get("userName"));
27
- (0, c2_util_1.log)("LOG_ADD_IN_CONTEXT_ACCOUNT_ID", express_http_context_1.default.get("accountId"));
28
- (0, c2_util_1.log)("LOG_ADD_IN_CONTEXT_ACCOUNT_BLOCK_DATE", express_http_context_1.default.get("accountBlockDate"));
29
- (0, c2_util_1.log)("LOG_ADD_IN_CONTEXT_ACCOUNT_EXPIRE_DATE", express_http_context_1.default.get("accountExpireDate"));
30
- (0, c2_util_1.log)("LOG_ADD_IN_CONTEXT_SCOPES", express_http_context_1.default.get("scopes"));
31
19
  }
32
20
  }
33
21
  exports.default = new AddInContextFlowItem;
package/dist/model/Server.js CHANGED
@@ -40,11 +40,7 @@ class Server {
40
40
  // this.app.use("/docs", swaggerUI.serve, swaggerUI.setup((global as any).OPEN_API_DOC))
41
41
  (0, c2_util_1.log)("LOG", "Rotas abertas OK");
42
42
  //middlewares de checagem de token obrigatorio
43
- this.app.use(MiddlewareCheckTokenFlow_1.default.config);
44
- //middlewares de checagem de token opcional
45
- // this.config.middlewaresCloseControllers?.forEach((middl: RequestHandler) => {
46
- // this.app.use(middl)
47
- // })
43
+ this.app.use(MiddlewareCheckTokenFlow_1.default.execute);
48
44
  for (const closeRouter of this.config.closeControllers.map(c => c.router)) {
49
45
  // closeRouter.use(MiddlewareJwt.config, ...(this.config.middlewaresCloseControllers?.map(m => m) ?? []))
50
46
  this.app.use(closeRouter);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "c2-http",
3
- "version": "1.0.155",
3
+ "version": "1.0.157",
4
4
  "description": "Biblioteca Typescript para API NodeJS",
5
5
  "repository": "https://cabralsilva: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@github.com/cabralsilva/c2-http.git",
6
6
  "author": "Daniel Cabral <cabralconsultoriaemsoftware@gmail.com>",
@@ -28,7 +28,7 @@
28
28
  "c2-util": "^1.0.28",
29
29
  "cookie-parser": "^1.4.7",
30
30
  "cors": "^2.8.5",
31
- "express": "^4.19.2",
31
+ "express": "4.19.2",
32
32
  "express-http-context": "1.2.4",
33
33
  "express-prom-bundle": "^8.0.0",
34
34
  "express-rest-i18n": "^1.0.1",