@thebester/common 1.0.10 → 1.0.12
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/build/errors/bad-request-error.js +5 -3
- package/build/errors/custom-error.js +5 -1
- package/build/errors/database-connection-error.js +6 -2
- package/build/errors/not-authorized-error.js +6 -2
- package/build/errors/not-found-error.js +6 -2
- package/build/errors/request-validation-error.js +6 -2
- package/build/index.js +26 -10
- package/build/middelwares/current-user.d.ts +2 -2
- package/build/middelwares/current-user.js +9 -3
- package/build/middelwares/error-handler.d.ts +1 -2
- package/build/middelwares/error-handler.js +6 -3
- package/build/middelwares/require-auth.d.ts +1 -2
- package/build/middelwares/require-auth.js +6 -3
- package/build/middelwares/validate-request.d.ts +1 -2
- package/build/middelwares/validate-request.js +8 -5
- package/package.json +1 -2
|
@@ -1,5 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const custom_error_1 = require("./custom-error");
|
|
4
|
+
class BadRequestError extends custom_error_1.CustomError {
|
|
3
5
|
constructor(message) {
|
|
4
6
|
super(message);
|
|
5
7
|
this.message = message;
|
|
@@ -11,4 +13,4 @@ class BadRequestError extends CustomError {
|
|
|
11
13
|
return [{ message: this.message }];
|
|
12
14
|
}
|
|
13
15
|
}
|
|
14
|
-
|
|
16
|
+
exports.default = BadRequestError;
|
|
@@ -1,7 +1,11 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.CustomError = void 0;
|
|
4
|
+
class CustomError extends Error {
|
|
2
5
|
constructor(message) {
|
|
3
6
|
super(message);
|
|
4
7
|
// Only because we are extending a built in class
|
|
5
8
|
Object.setPrototypeOf(this, CustomError.prototype);
|
|
6
9
|
}
|
|
7
10
|
}
|
|
11
|
+
exports.CustomError = CustomError;
|
|
@@ -1,5 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.DatabaseConnectionError = void 0;
|
|
4
|
+
const custom_error_1 = require("./custom-error");
|
|
5
|
+
class DatabaseConnectionError extends custom_error_1.CustomError {
|
|
3
6
|
constructor() {
|
|
4
7
|
super("Error connecting to database");
|
|
5
8
|
this.statusCode = 500;
|
|
@@ -15,3 +18,4 @@ export class DatabaseConnectionError extends CustomError {
|
|
|
15
18
|
];
|
|
16
19
|
}
|
|
17
20
|
}
|
|
21
|
+
exports.DatabaseConnectionError = DatabaseConnectionError;
|
|
@@ -1,5 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.NotAuthorizedError = void 0;
|
|
4
|
+
const custom_error_1 = require("./custom-error");
|
|
5
|
+
class NotAuthorizedError extends custom_error_1.CustomError {
|
|
3
6
|
constructor() {
|
|
4
7
|
super("Not authorized");
|
|
5
8
|
this.statusCode = 401;
|
|
@@ -10,3 +13,4 @@ export class NotAuthorizedError extends CustomError {
|
|
|
10
13
|
return [{ message: "Not authorized" }];
|
|
11
14
|
}
|
|
12
15
|
}
|
|
16
|
+
exports.NotAuthorizedError = NotAuthorizedError;
|
|
@@ -1,5 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.NotFoundError = void 0;
|
|
4
|
+
const custom_error_1 = require("./custom-error");
|
|
5
|
+
class NotFoundError extends custom_error_1.CustomError {
|
|
3
6
|
constructor() {
|
|
4
7
|
super("Route not found");
|
|
5
8
|
this.statusCode = 404;
|
|
@@ -14,3 +17,4 @@ export class NotFoundError extends CustomError {
|
|
|
14
17
|
];
|
|
15
18
|
}
|
|
16
19
|
}
|
|
20
|
+
exports.NotFoundError = NotFoundError;
|
|
@@ -1,5 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.RequestValidationError = void 0;
|
|
4
|
+
const custom_error_1 = require("./custom-error");
|
|
5
|
+
class RequestValidationError extends custom_error_1.CustomError {
|
|
3
6
|
constructor(errors) {
|
|
4
7
|
super("Invalid request parameters");
|
|
5
8
|
this.errors = errors;
|
|
@@ -17,3 +20,4 @@ export class RequestValidationError extends CustomError {
|
|
|
17
20
|
});
|
|
18
21
|
}
|
|
19
22
|
}
|
|
23
|
+
exports.RequestValidationError = RequestValidationError;
|
package/build/index.js
CHANGED
|
@@ -1,11 +1,27 @@
|
|
|
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 __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
+
};
|
|
16
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
1
17
|
// Re-export stuff from errors and middlewares
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
18
|
+
__exportStar(require("./errors/bad-request-error"), exports);
|
|
19
|
+
__exportStar(require("./errors/custom-error"), exports);
|
|
20
|
+
__exportStar(require("./errors/database-connection-error"), exports);
|
|
21
|
+
__exportStar(require("./errors/not-authorized-error"), exports);
|
|
22
|
+
__exportStar(require("./errors/not-found-error"), exports);
|
|
23
|
+
__exportStar(require("./errors/request-validation-error"), exports);
|
|
24
|
+
__exportStar(require("./middelwares/current-user"), exports);
|
|
25
|
+
__exportStar(require("./middelwares/error-handler"), exports);
|
|
26
|
+
__exportStar(require("./middelwares/require-auth"), exports);
|
|
27
|
+
__exportStar(require("./middelwares/validate-request"), exports);
|
|
@@ -1,15 +1,21 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.currentUser = void 0;
|
|
7
|
+
const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
|
|
2
8
|
const currentUser = (req, res, next) => {
|
|
3
9
|
var _a;
|
|
4
10
|
if (!((_a = req.session) === null || _a === void 0 ? void 0 : _a.jwt)) {
|
|
5
11
|
return next();
|
|
6
12
|
}
|
|
7
13
|
try {
|
|
8
|
-
const payload =
|
|
14
|
+
const payload = jsonwebtoken_1.default.verify(req.session.jwt, process.env.JWT_KEY);
|
|
9
15
|
req.currentUser = payload;
|
|
10
16
|
}
|
|
11
17
|
catch (err) {
|
|
12
18
|
}
|
|
13
19
|
next();
|
|
14
20
|
};
|
|
15
|
-
|
|
21
|
+
exports.currentUser = currentUser;
|
|
@@ -1,3 +1,2 @@
|
|
|
1
1
|
import type { Request, Response, NextFunction } from "express";
|
|
2
|
-
declare const errorHandler: (err: Error, req: Request, res: Response, next: NextFunction) => Response<any, Record<string, any>> | undefined;
|
|
3
|
-
export default errorHandler;
|
|
2
|
+
export declare const errorHandler: (err: Error, req: Request, res: Response, next: NextFunction) => Response<any, Record<string, any>> | undefined;
|
|
@@ -1,10 +1,13 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.errorHandler = void 0;
|
|
4
|
+
const custom_error_1 = require("../errors/custom-error");
|
|
2
5
|
const errorHandler = (err, req, res, next) => {
|
|
3
|
-
if (err instanceof CustomError) {
|
|
6
|
+
if (err instanceof custom_error_1.CustomError) {
|
|
4
7
|
return res.status(err.statusCode).send({ errors: err.serializeErrors() });
|
|
5
8
|
}
|
|
6
9
|
res.status(400).send({
|
|
7
10
|
errors: [{ message: "Something went wrong" }]
|
|
8
11
|
});
|
|
9
12
|
};
|
|
10
|
-
|
|
13
|
+
exports.errorHandler = errorHandler;
|
|
@@ -1,3 +1,2 @@
|
|
|
1
1
|
import type { Request, Response, NextFunction } from "express";
|
|
2
|
-
declare const requireAuth: (req: Request, res: Response, next: NextFunction) => void;
|
|
3
|
-
export default requireAuth;
|
|
2
|
+
export declare const requireAuth: (req: Request, res: Response, next: NextFunction) => void;
|
|
@@ -1,8 +1,11 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.requireAuth = void 0;
|
|
4
|
+
const not_authorized_error_1 = require("../errors/not-authorized-error");
|
|
2
5
|
const requireAuth = (req, res, next) => {
|
|
3
6
|
if (!req.currentUser) {
|
|
4
|
-
throw new NotAuthorizedError();
|
|
7
|
+
throw new not_authorized_error_1.NotAuthorizedError();
|
|
5
8
|
}
|
|
6
9
|
next();
|
|
7
10
|
};
|
|
8
|
-
|
|
11
|
+
exports.requireAuth = requireAuth;
|
|
@@ -1,3 +1,2 @@
|
|
|
1
1
|
import type { Request, Response, NextFunction } from "express";
|
|
2
|
-
declare const validateRequest: (req: Request, res: Response, next: NextFunction) => void;
|
|
3
|
-
export default validateRequest;
|
|
2
|
+
export declare const validateRequest: (req: Request, res: Response, next: NextFunction) => void;
|
|
@@ -1,10 +1,13 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.validateRequest = void 0;
|
|
4
|
+
const express_validator_1 = require("express-validator");
|
|
5
|
+
const request_validation_error_1 = require("../errors/request-validation-error");
|
|
3
6
|
const validateRequest = (req, res, next) => {
|
|
4
|
-
const errors = validationResult(req);
|
|
7
|
+
const errors = (0, express_validator_1.validationResult)(req);
|
|
5
8
|
if (!errors.isEmpty()) {
|
|
6
|
-
throw new RequestValidationError(errors.array());
|
|
9
|
+
throw new request_validation_error_1.RequestValidationError(errors.array());
|
|
7
10
|
}
|
|
8
11
|
next();
|
|
9
12
|
};
|
|
10
|
-
|
|
13
|
+
exports.validateRequest = validateRequest;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@thebester/common",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.12",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "./build/index.js",
|
|
6
6
|
"types": "./build/index.d.ts",
|
|
@@ -15,7 +15,6 @@
|
|
|
15
15
|
"keywords": [],
|
|
16
16
|
"author": "",
|
|
17
17
|
"license": "ISC",
|
|
18
|
-
"type": "module",
|
|
19
18
|
"devDependencies": {
|
|
20
19
|
"del-cli": "^7.0.0",
|
|
21
20
|
"typescript": "^5.9.3"
|