Andreas/LibreChat
1
0
Fork 0
mirror of https://github.com/danny-avila/LibreChat.git synced 2025-12-17 00:40:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix(User.js, auth.service.js, localStrategy.js): change deprecated Joi.validate() to schema.validate() method (#322)

Browse source
This commit is contained in:
Danny Avila 2023-05-18 17:39:06 -04:00 • committed by GitHub
parent 92eee52c52
commit e56d90e45a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
api/models/User.js
View file

@ -79,7 +79,7 @@ const userSchema = mongoose.Schema(
//Remove refreshToken from the response //Remove refreshToken from the response
userSchema.set('toJSON', { userSchema.set('toJSON', {
transform: function (doc, ret, options) { transform: function (_doc, ret,) {
delete ret.refreshToken; delete ret.refreshToken;
return ret; return ret;
} }
@ -168,7 +168,7 @@ module.exports.validateUser = (user) => {
password: Joi.string().min(8).max(60).allow('').allow(null) password: Joi.string().min(8).max(60).allow('').allow(null)
}; };
return Joi.validate(user, schema); return schema.validate(user);
}; };
const User = mongoose.model('User', userSchema); const User = mongoose.model('User', userSchema);

3
api/server/services/auth.service.js
View file

@ -4,7 +4,6 @@ const sendEmail = require('../../utils/sendEmail');
const crypto = require('crypto'); const crypto = require('crypto');
const bcrypt = require('bcrypt'); const bcrypt = require('bcrypt');
const DebugControl = require('../../utils/debug.js'); const DebugControl = require('../../utils/debug.js');
const Joi = require('joi');
const { registerSchema } = require('../../strategies/validators'); const { registerSchema } = require('../../strategies/validators');
const migrateDataToFirstUser = require('../../utils/migrateDataToFirstUser'); const migrateDataToFirstUser = require('../../utils/migrateDataToFirstUser');
@ -47,7 +46,7 @@ const logoutUser = async (user, refreshToken) => {
const registerUser = async (user) => { const registerUser = async (user) => {
let response = {}; let response = {};
const { error } = Joi.validate(user, registerSchema); const { error } = registerSchema.validate(user);
if (error) { if (error) {
log({ log({
title: 'Route: register - Joi Validation Error', title: 'Route: register - Joi Validation Error',

3
api/strategies/localStrategy.js
View file

@ -1,6 +1,5 @@
const passport = require('passport'); const passport = require('passport');
const PassportLocalStrategy = require('passport-local').Strategy; const PassportLocalStrategy = require('passport-local').Strategy;
const Joi = require('joi');
const User = require('../models/User'); const User = require('../models/User');
const { loginSchema } = require('./validators'); const { loginSchema } = require('./validators');
@ -14,7 +13,7 @@ const passportLogin = new PassportLocalStrategy(
passReqToCallback: true passReqToCallback: true
}, },
async (req, email, password, done) => { async (req, email, password, done) => {
const { error } = Joi.validate(req.body, loginSchema); const { error } = loginSchema.validate(req.body);
if (error) { if (error) {
log({ log({
title: 'Passport Local Strategy - Validation Error', title: 'Passport Local Strategy - Validation Error',