Merge pull request #649 from bluewave-labs/fix/remove-double-login-protection

Revert double login prevention
This commit is contained in:
Alexander Holliday authored and GitHub committed 2024-08-15 11:50:20 -07:00
commit 29b790a8e2
6 files changed
+8 -69

No files matched your search

+4 -22
View File
@@ -78,28 +78,10 @@ function Sidebar() {
* *
*/ */
const logout = async () => { const logout = async () => {
try { // Clear auth state
// Make request to BE to remove JWT from user dispatch(clearAuthState());
await axiosInstance.post( dispatch(clearUptimeMonitorState());
"/auth/logout", navigate("/login");
{ email: authState.user.email },
{
headers: {
Authorization: `Bearer ${authState.authToken}`,
"Content-Type": "application/json",
},
}
);
// Clear auth state
dispatch(clearAuthState());
dispatch(clearUptimeMonitorState());
navigate("/login");
} catch (error) {
createToast({
body: error.message,
});
}
}; };
/** /**
-22
View File
@@ -136,10 +136,6 @@ const loginController = async (req, res, next) => {
throw new Error(errorMessages.AUTH_INCORRECT_PASSWORD); 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? // Remove password from user object. Should this be abstracted to DB layer?
const userWithoutPassword = { ...user._doc }; const userWithoutPassword = { ...user._doc };
delete userWithoutPassword.password; delete userWithoutPassword.password;
@@ -164,23 +160,6 @@ 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(email);
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) => { const userEditController = async (req, res, next) => {
try { try {
await editUserParamValidation.validateAsync(req.params); await editUserParamValidation.validateAsync(req.params);
@@ -524,7 +503,6 @@ const getAllUsersController = async (req, res) => {
module.exports = { module.exports = {
registerController, registerController,
loginController, loginController,
logoutController,
userEditController, userEditController,
inviteController, inviteController,
inviteVerifyController, inviteVerifyController,
+4 -20
View File
@@ -34,27 +34,11 @@ const verifyJWT = (req, res, next) => {
const parsedToken = token.slice(TOKEN_PREFIX.length, token.length); const parsedToken = token.slice(TOKEN_PREFIX.length, token.length);
// Verify the token's authenticity // Verify the token's authenticity
jwt.verify(parsedToken, process.env.JWT_SECRET, async (err, decoded) => { jwt.verify(parsedToken, process.env.JWT_SECRET, (err, decoded) => {
if (err) { if (err) {
try { return res
const userId = jwt.decode(parsedToken)._id; .status(401)
await req.db.logoutUser(userId); .json({ success: false, msg: errorMessages.INVALID_AUTH_TOKEN });
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 //Add the user to the request object for use in the route
req.user = decoded; req.user = decoded;
-3
View File
@@ -40,9 +40,6 @@ const UserSchema = mongoose.Schema(
default: "user", default: "user",
enum: ["user", "admin"], enum: ["user", "admin"],
}, },
authToken: {
type: String,
},
}, },
{ {
timestamps: true, timestamps: true,
-1
View File
@@ -24,7 +24,6 @@ const {
//Auth routes //Auth routes
router.post("/register", upload.single("profileImage"), registerController); router.post("/register", upload.single("profileImage"), registerController);
router.post("/login", loginController); router.post("/login", loginController);
router.post("/logout", logoutController);
router.put( router.put(
"/user/:userId", "/user/:userId",
upload.single("profileImage"), upload.single("profileImage"),
-1
View File
@@ -7,7 +7,6 @@ const errorMessages = {
UNAUTHORIZED: "Unauthorized access", UNAUTHORIZED: "Unauthorized access",
AUTH_ADMIN_EXISTS: "Admin already exists", AUTH_ADMIN_EXISTS: "Admin already exists",
AUTH_INVITE_NOT_FOUND: "Invite not found", AUTH_INVITE_NOT_FOUND: "Invite not found",
AUTH_ALREADY_LOGGED_IN: "User already logged in",
//Error handling middleware //Error handling middleware
UNKNOWN_SERVICE: "Unknown service", UNKNOWN_SERVICE: "Unknown service",