@amktickets/common 1.0.3 → 1.0.5
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 +6 -2
- 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/middlewares/current-user.js +12 -4
- package/build/middlewares/error-handler.js +7 -3
- package/build/middlewares/require-auth.js +7 -3
- package/build/middlewares/validate-request.js +9 -5
- package/package.json +2 -2
|
@@ -1,5 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.BadRequestError = void 0;
|
|
4
|
+
const custom_error_js_1 = require("./custom-error.js");
|
|
5
|
+
class BadRequestError extends custom_error_js_1.CustomError {
|
|
3
6
|
constructor(message) {
|
|
4
7
|
super(message);
|
|
5
8
|
this.message = message;
|
|
@@ -10,3 +13,4 @@ export class BadRequestError extends CustomError {
|
|
|
10
13
|
return [{ message: this.message }];
|
|
11
14
|
}
|
|
12
15
|
}
|
|
16
|
+
exports.BadRequestError = BadRequestError;
|
|
@@ -1,6 +1,10 @@
|
|
|
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
|
Object.setPrototypeOf(this, CustomError.prototype);
|
|
5
8
|
}
|
|
6
9
|
}
|
|
10
|
+
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_js_1 = require("./custom-error.js");
|
|
5
|
+
class DatabaseConnectionError extends custom_error_js_1.CustomError {
|
|
3
6
|
constructor() {
|
|
4
7
|
super('Error connecting to database');
|
|
5
8
|
this.statusCode = 500;
|
|
@@ -10,3 +13,4 @@ export class DatabaseConnectionError extends CustomError {
|
|
|
10
13
|
return [{ message: this.reason }];
|
|
11
14
|
}
|
|
12
15
|
}
|
|
16
|
+
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_js_1 = require("./custom-error.js");
|
|
5
|
+
class NotAuthorizedError extends custom_error_js_1.CustomError {
|
|
3
6
|
constructor() {
|
|
4
7
|
super('Not authorized');
|
|
5
8
|
this.statusCode = 401;
|
|
@@ -9,3 +12,4 @@ export class NotAuthorizedError extends CustomError {
|
|
|
9
12
|
return [{ message: 'Not authorized' }];
|
|
10
13
|
}
|
|
11
14
|
}
|
|
15
|
+
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_js_1 = require("./custom-error.js");
|
|
5
|
+
class NotFoundError extends custom_error_js_1.CustomError {
|
|
3
6
|
constructor() {
|
|
4
7
|
super('Route not found');
|
|
5
8
|
this.statusCode = 404;
|
|
@@ -9,3 +12,4 @@ export class NotFoundError extends CustomError {
|
|
|
9
12
|
return [{ message: 'Not Found' }];
|
|
10
13
|
}
|
|
11
14
|
}
|
|
15
|
+
exports.NotFoundError = NotFoundError;
|
|
@@ -1,10 +1,13 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.RequestValidationError = void 0;
|
|
4
|
+
const custom_error_js_1 = require("./custom-error.js");
|
|
2
5
|
// instead of creating an interface we will create abstract class
|
|
3
6
|
// interface customError{
|
|
4
7
|
// statusCode: number;
|
|
5
8
|
// serializeErrors(): { message: string; field?: string }[];
|
|
6
9
|
// }
|
|
7
|
-
|
|
10
|
+
class RequestValidationError extends custom_error_js_1.CustomError {
|
|
8
11
|
constructor(errors) {
|
|
9
12
|
super('Invalid request parameters');
|
|
10
13
|
this.errors = errors;
|
|
@@ -21,3 +24,4 @@ export class RequestValidationError extends CustomError {
|
|
|
21
24
|
});
|
|
22
25
|
}
|
|
23
26
|
}
|
|
27
|
+
exports.RequestValidationError = RequestValidationError;
|
package/build/index.js
CHANGED
|
@@ -1,10 +1,26 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
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 });
|
|
17
|
+
__exportStar(require("./errors/bad-request-error"), exports);
|
|
18
|
+
__exportStar(require("./errors/custom-error"), exports);
|
|
19
|
+
__exportStar(require("./errors/database-connection-error"), exports);
|
|
20
|
+
__exportStar(require("./errors/not-authorized-error"), exports);
|
|
21
|
+
__exportStar(require("./errors/not-found-error"), exports);
|
|
22
|
+
__exportStar(require("./errors/request-validation-error"), exports);
|
|
23
|
+
__exportStar(require("./middlewares/current-user"), exports);
|
|
24
|
+
__exportStar(require("./middlewares/require-auth"), exports);
|
|
25
|
+
__exportStar(require("./middlewares/validate-request"), exports);
|
|
26
|
+
__exportStar(require("./middlewares/error-handler"), exports);
|
|
@@ -1,10 +1,17 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
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"));
|
|
8
|
+
const currentUser = (req, res, next) => {
|
|
9
|
+
var _a;
|
|
10
|
+
if (!((_a = req.session) === null || _a === void 0 ? void 0 : _a.jwt)) {
|
|
4
11
|
return next();
|
|
5
12
|
}
|
|
6
13
|
try {
|
|
7
|
-
const payload =
|
|
14
|
+
const payload = jsonwebtoken_1.default.verify(req.session.jwt, process.env.JWT_KEY);
|
|
8
15
|
req.currentUser = payload;
|
|
9
16
|
}
|
|
10
17
|
catch (err) {
|
|
@@ -12,3 +19,4 @@ export const currentUser = (req, res, next) => {
|
|
|
12
19
|
}
|
|
13
20
|
next();
|
|
14
21
|
};
|
|
22
|
+
exports.currentUser = currentUser;
|
|
@@ -1,9 +1,13 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.errorHandler = void 0;
|
|
4
|
+
const custom_error_js_1 = require("../errors/custom-error.js");
|
|
5
|
+
const errorHandler = (err, req, res, next) => {
|
|
6
|
+
if (err instanceof custom_error_js_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
|
};
|
|
13
|
+
exports.errorHandler = errorHandler;
|
|
@@ -1,7 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.requireAuth = void 0;
|
|
4
|
+
const not_authorized_error_js_1 = require("../errors/not-authorized-error.js");
|
|
5
|
+
const requireAuth = (req, res, next) => {
|
|
3
6
|
if (!req.currentUser) {
|
|
4
|
-
throw new NotAuthorizedError();
|
|
7
|
+
throw new not_authorized_error_js_1.NotAuthorizedError();
|
|
5
8
|
}
|
|
6
9
|
next();
|
|
7
10
|
};
|
|
11
|
+
exports.requireAuth = requireAuth;
|
|
@@ -1,9 +1,13 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
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_js_1 = require("../errors/request-validation-error.js");
|
|
6
|
+
const validateRequest = (req, res, next) => {
|
|
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_js_1.RequestValidationError(errors.array());
|
|
7
10
|
}
|
|
8
11
|
next();
|
|
9
12
|
};
|
|
13
|
+
exports.validateRequest = validateRequest;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@amktickets/common",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.5",
|
|
4
4
|
"main": "./build/index.js",
|
|
5
5
|
"types": "./build/index.d.ts",
|
|
6
6
|
"files": [
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
},
|
|
22
22
|
"dependencies": {
|
|
23
23
|
"@types/cookie-session": "^2.0.49",
|
|
24
|
-
"@types/express": "^
|
|
24
|
+
"@types/express": "^4.17.25",
|
|
25
25
|
"@types/jsonwebtoken": "^9.0.10",
|
|
26
26
|
"cookie-session": "^2.1.1",
|
|
27
27
|
"express": "^5.2.1",
|