+
{
gap={theme.gap.small}
>
- BlueWave Uptime
+ BlueWave Uptime
{
- const dispatch = useDispatch();
- const navigate = useNavigate();
- const { token } = useParams();
+/**
+ * Displays the initial landing page.
+ *
+ * @param {Object} props
+ * @param {boolean} props.isAdmin - Whether the user is creating and admin account
+ * @param {Function} props.onContinue - Callback function to handle "Continue with Email" button click.
+ * @returns {JSX.Element}
+ */
+const LandingPage = ({ isAdmin, onSignup }) => {
const theme = useTheme();
- // TODO If possible, change the IDs of these fields to match the backend
- const idMap = {
- "register-firstname-input": "firstName",
- "register-lastname-input": "lastName",
- "register-email-input": "email",
- "register-password-input": "password",
- "register-confirm-input": "confirm",
- };
-
- const [form, setForm] = useState({
- firstName: "",
- lastName: "",
- email: "",
- password: "",
- confirm: "",
- role: [],
- });
- const [errors, setErrors] = useState({});
-
- useEffect(() => {
- const fetchInvite = async () => {
- if (token !== undefined) {
- try {
- const res = await axiosInstance.post(`/auth/invite/verify`, {
- token,
- });
- const { role, email } = res.data.data;
- console.log(role);
- setForm({ ...form, email, role });
- } catch (error) {
- console.log(error);
- }
- }
- };
- fetchInvite();
- }, [token]);
-
- const handleSubmit = async (e) => {
- e.preventDefault();
- const registerForm = { ...form, role: isAdmin ? ["admin"] : form.role };
- const { error } = credentials.validate(registerForm, {
- abortEarly: false,
- context: { password: form.password },
- });
-
- if (error) {
- // validation errors
- const newErrors = {};
- error.details.forEach((err) => {
- newErrors[err.path[0]] = err.message;
- });
- setErrors(newErrors);
- createToast({
- body:
- error.details && error.details.length > 0
- ? error.details[0].message
- : "Error validating data.",
- });
- } else {
- delete registerForm.confirm;
- const action = await dispatch(register(registerForm));
- if (action.payload.success) {
- const token = action.payload.data;
- localStorage.setItem("token", token);
- navigate("/");
- createToast({
- body: "Welcome! Your account was created successfully.",
- });
- } else {
- if (action.payload) {
- // dispatch errors
- createToast({
- body: action.payload.msg,
- });
- } else {
- // unknown errors
- createToast({
- body: "Unknown error.",
- });
- }
- }
- }
- };
-
- const handleChange = (event) => {
- const { value, id } = event.target;
- const name = idMap[id];
- setForm((prev) => ({
- ...prev,
- [name]: value,
- }));
-
- const { error } = credentials.validate(
- { [name]: value },
- { abortEarly: false, context: { password: form.password } }
- );
-
- setErrors((prev) => {
- const prevErrors = { ...prev };
- if (error) prevErrors[name] = error.details[0].message;
- else delete prevErrors[name];
- return prevErrors;
- });
- };
return (
-
-
-
-
An open source server monitoring application
-
-
-
-
+
BlueWave Uptime is an open source server monitoring application used to track the operational status and performance of servers and websites. It regularly checks whether a server/website is accessible and performs optimally, providing real-time alerts and reports on the monitored services' availability, downtime, and response time.
diff --git a/Server/controllers/authController.js b/Server/controllers/authController.js
index 02eb1bea4..0f89e3371 100644
--- a/Server/controllers/authController.js
+++ b/Server/controllers/authController.js
@@ -135,6 +135,10 @@ const loginController = async (req, res, next) => {
throw new Error(errorMessages.AUTH_INCORRECT_PASSWORD);
}
+ if (user.authToken) {
+ throw new Error(errorMessages.AUTH_ALREADY_LOGGED_IN);
+ }
+
// Remove password from user object. Should this be abstracted to DB layer?
const userWithoutPassword = { ...user._doc };
delete userWithoutPassword.password;
@@ -142,6 +146,8 @@ const loginController = async (req, res, next) => {
// Happy path, return token
const token = issueToken(userWithoutPassword);
+ user.authToken = token;
+ await user.save();
// reset avatar image
userWithoutPassword.avatarImage = user.avatarImage;
@@ -157,6 +163,23 @@ const loginController = async (req, res, next) => {
}
};
+const logoutController = async (req, res, next) => {
+ try {
+ // Get user
+ const { email } = req.body;
+ const userToLogout = await req.db.getUserByEmail({ body: { email } }, res);
+ userToLogout.authToken = null;
+ await userToLogout.save();
+
+ return res
+ .status(200)
+ .json({ success: true, msg: successMessages.AUTH_LOGOUT_USER });
+ } catch (error) {
+ error.service = SERVICE_NAME;
+ next(error);
+ }
+};
+
const userEditController = async (req, res, next) => {
try {
await editUserParamValidation.validateAsync(req.params);
@@ -524,6 +547,7 @@ const getAllUsersController = async (req, res) => {
module.exports = {
registerController,
loginController,
+ logoutController,
userEditController,
inviteController,
inviteVerifyController,
diff --git a/Server/db/mongo/MongoDB.js b/Server/db/mongo/MongoDB.js
index ed1b9e4b1..fa84cd98a 100644
--- a/Server/db/mongo/MongoDB.js
+++ b/Server/db/mongo/MongoDB.js
@@ -37,6 +37,7 @@ const {
updateUser,
deleteUser,
getAllUsers,
+ logoutUser,
} = require("./modules/userModule");
//****************************************
@@ -133,6 +134,7 @@ module.exports = {
updateUser,
deleteUser,
getAllUsers,
+ logoutUser,
requestInviteToken,
getInviteToken,
requestRecoveryToken,
diff --git a/Server/db/mongo/modules/userModule.js b/Server/db/mongo/modules/userModule.js
index de7d54ebf..d626bcb9a 100644
--- a/Server/db/mongo/modules/userModule.js
+++ b/Server/db/mongo/modules/userModule.js
@@ -27,7 +27,6 @@ const insertUser = async (req, res) => {
const avatar = await GenerateAvatarImage(req.file);
userData.avatarImage = avatar;
}
- console.log(userData);
const newUser = new UserModel(userData);
await newUser.save();
return await UserModel.findOne({ _id: newUser._id })
@@ -151,10 +150,20 @@ const getAllUsers = async (req, res) => {
}
};
+const logoutUser = async (userId) => {
+ try {
+ await UserModel.updateOne({ _id: userId }, { $unset: { authToken: null } });
+ return true;
+ } catch (error) {
+ throw error;
+ }
+};
+
module.exports = {
insertUser,
getUserByEmail,
updateUser,
deleteUser,
getAllUsers,
+ logoutUser,
};
diff --git a/Server/middleware/verifyJWT.js b/Server/middleware/verifyJWT.js
index 1dbbe8d99..cfbf4b46c 100644
--- a/Server/middleware/verifyJWT.js
+++ b/Server/middleware/verifyJWT.js
@@ -3,6 +3,8 @@ const logger = require("../utils/logger");
const SERVICE_NAME = "verifyJWT";
const TOKEN_PREFIX = "Bearer ";
const { errorMessages } = require("../utils/messages");
+const { parse } = require("path");
+const User = require("../models/user");
/**
* Verifies the JWT token
* @function
@@ -32,14 +34,27 @@ const verifyJWT = (req, res, next) => {
const parsedToken = token.slice(TOKEN_PREFIX.length, token.length);
// Verify the token's authenticity
- jwt.verify(parsedToken, process.env.JWT_SECRET, (err, decoded) => {
+ jwt.verify(parsedToken, process.env.JWT_SECRET, async (err, decoded) => {
if (err) {
- logger.error(errorMessages.INVALID_AUTH_TOKEN, {
- service: SERVICE_NAME,
- });
- return res
- .status(401)
- .json({ success: false, msg: errorMessages.INVALID_AUTH_TOKEN });
+ try {
+ const userId = jwt.decode(parsedToken)._id;
+ await req.db.logoutUser(userId);
+ logger.error(errorMessages.INVALID_AUTH_TOKEN, {
+ service: SERVICE_NAME,
+ });
+ return res
+ .status(401)
+ .json({ success: false, msg: errorMessages.INVALID_AUTH_TOKEN });
+ } catch (error) {
+ logger.error(errorMessages.UNKNOWN_ERROR, {
+ service: SERVICE_NAME,
+ error: error,
+ });
+ error.status = 401;
+ error.service = SERVICE_NAME;
+ next(error);
+ return;
+ }
}
//Add the user to the request object for use in the route
req.user = decoded;
diff --git a/Server/models/user.js b/Server/models/user.js
index 977cabc15..dee89b5f7 100644
--- a/Server/models/user.js
+++ b/Server/models/user.js
@@ -40,6 +40,9 @@ const UserSchema = mongoose.Schema(
default: "user",
enum: ["user", "admin"],
},
+ authToken: {
+ type: String,
+ },
},
{
timestamps: true,
diff --git a/Server/routes/authRoute.js b/Server/routes/authRoute.js
index b01e90294..224b4501f 100644
--- a/Server/routes/authRoute.js
+++ b/Server/routes/authRoute.js
@@ -9,6 +9,7 @@ const User = require("../models/user");
const {
registerController,
loginController,
+ logoutController,
userEditController,
recoveryRequestController,
validateRecoveryTokenController,
@@ -23,6 +24,7 @@ const {
//Auth routes
router.post("/register", upload.single("profileImage"), registerController);
router.post("/login", loginController);
+router.post("/logout", logoutController);
router.put(
"/user/:userId",
upload.single("profileImage"),
diff --git a/Server/utils/messages.js b/Server/utils/messages.js
index d04052607..40d7205e5 100644
--- a/Server/utils/messages.js
+++ b/Server/utils/messages.js
@@ -7,6 +7,7 @@ const errorMessages = {
UNAUTHORIZED: "Unauthorized access",
AUTH_ADMIN_EXISTS: "Admin already exists",
AUTH_INVITE_NOT_FOUND: "Invite not found",
+ AUTH_ALREADY_LOGGED_IN: "User already logged in",
//Error handling middleware
UNKNOWN_SERVICE: "Unknown service",
@@ -55,6 +56,7 @@ const successMessages = {
// Auth Controller
AUTH_CREATE_USER: "User created successfully",
AUTH_LOGIN_USER: "User logged in successfully",
+ AUTH_LOGOUT_USER: "User logged out successfully",
AUTH_UPDATE_USER: "User updated successfully",
AUTH_CREATE_RECOVERY_TOKEN: "Recovery token created successfully",
AUTH_VERIFY_RECOVERY_TOKEN: "Recovery token verified successfully",