- ![]()
+
+
+
- ![]()
+
+
+
- ![]()
+
+
- ![]()
+
+ BlueWave Uptime
An open source server monitoring application
@@ -24,31 +23,33 @@ BlueWave Uptime is an open source server monitoring application used to track th - [x] Incidents at a glance - [x] Page speed monitoring - [ ] Scheduled maintenance (in the works) -- [ ] Status pages (in the works) **Roadmap (short term):** + +- [ ] Memory, disk and CPU monitoring - [ ] 3rd party integrations - [ ] DNS monitoring - [ ] SSL monitoring **Roadmap (long term):** -- [ ] Memory, disk and CPU monitoring using OpenTelemetry + +- [ ] Status pages ## Tech stack -* [ReactJs](https://react.dev/) -* [MUI (React framework)](https://mui.com/) -* [Node.js](https://nodejs.org/en) -* [MongoDB](https://mongodb.com) +- [ReactJs](https://react.dev/) +- [MUI (React framework)](https://mui.com/) +- [Node.js](https://nodejs.org/en) +- [MongoDB](https://mongodb.com) ## Contributing We love contributors. Here's how you can contribute: -* Check [Contributor's guideline](https://github.com/bluewave-labs/bluewave-uptime/blob/master/CONTRIBUTING.md). -* Have a look at our Figma designs [here](https://www.figma.com/design/RPSfaw66HjzSwzntKcgDUV/Uptime-Genie?node-id=0-1&t=WqOFv9jqNTFGItpL-1). We encourage you to copy to your own Figma page, then work on it as it is read-only. -* Open an issue if you believe you've encountered a bug -* Make a pull request to add new features/make quality-of-life improvements/fix bugs. +- Check [Contributor's guideline](https://github.com/bluewave-labs/bluewave-uptime/blob/master/CONTRIBUTING.md). +- Have a look at our Figma designs [here](https://www.figma.com/design/RPSfaw66HjzSwzntKcgDUV/Uptime-Genie?node-id=0-1&t=WqOFv9jqNTFGItpL-1). We encourage you to copy to your own Figma page, then work on it as it is read-only. +- Open an issue if you believe you've encountered a bug +- Make a pull request to add new features/make quality-of-life improvements/fix bugs.### Client @@ -2112,4 +2145,3 @@ const myRoute = async(req, res, next) => { ``` Errors should not be handled at the controller level and should be left to the middleware to handle. - diff --git a/Server/controllers/authController.js b/Server/controllers/authController.js index 0f89e3371..d4a77fe4d 100644 --- a/Server/controllers/authController.js +++ b/Server/controllers/authController.js @@ -126,11 +126,12 @@ const loginController = async (req, res, next) => { return; } try { + const { email, password } = req.body; // Check if user exists - const user = await req.db.getUserByEmail(req, res); + const user = await req.db.getUserByEmail(email); // Compare password - const match = await user.comparePassword(req.body.password); + const match = await user.comparePassword(password); if (match !== true) { throw new Error(errorMessages.AUTH_INCORRECT_PASSWORD); } @@ -167,7 +168,7 @@ const logoutController = async (req, res, next) => { try { // Get user const { email } = req.body; - const userToLogout = await req.db.getUserByEmail({ body: { email } }, res); + const userToLogout = await req.db.getUserByEmail(email); userToLogout.authToken = null; await userToLogout.save(); @@ -216,7 +217,7 @@ const userEditController = async (req, res, next) => { // Add user email to body for DB operation req.body.email = email; // Get user - const user = await req.db.getUserByEmail(req, res); + const user = await req.db.getUserByEmail(email); // Compare passwords const match = await user.comparePassword(req.body.password); // If not a match, throw a 403 @@ -350,7 +351,8 @@ const recoveryRequestController = async (req, res, next) => { } try { - const user = await req.db.getUserByEmail(req, res); + const { email } = req.body; + const user = await req.db.getUserByEmail(email); if (user) { const recoveryToken = await req.db.requestRecoveryToken(req, res); const name = user.firstName; @@ -462,41 +464,16 @@ const deleteUserController = async (req, res, next) => { const decodedToken = jwt.decode(token); const { _id, email } = decodedToken; - // TODO fix this hack - const decodedTokenCastedAsRequest = { - query: {}, - params: { - userId: _id, - }, - body: { - email, - }, - }; - - // Validate user - try { - await deleteUserParamValidation.validateAsync( - decodedTokenCastedAsRequest.body - ); - } catch (error) { - error.status = 422; - error.service = SERVICE_NAME; - error.message = - error.details?.[0]?.message || error.message || "Validation Error"; - next(error); - return; - } - // Check if the user exists - const user = await req.db.getUserByEmail(decodedTokenCastedAsRequest); + const user = await req.db.getUserByEmail(email); if (!user) { throw new Error(errorMessages.DB_USER_NOT_FOUND); } // 1. Find all the monitors associated with the user id - const monitors = await req.db.getMonitorsByUserId( - decodedTokenCastedAsRequest - ); + const monitors = await req.db.getMonitorsByUserId({ + params: { userId: _id }, + }); if (monitors) { //2. Remove all jobs, delete checks and alerts @@ -514,7 +491,7 @@ const deleteUserController = async (req, res, next) => { await req.db.deleteMonitorsByUserId(user._id); // 4. Delete the user by id - await req.db.deleteUser(decodedTokenCastedAsRequest); + await req.db.deleteUser(user._id); return res.status(200).json({ success: true, diff --git a/Server/controllers/monitorController.js b/Server/controllers/monitorController.js index d45b300f8..28c33caeb 100644 --- a/Server/controllers/monitorController.js +++ b/Server/controllers/monitorController.js @@ -7,6 +7,7 @@ const { getMonitorsByUserIdQueryValidation, } = require("../validation/joi"); +const sslChecker = require("ssl-checker"); const SERVICE_NAME = "monitorController"; const { errorMessages, successMessages } = require("../utils/messages"); const { runInNewContext } = require("vm"); @@ -33,6 +34,73 @@ const getAllMonitors = async (req, res, next) => { } }; +/** + * Returns monitor stats for monitor with matching ID + * @async + * @param {Express.Request} req + * @param {Express.Response} res + * @returns {Promise