WIP: first pass, massive refactor of model imports

This commit is contained in:
Danny Avila 2025-05-30 12:54:24 -04:00
parent c682d45fb2
commit ab5450be8b
No known key found for this signature in database
GPG key ID: BF31EEB2C5CA0956
53 changed files with 179 additions and 72 deletions

View file

@ -1,7 +1,8 @@
const cookies = require('cookie');
const jwt = require('jsonwebtoken');
const mongoose = require('mongoose');
const openIdClient = require('openid-client');
const { User, Session, logger } = require('@librechat/data-schemas');
const { logger } = require('@librechat/data-schemas');
const {
registerUser,
resetPassword,
@ -12,6 +13,9 @@ const {
const { getOpenIdConfig } = require('~/strategies');
const { isEnabled } = require('~/server/utils');
const Session = mongoose.models.Session;
const User = mongoose.models.User;
const registrationController = async (req, res) => {
try {
const response = await registerUser(req.body);

View file

@ -1,4 +1,7 @@
const { Balance } = require('@librechat/data-schemas');
const mongoose = require('mongoose');
const Balance = mongoose.models.Balance;
async function balanceController(req, res) {
const balanceData = await Balance.findOne(
{ user: req.user.id },

View file

@ -1,4 +1,5 @@
const { User, logger } = require('@librechat/data-schemas');
const mongoose = require('mongoose');
const { logger } = require('@librechat/data-schemas');
const {
generateTOTPSecret,
generateBackupCodes,
@ -9,6 +10,8 @@ const {
const { encryptV3 } = require('~/server/utils/crypto');
const safeAppTitle = (process.env.APP_TITLE || 'LibreChat').replace(/\s+/g, '');
const User = mongoose.models.User;
/**
* Enable 2FA for the user by generating a new TOTP secret and backup codes.
* The secret is encrypted and stored, and 2FA is marked as disabled until confirmed.

View file

@ -4,7 +4,8 @@ const {
webSearchKeys,
extractWebSearchEnvVars,
} = require('librechat-data-provider');
const { User, Session, Transaction, Balance, logger } = require('@librechat/data-schemas');
const mongoose = require('mongoose');
const { logger } = require('@librechat/data-schemas');
const { getFiles, deleteFiles, deleteConvos, deletePresets, deleteMessages } = require('~/models');
const { updateUserPluginAuth, deleteUserPluginAuth } = require('~/server/services/PluginService');
const { updateUserPluginsService, deleteUserKey } = require('~/server/services/UserService');
@ -14,6 +15,11 @@ 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 getUserController = async (req, res) => {
/** @type {MongoUser} */
const userData = req.user.toObject != null ? req.user.toObject() : { ...req.user };

View file

@ -1,11 +1,14 @@
const jwt = require('jsonwebtoken');
const mongoose = require('mongoose');
const {
verifyTOTP,
verifyBackupCode,
getTOTPSecret,
} = require('~/server/services/twoFactorService');
const { setAuthTokens } = require('~/server/services/AuthService');
const { User, logger } = require('@librechat/data-schemas');
const { logger } = require('@librechat/data-schemas');
const User = mongoose.models.User;
/**
* Verifies the 2FA code during login using a temporary token.