Andreas/LibreChat
1
0
Fork 0
mirror of https://github.com/danny-avila/LibreChat.git synced 2025-12-20 02:10:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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

12
api/strategies/openidStrategy.js
View file

@ -1,5 +1,4 @@
const fetch = require('node-fetch');
const mongoose = require('mongoose');
const passport = require('passport');
const client = require('openid-client');
const jwtDecode = require('jsonwebtoken/decode');
@ -8,11 +7,10 @@ const { CacheKeys } = require('librechat-data-provider');
const { HttpsProxyAgent } = require('https-proxy-agent');
const { Strategy: OpenIDStrategy } = require('openid-client/passport');
const { getStrategyFunctions } = require('~/server/services/Files/strategies');
const { findUser, createUser, updateUser } = require('~/models');
const getLogStores = require('~/cache/getLogStores');
const { isEnabled } = require('~/server/utils');
const User = require('~/db/models').User;
/**
* @typedef {import('openid-client').ClientMetadata} ClientMetadata
* @typedef {import('openid-client').Configuration} Configuration
@ -248,13 +246,13 @@ async function setupOpenId() {
async (tokenset, done) => {
try {
const claims = tokenset.claims();
let user = await User.findUser({ openidId: claims.sub });
let user = await findUser({ openidId: claims.sub });
logger.info(
`[openidStrategy] user ${user ? 'found' : 'not found'} with openidId: ${claims.sub}`,
);
if (!user) {
user = await User.findUser({ email: claims.email });
user = await findUser({ email: claims.email });
logger.info(
`[openidStrategy] user ${user ? 'found' : 'not found'} with email: ${
claims.email
@ -318,7 +316,7 @@ async function setupOpenId() {
const balanceConfig = await getBalanceConfig();
user = await User.createUser(user, balanceConfig, true, true);
user = await createUser(user, balanceConfig, true, true);
} else {
user.provider = 'openid';
user.openidId = userinfo.sub;
@ -354,7 +352,7 @@ async function setupOpenId() {
}
}
user = await User.updateUser(user._id, user);
user = await updateUser(user._id, user);
logger.info(
`[openidStrategy] login success openidId: ${user.openidId} | email: ${user.email} | username: ${user.username} `,