From 952c70fca445599c9a46062fc29862f64eb86c51 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Tue, 20 Jan 2026 23:07:31 +0000 Subject: [PATCH] remove v1 dir --- server/src/app.js | 6 +++--- server/src/config/routes.ts | 4 ++-- server/src/middleware/{v1 => }/handleErrors.ts | 0 server/src/middleware/{v1 => }/isAllowed.ts | 0 server/src/middleware/{v1 => }/rateLimiter.ts | 0 server/src/middleware/{v1 => }/sanitization.ts | 0 server/src/middleware/{v1 => }/verifyJWT.ts | 0 server/src/routes/v1/authRoute.js | 2 +- server/src/routes/v1/checkRoute.js | 2 +- server/src/routes/v1/diagnosticRoute.js | 2 +- server/src/routes/v1/incidentRoute.js | 2 +- server/src/routes/v1/inviteRoute.js | 2 +- server/src/routes/v1/logRoutes.js | 2 +- server/src/routes/v1/monitorRoute.ts | 2 +- server/src/routes/v1/queueRoute.js | 2 +- server/src/routes/v1/settingsRoute.js | 2 +- 16 files changed, 14 insertions(+), 14 deletions(-) rename server/src/middleware/{v1 => }/handleErrors.ts (100%) rename server/src/middleware/{v1 => }/isAllowed.ts (100%) rename server/src/middleware/{v1 => }/rateLimiter.ts (100%) rename server/src/middleware/{v1 => }/sanitization.ts (100%) rename server/src/middleware/{v1 => }/verifyJWT.ts (100%) diff --git a/server/src/app.js b/server/src/app.js index cd47d36e7..c83726a49 100644 --- a/server/src/app.js +++ b/server/src/app.js @@ -5,10 +5,10 @@ import helmet from "helmet"; import compression from "compression"; import cookieParser from "cookie-parser"; import swaggerUi from "swagger-ui-express"; -import { handleErrors } from "./middleware/v1/handleErrors.js"; +import { handleErrors } from "./middleware/handleErrors.js"; import { setupRoutes } from "./config/routes.js"; -import { generalApiLimiter } from "./middleware/v1/rateLimiter.js"; -import { sanitizeBody, sanitizeQuery } from "./middleware/v1/sanitization.js"; +import { generalApiLimiter } from "./middleware/rateLimiter.js"; +import { sanitizeBody, sanitizeQuery } from "./middleware/sanitization.js"; export const createApp = ({ services, controllers, envSettings, frontendPath, openApiSpec }) => { const allowedOrigin = envSettings.clientHost; diff --git a/server/src/config/routes.ts b/server/src/config/routes.ts index 835480b56..024387c25 100644 --- a/server/src/config/routes.ts +++ b/server/src/config/routes.ts @@ -1,5 +1,5 @@ -import { createVerifyJWT } from "../middleware/v1/verifyJWT.js"; -import { authApiLimiter } from "../middleware/v1/rateLimiter.js"; +import { createVerifyJWT } from "../middleware/verifyJWT.js"; +import { authApiLimiter } from "../middleware/rateLimiter.js"; import AuthRoutes from "../routes/v1/authRoute.js"; import InviteRoutes from "../routes/v1/inviteRoute.js"; diff --git a/server/src/middleware/v1/handleErrors.ts b/server/src/middleware/handleErrors.ts similarity index 100% rename from server/src/middleware/v1/handleErrors.ts rename to server/src/middleware/handleErrors.ts diff --git a/server/src/middleware/v1/isAllowed.ts b/server/src/middleware/isAllowed.ts similarity index 100% rename from server/src/middleware/v1/isAllowed.ts rename to server/src/middleware/isAllowed.ts diff --git a/server/src/middleware/v1/rateLimiter.ts b/server/src/middleware/rateLimiter.ts similarity index 100% rename from server/src/middleware/v1/rateLimiter.ts rename to server/src/middleware/rateLimiter.ts diff --git a/server/src/middleware/v1/sanitization.ts b/server/src/middleware/sanitization.ts similarity index 100% rename from server/src/middleware/v1/sanitization.ts rename to server/src/middleware/sanitization.ts diff --git a/server/src/middleware/v1/verifyJWT.ts b/server/src/middleware/verifyJWT.ts similarity index 100% rename from server/src/middleware/v1/verifyJWT.ts rename to server/src/middleware/verifyJWT.ts diff --git a/server/src/routes/v1/authRoute.js b/server/src/routes/v1/authRoute.js index 0be1e4750..0eca250e5 100755 --- a/server/src/routes/v1/authRoute.js +++ b/server/src/routes/v1/authRoute.js @@ -1,5 +1,5 @@ import { Router } from "express"; -import { isAllowed } from "../../middleware/v1/isAllowed.js"; +import { isAllowed } from "../../middleware/isAllowed.js"; import multer from "multer"; const upload = multer(); diff --git a/server/src/routes/v1/checkRoute.js b/server/src/routes/v1/checkRoute.js index 6565425d4..2c34049bb 100755 --- a/server/src/routes/v1/checkRoute.js +++ b/server/src/routes/v1/checkRoute.js @@ -1,6 +1,6 @@ import { Router } from "express"; -import { isAllowed } from "../../middleware/v1/isAllowed.js"; +import { isAllowed } from "../../middleware/isAllowed.js"; class CheckRoutes { constructor(checkController) { diff --git a/server/src/routes/v1/diagnosticRoute.js b/server/src/routes/v1/diagnosticRoute.js index d0d1be8a2..9ec470e53 100755 --- a/server/src/routes/v1/diagnosticRoute.js +++ b/server/src/routes/v1/diagnosticRoute.js @@ -1,5 +1,5 @@ import { Router } from "express"; -import { isAllowed } from "../../middleware/v1/isAllowed.js"; +import { isAllowed } from "../../middleware/isAllowed.js"; class DiagnosticRoutes { constructor(diagnosticController, verifyJWT) { diff --git a/server/src/routes/v1/incidentRoute.js b/server/src/routes/v1/incidentRoute.js index 6825ce21e..f87ef17a7 100644 --- a/server/src/routes/v1/incidentRoute.js +++ b/server/src/routes/v1/incidentRoute.js @@ -1,5 +1,5 @@ import { Router } from "express"; -import { isAllowed } from "../../middleware/v1/isAllowed.js"; +import { isAllowed } from "../../middleware/isAllowed.js"; class IncidentRoutes { constructor(incidentController) { diff --git a/server/src/routes/v1/inviteRoute.js b/server/src/routes/v1/inviteRoute.js index 6ef9671a3..44ec0495f 100755 --- a/server/src/routes/v1/inviteRoute.js +++ b/server/src/routes/v1/inviteRoute.js @@ -1,5 +1,5 @@ import { Router } from "express"; -import { isAllowed } from "../../middleware/v1/isAllowed.js"; +import { isAllowed } from "../../middleware/isAllowed.js"; class InviteRoutes { constructor(inviteController, verifyJWT) { diff --git a/server/src/routes/v1/logRoutes.js b/server/src/routes/v1/logRoutes.js index 43da8b75a..feabe669a 100755 --- a/server/src/routes/v1/logRoutes.js +++ b/server/src/routes/v1/logRoutes.js @@ -1,5 +1,5 @@ import { Router } from "express"; -import { isAllowed } from "../../middleware/v1/isAllowed.js"; +import { isAllowed } from "../../middleware/isAllowed.js"; class LogRoutes { constructor(logController) { this.router = Router(); diff --git a/server/src/routes/v1/monitorRoute.ts b/server/src/routes/v1/monitorRoute.ts index 2e6db630d..4488a2c49 100755 --- a/server/src/routes/v1/monitorRoute.ts +++ b/server/src/routes/v1/monitorRoute.ts @@ -1,5 +1,5 @@ import { Router } from "express"; -import { isAllowed } from "../../middleware/v1/isAllowed.js"; +import { isAllowed } from "../../middleware/isAllowed.js"; import multer from "multer"; import { fetchMonitorCertificate } from "../../controllers/controllerUtils.js"; const upload = multer({ diff --git a/server/src/routes/v1/queueRoute.js b/server/src/routes/v1/queueRoute.js index c6cfa05da..59e1cb744 100755 --- a/server/src/routes/v1/queueRoute.js +++ b/server/src/routes/v1/queueRoute.js @@ -1,5 +1,5 @@ import { Router } from "express"; -import { isAllowed } from "../../middleware/v1/isAllowed.js"; +import { isAllowed } from "../../middleware/isAllowed.js"; class QueueRoutes { constructor(queueController) { this.router = Router(); diff --git a/server/src/routes/v1/settingsRoute.js b/server/src/routes/v1/settingsRoute.js index e88186af2..76556e923 100755 --- a/server/src/routes/v1/settingsRoute.js +++ b/server/src/routes/v1/settingsRoute.js @@ -1,5 +1,5 @@ import { Router } from "express"; -import { isAllowed } from "../../middleware/v1/isAllowed.js"; +import { isAllowed } from "../../middleware/isAllowed.js"; class SettingsRoutes { constructor(settingsController) {