Andreas/LibreChat
1
0
Fork 0
mirror of https://github.com/danny-avila/LibreChat.git synced 2026-01-15 15:08:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix(auth): replace mongoose model references with new function imports

Browse source 
- Updated AuthController, checkBan middleware, localStrategy, and openidStrategy to use new function imports for user operations.
- Removed unused mongoose imports to streamline the codebase.
- Enhanced consistency across user-related operations by utilizing the centralized methods for user management.
This commit is contained in:
Danny Avila 2025-05-30 13:46:31 -04:00
parent 90ac2b51cd
commit 6e278f6932
No known key found for this signature in database
GPG key ID: BF31EEB2C5CA0956
5 changed files with 12 additions and 241 deletions
Download patch file Download diff file Expand all files Collapse all files

7
api/server/controllers/AuthController.js
View file

@ -1,6 +1,5 @@
const cookies = require('cookie');
const jwt = require('jsonwebtoken');
const mongoose = require('mongoose');
const openIdClient = require('openid-client');
const { logger } = require('@librechat/data-schemas');
const {
@ -10,11 +9,11 @@ const {
requestPasswordReset,
setOpenIDAuthTokens,
} = require('~/server/services/AuthService');
const { findUser, getUserById } = require('~/models');
const { getOpenIdConfig } = require('~/strategies');
const { isEnabled } = require('~/server/utils');
const Session = require('~/db/models').Session;
const User = require('~/db/models').User;
const registrationController = async (req, res) => {
try {
@ -73,7 +72,7 @@ const refreshController = async (req, res) => {
const openIdConfig = getOpenIdConfig();
const tokenset = await openIdClient.refreshTokenGrant(openIdConfig, refreshToken);
const claims = tokenset.claims();
const user = await User.findUser({ email: claims.email });
const user = await findUser({ email: claims.email });
if (!user) {
return res.status(401).redirect('/login');
}
@ -86,7 +85,7 @@ const refreshController = async (req, res) => {
}
try {
const payload = jwt.verify(refreshToken, process.env.JWT_REFRESH_SECRET);
const user = await User.getUserById(payload.id, '-password -__v -totpSecret');
const user = await getUserById(payload.id, '-password -__v -totpSecret');
if (!user) {
return res.status(401).redirect('/login');
}

6
api/server/middleware/checkBan.js
View file

@ -1,14 +1,12 @@
const { Keyv } = require('keyv');
const uap = require('ua-parser-js');
const mongoose = require('mongoose');
const { logger } = require('@librechat/data-schemas');
const { ViolationTypes } = require('librechat-data-provider');
const { isEnabled, removePorts } = require('~/server/utils');
const keyvMongo = require('~/cache/keyvMongo');
const denyRequest = require('./denyRequest');
const { getLogStores } = require('~/cache');
const User = require('~/db/models').User;
const { findUser } = require('~/models');
const banCache = new Keyv({ store: keyvMongo, namespace: ViolationTypes.BAN, ttl: 0 });
const message = 'Your account has been temporarily banned due to violations of our service.';
@ -59,7 +57,7 @@ const checkBan = async (req, res, next = () => {}) => {
let userId = req.user?.id ?? req.user?._id ?? null;
if (!userId && req?.body?.email) {
const user = await User.findUser({ email: req.body.email }, '_id');
const user = await findUser({ email: req.body.email }, '_id');
userId = user?._id ? user._id.toString() : userId;
}