@mtg-tracker/common 1.0.10 → 1.0.12

package/build/errors/bad-request-error.d.ts

@@ -0,0 +1,9 @@
+import { CustomError } from './custom-error';
+export declare class BadRequestError extends CustomError {
+    message: string;
+    statusCode: number;
+    constructor(message: string);
+    serializeErrors(): {
+        message: string;
+    }[];
+}

package/build/errors/bad-request-error.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BadRequestError = void 0;
+const custom_error_1 = require("./custom-error");
+class BadRequestError extends custom_error_1.CustomError {
+    constructor(message) {
+        super(message);
+        this.message = message;
+        this.statusCode = 400;
+        Object.setPrototypeOf(this, BadRequestError.prototype);
+    }
+    serializeErrors() {
+        return [{ message: this.message }];
+    }
+}
+exports.BadRequestError = BadRequestError;

package/build/errors/custom-error.d.ts

@@ -0,0 +1,8 @@
+export declare abstract class CustomError extends Error {
+    abstract statusCode: number;
+    constructor(message: string);
+    abstract serializeErrors(): {
+        message: string;
+        field?: string;
+    }[];
+}

package/build/errors/custom-error.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CustomError = void 0;
+class CustomError extends Error {
+    constructor(message) {
+        super(message);
+        Object.setPrototypeOf(this, CustomError.prototype);
+    }
+}
+exports.CustomError = CustomError;

package/build/errors/request-validation-error.d.ts

@@ -0,0 +1,14 @@
+import { ValidationError } from 'express-validator';
+import { CustomError } from './custom-error';
+export declare class RequestValidationError extends CustomError {
+    errors: ValidationError[];
+    statusCode: number;
+    constructor(errors: ValidationError[]);
+    serializeErrors(): ({
+        message: any;
+        field: string;
+    } | {
+        message: any;
+        field?: undefined;
+    })[];
+}

package/build/errors/request-validation-error.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RequestValidationError = void 0;
+const custom_error_1 = require("./custom-error");
+class RequestValidationError extends custom_error_1.CustomError {
+    constructor(errors) {
+        super('Invalid request parameters');
+        this.errors = errors;
+        this.statusCode = 400;
+        // Only because we are extending a built in class
+        Object.setPrototypeOf(this, RequestValidationError.prototype);
+    }
+    serializeErrors() {
+        return this.errors.map((err) => {
+            if (err.type === 'field') {
+                return { message: err.msg, field: err.path };
+            }
+            return { message: err.msg };
+        });
+    }
+}
+exports.RequestValidationError = RequestValidationError;

package/build/functions/runMigrations.d.ts

@@ -1,2 +1,2 @@
 import mysql from 'mysql2/promise';
-export declare function runMigrations(pool: mysql.Pool): Promise<void>;
+export declare function runMigrations(pool: mysql.Pool, service: string): Promise<void>;

package/build/functions/runMigrations.js

@@ -15,24 +15,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.runMigrations = runMigrations;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-function runMigrations(pool) {
+function runMigrations(pool, service) {
     return __awaiter(this, void 0, void 0, function* () {
-        console.log('Running database migrations...');
+        console.log(`Running database migrations for the ${service} service...`);
+        // Sanitize service name
+        const sanitizedService = service.replace(/[^a-zA-Z0-9_]/g, '');
+        const migrationsTable = `migrations_${sanitizedService}`;
         // Create migrations tracking table if it doesn't exist
         yield pool.query(`
-    CREATE TABLE IF NOT EXISTS migrations_users (
+    CREATE TABLE IF NOT EXISTS ${migrationsTable} (
       id INT AUTO_INCREMENT PRIMARY KEY,
       filename VARCHAR(255) NOT NULL UNIQUE,
       executed_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
     )
   `);
         // Get all migration files
-        const migrationsDir = path_1.default.join(__dirname);
+        const migrationsDir = path_1.default.join(__dirname, 'migrations');
         const files = fs_1.default.readdirSync(migrationsDir)
             .filter(file => file.endsWith('_up.sql'))
-            .sort();
+            .sort(); // Sort to ensure correct order
         // Check which migrations have already been run
-        const [executedMigrations] = yield pool.query('SELECT filename FROM migrations_users');
+        const [executedMigrations] = yield pool.query(`SELECT filename FROM ${migrationsTable}`);
         const executedFiles = new Set(executedMigrations.map(row => row.filename));
         // Run pending migrations
         for (const file of files) {
@@ -47,7 +50,7 @@ function runMigrations(pool) {
                 // Execute the migration
                 yield pool.query(sql);
                 // Record that this migration was executed
-                yield pool.query('INSERT INTO migrations_users (filename) VALUES (?)', [file]);
+                yield pool.query(`INSERT INTO ${migrationsTable} (filename) VALUES (?)`, [file]);
                 console.log(`Migration ${file} completed successfully`);
             }
             catch (error) {
@@ -55,6 +58,6 @@ function runMigrations(pool) {
                 throw error;
             }
         }
-        console.log('All migrations complete on auth');
+        console.log('All migrations completed for the ' + service + ' service');
     });
 }

package/build/index.d.ts

@@ -1 +1,7 @@
 export * from './functions/runMigrations';
+export * from './errors/bad-request-error';
+export * from './errors/custom-error';
+export * from './errors/request-validation-error';
+export * from './middlewares/current-user';
+export * from './middlewares/error-handler';
+export * from './middlewares/validate-request';

package/build/index.js

@@ -15,3 +15,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./functions/runMigrations"), exports);
+__exportStar(require("./errors/bad-request-error"), exports);
+__exportStar(require("./errors/custom-error"), exports);
+__exportStar(require("./errors/request-validation-error"), exports);
+__exportStar(require("./middlewares/current-user"), exports);
+__exportStar(require("./middlewares/error-handler"), exports);
+__exportStar(require("./middlewares/validate-request"), exports);

package/build/middlewares/current-user.d.ts

@@ -0,0 +1,14 @@
+import { Request, Response, NextFunction } from 'express';
+interface UserPayload {
+    id: string;
+    email: string;
+}
+declare global {
+    namespace Express {
+        interface Request {
+            currentUser?: UserPayload;
+        }
+    }
+}
+export declare const currentUser: (req: Request, res: Response, next: NextFunction) => void;
+export {};

package/build/middlewares/current-user.js

@@ -0,0 +1,20 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.currentUser = void 0;
+const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
+const currentUser = (req, res, next) => {
+    var _a;
+    if (!((_a = req.session) === null || _a === void 0 ? void 0 : _a.jwt)) {
+        return next();
+    }
+    try {
+        const payload = jsonwebtoken_1.default.verify(req.session.jwt, process.env.JWT_KEY || 'your-secret-key');
+        req.currentUser = payload;
+    }
+    catch (err) { }
+    next();
+};
+exports.currentUser = currentUser;

package/build/middlewares/error-handler.d.ts

@@ -0,0 +1,2 @@
+import { Request, Response, NextFunction } from 'express';
+export declare const errorHandler: (err: Error, req: Request, res: Response, next: NextFunction) => Response<any, Record<string, any>> | undefined;

package/build/middlewares/error-handler.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.errorHandler = void 0;
+const custom_error_1 = require("../errors/custom-error");
+const errorHandler = (err, req, res, next) => {
+    if (err instanceof custom_error_1.CustomError) {
+        return res.status(err.statusCode).send({ errors: err.serializeErrors() });
+    }
+    res.status(400).send({
+        errors: [{ message: 'Something went wrong' }]
+    });
+};
+exports.errorHandler = errorHandler;

package/build/middlewares/validate-request.d.ts

@@ -0,0 +1,2 @@
+import { Request, Response, NextFunction } from 'express';
+export declare const validateRequest: (req: Request, res: Response, next: NextFunction) => void;

package/build/middlewares/validate-request.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateRequest = void 0;
+const express_validator_1 = require("express-validator");
+const request_validation_error_1 = require("../errors/request-validation-error");
+const validateRequest = (req, res, next) => {
+    const errors = (0, express_validator_1.validationResult)(req);
+    if (!errors.isEmpty()) {
+        throw new request_validation_error_1.RequestValidationError(errors.array());
+    }
+    next();
+};
+exports.validateRequest = validateRequest;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mtg-tracker/common",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",