mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-16 16:30:15 +01:00
🚀 refactor: Remove Local Login Redundancies (#3002)
This commit is contained in:
parent
35f8053f45
commit
1da92111aa
4 changed files with 23 additions and 30 deletions
|
|
@ -1,42 +1,20 @@
|
|||
const { setAuthTokens } = require('~/server/services/AuthService');
|
||||
const { getUserById, updateUser } = require('~/models/userMethods');
|
||||
const { isEnabled, checkEmailConfig } = require('~/server/utils');
|
||||
const { logger } = require('~/config');
|
||||
|
||||
// Unix timestamp for 2024-06-07 15:20:18 Eastern Time
|
||||
const verificationEnabledTimestamp = 1717788018;
|
||||
|
||||
const loginController = async (req, res) => {
|
||||
try {
|
||||
const user = await getUserById(req.user._id, '-password -__v');
|
||||
|
||||
// If user doesn't exist, return error
|
||||
if (!user) {
|
||||
if (!req.user) {
|
||||
return res.status(400).json({ message: 'Invalid credentials' });
|
||||
}
|
||||
|
||||
const emailEnabled = checkEmailConfig();
|
||||
const userCreatedAtTimestamp = Math.floor(new Date(user.createdAt).getTime() / 1000);
|
||||
const { password: _, __v, ...user } = req.user;
|
||||
user.id = user._id.toString();
|
||||
|
||||
if (
|
||||
!emailEnabled &&
|
||||
!user.emailVerified &&
|
||||
userCreatedAtTimestamp < verificationEnabledTimestamp
|
||||
) {
|
||||
await updateUser(user._id, { emailVerified: true });
|
||||
user.emailVerified = true;
|
||||
}
|
||||
|
||||
if (!user.emailVerified && !isEnabled(process.env.ALLOW_UNVERIFIED_EMAIL_LOGIN)) {
|
||||
return res.status(422).json({ message: 'Email not verified' });
|
||||
}
|
||||
|
||||
const token = await setAuthTokens(user._id, res);
|
||||
const token = await setAuthTokens(req.user._id, res);
|
||||
|
||||
return res.status(200).send({ token, user });
|
||||
} catch (err) {
|
||||
logger.error('[loginController]', err);
|
||||
|
||||
return res.status(500).json({ message: 'Something went wrong' });
|
||||
}
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue