diff --git a/Server/controllers/authController.js b/Server/controllers/authController.js index ce4f7b785..94952e3c7 100644 --- a/Server/controllers/authController.js +++ b/Server/controllers/authController.js @@ -13,16 +13,14 @@ import { getTokenFromHeaders, tokenType } from "../utils/utils.js"; import crypto from "crypto"; import { handleValidationError, handleError } from "./controllerUtils.js"; const SERVICE_NAME = "authController"; -import ServiceRegistry from "../service/serviceRegistry.js"; -import StringService from "../service/stringService.js"; class AuthController { - constructor(db, settingsService, emailService, jobQueue) { + constructor(db, settingsService, emailService, jobQueue, stringService) { this.db = db; this.settingsService = settingsService; this.emailService = emailService; this.jobQueue = jobQueue; - this.stringService = ServiceRegistry.get(StringService.SERVICE_NAME); + this.stringService = stringService; } /** diff --git a/Server/controllers/checkController.js b/Server/controllers/checkController.js index a345212f3..2addd7359 100644 --- a/Server/controllers/checkController.js +++ b/Server/controllers/checkController.js @@ -12,16 +12,14 @@ import { import jwt from "jsonwebtoken"; import { getTokenFromHeaders } from "../utils/utils.js"; import { handleValidationError, handleError } from "./controllerUtils.js"; -import ServiceRegistry from "../service/serviceRegistry.js"; -import StringService from "../service/stringService.js"; const SERVICE_NAME = "checkController"; class CheckController { - constructor(db, settingsService) { + constructor(db, settingsService, stringService) { this.db = db; this.settingsService = settingsService; - this.stringService = ServiceRegistry.get(StringService.SERVICE_NAME); + this.stringService = stringService; } createCheck = async (req, res, next) => { diff --git a/Server/controllers/inviteController.js b/Server/controllers/inviteController.js index 146eb34c2..40d045432 100644 --- a/Server/controllers/inviteController.js +++ b/Server/controllers/inviteController.js @@ -7,17 +7,15 @@ import logger from "../utils/logger.js"; import jwt from "jsonwebtoken"; import { handleError, handleValidationError } from "./controllerUtils.js"; import { getTokenFromHeaders } from "../utils/utils.js"; -import ServiceRegistry from "../service/serviceRegistry.js"; -import StringService from "../service/stringService.js"; const SERVICE_NAME = "inviteController"; class InviteController { - constructor(db, settingsService, emailService) { + constructor(db, settingsService, emailService, stringService) { this.db = db; this.settingsService = settingsService; this.emailService = emailService; - this.stringService = ServiceRegistry.get(StringService.SERVICE_NAME); + this.stringService = stringService; } /** diff --git a/Server/controllers/maintenanceWindowController.js b/Server/controllers/maintenanceWindowController.js index a1a3395c8..a11f957ed 100644 --- a/Server/controllers/maintenanceWindowController.js +++ b/Server/controllers/maintenanceWindowController.js @@ -10,16 +10,14 @@ import { import jwt from "jsonwebtoken"; import { getTokenFromHeaders } from "../utils/utils.js"; import { handleValidationError, handleError } from "./controllerUtils.js"; -import ServiceRegistry from "../service/serviceRegistry.js"; -import StringService from "../service/stringService.js"; const SERVICE_NAME = "maintenanceWindowController"; class MaintenanceWindowController { - constructor(db, settingsService) { + constructor(db, settingsService, stringService) { this.db = db; this.settingsService = settingsService; - this.stringService = ServiceRegistry.get(StringService.SERVICE_NAME); + this.stringService = stringService; } createMaintenanceWindows = async (req, res, next) => { diff --git a/Server/controllers/monitorController.js b/Server/controllers/monitorController.js index 66d68c74b..f65113cd7 100644 --- a/Server/controllers/monitorController.js +++ b/Server/controllers/monitorController.js @@ -20,16 +20,14 @@ import logger from "../utils/logger.js"; import { handleError, handleValidationError } from "./controllerUtils.js"; import axios from "axios"; import seedDb from "../db/mongo/utils/seedDb.js"; -import ServiceRegistry from "../service/serviceRegistry.js"; -import StringService from "../service/stringService.js"; const SERVICE_NAME = "monitorController"; class MonitorController { - constructor(db, settingsService, jobQueue) { + constructor(db, settingsService, jobQueue, stringService) { this.db = db; this.settingsService = settingsService; this.jobQueue = jobQueue; - this.stringService = ServiceRegistry.get(StringService.SERVICE_NAME); + this.stringService = stringService; } /** diff --git a/Server/controllers/queueController.js b/Server/controllers/queueController.js index bd33fa001..330ade532 100644 --- a/Server/controllers/queueController.js +++ b/Server/controllers/queueController.js @@ -1,13 +1,11 @@ import { handleError } from "./controllerUtils.js"; -import ServiceRegistry from "../service/serviceRegistry.js"; -import StringService from "../service/stringService.js"; const SERVICE_NAME = "JobQueueController"; class JobQueueController { - constructor(jobQueue) { + constructor(jobQueue, stringService) { this.jobQueue = jobQueue; - this.stringService = ServiceRegistry.get(StringService.SERVICE_NAME); + this.stringService = stringService; } getMetrics = async (req, res, next) => { diff --git a/Server/controllers/settingsController.js b/Server/controllers/settingsController.js index 7e4018241..54643dfbb 100644 --- a/Server/controllers/settingsController.js +++ b/Server/controllers/settingsController.js @@ -1,15 +1,13 @@ -import ServiceRegistry from "../service/serviceRegistry.js"; -import StringService from "../service/stringService.js"; import { updateAppSettingsBodyValidation } from "../validation/joi.js"; import { handleValidationError, handleError } from "./controllerUtils.js"; const SERVICE_NAME = "SettingsController"; class SettingsController { - constructor(db, settingsService) { + constructor(db, settingsService, stringService) { this.db = db; this.settingsService = settingsService; - this.stringService = ServiceRegistry.get(StringService.SERVICE_NAME); + this.stringService = stringService; } getAppSettings = async (req, res, next) => { diff --git a/Server/controllers/statusPageController.js b/Server/controllers/statusPageController.js index b38989115..6c1192b95 100644 --- a/Server/controllers/statusPageController.js +++ b/Server/controllers/statusPageController.js @@ -10,9 +10,9 @@ import { successMessages, errorMessages } from "../utils/messages.js"; const SERVICE_NAME = "statusPageController"; class StatusPageController { - constructor(db) { + constructor(db, stringService) { this.db = db; - this.stringService = ServiceRegistry.get(StringService.SERVICE_NAME); + this.stringService = stringService; } createStatusPage = async (req, res, next) => { diff --git a/Server/index.js b/Server/index.js index 76bb60023..8eefabf30 100644 --- a/Server/index.js +++ b/Server/index.js @@ -222,39 +222,49 @@ const startApp = async () => { ServiceRegistry.get(SettingsService.SERVICE_NAME), ServiceRegistry.get(EmailService.SERVICE_NAME), ServiceRegistry.get(JobQueue.SERVICE_NAME), + ServiceRegistry.get(StringService.SERVICE_NAME) ); const monitorController = new MonitorController( ServiceRegistry.get(MongoDB.SERVICE_NAME), ServiceRegistry.get(SettingsService.SERVICE_NAME), - ServiceRegistry.get(JobQueue.SERVICE_NAME) + ServiceRegistry.get(JobQueue.SERVICE_NAME), + ServiceRegistry.get(StringService.SERVICE_NAME) ); const settingsController = new SettingsController( ServiceRegistry.get(MongoDB.SERVICE_NAME), - ServiceRegistry.get(SettingsService.SERVICE_NAME) + ServiceRegistry.get(SettingsService.SERVICE_NAME), + ServiceRegistry.get(StringService.SERVICE_NAME) ); const checkController = new CheckController( ServiceRegistry.get(MongoDB.SERVICE_NAME), - ServiceRegistry.get(SettingsService.SERVICE_NAME) + ServiceRegistry.get(SettingsService.SERVICE_NAME), + ServiceRegistry.get(StringService.SERVICE_NAME) ); const inviteController = new InviteController( ServiceRegistry.get(MongoDB.SERVICE_NAME), ServiceRegistry.get(SettingsService.SERVICE_NAME), - ServiceRegistry.get(EmailService.SERVICE_NAME) + ServiceRegistry.get(EmailService.SERVICE_NAME), + ServiceRegistry.get(StringService.SERVICE_NAME) ); const maintenanceWindowController = new MaintenanceWindowController( ServiceRegistry.get(MongoDB.SERVICE_NAME), - ServiceRegistry.get(SettingsService.SERVICE_NAME) + ServiceRegistry.get(SettingsService.SERVICE_NAME), + ServiceRegistry.get(StringService.SERVICE_NAME) ); - const queueController = new QueueController(ServiceRegistry.get(JobQueue.SERVICE_NAME)); + const queueController = new QueueController( + ServiceRegistry.get(JobQueue.SERVICE_NAME), + ServiceRegistry.get(StringService.SERVICE_NAME) + ); const statusPageController = new StatusPageController( - ServiceRegistry.get(MongoDB.SERVICE_NAME) + ServiceRegistry.get(MongoDB.SERVICE_NAME), + ServiceRegistry.get(StringService.SERVICE_NAME) ); const distributedUptimeController = new DistributedUptimeController(