refactor(db): streamline model imports and remove unused model exports

- Removed the export of models from the database connection module to simplify the structure.
- Updated various files to import models directly from the new centralized models module.
- Ensured consistency across the codebase by replacing mongoose model references with the new import paths.
This commit is contained in:
Danny Avila 2025-05-30 13:13:10 -04:00
parent eb368fcb70
commit 20ad7d52f3
No known key found for this signature in database
GPG key ID: BF31EEB2C5CA0956
46 changed files with 61 additions and 66 deletions

View file

@ -13,8 +13,8 @@ const {
const { getOpenIdConfig } = require('~/strategies');
const { isEnabled } = require('~/server/utils');
const Session = mongoose.models.Session;
const User = mongoose.models.User;
const Session = require('~/db/models').Session;
const User = require('~/db/models').User;
const registrationController = async (req, res) => {
try {

View file

@ -1,6 +1,6 @@
const mongoose = require('mongoose');
const Balance = mongoose.models.Balance;
const Balance = require('~/db/models').Balance;
async function balanceController(req, res) {
const balanceData = await Balance.findOne(

View file

@ -10,7 +10,7 @@ const {
const { encryptV3 } = require('~/server/utils/crypto');
const safeAppTitle = (process.env.APP_TITLE || 'LibreChat').replace(/\s+/g, '');
const User = mongoose.models.User;
const User = require('~/db/models').User;
/**
* Enable 2FA for the user by generating a new TOTP secret and backup codes.

View file

@ -15,10 +15,10 @@ const { processDeleteRequest } = require('~/server/services/Files/process');
const { deleteAllSharedLinks } = require('~/models/Share');
const { deleteToolCalls } = require('~/models/ToolCall');
const Transaction = mongoose.models.Transaction;
const Session = mongoose.models.Session;
const Balance = mongoose.models.Balance;
const User = mongoose.models.User;
const Transaction = require('~/db/models').Transaction;
const Session = require('~/db/models').Session;
const Balance = require('~/db/models').Balance;
const User = require('~/db/models').User;
const getUserController = async (req, res) => {
/** @type {MongoUser} */

View file

@ -8,7 +8,7 @@ const {
const { setAuthTokens } = require('~/server/services/AuthService');
const { logger } = require('@librechat/data-schemas');
const User = mongoose.models.User;
const User = require('~/db/models').User;
/**
* Verifies the 2FA code during login using a temporary token.

View file

@ -9,8 +9,9 @@ const passport = require('passport');
const mongoSanitize = require('express-mongo-sanitize');
const fs = require('fs');
const cookieParser = require('cookie-parser');
const { connectDb, indexSync } = require('~/db');
const { jwtLogin, passportLogin } = require('~/strategies');
const { connectDb, indexSync, getModels } = require('db');
const { isEnabled } = require('~/server/utils');
const { ldapLogin } = require('~/strategies');
const { logger } = require('~/config');

View file

@ -8,7 +8,7 @@ const keyvMongo = require('~/cache/keyvMongo');
const denyRequest = require('./denyRequest');
const { getLogStores } = require('~/cache');
const User = mongoose.models.User;
const User = require('~/db/models').User;
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.';

View file

@ -2,7 +2,7 @@ const mongoose = require('mongoose');
const { logger } = require('@librechat/data-schemas');
const { getBalanceConfig } = require('~/server/services/Config');
const Balance = mongoose.models.Balance;
const Balance = require('~/db/models').Balance;
/**
* Middleware to synchronize user balance settings with current balance configuration.

View file

@ -16,7 +16,7 @@ const { cleanUpPrimaryKeyValue } = require('~/lib/utils/misc');
const { getConvosQueried } = require('~/models/Conversation');
const { countTokens } = require('~/server/utils');
const Message = mongoose.models.Message;
const Message = require('~/db/models').Message;
const router = express.Router();
router.use(requireJwtAuth);

View file

@ -2,7 +2,7 @@ const mongoose = require('mongoose');
const { encrypt, decrypt } = require('~/server/utils/');
const { logger } = require('~/config');
const PluginAuth = mongoose.models.PluginAuth;
const PluginAuth = require('~/db/models').PluginAuth;
/**
* Asynchronously retrieves and decrypts the authentication value for a user's plugin, based on a specified authentication field.

View file

@ -4,7 +4,7 @@ const { ErrorTypes } = require('librechat-data-provider');
const { encrypt, decrypt } = require('~/server/utils/crypto');
const { updateUser } = require('~/models');
const Key = mongoose.models.Key;
const Key = require('~/db/models').Key;
/**
* Updates the plugins for a user based on the action specified (install/uninstall).

View file

@ -2,7 +2,7 @@ const mongoose = require('mongoose');
const { webcrypto } = require('node:crypto');
const { hashBackupCode, decryptV3, decryptV2 } = require('~/server/utils/crypto');
const User = mongoose.models.User;
const User = require('~/db/models').User;
// Base32 alphabet for TOTP secret encoding.
const BASE32_ALPHABET = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ234567';