Merge remote-tracking branch 'upstream/develop' into feat/be/webhook-integrations

This commit is contained in:
Skorpios committed 2025-02-12 17:29:57 -08:00
commit 023d9434c1
47 files changed
+1340 -497

No files matched your search

+21 -19
View File
@@ -8,7 +8,6 @@ import {
newPasswordValidation,
} from "../validation/joi.js";
import logger from "../utils/logger.js";
import { errorMessages, successMessages } from "../utils/messages.js";
import jwt from "jsonwebtoken";
import { getTokenFromHeaders, tokenType } from "../utils/utils.js";
import crypto from "crypto";
@@ -16,11 +15,12 @@ import { handleValidationError, handleError } from "./controllerUtils.js";
const SERVICE_NAME = "authController";
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 = stringService;
}
/**
@@ -85,7 +85,7 @@ class AuthController {
const newUser = await this.db.insertUser({ ...req.body }, req.file);
logger.info({
message: successMessages.AUTH_CREATE_USER,
message: this.stringService.authCreateUser,
service: SERVICE_NAME,
details: newUser._id,
});
@@ -116,7 +116,7 @@ class AuthController {
});
res.success({
msg: successMessages.AUTH_CREATE_USER,
msg: this.stringService.authCreateUser,
data: { user: newUser, token: token, refreshToken: refreshToken },
});
} catch (error) {
@@ -153,7 +153,7 @@ class AuthController {
// Compare password
const match = await user.comparePassword(password);
if (match !== true) {
const error = new Error(errorMessages.AUTH_INCORRECT_PASSWORD);
const error = new Error(this.stringService.authIncorrectPassword);
error.status = 401;
next(error);
return;
@@ -176,7 +176,7 @@ class AuthController {
userWithoutPassword.avatarImage = user.avatarImage;
return res.success({
msg: successMessages.AUTH_LOGIN_USER,
msg: this.stringService.authLoginUser,
data: {
user: userWithoutPassword,
token: token,
@@ -200,13 +200,14 @@ 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) => {
try {
// check for refreshToken
const refreshToken = req.headers["x-refresh-token"];
if (!refreshToken) {
// No refresh token provided
const error = new Error(errorMessages.NO_REFRESH_TOKEN);
const error = new Error(this.stringService.noRefreshToken);
error.status = 401;
error.service = SERVICE_NAME;
error.method = "refreshAuthToken";
@@ -221,8 +222,8 @@ class AuthController {
// Invalid or expired refresh token, trigger logout
const errorMessage =
refreshErr.name === "TokenExpiredError"
? errorMessages.EXPIRED_REFRESH_TOKEN
: errorMessages.INVALID_REFRESH_TOKEN;
? this.stringService.expiredAuthToken
: this.stringService.invalidAuthToken;
const error = new Error(errorMessage);
error.status = 401;
error.service = SERVICE_NAME;
@@ -243,7 +244,7 @@ class AuthController {
);
return res.success({
msg: successMessages.AUTH_TOKEN_REFRESHED,
msg: this.stringService.authTokenRefreshed,
data: { user: payloadData, token: newAuthToken, refreshToken: refreshToken },
});
} catch (error) {
@@ -265,6 +266,7 @@ 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) => {
try {
await editUserParamValidation.validateAsync(req.params);
await editUserBodyValidation.validateAsync(req.body);
@@ -276,7 +278,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(errorMessages.AUTH_UNAUTHORIZED);
const error = new Error(this.stringService.unauthorized);
error.status = 401;
error.service = SERVICE_NAME;
next(error);
@@ -300,7 +302,7 @@ class AuthController {
// If not a match, throw a 403
// 403 instead of 401 to avoid triggering axios interceptor
if (!match) {
const error = new Error(errorMessages.AUTH_INCORRECT_PASSWORD);
const error = new Error(this.stringService.authIncorrectPassword);
error.status = 403;
next(error);
return;
@@ -311,7 +313,7 @@ class AuthController {
const updatedUser = await this.db.updateUser(req, res);
res.success({
msg: successMessages.AUTH_UPDATE_USER,
msg: this.stringService.authUpdateUser,
data: updatedUser,
});
} catch (error) {
@@ -333,7 +335,7 @@ class AuthController {
const superAdminExists = await this.db.checkSuperadmin(req, res);
return res.success({
msg: successMessages.AUTH_ADMIN_EXISTS,
msg: this.stringService.authAdminExists,
data: superAdminExists,
});
} catch (error) {
@@ -379,7 +381,7 @@ class AuthController {
);
return res.success({
msg: successMessages.AUTH_CREATE_RECOVERY_TOKEN,
msg: this.stringService.authCreateRecoveryToken,
data: msgId,
});
} catch (error) {
@@ -410,7 +412,7 @@ class AuthController {
await this.db.validateRecoveryToken(req, res);
return res.success({
msg: successMessages.AUTH_VERIFY_RECOVERY_TOKEN,
msg: this.stringService.authVerifyRecoveryToken,
});
} catch (error) {
next(handleError(error, SERVICE_NAME, "validateRecoveryTokenController"));
@@ -443,7 +445,7 @@ class AuthController {
const token = this.issueToken(user._doc, tokenType.ACCESS_TOKEN, appSettings);
return res.success({
msg: successMessages.AUTH_RESET_PASSWORD,
msg: this.stringService.authResetPassword,
data: { user, token },
});
} catch (error) {
@@ -497,7 +499,7 @@ class AuthController {
await this.db.deleteUser(user._id);
return res.success({
msg: successMessages.AUTH_DELETE_USER,
msg: this.stringService.authDeleteUser,
});
} catch (error) {
next(handleError(error, SERVICE_NAME, "deleteUserController"));
@@ -509,7 +511,7 @@ class AuthController {
const allUsers = await this.db.getAllUsers(req, res);
return res.success({
msg: successMessages.AUTH_GET_ALL_USERS,
msg: this.stringService.authGetAllUsers,
data: allUsers,
});
} catch (error) {
+8 -8
View File
@@ -9,7 +9,6 @@ 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";
@@ -17,9 +16,10 @@ import { handleValidationError, handleError } from "./controllerUtils.js";
const SERVICE_NAME = "checkController";
class CheckController {
constructor(db, settingsService) {
constructor(db, settingsService, stringService) {
this.db = db;
this.settingsService = settingsService;
this.stringService = stringService;
}
createCheck = async (req, res, next) => {
@@ -36,7 +36,7 @@ class CheckController {
const check = await this.db.createCheck(checkData);
return res.success({
msg: successMessages.CHECK_CREATE,
msg: this.stringService.checkCreate,
data: check,
});
} catch (error) {
@@ -57,7 +57,7 @@ class CheckController {
const result = await this.db.getChecksByMonitor(req);
return res.success({
msg: successMessages.CHECK_GET,
msg: this.stringService.checkGet,
data: result,
});
} catch (error) {
@@ -77,7 +77,7 @@ class CheckController {
const checkData = await this.db.getChecksByTeam(req);
return res.success({
msg: successMessages.CHECK_GET,
msg: this.stringService.checkGet,
data: checkData,
});
} catch (error) {
@@ -97,7 +97,7 @@ class CheckController {
const deletedCount = await this.db.deleteChecks(req.params.monitorId);
return res.success({
msg: successMessages.CHECK_DELETE,
msg: this.stringService.checkDelete,
data: { deletedCount },
});
} catch (error) {
@@ -117,7 +117,7 @@ class CheckController {
const deletedCount = await this.db.deleteChecksByTeamId(req.params.teamId);
return res.success({
msg: successMessages.CHECK_DELETE,
msg: this.stringService.checkDelete,
data: { deletedCount },
});
} catch (error) {
@@ -144,7 +144,7 @@ class CheckController {
await this.db.updateChecksTTL(teamId, ttl);
return res.success({
msg: successMessages.CHECK_UPDATE_TTL,
msg: this.stringService.checkUpdateTTL,
});
} catch (error) {
next(handleError(error, SERVICE_NAME, "updateTTL"));
+5 -4
View File
@@ -7,14 +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 { successMessages } from "../utils/messages.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 = stringService;
}
/**
@@ -66,7 +67,7 @@ class InviteController {
});
return res.success({
msg: successMessages.INVITE_ISSUED,
msg: this.stringService.inviteIssued,
data: inviteToken,
});
} catch (error) {
@@ -86,7 +87,7 @@ class InviteController {
const invite = await this.db.getInviteToken(req.body.token);
return res.success({
msg: successMessages.INVITE_VERIFIED,
msg: this.stringService.inviteVerified,
data: invite,
});
} catch (error) {
@@ -9,14 +9,15 @@ 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";
const SERVICE_NAME = "maintenanceWindowController";
class MaintenanceWindowController {
constructor(db, settingsService) {
constructor(db, settingsService, stringService) {
this.db = db;
this.settingsService = settingsService;
this.stringService = stringService;
}
createMaintenanceWindows = async (req, res, next) => {
@@ -45,7 +46,7 @@ class MaintenanceWindowController {
await Promise.all(dbTransactions);
return res.success({
msg: successMessages.MAINTENANCE_WINDOW_CREATE,
msg: this.stringService.maintenanceWindowCreate,
});
} catch (error) {
next(handleError(error, SERVICE_NAME, "createMaintenanceWindow"));
@@ -63,7 +64,7 @@ class MaintenanceWindowController {
const maintenanceWindow = await this.db.getMaintenanceWindowById(req.params.id);
return res.success({
msg: successMessages.MAINTENANCE_WINDOW_GET_BY_ID,
msg: this.stringService.maintenanceWindowGetById,
data: maintenanceWindow,
});
} catch (error) {
@@ -89,7 +90,7 @@ class MaintenanceWindowController {
);
return res.success({
msg: successMessages.MAINTENANCE_WINDOW_GET_BY_TEAM,
msg: this.stringService.maintenanceWindowGetByTeam,
data: maintenanceWindows,
});
} catch (error) {
@@ -111,7 +112,7 @@ class MaintenanceWindowController {
);
return res.success({
msg: successMessages.MAINTENANCE_WINDOW_GET_BY_USER,
msg: this.stringService.maintenanceWindowGetByUser,
data: maintenanceWindows,
});
} catch (error) {
@@ -129,7 +130,7 @@ class MaintenanceWindowController {
try {
await this.db.deleteMaintenanceWindowById(req.params.id);
return res.success({
msg: successMessages.MAINTENANCE_WINDOW_DELETE,
msg: this.stringService.maintenanceWindowDelete,
});
} catch (error) {
next(handleError(error, SERVICE_NAME, "deleteMaintenanceWindow"));
@@ -150,7 +151,7 @@ class MaintenanceWindowController {
req.body
);
return res.success({
msg: successMessages.MAINTENANCE_WINDOW_EDIT,
msg: this.stringService.maintenanceWindowEdit,
data: editedMaintenanceWindow,
});
} catch (error) {
+20 -20
View File
@@ -14,7 +14,6 @@ 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";
@@ -24,10 +23,11 @@ import seedDb from "../db/mongo/utils/seedDb.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 = stringService;
}
/**
@@ -43,7 +43,7 @@ class MonitorController {
try {
const monitors = await this.db.getAllMonitors();
return res.success({
msg: successMessages.MONITOR_GET_ALL,
msg: this.stringService.monitorGetAll,
data: monitors,
});
} catch (error) {
@@ -64,7 +64,7 @@ class MonitorController {
try {
const monitors = await this.db.getAllMonitorsWithUptimeStats();
return res.success({
msg: successMessages.MONITOR_GET_ALL,
msg: this.stringService.monitorGetAll,
data: monitors,
});
} catch (error) {
@@ -76,7 +76,7 @@ class MonitorController {
try {
const monitor = await this.db.getUptimeDetailsById(req);
return res.success({
msg: successMessages.MONITOR_GET_BY_ID,
msg: this.stringService.monitorGetById,
data: monitor,
});
} catch (error) {
@@ -105,7 +105,7 @@ class MonitorController {
try {
const monitorStats = await this.db.getMonitorStatsById(req);
return res.success({
msg: successMessages.MONITOR_STATS_BY_ID,
msg: this.stringService.monitorStatsById,
data: monitorStats,
});
} catch (error) {
@@ -133,7 +133,7 @@ class MonitorController {
try {
const monitor = await this.db.getHardwareDetailsById(req);
return res.success({
msg: successMessages.MONITOR_GET_BY_ID,
msg: this.stringService.monitorGetById,
data: monitor,
});
} catch (error) {
@@ -154,7 +154,7 @@ class MonitorController {
const certificate = await fetchMonitorCertificate(sslChecker, monitor);
return res.success({
msg: successMessages.MONITOR_CERTIFICATE,
msg: this.stringService.monitorCertificate,
data: {
certificateDate: new Date(certificate.validTo),
},
@@ -187,7 +187,7 @@ class MonitorController {
try {
const monitor = await this.db.getMonitorById(req.params.monitorId);
return res.success({
msg: successMessages.MONITOR_GET_BY_ID,
msg: this.stringService.monitorGetById,
data: monitor,
});
} catch (error) {
@@ -231,7 +231,7 @@ class MonitorController {
// Add monitor to job queue
this.jobQueue.addJob(monitor._id, monitor);
return res.success({
msg: successMessages.MONITOR_CREATE,
msg: this.stringService.monitorCreate,
data: monitor,
});
} catch (error) {
@@ -309,7 +309,7 @@ class MonitorController {
stack: error.stack,
});
}
return res.success({ msg: successMessages.MONITOR_DELETE });
return res.success({ msg: this.stringService.monitorDelete });
} catch (error) {
next(handleError(error, SERVICE_NAME, "deleteMonitor"));
}
@@ -390,10 +390,10 @@ class MonitorController {
await Promise.all(
notifications &&
notifications.map(async (notification) => {
notification.monitorId = editedMonitor._id;
await this.db.createNotification(notification);
})
notifications.map(async (notification) => {
notification.monitorId = editedMonitor._id;
await this.db.createNotification(notification);
})
);
// Delete the old job(editedMonitor has the same ID as the old monitor)
@@ -401,7 +401,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,
msg: this.stringService.monitorEdit,
data: editedMonitor,
});
} catch (error) {
@@ -438,8 +438,8 @@ class MonitorController {
monitor.save();
return res.success({
msg: monitor.isActive
? successMessages.MONITOR_RESUME
: successMessages.MONITOR_PAUSE,
? this.stringService.monitorResume
: this.stringService.monitorPause,
data: monitor,
});
} catch (error) {
@@ -469,7 +469,7 @@ class MonitorController {
);
return res.success({
msg: successMessages.MONITOR_DEMO_ADDED,
msg: this.stringService.monitorDemoAdded,
data: demoMonitors.length,
});
} catch (error) {
@@ -488,7 +488,7 @@ class MonitorController {
try {
const monitors = await this.db.getMonitorsByTeamId(req);
return res.success({
msg: successMessages.MONITOR_GET_BY_TEAM_ID,
msg: this.stringService.monitorGetByTeamId,
data: monitors,
});
} catch (error) {
+6 -6
View File
@@ -1,18 +1,18 @@
import { handleError } from "./controllerUtils.js";
import { successMessages } from "../utils/messages.js";
const SERVICE_NAME = "JobQueueController";
class JobQueueController {
constructor(jobQueue) {
constructor(jobQueue, stringService) {
this.jobQueue = jobQueue;
this.stringService = stringService;
}
getMetrics = async (req, res, next) => {
try {
const metrics = await this.jobQueue.getMetrics();
res.success({
msg: successMessages.QUEUE_GET_METRICS,
msg: this.stringService.queueGetMetrics,
data: metrics,
});
} catch (error) {
@@ -25,7 +25,7 @@ class JobQueueController {
try {
const jobs = await this.jobQueue.getJobStats();
return res.success({
msg: successMessages.QUEUE_GET_METRICS,
msg: this.stringService.queueGetMetrics,
data: jobs,
});
} catch (error) {
@@ -38,7 +38,7 @@ class JobQueueController {
try {
await this.jobQueue.addJob(Math.random().toString(36).substring(7));
return res.success({
msg: successMessages.QUEUE_ADD_JOB,
msg: this.stringService.queueAddJob,
});
} catch (error) {
next(handleError(error, SERVICE_NAME, "addJob"));
@@ -50,7 +50,7 @@ class JobQueueController {
try {
await this.jobQueue.obliterate();
return res.success({
msg: successMessages.QUEUE_OBLITERATE,
msg: this.stringService.queueObliterate,
});
} catch (error) {
next(handleError(error, SERVICE_NAME, "obliterateQueue"));
+5 -4
View File
@@ -1,12 +1,13 @@
import { successMessages } from "../utils/messages.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 = stringService;
}
getAppSettings = async (req, res, next) => {
@@ -14,7 +15,7 @@ class SettingsController {
const settings = { ...(await this.settingsService.getSettings()) };
delete settings.jwtSecret;
return res.success({
msg: successMessages.GET_APP_SETTINGS,
msg: this.stringService.getAppSettings,
data: settings,
});
} catch (error) {
@@ -35,7 +36,7 @@ class SettingsController {
const updatedSettings = { ...(await this.settingsService.reloadSettings()) };
delete updatedSettings.jwtSecret;
return res.success({
msg: successMessages.UPDATE_APP_SETTINGS,
msg: this.stringService.updateAppSettings,
data: updatedSettings,
});
} catch (error) {
+10 -9
View File
@@ -5,13 +5,13 @@ import {
getStatusPageQueryValidation,
imageValidation,
} from "../validation/joi.js";
import { successMessages, errorMessages } from "../utils/messages.js";
const SERVICE_NAME = "statusPageController";
class StatusPageController {
constructor(db) {
constructor(db, stringService) {
this.db = db;
this.stringService = stringService;
}
createStatusPage = async (req, res, next) => {
@@ -26,7 +26,7 @@ class StatusPageController {
try {
const statusPage = await this.db.createStatusPage(req.body, req.file);
return res.success({
msg: successMessages.STATUS_PAGE_CREATE,
msg: this.stringService.statusPageCreate,
data: statusPage,
});
} catch (error) {
@@ -46,12 +46,12 @@ class StatusPageController {
try {
const statusPage = await this.db.updateStatusPage(req.body, req.file);
if (statusPage === null) {
const error = new Error(errorMessages.STATUS_PAGE_NOT_FOUND);
const error = new Error(this.stringService.statusPageNotFound);
error.status = 404;
throw error;
}
return res.success({
msg: successMessages.STATUS_PAGE_UPDATE,
msg: this.stringService.statusPageUpdate,
data: statusPage,
});
} catch (error) {
@@ -63,7 +63,7 @@ class StatusPageController {
try {
const statusPage = await this.db.getStatusPage();
return res.success({
msg: successMessages.STATUS_PAGE,
msg: this.stringService.statusPageByUrl,
data: statusPage,
});
} catch (error) {
@@ -83,7 +83,7 @@ class StatusPageController {
try {
const statusPage = await this.db.getStatusPageByUrl(req.params.url, req.query.type);
return res.success({
msg: successMessages.STATUS_PAGE_BY_URL,
msg: this.stringService.statusPageByUrl,
data: statusPage,
});
} catch (error) {
@@ -95,8 +95,9 @@ class StatusPageController {
try {
const teamId = req.params.teamId;
const statusPages = await this.db.getStatusPagesByTeamId(teamId);
return res.success({
msg: successMessages.STATUS_PAGE_BY_TEAM_ID,
msg: this.stringService.statusPageByTeamId,
data: statusPages,
});
} catch (error) {
@@ -108,7 +109,7 @@ class StatusPageController {
try {
await this.db.deleteStatusPage(req.params.url);
return res.success({
msg: successMessages.STATUS_PAGE_DELETE,
msg: this.stringService.statusPageDelete,
});
} catch (error) {
next(handleError(error, SERVICE_NAME, "deleteStatusPage"));