From e76b44fcbaaea00ace4638c3e7f019b08383ae37 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 23 Jul 2025 11:47:21 -0700 Subject: [PATCH] fix validaiton for editing user --- server/index.js | 13 +++++++++++++ server/validation/joi.js | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/server/index.js b/server/index.js index 8fb8942de..e20858208 100755 --- a/server/index.js +++ b/server/index.js @@ -1,6 +1,7 @@ import path from "path"; import fs from "fs"; import swaggerUi from "swagger-ui-express"; +import jwt from "jsonwebtoken"; import express from "express"; import helmet from "helmet"; @@ -56,6 +57,8 @@ import PulseQueueHelper from "./service/PulseQueue/PulseQueueHelper.js"; import SuperSimpleQueue from "./service/SuperSimpleQueue/SuperSimpleQueue.js"; import SuperSimpleQueueHelper from "./service/SuperSimpleQueue/SuperSimpleQueueHelper.js"; +import UserService from "./service/userService.js"; + //Network service and dependencies import NetworkService from "./service/networkService.js"; import axios from "axios"; @@ -176,6 +179,14 @@ const startApp = async () => { }); const redisService = new RedisService({ Redis: IORedis, logger }); + const userService = new UserService({ + db, + emailService, + settingsService, + logger, + stringService, + jwt, + }); // const jobQueueHelper = new JobQueueHelper({ // redisService, @@ -235,6 +246,7 @@ const startApp = async () => { ServiceRegistry.register(NotificationService.SERVICE_NAME, notificationService); ServiceRegistry.register(TranslationService.SERVICE_NAME, translationService); ServiceRegistry.register(RedisService.SERVICE_NAME, redisService); + ServiceRegistry.register(UserService.SERVICE_NAME, userService); await translationService.initialize(); @@ -255,6 +267,7 @@ const startApp = async () => { jobQueue: ServiceRegistry.get(JobQueue.SERVICE_NAME), stringService: ServiceRegistry.get(StringService.SERVICE_NAME), logger: logger, + userService: ServiceRegistry.get(UserService.SERVICE_NAME), }); const monitorController = new MonitorController( diff --git a/server/validation/joi.js b/server/validation/joi.js index dcbf9a606..c141bbd34 100755 --- a/server/validation/joi.js +++ b/server/validation/joi.js @@ -58,8 +58,8 @@ const registrationBodyValidation = joi.object({ }); const editUserBodyValidation = joi.object({ - firstName: nameValidation.required(), - lastName: nameValidation.required(), + firstName: nameValidation.optional(), + lastName: nameValidation.optional(), profileImage: joi.any(), newPassword: joi.string().min(8).pattern(passwordPattern), password: joi.string().min(8).pattern(passwordPattern),