From e56d90e45a792058e8289912d94c891636437f9d Mon Sep 17 00:00:00 2001
From: Danny Avila <110412045+danny-avila@users.noreply.github.com>
Date: Thu, 18 May 2023 17:39:06 -0400
Subject: [PATCH] fix(User.js, auth.service.js, localStrategy.js): change
 deprecated Joi.validate() to schema.validate() method (#322)

---
 api/models/User.js                  | 4 ++--
 api/server/services/auth.service.js | 3 +--
 api/strategies/localStrategy.js     | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/api/models/User.js b/api/models/User.js
index bade1d78d..ac7fe7c9a 100644
--- a/api/models/User.js
+++ b/api/models/User.js
@@ -79,7 +79,7 @@ const userSchema = mongoose.Schema(
 
 //Remove refreshToken from the response
 userSchema.set('toJSON', {
-  transform: function (doc, ret, options) {
+  transform: function (_doc, ret,) {
     delete ret.refreshToken;
     return ret;
   }
@@ -168,7 +168,7 @@ module.exports.validateUser = (user) => {
     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);
diff --git a/api/server/services/auth.service.js b/api/server/services/auth.service.js
index cdad99539..9e21ae166 100644
--- a/api/server/services/auth.service.js
+++ b/api/server/services/auth.service.js
@@ -4,7 +4,6 @@ const sendEmail = require('../../utils/sendEmail');
 const crypto = require('crypto');
 const bcrypt = require('bcrypt');
 const DebugControl = require('../../utils/debug.js');
-const Joi = require('joi');
 const { registerSchema } = require('../../strategies/validators');
 const migrateDataToFirstUser = require('../../utils/migrateDataToFirstUser');
 
@@ -47,7 +46,7 @@ const logoutUser = async (user, refreshToken) => {
 
 const registerUser = async (user) => {
   let response = {};
-  const { error } = Joi.validate(user, registerSchema);
+  const { error } = registerSchema.validate(user);
   if (error) {
     log({
       title: 'Route: register - Joi Validation Error',
diff --git a/api/strategies/localStrategy.js b/api/strategies/localStrategy.js
index 09aa63a6d..108b953b0 100644
--- a/api/strategies/localStrategy.js
+++ b/api/strategies/localStrategy.js
@@ -1,6 +1,5 @@
 const passport = require('passport');
 const PassportLocalStrategy = require('passport-local').Strategy;
-const Joi = require('joi');
 
 const User = require('../models/User');
 const { loginSchema } = require('./validators');
@@ -14,7 +13,7 @@ const passportLogin = new PassportLocalStrategy(
     passReqToCallback: true
   },
   async (req, email, password, done) => {
-    const { error } = Joi.validate(req.body, loginSchema);
+    const { error } = loginSchema.validate(req.body);
     if (error) {
       log({
         title: 'Passport Local Strategy - Validation Error',