@alanszp/express 20.0.1 → 20.2.0
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.
- package/dist/endpoints/BaseApi.d.ts +4 -4
- package/dist/endpoints/BaseApi.js +2 -2
- package/dist/endpoints/BaseApi.js.map +1 -1
- package/dist/helpers/getIp.js +1 -2
- package/dist/helpers/getIp.js.map +1 -1
- package/dist/helpers/getRequestBaseLog.js +1 -2
- package/dist/helpers/getRequestBaseLog.js.map +1 -1
- package/dist/helpers/getRequestLogger.js +1 -2
- package/dist/helpers/getRequestLogger.js.map +1 -1
- package/dist/helpers/now.js +1 -2
- package/dist/helpers/now.js.map +1 -1
- package/dist/helpers/renderErrorJson.js +4 -5
- package/dist/helpers/renderErrorJson.js.map +1 -1
- package/dist/index.js +5 -1
- package/dist/index.js.map +1 -1
- package/dist/middlewares/accessLogger.js +1 -2
- package/dist/middlewares/accessLogger.js.map +1 -1
- package/dist/middlewares/auditLog.d.ts +1 -1
- package/dist/middlewares/auditLog.js +2 -3
- package/dist/middlewares/auditLog.js.map +1 -1
- package/dist/middlewares/authedForOrg.js +1 -2
- package/dist/middlewares/authedForOrg.js.map +1 -1
- package/dist/middlewares/authenticateUser.d.ts +1 -1
- package/dist/middlewares/authenticateUser.js +7 -7
- package/dist/middlewares/authenticateUser.js.map +1 -1
- package/dist/middlewares/createContext.js +1 -2
- package/dist/middlewares/createContext.js.map +1 -1
- package/dist/middlewares/errorRequestHandlerMiddleware.d.ts +1 -1
- package/dist/middlewares/errorRequestHandlerMiddleware.js.map +1 -1
- package/dist/middlewares/hasPermissions.js +3 -4
- package/dist/middlewares/hasPermissions.js.map +1 -1
- package/dist/middlewares/hasRoles.js +1 -2
- package/dist/middlewares/hasRoles.js.map +1 -1
- package/dist/middlewares/jsonBodyParser.js +1 -2
- package/dist/middlewares/jsonBodyParser.js.map +1 -1
- package/dist/middlewares/returnNotFound.js +1 -2
- package/dist/middlewares/returnNotFound.js.map +1 -1
- package/dist/test/mocks/expressMocks.d.ts +2 -3
- package/dist/types/AuthMethod.d.ts +5 -5
- package/dist/types/GenericRequest.d.ts +1 -1
- package/package.json +11 -11
|
@@ -3,15 +3,15 @@ import { BaseModel } from "@alanszp/validations";
|
|
|
3
3
|
import { Controller } from "tsoa";
|
|
4
4
|
import { Request } from "express";
|
|
5
5
|
import { ILogger } from "@alanszp/logger";
|
|
6
|
-
export
|
|
6
|
+
export type AuthRequest = Request & {
|
|
7
7
|
user: JWTUser;
|
|
8
8
|
};
|
|
9
9
|
interface Viewable<T> {
|
|
10
10
|
toView: () => T;
|
|
11
11
|
}
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
export
|
|
12
|
+
type DefaultViewFnReturn<CommandReturnType> = CommandReturnType extends Viewable<infer ViewReturnType> ? ViewReturnType : CommandReturnType;
|
|
13
|
+
type InferReturnType<Input extends BaseModel, ViewFunction extends ((crt: CommandReturnType, input: Input) => unknown) | undefined, CommandReturnType> = ViewFunction extends (crt: CommandReturnType, input: Input) => unknown ? ReturnType<ViewFunction> : DefaultViewFnReturn<CommandReturnType>;
|
|
14
|
+
export type BuildAuthEndpointOptions<Input extends BaseModel, CommandReturnType, ViewFunction extends ((crt: CommandReturnType, input: Input) => unknown) | undefined> = {
|
|
15
15
|
request: AuthRequest;
|
|
16
16
|
inputConstructor: (jwtUser: JWTUser) => Promise<Input> | Input;
|
|
17
17
|
command: (input: Input) => Promise<CommandReturnType>;
|
|
@@ -18,8 +18,8 @@ function isViewable(object) {
|
|
|
18
18
|
typeof object.toView === "function");
|
|
19
19
|
}
|
|
20
20
|
class BaseApi extends tsoa_1.Controller {
|
|
21
|
-
buildAuthEndpoint(
|
|
22
|
-
return __awaiter(this,
|
|
21
|
+
buildAuthEndpoint(_a) {
|
|
22
|
+
return __awaiter(this, arguments, void 0, function* ({ request, inputConstructor, command, returnCode = 200, view, getLogger, }) {
|
|
23
23
|
const { path, method, user } = request;
|
|
24
24
|
const baseLog = `${(0, lodash_1.snakeCase)(path)}.${(0, lodash_1.snakeCase)(method)}`;
|
|
25
25
|
const logger = getLogger();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseApi.js","sourceRoot":"","sources":["../../src/endpoints/BaseApi.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,+BAAkC;AAElC,mCAAmC;AASnC,SAAS,UAAU,CAAI,MAAe;IACpC,OAAO,CACL,OAAO,MAAM,KAAK,QAAQ;QAC1B,MAAM,KAAK,IAAI;QACf,OAAQ,MAAsB,CAAC,MAAM,KAAK,UAAU,CACrD,CAAC;AACJ,CAAC;AAgCD,MAAa,OAAQ,SAAQ,iBAAU;IACrB,iBAAiB
|
|
1
|
+
{"version":3,"file":"BaseApi.js","sourceRoot":"","sources":["../../src/endpoints/BaseApi.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,+BAAkC;AAElC,mCAAmC;AASnC,SAAS,UAAU,CAAI,MAAe;IACpC,OAAO,CACL,OAAO,MAAM,KAAK,QAAQ;QAC1B,MAAM,KAAK,IAAI;QACf,OAAQ,MAAsB,CAAC,MAAM,KAAK,UAAU,CACrD,CAAC;AACJ,CAAC;AAgCD,MAAa,OAAQ,SAAQ,iBAAU;IACrB,iBAAiB;6DAW/B,EACA,OAAO,EACP,gBAAgB,EAChB,OAAO,EACP,UAAU,GAAG,GAAG,EAChB,IAAI,EACJ,SAAS,GAKV;YACC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;YACvC,MAAM,OAAO,GAAG,GAAG,IAAA,kBAAS,EAAC,IAAI,CAAC,IAAI,IAAA,kBAAS,EAAC,MAAM,CAAC,EAAE,CAAC;YAC1D,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;YAE3B,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,CAAC;YAE3C,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,sBAAsB,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;YAEzD,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,CAAC;YAE7C,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;YAC3B,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,qBAAqB,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;YAE7D,2EAA2E;YAC3E,IAAI,IAAI,EAAE,CAAC;gBACT,OAAO,IAAI,CAAC,eAAe,EAAE,KAAK,CAAuB,CAAC;YAC5D,CAAC;YAED,gFAAgF;YAChF,IAAI,UAAU,CAAqB,eAAe,CAAC,EAAE,CAAC;gBACpD,OAAO,eAAe,CAAC,MAAM,EAAE,CAAC;YAClC,CAAC;YAED,+CAA+C;YAC/C,OAAO,eAAqC,CAAC;QAC/C,CAAC;KAAA;CACF;AAlDD,0BAkDC"}
|
package/dist/helpers/getIp.js
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getIp =
|
|
3
|
+
exports.getIp = getIp;
|
|
4
4
|
function getIp(req) {
|
|
5
5
|
var _a;
|
|
6
6
|
return req.headers["cf-connecting-ip"] || req.ip || ((_a = req.socket) === null || _a === void 0 ? void 0 : _a.remoteAddress);
|
|
7
7
|
}
|
|
8
|
-
exports.getIp = getIp;
|
|
9
8
|
//# sourceMappingURL=getIp.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getIp.js","sourceRoot":"","sources":["../../src/helpers/getIp.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getIp.js","sourceRoot":"","sources":["../../src/helpers/getIp.ts"],"names":[],"mappings":";;AAEA,sBAEC;AAFD,SAAgB,KAAK,CAAC,GAAY;;IAChC,OAAO,GAAG,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,GAAG,CAAC,EAAE,KAAI,MAAA,GAAG,CAAC,MAAM,0CAAE,aAAa,CAAA,CAAC;AAChF,CAAC"}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getRequestBaseLog =
|
|
3
|
+
exports.getRequestBaseLog = getRequestBaseLog;
|
|
4
4
|
const lodash_1 = require("lodash");
|
|
5
5
|
function getRequestBaseLog(req) {
|
|
6
6
|
return `${(0, lodash_1.snakeCase)(req.path)}.${(0, lodash_1.snakeCase)(req.method)}`;
|
|
7
7
|
}
|
|
8
|
-
exports.getRequestBaseLog = getRequestBaseLog;
|
|
9
8
|
//# sourceMappingURL=getRequestBaseLog.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getRequestBaseLog.js","sourceRoot":"","sources":["../../src/helpers/getRequestBaseLog.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getRequestBaseLog.js","sourceRoot":"","sources":["../../src/helpers/getRequestBaseLog.ts"],"names":[],"mappings":";;AAGA,8CAEC;AAJD,mCAAmC;AAEnC,SAAgB,iBAAiB,CAAC,GAAY;IAC5C,OAAO,GAAG,IAAA,kBAAS,EAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAA,kBAAS,EAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;AAC3D,CAAC"}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getRequestLogger =
|
|
3
|
+
exports.getRequestLogger = getRequestLogger;
|
|
4
4
|
const logger_1 = require("@alanszp/logger");
|
|
5
5
|
function getRequestLogger(req) {
|
|
6
6
|
var _a;
|
|
7
7
|
return ((_a = req.context) === null || _a === void 0 ? void 0 : _a.log) || new logger_1.MockLogger();
|
|
8
8
|
}
|
|
9
|
-
exports.getRequestLogger = getRequestLogger;
|
|
10
9
|
//# sourceMappingURL=getRequestLogger.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getRequestLogger.js","sourceRoot":"","sources":["../../src/helpers/getRequestLogger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getRequestLogger.js","sourceRoot":"","sources":["../../src/helpers/getRequestLogger.ts"],"names":[],"mappings":";;AAGA,4CAEC;AAJD,4CAA6C;AAE7C,SAAgB,gBAAgB,CAAC,GAAY;;IAC3C,OAAO,CAAA,MAAA,GAAG,CAAC,OAAO,0CAAE,GAAG,KAAI,IAAI,mBAAU,EAAE,CAAC;AAC9C,CAAC"}
|
package/dist/helpers/now.js
CHANGED
package/dist/helpers/now.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"now.js","sourceRoot":"","sources":["../../src/helpers/now.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"now.js","sourceRoot":"","sources":["../../src/helpers/now.ts"],"names":[],"mappings":";;AAAA,kBAEC;AAFD,SAAgB,GAAG;IACjB,OAAO,IAAI,IAAI,EAAE,CAAC;AACpB,CAAC"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.render401Error = render401Error;
|
|
4
|
+
exports.render403Error = render403Error;
|
|
5
|
+
exports.render404Error = render404Error;
|
|
6
|
+
exports.render400Error = render400Error;
|
|
4
7
|
const core_1 = require("@alanszp/core");
|
|
5
8
|
function render401Error(requiredChecks) {
|
|
6
9
|
return {
|
|
@@ -10,7 +13,6 @@ function render401Error(requiredChecks) {
|
|
|
10
13
|
origin: (0, core_1.appIdentifier)(),
|
|
11
14
|
};
|
|
12
15
|
}
|
|
13
|
-
exports.render401Error = render401Error;
|
|
14
16
|
function render403Error() {
|
|
15
17
|
return {
|
|
16
18
|
code: "forbidden",
|
|
@@ -19,7 +21,6 @@ function render403Error() {
|
|
|
19
21
|
origin: (0, core_1.appIdentifier)(),
|
|
20
22
|
};
|
|
21
23
|
}
|
|
22
|
-
exports.render403Error = render403Error;
|
|
23
24
|
function render404Error() {
|
|
24
25
|
return {
|
|
25
26
|
code: "not_found",
|
|
@@ -28,7 +29,6 @@ function render404Error() {
|
|
|
28
29
|
origin: (0, core_1.appIdentifier)(),
|
|
29
30
|
};
|
|
30
31
|
}
|
|
31
|
-
exports.render404Error = render404Error;
|
|
32
32
|
function render400Error(message) {
|
|
33
33
|
return {
|
|
34
34
|
code: "bad_request",
|
|
@@ -37,5 +37,4 @@ function render400Error(message) {
|
|
|
37
37
|
origin: (0, core_1.appIdentifier)(),
|
|
38
38
|
};
|
|
39
39
|
}
|
|
40
|
-
exports.render400Error = render400Error;
|
|
41
40
|
//# sourceMappingURL=renderErrorJson.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderErrorJson.js","sourceRoot":"","sources":["../../src/helpers/renderErrorJson.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"renderErrorJson.js","sourceRoot":"","sources":["../../src/helpers/renderErrorJson.ts"],"names":[],"mappings":";;AAGA,wCAOC;AAED,wCAOC;AAED,wCAOC;AAED,wCAOC;AArCD,wCAA8C;AAG9C,SAAgB,cAAc,CAAC,cAAwB;IACrD,OAAO;QACL,IAAI,EAAE,oBAAoB;QAC1B,OAAO,EAAE,oBAAoB;QAC7B,OAAO,EAAE,EAAE,cAAc,EAAE;QAC3B,MAAM,EAAE,IAAA,oBAAa,GAAE;KACxB,CAAC;AACJ,CAAC;AAED,SAAgB,cAAc;IAC5B,OAAO;QACL,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,WAAW;QACpB,OAAO,EAAE,EAAE;QACX,MAAM,EAAE,IAAA,oBAAa,GAAE;KACxB,CAAC;AACJ,CAAC;AAED,SAAgB,cAAc;IAC5B,OAAO;QACL,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,WAAW;QACpB,OAAO,EAAE,EAAE;QACX,MAAM,EAAE,IAAA,oBAAa,GAAE;KACxB,CAAC;AACJ,CAAC;AAED,SAAgB,cAAc,CAAC,OAAe;IAC5C,OAAO;QACL,IAAI,EAAE,aAAa;QACnB,OAAO;QACP,OAAO,EAAE,EAAE;QACX,MAAM,EAAE,IAAA,oBAAa,GAAE;KACxB,CAAC;AACJ,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
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);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qDAAmC;AACnC,wDAAsC;AACtC,yDAAuC;AACvC,6DAA2C;AAC3C,6DAA2C;AAC3C,8DAA4C;AAC5C,iEAA+C;AAC/C,8EAA4D;AAC5D,+DAA6C;AAC7C,+DAA6C;AAC7C,yDAAuC;AACvC,+DAA6C;AAC7C,8DAA4C;AAC5C,sDAAoC;AACpC,kEAAgD;AAChD,iCAA8C;AAArC,qGAAA,KAAK,OAAe"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.accessLogger =
|
|
3
|
+
exports.accessLogger = accessLogger;
|
|
4
4
|
const logger_1 = require("@alanszp/logger");
|
|
5
5
|
const getIp_1 = require("../helpers/getIp");
|
|
6
6
|
function accessLogger(req, res, next) {
|
|
@@ -26,5 +26,4 @@ function accessLogger(req, res, next) {
|
|
|
26
26
|
});
|
|
27
27
|
return next();
|
|
28
28
|
}
|
|
29
|
-
exports.accessLogger = accessLogger;
|
|
30
29
|
//# sourceMappingURL=accessLogger.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accessLogger.js","sourceRoot":"","sources":["../../src/middlewares/accessLogger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"accessLogger.js","sourceRoot":"","sources":["../../src/middlewares/accessLogger.ts"],"names":[],"mappings":";;AAKA,oCA4BC;AAhCD,4CAA0C;AAC1C,4CAAyC;AAGzC,SAAgB,YAAY,CAC1B,GAAmB,EACnB,GAAa,EACb,IAAkB;IAElB,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;IAE1C,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;QACpB,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACxC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE;YACvB,QAAQ,EAAE,gBAAO,CAAC,MAAM;YACxB,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ;YACzB,QAAQ,EAAE,CAAC,OAAO,GAAG,SAAS,CAAC,CAAC,QAAQ,EAAE;YAC1C,UAAU,EAAE,CAAC,CAAC,OAAO,GAAG,SAAS,CAAC,GAAG,MAAM,CAAC,OAAS,CAAC,CAAC,CAAC,QAAQ,EAAE;YAClE,aAAa,EAAE,IAAA,aAAK,EAAC,GAAG,CAAC;YACzB,YAAY,EAAE,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC;YAC5C,cAAc,EAAE,GAAG,CAAC,OAAO,CAAC,aAAa;YACzC,UAAU,EAAE,GAAG,CAAC,UAAU;YAC1B,GAAG,EAAE,GAAG,CAAC,WAAW,IAAI,GAAG,CAAC,GAAG;YAC/B,WAAW,EAAE,GAAG,GAAG,CAAC,gBAAgB,IAAI,GAAG,CAAC,gBAAgB,EAAE;YAC9D,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,IAAI,GAAG;YAC5D,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC;YACpC,aAAa,EAAE,GAAG,CAAC,SAAS,CAAC,gBAAgB,CAAC;SAC/C,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,EAAE,CAAC;AAChB,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { NextFunction, Response, Request } from "express";
|
|
2
2
|
import { AuditBody } from "@alanszp/audit";
|
|
3
3
|
import { GenericRequest } from "../types/GenericRequest";
|
|
4
|
-
export
|
|
4
|
+
export type AuditBodyModifier = (req: Request<Record<string, string>, unknown, unknown>, res: Response) => Promise<Partial<AuditBody>> | Partial<AuditBody>;
|
|
5
5
|
/**
|
|
6
6
|
* Configures the audit log to execute AFTER the response is sent.
|
|
7
7
|
*/
|
|
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.auditLog =
|
|
12
|
+
exports.auditLog = auditLog;
|
|
13
13
|
const getIp_1 = require("../helpers/getIp");
|
|
14
14
|
/**
|
|
15
15
|
* Configures the audit log to execute AFTER the response is sent.
|
|
@@ -17,8 +17,8 @@ const getIp_1 = require("../helpers/getIp");
|
|
|
17
17
|
function auditLog(action, bodyModifier) {
|
|
18
18
|
return function writeAuditLogMiddleware(req, res, next) {
|
|
19
19
|
res.on("finish", function writeAuditLog() {
|
|
20
|
-
var _a, _b, _c, _d, _e;
|
|
21
20
|
return __awaiter(this, void 0, void 0, function* () {
|
|
21
|
+
var _a, _b, _c, _d, _e;
|
|
22
22
|
try {
|
|
23
23
|
const audit = req.context.audit;
|
|
24
24
|
const partialBody = bodyModifier
|
|
@@ -48,5 +48,4 @@ function auditLog(action, bodyModifier) {
|
|
|
48
48
|
next();
|
|
49
49
|
};
|
|
50
50
|
}
|
|
51
|
-
exports.auditLog = auditLog;
|
|
52
51
|
//# sourceMappingURL=auditLog.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auditLog.js","sourceRoot":"","sources":["../../src/middlewares/auditLog.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"auditLog.js","sourceRoot":"","sources":["../../src/middlewares/auditLog.ts"],"names":[],"mappings":";;;;;;;;;;;AAaA,4BA+CC;AA1DD,4CAAyC;AAQzC;;GAEG;AACH,SAAgB,QAAQ,CAAC,MAAc,EAAE,YAAgC;IACvE,OAAO,SAAS,uBAAuB,CACrC,GAAmB,EACnB,GAAa,EACb,IAAkB;QAElB,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,SAAe,aAAa;;;gBAC3C,IAAI,CAAC;oBACH,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC;oBAEhC,MAAM,WAAW,GAAG,YAAY;wBAC9B,CAAC,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;wBAC/C,CAAC,CAAE,EAAyB,CAAC;oBAE/B,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC;oBACpC,IAAI,OAAO,EAAE,CAAC;wBACZ,WAAW,CAAC,MAAM;4BAChB,MAAA,OAAO,CAAC,6BAA6B,mCACrC,OAAO,CAAC,qBAAqB,CAAC;wBAChC,WAAW,CAAC,kBAAkB,GAAG,OAAO,CAAC,eAAe,EAAE;4BACxD,CAAC,CAAC,OAAO,CAAC,qBAAqB;4BAC/B,CAAC,CAAC,SAAS,CAAC;wBACd,WAAW,CAAC,QAAQ,GAAG,MAAA,OAAO,CAAC,UAAU,mCAAI,OAAO,CAAC,EAAE,CAAC;wBACxD,WAAW,CAAC,oBAAoB,GAAG,OAAO,CAAC,eAAe,EAAE;4BAC1D,CAAC,CAAC,OAAO,CAAC,EAAE;4BACZ,CAAC,CAAC,SAAS,CAAC;oBAChB,CAAC;oBAED,WAAW,CAAC,EAAE,GAAG,IAAA,aAAK,EAAC,GAAG,CAAC,IAAI,OAAO,CAAC;oBAEvC,KAAK,CAAC,GAAG,+BACP,OAAO,EACL,GAAG,CAAC,UAAU,KAAK,GAAG;4BACtB,CAAC,GAAG,CAAC,UAAU,IAAI,GAAG,IAAI,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC,IAC9C,WAAW,KACd,GAAG,EAAE,MAAA,GAAG,CAAC,OAAO,CAAC,WAAW,mCAAI,SAAS,EACzC,GAAG,EAAE,MAAA,GAAG,CAAC,OAAO,CAAC,cAAc,mCAAI,SAAS,EAC5C,GAAG,EAAE,MAAA,GAAG,CAAC,OAAO,CAAC,SAAS,mCAAI,SAAS,EACvC,MAAM,IACN,CAAC;gBACL,CAAC;gBAAC,OAAO,KAAc,EAAE,CAAC;oBACxB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,yBAAyB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;gBACtE,CAAC;YACH,CAAC;SAAA,CAAC,CAAC;QAEH,IAAI,EAAE,CAAC;IACT,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.authForOrg =
|
|
3
|
+
exports.authForOrg = authForOrg;
|
|
4
4
|
const getRequestLogger_1 = require("../helpers/getRequestLogger");
|
|
5
5
|
const renderErrorJson_1 = require("../helpers/renderErrorJson");
|
|
6
6
|
function response401(res) {
|
|
@@ -41,5 +41,4 @@ function authForOrg(req, res, next) {
|
|
|
41
41
|
res.status(404).json((0, renderErrorJson_1.render404Error)());
|
|
42
42
|
}
|
|
43
43
|
}
|
|
44
|
-
exports.authForOrg = authForOrg;
|
|
45
44
|
//# sourceMappingURL=authedForOrg.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authedForOrg.js","sourceRoot":"","sources":["../../src/middlewares/authedForOrg.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"authedForOrg.js","sourceRoot":"","sources":["../../src/middlewares/authedForOrg.ts"],"names":[],"mappings":";;AASA,gCAwCC;AAhDD,kEAA+D;AAE/D,gEAA4E;AAE5E,SAAS,WAAW,CAAC,GAAa;IAChC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,gCAAc,EAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAChD,CAAC;AAED,SAAgB,UAAU,CACxB,GAAmB,EACnB,GAAa,EACb,IAAkB;;IAElB,MAAM,EAAE,YAAY,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;IACpC,MAAM,MAAM,GAAG,IAAA,mCAAgB,EAAC,GAAG,CAAC,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,CAAC;IAClE,IAAI,CAAC;QACH,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,MAAM,CAAC,KAAK,CAAC,kDAAkD,CAAC,CAAC;YACjE,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC;QAC1B,CAAC;QAED,IAAI,CAAC,CAAA,MAAA,MAAA,GAAG,CAAC,OAAO,0CAAE,OAAO,0CAAE,qBAAqB,CAAA,EAAE,CAAC;YACjD,MAAM,CAAC,IAAI,CAAC,wCAAwC,EAAE;gBACpD,OAAO,EAAE,CAAA,MAAA,GAAG,CAAC,OAAO,0CAAE,OAAO,KAAI,IAAI;aACtC,CAAC,CAAC;YACH,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC;QAC1B,CAAC;QAED,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC;QACzD,IAAI,MAAM,KAAK,YAAY,EAAE,CAAC;YAC5B,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;gBACtB,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,qBAAqB,GAAG,YAAY,CAAC;gBACzD,OAAO,IAAI,EAAE,CAAC;YAChB,CAAC;YAED,MAAM,CAAC,IAAI,CAAC,sCAAsC,EAAE;gBAClD,MAAM;aACP,CAAC,CAAC;YACH,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC;QAC1B,CAAC;QAED,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACxB,MAAM,CAAC,IAAI,CAAC,4CAA4C,EAAE;YACxD,KAAK;SACN,CAAC,CAAC;QACH,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,gCAAc,GAAE,CAAC,CAAC;IACzC,CAAC;AACH,CAAC"}
|
|
@@ -28,7 +28,7 @@ export interface BothMethodsOptions {
|
|
|
28
28
|
validApiKeys: string[];
|
|
29
29
|
types: [AuthMethods.JWT, AuthMethods.API_KEY] | [AuthMethods.API_KEY, AuthMethods.JWT];
|
|
30
30
|
}
|
|
31
|
-
export
|
|
31
|
+
export type AuthOptions = JWTOptions | ApiKeyOptions | BothMethodsOptions;
|
|
32
32
|
export declare function createAuthContext<Options extends AuthOptions>(options: Options): (authMethods: Options["types"][number][]) => (req: GenericRequest, res: Response, next: NextFunction) => Promise<void>;
|
|
33
33
|
/**
|
|
34
34
|
* Attempt to authenticate a user using the authentication methods sent by parameter
|
|
@@ -9,7 +9,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.
|
|
12
|
+
exports.JwtCookiesKeys = exports.AuthMethods = void 0;
|
|
13
|
+
exports.createAuthContext = createAuthContext;
|
|
14
|
+
exports.tsoaAuthProvider = tsoaAuthProvider;
|
|
13
15
|
const jwt_1 = require("@alanszp/jwt");
|
|
14
16
|
const cookie_1 = require("cookie");
|
|
15
17
|
const getRequestLogger_1 = require("../helpers/getRequestLogger");
|
|
@@ -28,13 +30,13 @@ var AuthMethods;
|
|
|
28
30
|
(function (AuthMethods) {
|
|
29
31
|
AuthMethods["JWT"] = "JWT";
|
|
30
32
|
AuthMethods["API_KEY"] = "API_KEY";
|
|
31
|
-
})(AuthMethods
|
|
33
|
+
})(AuthMethods || (exports.AuthMethods = AuthMethods = {}));
|
|
32
34
|
var JwtCookiesKeys;
|
|
33
35
|
(function (JwtCookiesKeys) {
|
|
34
36
|
JwtCookiesKeys["USER_ACCESS"] = "jwt";
|
|
35
37
|
JwtCookiesKeys["IMPERSONATED_ACCESS"] = "impersonatedJwt";
|
|
36
38
|
JwtCookiesKeys["PARTIAL_LOGIN_ACCESS"] = "partialAccessJwt";
|
|
37
|
-
})(JwtCookiesKeys
|
|
39
|
+
})(JwtCookiesKeys || (exports.JwtCookiesKeys = JwtCookiesKeys = {}));
|
|
38
40
|
const middlewareGetterByAuthType = {
|
|
39
41
|
[AuthMethods.JWT]: (req, options, logger) => __awaiter(void 0, void 0, void 0, function* () {
|
|
40
42
|
var _a, _b;
|
|
@@ -62,8 +64,8 @@ const middlewareGetterByAuthType = {
|
|
|
62
64
|
}
|
|
63
65
|
}),
|
|
64
66
|
[AuthMethods.API_KEY]: (req, options, logger) => __awaiter(void 0, void 0, void 0, function* () {
|
|
65
|
-
var
|
|
66
|
-
const token = (
|
|
67
|
+
var _a;
|
|
68
|
+
const token = (_a = req.headers) === null || _a === void 0 ? void 0 : _a.authorization;
|
|
67
69
|
try {
|
|
68
70
|
if (!token)
|
|
69
71
|
return undefined;
|
|
@@ -114,7 +116,6 @@ function createAuthContext(options) {
|
|
|
114
116
|
};
|
|
115
117
|
};
|
|
116
118
|
}
|
|
117
|
-
exports.createAuthContext = createAuthContext;
|
|
118
119
|
/**
|
|
119
120
|
* Attempt to authenticate a user using the authentication methods sent by parameter
|
|
120
121
|
* Used in authenticationModule for TSOA
|
|
@@ -154,5 +155,4 @@ function tsoaAuthProvider(req, options, authMethods) {
|
|
|
154
155
|
}
|
|
155
156
|
});
|
|
156
157
|
}
|
|
157
|
-
exports.tsoaAuthProvider = tsoaAuthProvider;
|
|
158
158
|
//# sourceMappingURL=authenticateUser.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authenticateUser.js","sourceRoot":"","sources":["../../src/middlewares/authenticateUser.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"authenticateUser.js","sourceRoot":"","sources":["../../src/middlewares/authenticateUser.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.createContext =
|
|
6
|
+
exports.createContext = createContext;
|
|
7
7
|
const cuid2_1 = require("@paralleldrive/cuid2");
|
|
8
8
|
const core_1 = require("@alanszp/core");
|
|
9
9
|
const newrelic_1 = __importDefault(require("newrelic"));
|
|
@@ -39,5 +39,4 @@ function createContext(sharedContext, baseLogger, audit) {
|
|
|
39
39
|
});
|
|
40
40
|
};
|
|
41
41
|
}
|
|
42
|
-
exports.createContext = createContext;
|
|
43
42
|
//# sourceMappingURL=createContext.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createContext.js","sourceRoot":"","sources":["../../src/middlewares/createContext.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createContext.js","sourceRoot":"","sources":["../../src/middlewares/createContext.ts"],"names":[],"mappings":";;;;;AASA,sCA8CC;AAvDD,gDAAgD;AAIhD,wCAAoE;AAGpE,wDAAgC;AAEhC,SAAgB,aAAa,CAC3B,aAA4B,EAC5B,UAAmB,EACnB,KAAY;IAEZ,OAAO,CAAC,GAAmB,EAAE,GAAa,EAAE,IAAkB,EAAQ,EAAE;;QACtE,GAAG,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;QAEhC,MAAM,aAAa,GACjB,GAAG,CAAC,MAAM,CAAC,mBAAmB,CAAC,KAAI,MAAA,MAAA,GAAG,CAAC,IAAI,0CAAE,MAAM,0CAAE,GAAG,CAAA,CAAC;QAC3D,MAAM,cAAc,GAAG,IAAA,2BAAoB,EAAC,aAAa,EAAE,IAAA,oBAAa,GAAE,CAAC,CAAC;QAE5E,MAAM,WAAW,GACf,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,KAAI,MAAA,MAAA,GAAG,CAAC,IAAI,0CAAE,MAAM,0CAAE,GAAG,CAAA,IAAI,IAAA,gBAAQ,GAAE,CAAC;QAEtE,MAAM,SAAS,GAAG,IAAA,gBAAQ,GAAE,CAAC;QAE7B,GAAG,CAAC,SAAS,CAAC,gBAAgB,EAAE,WAAW,CAAC,CAAC;QAC7C,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;QAEzC,aAAa,CAAC,GAAG,CACf,CAAC,OAAO,EAAE,EAAE;YACV,GAAG,CAAC,OAAO,CAAC,aAAa,GAAG,EAAE,CAAC;YAC/B,GAAG,CAAC,OAAO,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;YAC9C,GAAG,CAAC,OAAO,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;YACpD,GAAG,CAAC,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;YAC1C,GAAG,CAAC,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;YACjC,GAAG,CAAC,OAAO,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;YAElC,kBAAQ,CAAC,mBAAmB,CAAC;gBAC3B,GAAG,EAAE,OAAO,CAAC,cAAc;gBAC3B,GAAG,EAAE,OAAO,CAAC,WAAW;gBACxB,GAAG,EAAE,OAAO,CAAC,SAAS;aACvB,CAAC,CAAC;YAEH,IAAI,EAAE,CAAC;QACT,CAAC,EACD;YACE,MAAM,EAAE,UAAU;YAClB,KAAK,EAAE,KAAK,CAAC,SAAS,EAAE;YACxB,WAAW;YACX,cAAc;YACd,SAAS;SACV,CACF,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { ErrorRequestHandler } from "express";
|
|
2
2
|
import { ILogger } from "@alanszp/logger";
|
|
3
|
-
export
|
|
3
|
+
export type ErrorRequestHandlerMiddleware = (getLogger: () => ILogger) => ErrorRequestHandler;
|
|
4
4
|
export declare const errorRequestHandlerMiddleware: ErrorRequestHandlerMiddleware;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errorRequestHandlerMiddleware.js","sourceRoot":"","sources":["../../src/middlewares/errorRequestHandlerMiddleware.ts"],"names":[],"mappings":";;;AACA,4CAIyB;AACzB,wCAA8C;AAC9C,+BAAqC;AAGrC,oEAAiE;AACjE,qCAAgE;AAChE,gEAA4E;AAC5E,mCAAmC;AAM5B,MAAM,6BAA6B,GACxC,CAAC,SAAwB,EAAE,EAAE,CAC7B,CAAC,KAAc,EAAE,GAAmB,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;IACzE,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,OAAO,GAAG,IAAA,qCAAiB,EAAC,GAAG,CAAC,CAAC;IAEvC,IAAI;
|
|
1
|
+
{"version":3,"file":"errorRequestHandlerMiddleware.js","sourceRoot":"","sources":["../../src/middlewares/errorRequestHandlerMiddleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.
|
|
12
|
+
exports.hasPermission = hasPermission;
|
|
13
|
+
exports.hasSomePermission = hasSomePermission;
|
|
14
|
+
exports.hasEveryPermission = hasEveryPermission;
|
|
13
15
|
const hasRoles_1 = require("./hasRoles");
|
|
14
16
|
const renderErrorJson_1 = require("../helpers/renderErrorJson");
|
|
15
17
|
function response401(res) {
|
|
@@ -39,7 +41,6 @@ function hasPermission(permission) {
|
|
|
39
41
|
}
|
|
40
42
|
});
|
|
41
43
|
}
|
|
42
|
-
exports.hasPermission = hasPermission;
|
|
43
44
|
/**
|
|
44
45
|
* Check if the jwtUser has at least one permission
|
|
45
46
|
* If not, check if the jwtUser has the required roles (to maintain backwards compatibility)
|
|
@@ -64,7 +65,6 @@ function hasSomePermission(permissions) {
|
|
|
64
65
|
}
|
|
65
66
|
});
|
|
66
67
|
}
|
|
67
|
-
exports.hasSomePermission = hasSomePermission;
|
|
68
68
|
/**
|
|
69
69
|
* Check if the jwtUser has all permissions
|
|
70
70
|
* If not, check if the jwtUser has the required roles (to maintain backwards compatibility)
|
|
@@ -89,5 +89,4 @@ function hasEveryPermission(permissions) {
|
|
|
89
89
|
}
|
|
90
90
|
});
|
|
91
91
|
}
|
|
92
|
-
exports.hasEveryPermission = hasEveryPermission;
|
|
93
92
|
//# sourceMappingURL=hasPermissions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hasPermissions.js","sourceRoot":"","sources":["../../src/middlewares/hasPermissions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"hasPermissions.js","sourceRoot":"","sources":["../../src/middlewares/hasPermissions.ts"],"names":[],"mappings":";;;;;;;;;;;AAcA,sCAmBC;AAOD,8CAmBC;AAOD,gDAmBC;AAnFD,yCAAsC;AACtC,gEAA4D;AAE5D,SAAS,WAAW,CAAC,GAAa;IAChC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,gCAAc,EAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAChD,CAAC;AAED;;;;GAIG;AACH,SAAgB,aAAa,CAAC,UAAkB;IAC9C,OAAO,CAAO,GAAmB,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QACtE,IAAI,CAAC;YACH,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC;YAChC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC;YAC1B,CAAC;YAED,4GAA4G;YAC5G,IAAI,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC;gBAC/B,OAAO,IAAA,mBAAQ,EAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;YAC7C,CAAC;YAED,MAAM,OAAO,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;YAC7C,IAAI,EAAE,CAAC;QACT,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,IAAI,CAAC,KAAK,CAAC,CAAC;QACd,CAAC;IACH,CAAC,CAAA,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAgB,iBAAiB,CAAC,WAAqB;IACrD,OAAO,CAAO,GAAmB,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QACtE,IAAI,CAAC;YACH,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC;YAChC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC;YAC1B,CAAC;YAED,4GAA4G;YAC5G,IAAI,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC;gBAC/B,OAAO,IAAA,mBAAQ,EAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;YAC7C,CAAC;YAED,MAAM,OAAO,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC;YAClD,IAAI,EAAE,CAAC;QACT,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,IAAI,CAAC,KAAK,CAAC,CAAC;QACd,CAAC;IACH,CAAC,CAAA,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAgB,kBAAkB,CAAC,WAAqB;IACtD,OAAO,CAAO,GAAmB,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QACtE,IAAI,CAAC;YACH,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC;YAChC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC;YAC1B,CAAC;YAED,4GAA4G;YAC5G,IAAI,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC;gBAC/B,OAAO,IAAA,mBAAQ,EAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;YAC7C,CAAC;YAED,MAAM,OAAO,CAAC,uBAAuB,CAAC,WAAW,CAAC,CAAC;YACnD,IAAI,EAAE,CAAC;QACT,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,IAAI,CAAC,KAAK,CAAC,CAAC;QACd,CAAC;IACH,CAAC,CAAA,CAAC;AACJ,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.hasRoles =
|
|
3
|
+
exports.hasRoles = hasRoles;
|
|
4
4
|
const renderErrorJson_1 = require("../helpers/renderErrorJson");
|
|
5
5
|
function response403(res) {
|
|
6
6
|
res.status(403).json((0, renderErrorJson_1.render403Error)());
|
|
@@ -17,5 +17,4 @@ function hasRoles(roles) {
|
|
|
17
17
|
response403(res);
|
|
18
18
|
};
|
|
19
19
|
}
|
|
20
|
-
exports.hasRoles = hasRoles;
|
|
21
20
|
//# sourceMappingURL=hasRoles.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hasRoles.js","sourceRoot":"","sources":["../../src/middlewares/hasRoles.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"hasRoles.js","sourceRoot":"","sources":["../../src/middlewares/hasRoles.ts"],"names":[],"mappings":";;AAQA,4BAeC;AArBD,gEAA4D;AAE5D,SAAS,WAAW,CAAC,GAAa;IAChC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,gCAAc,GAAE,CAAC,CAAC;AACzC,CAAC;AAED,SAAgB,QAAQ,CACtB,KAAwB;IAExB,OAAO,CAAC,GAAmB,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QAChE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC;QAChC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC;QAC1B,CAAC;QAED,IAAI,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAC5B,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC;QAED,WAAW,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.jsonBodyParser =
|
|
3
|
+
exports.jsonBodyParser = jsonBodyParser;
|
|
4
4
|
const body_parser_1 = require("body-parser");
|
|
5
5
|
const renderErrorJson_1 = require("../helpers/renderErrorJson");
|
|
6
6
|
function jsonBodyParser(options) {
|
|
@@ -18,5 +18,4 @@ function jsonBodyParser(options) {
|
|
|
18
18
|
}
|
|
19
19
|
};
|
|
20
20
|
}
|
|
21
|
-
exports.jsonBodyParser = jsonBodyParser;
|
|
22
21
|
//# sourceMappingURL=jsonBodyParser.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jsonBodyParser.js","sourceRoot":"","sources":["../../src/middlewares/jsonBodyParser.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"jsonBodyParser.js","sourceRoot":"","sources":["../../src/middlewares/jsonBodyParser.ts"],"names":[],"mappings":";;AAKA,wCAgBC;AArBD,6CAAgD;AAGhD,gEAA4D;AAE5D,SAAgB,cAAc,CAAC,OAAqB;IAClD,MAAM,UAAU,GAAG,IAAA,kBAAI,kBAAG,KAAK,EAAE,KAAK,IAAK,OAAO,EAAG,CAAC;IACtD,OAAO,SAAS,wBAAwB,CACtC,GAAmB,EACnB,GAAa,EACb,IAAkB;QAElB,IAAI,CAAC;YACH,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,KAAe,EAAE,EAAE;gBACvC,IAAI,CAAC,KAAK;oBAAE,OAAO,IAAI,EAAE,CAAC;gBAC1B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,gCAAc,EAAC,gBAAgB,CAAC,CAAC,CAAC;YACzD,CAAC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,gCAAc,EAAC,gBAAgB,CAAC,CAAC,CAAC;QACzD,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.returnNotFound =
|
|
3
|
+
exports.returnNotFound = returnNotFound;
|
|
4
4
|
const renderErrorJson_1 = require("../helpers/renderErrorJson");
|
|
5
5
|
function returnNotFound(_req, res, _next) {
|
|
6
6
|
res.status(404).json((0, renderErrorJson_1.render404Error)());
|
|
7
7
|
}
|
|
8
|
-
exports.returnNotFound = returnNotFound;
|
|
9
8
|
//# sourceMappingURL=returnNotFound.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"returnNotFound.js","sourceRoot":"","sources":["../../src/middlewares/returnNotFound.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"returnNotFound.js","sourceRoot":"","sources":["../../src/middlewares/returnNotFound.ts"],"names":[],"mappings":";;AAIA,wCAMC;AARD,gEAA4D;AAE5D,SAAgB,cAAc,CAC5B,IAAoB,EACpB,GAAa,EACb,KAAmB;IAEnB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,gCAAc,GAAE,CAAC,CAAC;AACzC,CAAC"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
/// <reference types="jest" />
|
|
2
1
|
import { GenericRequest } from "../../types/GenericRequest";
|
|
3
|
-
export declare const mockRequest: (authorization: string, otherHeaders?: Record<string, unknown>
|
|
4
|
-
export declare const mockRequestWithBody: (authorization: string, otherHeaders?: Record<string, unknown
|
|
2
|
+
export declare const mockRequest: (authorization: string, otherHeaders?: Record<string, unknown>) => GenericRequest;
|
|
3
|
+
export declare const mockRequestWithBody: (authorization: string, otherHeaders?: Record<string, unknown>, body?: Record<string, unknown>) => GenericRequest;
|
|
5
4
|
export declare const mockResponse: () => any;
|
|
6
5
|
export declare const mockNext: () => jest.Mock<any, any>;
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
export
|
|
2
|
-
export
|
|
3
|
-
|
|
1
|
+
export type DistributiveOmit<T, K extends keyof any> = T extends any ? Omit<T, K> : never;
|
|
2
|
+
export type Overwrite<T, U> = DistributiveOmit<T, keyof U> & U;
|
|
3
|
+
type GenerateStringUnion<T> = Extract<{
|
|
4
4
|
[Key in keyof T]: true extends T[Key] ? Key : never;
|
|
5
5
|
}[keyof T], string>;
|
|
6
|
-
|
|
6
|
+
type OverridableStringUnion<T extends string | number, U = {}> = GenerateStringUnion<Overwrite<Record<T, true>, U>>;
|
|
7
7
|
export interface AuthMethodsOverride {
|
|
8
8
|
}
|
|
9
|
-
export
|
|
9
|
+
export type AuthMethod = OverridableStringUnion<"jwt" | "api_key", AuthMethodsOverride>;
|
|
10
10
|
export {};
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { Request } from "express";
|
|
2
|
-
export
|
|
2
|
+
export type GenericRequest = Request<any, any, any, any>;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@alanszp/express",
|
|
3
|
-
"version": "20.0
|
|
3
|
+
"version": "20.2.0",
|
|
4
4
|
"description": "Alan's express utils and middlewares.",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"typings": "dist/index.d.ts",
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"typeorm": "^0.3.28"
|
|
25
25
|
},
|
|
26
26
|
"devDependencies": {
|
|
27
|
-
"@alanszp/jwt": "^20.0
|
|
27
|
+
"@alanszp/jwt": "^20.2.0",
|
|
28
28
|
"@types/body-parser": "^1.19.1",
|
|
29
29
|
"@types/cookie": "^0.6.0",
|
|
30
30
|
"@types/express": "^4.17.12",
|
|
@@ -32,26 +32,26 @@
|
|
|
32
32
|
"@types/joi": "^17.2.3",
|
|
33
33
|
"@types/lodash": "^4.14.170",
|
|
34
34
|
"@types/newrelic": "^9.14.4",
|
|
35
|
-
"@types/node": "^
|
|
35
|
+
"@types/node": "^24.0.0",
|
|
36
36
|
"babel-jest": "^29.7.0",
|
|
37
37
|
"jest": "^29.7.0",
|
|
38
38
|
"ts-node": "^10.0.0",
|
|
39
39
|
"tslint": "^6.1.3",
|
|
40
40
|
"tsoa": "^6.2.0",
|
|
41
41
|
"typeorm": "^0.3.28",
|
|
42
|
-
"typescript": "^
|
|
42
|
+
"typescript": "^5.9.3"
|
|
43
43
|
},
|
|
44
44
|
"dependencies": {
|
|
45
|
-
"@alanszp/audit": "^20.0
|
|
46
|
-
"@alanszp/logger": "^20.0
|
|
47
|
-
"@alanszp/shared-context": "^20.0
|
|
45
|
+
"@alanszp/audit": "^20.2.0",
|
|
46
|
+
"@alanszp/logger": "^20.2.0",
|
|
47
|
+
"@alanszp/shared-context": "^20.2.0",
|
|
48
48
|
"@babel/core": "^7.23.9",
|
|
49
49
|
"@paralleldrive/cuid2": "^2.2.2",
|
|
50
50
|
"@types/cookies": "^0.7.0",
|
|
51
|
-
"body-parser": "^
|
|
51
|
+
"body-parser": "^2.2.2",
|
|
52
52
|
"cookie": "^0.7.0",
|
|
53
|
-
"lodash": "^4.17.
|
|
54
|
-
"newrelic": "^13.
|
|
53
|
+
"lodash": "^4.17.23",
|
|
54
|
+
"newrelic": "^13.16.0"
|
|
55
55
|
},
|
|
56
|
-
"gitHead": "
|
|
56
|
+
"gitHead": "5f7b992fc36b2b0291182f6c3ad380a837e6b754"
|
|
57
57
|
}
|