fix: use new structure

This commit is contained in:
cihatata authored and cihat committed 2025-02-11 07:43:38 +03:00
1 parent a98a3dd7a3
commit 88df88891c
22 files changed
+193 -146

No files matched your search

+24 -27
View File
@@ -8,7 +8,6 @@ import {
newPasswordValidation,
} from "../validation/joi.js";
import logger from "../utils/logger.js";
import { successMessages } from "../utils/messages.js";
import jwt from "jsonwebtoken";
import { getTokenFromHeaders, tokenType } from "../utils/utils.js";
import crypto from "crypto";
@@ -23,6 +22,7 @@ class AuthController {
this.settingsService = settingsService;
this.emailService = emailService;
this.jobQueue = jobQueue;
this.stringService = ServiceRegistry.get(StringService.SERVICE_NAME);
}
/**
@@ -78,7 +78,7 @@ class AuthController {
// If superAdmin exists, a token should be attached to all further register requests
const superAdminExists = await this.db.checkSuperadmin(req, res);
if (superAdminExists) {
await this.db.getInviteTokenAndDelete(inviteToken, req.language);
await this.db.getInviteTokenAndDelete(inviteToken);
} else {
// This is the first account, create JWT secret to use if one is not supplied by env
const jwtSecret = crypto.randomBytes(64).toString("hex");
@@ -87,7 +87,7 @@ class AuthController {
const newUser = await this.db.insertUser({ ...req.body }, req.file);
logger.info({
message: successMessages.AUTH_CREATE_USER(req.language),
message: this.stringService.authCreateUser,
service: SERVICE_NAME,
details: newUser._id,
});
@@ -118,7 +118,7 @@ class AuthController {
});
res.success({
msg: successMessages.AUTH_CREATE_USER(req.language),
msg: this.stringService.authCreateUser,
data: { user: newUser, token: token, refreshToken: refreshToken },
});
} catch (error) {
@@ -139,7 +139,6 @@ class AuthController {
* @throws {Error} If there is an error during the process, especially if there is a validation error (422) or the password is incorrect.
*/
loginUser = async (req, res, next) => {
const stringService = ServiceRegistry.get(StringService.SERVICE_NAME);
try {
await loginValidation.validateAsync(req.body);
} catch (error) {
@@ -151,12 +150,12 @@ class AuthController {
const { email, password } = req.body;
// Check if user exists
const user = await this.db.getUserByEmail(email, req.language);
const user = await this.db.getUserByEmail(email);
// Compare password
const match = await user.comparePassword(password);
if (match !== true) {
const error = new Error(stringService.authIncorrectPassword);
const error = new Error(this.stringService.authIncorrectPassword);
error.status = 401;
next(error);
return;
@@ -179,7 +178,7 @@ class AuthController {
userWithoutPassword.avatarImage = user.avatarImage;
return res.success({
msg: successMessages.AUTH_LOGIN_USER(req.language),
msg: this.stringService.authLoginUser,
data: {
user: userWithoutPassword,
token: token,
@@ -203,7 +202,6 @@ class AuthController {
* @throws {Error} If there is an error during the process such as any of the token is not received
*/
refreshAuthToken = async (req, res, next) => {
const stringService = ServiceRegistry.get(StringService.SERVICE_NAME);
try {
// check for refreshToken
@@ -211,7 +209,7 @@ class AuthController {
if (!refreshToken) {
// No refresh token provided
const error = new Error(stringService.noRefreshToken);
const error = new Error(this.stringService.noRefreshToken);
error.status = 401;
error.service = SERVICE_NAME;
error.method = "refreshAuthToken";
@@ -226,8 +224,8 @@ class AuthController {
// Invalid or expired refresh token, trigger logout
const errorMessage =
refreshErr.name === "TokenExpiredError"
? stringService.expiredAuthToken
: stringService.invalidAuthToken;
? this.stringService.expiredAuthToken
: this.stringService.invalidAuthToken;
const error = new Error(errorMessage);
error.status = 401;
error.service = SERVICE_NAME;
@@ -248,7 +246,7 @@ class AuthController {
);
return res.success({
msg: successMessages.AUTH_TOKEN_REFRESHED(req.language),
msg: this.stringService.authTokenRefreshed,
data: { user: payloadData, token: newAuthToken, refreshToken: refreshToken },
});
} catch (error) {
@@ -270,7 +268,6 @@ class AuthController {
* @throws {Error} If there is an error during the process, especially if there is a validation error (422), the user is unauthorized (401), or the password is incorrect (403).
*/
editUser = async (req, res, next) => {
const stringService = ServiceRegistry.get(StringService.SERVICE_NAME);
try {
await editUserParamValidation.validateAsync(req.params);
@@ -283,7 +280,7 @@ class AuthController {
// TODO is this neccessary any longer? Verify ownership middleware should handle this
if (req.params.userId !== req.user._id.toString()) {
const error = new Error(stringService.unauthorized);
const error = new Error(this.stringService.unauthorized);
error.status = 401;
error.service = SERVICE_NAME;
next(error);
@@ -301,13 +298,13 @@ class AuthController {
// Add user email to body for DB operation
req.body.email = email;
// Get user
const user = await this.db.getUserByEmail(email, req.language);
const user = await this.db.getUserByEmail(email);
// Compare passwords
const match = await user.comparePassword(req.body.password);
// If not a match, throw a 403
// 403 instead of 401 to avoid triggering axios interceptor
if (!match) {
const error = new Error(stringService.authIncorrectPassword);
const error = new Error(this.stringService.authIncorrectPassword);
error.status = 403;
next(error);
return;
@@ -318,7 +315,7 @@ class AuthController {
const updatedUser = await this.db.updateUser(req, res);
res.success({
msg: successMessages.AUTH_UPDATE_USER(req.language),
msg: this.stringService.authUpdateUser,
data: updatedUser,
});
} catch (error) {
@@ -340,7 +337,7 @@ class AuthController {
const superAdminExists = await this.db.checkSuperadmin(req, res);
return res.success({
msg: successMessages.AUTH_ADMIN_EXISTS(req.language),
msg: this.stringService.authAdminExists,
data: superAdminExists,
});
} catch (error) {
@@ -369,7 +366,7 @@ class AuthController {
try {
const { email } = req.body;
const user = await this.db.getUserByEmail(email, req.language);
const user = await this.db.getUserByEmail(email);
const recoveryToken = await this.db.requestRecoveryToken(req, res);
const name = user.firstName;
const { clientHost } = this.settingsService.getSettings();
@@ -386,7 +383,7 @@ class AuthController {
);
return res.success({
msg: successMessages.AUTH_CREATE_RECOVERY_TOKEN(req.language),
msg: this.stringService.authCreateRecoveryToken,
data: msgId,
});
} catch (error) {
@@ -417,7 +414,7 @@ class AuthController {
await this.db.validateRecoveryToken(req, res);
return res.success({
msg: successMessages.AUTH_VERIFY_RECOVERY_TOKEN(req.language),
msg: this.stringService.authVerifyRecoveryToken,
});
} catch (error) {
next(handleError(error, SERVICE_NAME, "validateRecoveryTokenController"));
@@ -450,7 +447,7 @@ class AuthController {
const token = this.issueToken(user._doc, tokenType.ACCESS_TOKEN, appSettings);
return res.success({
msg: successMessages.AUTH_RESET_PASSWORD(req.language),
msg: this.stringService.authResetPassword,
data: { user, token },
});
} catch (error) {
@@ -474,7 +471,7 @@ class AuthController {
const { email } = decodedToken;
// Check if the user exists
const user = await this.db.getUserByEmail(email, req.language);
const user = await this.db.getUserByEmail(email);
// 1. Find all the monitors associated with the team ID if superadmin
const result = await this.db.getMonitorsByTeamId({
@@ -501,10 +498,10 @@ class AuthController {
await this.db.deleteMonitorsByUserId(user._id);
}
// 6. Delete the user by id
await this.db.deleteUser(user._id, req.language);
await this.db.deleteUser(user._id);
return res.success({
msg: successMessages.AUTH_DELETE_USER(req.language),
msg: this.stringService.authDeleteUser,
});
} catch (error) {
next(handleError(error, SERVICE_NAME, "deleteUserController"));
@@ -516,7 +513,7 @@ class AuthController {
const allUsers = await this.db.getAllUsers(req, res);
return res.success({
msg: successMessages.AUTH_GET_ALL_USERS(req.language),
msg: this.stringService.authGetAllUsers,
data: allUsers,
});
} catch (error) {
+9 -7
View File
@@ -9,10 +9,11 @@ import {
deleteChecksByTeamIdParamValidation,
updateChecksTTLBodyValidation,
} from "../validation/joi.js";
import { successMessages } from "../utils/messages.js";
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";
@@ -20,6 +21,7 @@ class CheckController {
constructor(db, settingsService) {
this.db = db;
this.settingsService = settingsService;
this.stringService = ServiceRegistry.get(StringService.SERVICE_NAME);
}
createCheck = async (req, res, next) => {
@@ -36,7 +38,7 @@ class CheckController {
const check = await this.db.createCheck(checkData);
return res.success({
msg: successMessages.CHECK_CREATE(req.language),
msg: this.stringService.checkCreate,
data: check,
});
} catch (error) {
@@ -57,7 +59,7 @@ class CheckController {
const result = await this.db.getChecksByMonitor(req);
return res.success({
msg: successMessages.CHECK_GET(req.language),
msg: this.stringService.checkGet,
data: result,
});
} catch (error) {
@@ -77,7 +79,7 @@ class CheckController {
const checkData = await this.db.getChecksByTeam(req);
return res.success({
msg: successMessages.CHECK_GET(req.language),
msg: this.stringService.checkGet,
data: checkData,
});
} catch (error) {
@@ -97,7 +99,7 @@ class CheckController {
const deletedCount = await this.db.deleteChecks(req.params.monitorId);
return res.success({
msg: successMessages.CHECK_DELETE(req.language),
msg: this.stringService.checkDelete,
data: { deletedCount },
});
} catch (error) {
@@ -117,7 +119,7 @@ class CheckController {
const deletedCount = await this.db.deleteChecksByTeamId(req.params.teamId);
return res.success({
msg: successMessages.CHECK_DELETE(req.language),
msg: this.stringService.checkDelete,
data: { deletedCount },
});
} catch (error) {
@@ -144,7 +146,7 @@ class CheckController {
await this.db.updateChecksTTL(teamId, ttl);
return res.success({
msg: successMessages.CHECK_UPDATE_TTL(req.language),
msg: this.stringService.checkUpdateTTL,
});
} catch (error) {
next(handleError(error, SERVICE_NAME, "updateTTL"));
+7 -4
View File
@@ -7,7 +7,9 @@ import logger from "../utils/logger.js";
import jwt from "jsonwebtoken";
import { handleError, handleValidationError } from "./controllerUtils.js";
import { getTokenFromHeaders } from "../utils/utils.js";
import { successMessages } from "../utils/messages.js";
import ServiceRegistry from "../service/serviceRegistry.js";
import StringService from "../service/stringService.js";
const SERVICE_NAME = "inviteController";
class InviteController {
@@ -15,6 +17,7 @@ class InviteController {
this.db = db;
this.settingsService = settingsService;
this.emailService = emailService;
this.stringService = ServiceRegistry.get(StringService.SERVICE_NAME);
}
/**
@@ -66,7 +69,7 @@ class InviteController {
});
return res.success({
msg: successMessages.INVITE_ISSUED(req.language),
msg: this.stringService.inviteIssued,
data: inviteToken,
});
} catch (error) {
@@ -83,10 +86,10 @@ class InviteController {
}
try {
const invite = await this.db.getInviteToken(req.body.token, req.language);
const invite = await this.db.getInviteToken(req.body.token);
return res.success({
msg: successMessages.INVITE_VERIFIED(req.language),
msg: this.stringService.inviteVerified,
data: invite,
});
} catch (error) {
@@ -9,14 +9,17 @@ import {
} from "../validation/joi.js";
import jwt from "jsonwebtoken";
import { getTokenFromHeaders } from "../utils/utils.js";
import { successMessages } from "../utils/messages.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) {
this.db = db;
this.settingsService = settingsService;
this.stringService = ServiceRegistry.get(StringService.SERVICE_NAME);
}
createMaintenanceWindows = async (req, res, next) => {
@@ -45,7 +48,7 @@ class MaintenanceWindowController {
await Promise.all(dbTransactions);
return res.success({
msg: successMessages.MAINTENANCE_WINDOW_CREATE(req.language),
msg: this.stringService.maintenanceWindowCreate,
});
} catch (error) {
next(handleError(error, SERVICE_NAME, "createMaintenanceWindow"));
@@ -63,7 +66,7 @@ class MaintenanceWindowController {
const maintenanceWindow = await this.db.getMaintenanceWindowById(req.params.id);
return res.success({
msg: successMessages.MAINTENANCE_WINDOW_GET_BY_ID(req.language),
msg: this.stringService.maintenanceWindowGetById,
data: maintenanceWindow,
});
} catch (error) {
@@ -89,7 +92,7 @@ class MaintenanceWindowController {
);
return res.success({
msg: successMessages.MAINTENANCE_WINDOW_GET_BY_TEAM(req.language),
msg: this.stringService.maintenanceWindowGetByTeam,
data: maintenanceWindows,
});
} catch (error) {
@@ -111,7 +114,7 @@ class MaintenanceWindowController {
);
return res.success({
msg: successMessages.MAINTENANCE_WINDOW_GET_BY_USER(req.language),
msg: this.stringService.maintenanceWindowGetByUser,
data: maintenanceWindows,
});
} catch (error) {
@@ -129,7 +132,7 @@ class MaintenanceWindowController {
try {
await this.db.deleteMaintenanceWindowById(req.params.id);
return res.success({
msg: successMessages.MAINTENANCE_WINDOW_DELETE(req.language),
msg: this.stringService.maintenanceWindowDelete,
});
} catch (error) {
next(handleError(error, SERVICE_NAME, "deleteMaintenanceWindow"));
@@ -150,7 +153,7 @@ class MaintenanceWindowController {
req.body
);
return res.success({
msg: successMessages.MAINTENANCE_WINDOW_EDIT(req.language),
msg: this.stringService.maintenanceWindowEdit,
data: editedMaintenanceWindow,
});
} catch (error) {
+17 -15
View File
@@ -14,13 +14,14 @@ import {
getHardwareDetailsByIdQueryValidation,
} from "../validation/joi.js";
import sslChecker from "ssl-checker";
import { successMessages } from "../utils/messages.js";
import jwt from "jsonwebtoken";
import { getTokenFromHeaders } from "../utils/utils.js";
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 {
@@ -28,6 +29,7 @@ class MonitorController {
this.db = db;
this.settingsService = settingsService;
this.jobQueue = jobQueue;
this.stringService = ServiceRegistry.get(StringService.SERVICE_NAME);
}
/**
@@ -43,7 +45,7 @@ class MonitorController {
try {
const monitors = await this.db.getAllMonitors();
return res.success({
msg: successMessages.MONITOR_GET_ALL(req.language),
msg: this.stringService.monitorGetAll,
data: monitors,
});
} catch (error) {
@@ -64,7 +66,7 @@ class MonitorController {
try {
const monitors = await this.db.getAllMonitorsWithUptimeStats();
return res.success({
msg: successMessages.MONITOR_GET_ALL(req.language),
msg: this.stringService.monitorGetAll,
data: monitors,
});
} catch (error) {
@@ -76,7 +78,7 @@ class MonitorController {
try {
const monitor = await this.db.getUptimeDetailsById(req);
return res.success({
msg: successMessages.MONITOR_GET_BY_ID(req.language),
msg: this.stringService.monitorGetById,
data: monitor,
});
} catch (error) {
@@ -105,7 +107,7 @@ class MonitorController {
try {
const monitorStats = await this.db.getMonitorStatsById(req);
return res.success({
msg: successMessages.MONITOR_STATS_BY_ID(req.language),
msg: this.stringService.monitorStatsById,
data: monitorStats,
});
} catch (error) {
@@ -133,7 +135,7 @@ class MonitorController {
try {
const monitor = await this.db.getHardwareDetailsById(req);
return res.success({
msg: successMessages.MONITOR_GET_BY_ID(req.language),
msg: this.stringService.monitorGetById,
data: monitor,
});
} catch (error) {
@@ -154,7 +156,7 @@ class MonitorController {
const certificate = await fetchMonitorCertificate(sslChecker, monitor);
return res.success({
msg: successMessages.MONITOR_CERTIFICATE(req.language),
msg: this.stringService.monitorCertificate,
data: {
certificateDate: new Date(certificate.validTo),
},
@@ -187,7 +189,7 @@ class MonitorController {
try {
const monitor = await this.db.getMonitorById(req.params.monitorId);
return res.success({
msg: successMessages.MONITOR_GET_BY_ID(req.language),
msg: this.stringService.monitorGetById,
data: monitor,
});
} catch (error) {
@@ -231,7 +233,7 @@ class MonitorController {
// Add monitor to job queue
this.jobQueue.addJob(monitor._id, monitor);
return res.success({
msg: successMessages.MONITOR_CREATE(req.language),
msg: this.stringService.monitorCreate,
data: monitor,
});
} catch (error) {
@@ -309,7 +311,7 @@ class MonitorController {
stack: error.stack,
});
}
return res.success({ msg: successMessages.MONITOR_DELETE(req.language) });
return res.success({ msg: this.stringService.monitorDelete });
} catch (error) {
next(handleError(error, SERVICE_NAME, "deleteMonitor"));
}
@@ -401,7 +403,7 @@ class MonitorController {
// Add the new job back to the queue
await this.jobQueue.addJob(editedMonitor._id, editedMonitor);
return res.success({
msg: successMessages.MONITOR_EDIT(req.language),
msg: this.stringService.monitorEdit,
data: editedMonitor,
});
} catch (error) {
@@ -438,8 +440,8 @@ class MonitorController {
monitor.save();
return res.success({
msg: monitor.isActive
? successMessages.MONITOR_RESUME(req.language)
: successMessages.MONITOR_PAUSE(req.language),
? this.stringService.monitorResume
: this.stringService.monitorPause,
data: monitor,
});
} catch (error) {
@@ -469,7 +471,7 @@ class MonitorController {
);
return res.success({
msg: successMessages.MONITOR_DEMO_ADDED(req.language),
msg: this.stringService.monitorDemoAdded,
data: demoMonitors.length,
});
} catch (error) {
@@ -488,7 +490,7 @@ class MonitorController {
try {
const monitors = await this.db.getMonitorsByTeamId(req);
return res.success({
msg: successMessages.MONITOR_GET_BY_TEAM_ID(req.language),
msg: this.stringService.monitorGetByTeamId,
data: monitors,
});
} catch (error) {
+7 -5
View File
@@ -1,18 +1,20 @@
import { handleError } from "./controllerUtils.js";
import { successMessages } from "../utils/messages.js";
import ServiceRegistry from "../service/serviceRegistry.js";
import StringService from "../service/stringService.js";
const SERVICE_NAME = "JobQueueController";
class JobQueueController {
constructor(jobQueue) {
this.jobQueue = jobQueue;
this.stringService = ServiceRegistry.get(StringService.SERVICE_NAME);
}
getMetrics = async (req, res, next) => {
try {
const metrics = await this.jobQueue.getMetrics();
res.success({
msg: successMessages.QUEUE_GET_METRICS(req.language),
msg: this.stringService.queueGetMetrics,
data: metrics,
});
} catch (error) {
@@ -25,7 +27,7 @@ class JobQueueController {
try {
const jobs = await this.jobQueue.getJobStats();
return res.success({
msg: successMessages.QUEUE_GET_METRICS(req.language),
msg: this.stringService.queueGetMetrics,
data: jobs,
});
} catch (error) {
@@ -38,7 +40,7 @@ class JobQueueController {
try {
await this.jobQueue.addJob(Math.random().toString(36).substring(7));
return res.success({
msg: successMessages.QUEUE_ADD_JOB(req.language),
msg: this.stringService.queueAddJob,
});
} catch (error) {
next(handleError(error, SERVICE_NAME, "addJob"));
@@ -50,7 +52,7 @@ class JobQueueController {
try {
await this.jobQueue.obliterate();
return res.success({
msg: successMessages.QUEUE_OBLITERATE(req.language),
msg: this.stringService.queueObliterate,
});
} catch (error) {
next(handleError(error, SERVICE_NAME, "obliterateQueue"));
+6 -3
View File
@@ -1,12 +1,15 @@
import { successMessages } from "../utils/messages.js";
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) {
this.db = db;
this.settingsService = settingsService;
this.stringService = ServiceRegistry.get(StringService.SERVICE_NAME);
}
getAppSettings = async (req, res, next) => {
@@ -14,7 +17,7 @@ class SettingsController {
const settings = { ...(await this.settingsService.getSettings()) };
delete settings.jwtSecret;
return res.success({
msg: successMessages.GET_APP_SETTINGS(req.language),
msg: this.stringService.getAppSettings,
data: settings,
});
} catch (error) {
@@ -35,7 +38,7 @@ class SettingsController {
const updatedSettings = { ...(await this.settingsService.reloadSettings()) };
delete updatedSettings.jwtSecret;
return res.success({
msg: successMessages.UPDATE_APP_SETTINGS(req.language),
msg: this.stringService.updateAppSettings,
data: updatedSettings,
});
} catch (error) {
+3 -2
View File
@@ -12,6 +12,7 @@ const SERVICE_NAME = "statusPageController";
class StatusPageController {
constructor(db) {
this.db = db;
this.stringService = ServiceRegistry.get(StringService.SERVICE_NAME);
}
createStatusPage = async (req, res, next) => {
@@ -26,7 +27,7 @@ class StatusPageController {
try {
const statusPage = await this.db.createStatusPage(req.body, req.file);
return res.success({
msg: successMessages.STATUS_PAGE_CREATE(req.language),
msg: this.stringService.statusPageCreate,
data: statusPage,
});
} catch (error) {
@@ -63,7 +64,7 @@ class StatusPageController {
try {
const statusPage = await this.db.getStatusPage();
return res.success({
msg: successMessages.STATUS_PAGE_BY_URL(req.language),
msg: this.stringService.statusPageByUrl,
data: statusPage,
});
} catch (error) {