refactor: update validations

package-lock.json

@@ -9,6 +9,7 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
+        "@hapi/joi": "^17.1.1",
         "@types/glob": "^8.1.0",
         "bcrypt": "^5.1.1",
         "cors": "^2.8.5",
@@ -18,7 +19,7 @@
         "glob": "^10.3.10",
         "http": "^0.0.1-security",
         "i": "^0.3.7",
-        "joi": "^17.11.0",
+        "joi": "^17.12.1",
         "jsonwebtoken": "^9.0.2",
         "mongoose": "^8.0.3",
         "npm": "^10.2.5",
@@ -45,11 +46,44 @@
         "node": ">=12"
       }
     },
+    "node_modules/@hapi/address": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@hapi/address/-/address-4.1.0.tgz",
+      "integrity": "sha512-SkszZf13HVgGmChdHo/PxchnSaCJ6cetVqLzyciudzZRT0jcOouIF/Q93mgjw8cce+D+4F4C1Z/WrfFN+O3VHQ==",
+      "deprecated": "Moved to 'npm install @sideway/address'",
+      "dependencies": {
+        "@hapi/hoek": "^9.0.0"
+      }
+    },
+    "node_modules/@hapi/formula": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@hapi/formula/-/formula-2.0.0.tgz",
+      "integrity": "sha512-V87P8fv7PI0LH7LiVi8Lkf3x+KCO7pQozXRssAHNXXL9L1K+uyu4XypLXwxqVDKgyQai6qj3/KteNlrqDx4W5A==",
+      "deprecated": "Moved to 'npm install @sideway/formula'"
+    },
     "node_modules/@hapi/hoek": {
       "version": "9.3.0",
       "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
       "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ=="
     },
+    "node_modules/@hapi/joi": {
+      "version": "17.1.1",
+      "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-17.1.1.tgz",
+      "integrity": "sha512-p4DKeZAoeZW4g3u7ZeRo+vCDuSDgSvtsB/NpfjXEHTUjSeINAi/RrVOWiVQ1isaoLzMvFEhe8n5065mQq1AdQg==",
+      "deprecated": "Switch to 'npm install joi'",
+      "dependencies": {
+        "@hapi/address": "^4.0.1",
+        "@hapi/formula": "^2.0.0",
+        "@hapi/hoek": "^9.0.0",
+        "@hapi/pinpoint": "^2.0.0",
+        "@hapi/topo": "^5.0.0"
+      }
+    },
+    "node_modules/@hapi/pinpoint": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@hapi/pinpoint/-/pinpoint-2.0.1.tgz",
+      "integrity": "sha512-EKQmr16tM8s16vTT3cA5L0kZZcTMU5DUOZTuvpnY738m+jyP3JIUj+Mm1xc1rsLkGBQ/gVnfKYPwOmPg1tUR4Q=="
+    },
     "node_modules/@hapi/topo": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz",
@@ -228,9 +262,9 @@
       }
     },
     "node_modules/@sideway/address": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz",
-      "integrity": "sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.5.tgz",
+      "integrity": "sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==",
       "dependencies": {
         "@hapi/hoek": "^9.0.0"
       }
@@ -1449,13 +1483,13 @@
       }
     },
     "node_modules/joi": {
-      "version": "17.11.0",
-      "resolved": "https://registry.npmjs.org/joi/-/joi-17.11.0.tgz",
-      "integrity": "sha512-NgB+lZLNoqISVy1rZocE9PZI36bL/77ie924Ri43yEvi9GUUMPeyVIr8KdFTMUlby1p0PBYMk9spIxEUQYqrJQ==",
+      "version": "17.12.1",
+      "resolved": "https://registry.npmjs.org/joi/-/joi-17.12.1.tgz",
+      "integrity": "sha512-vtxmq+Lsc5SlfqotnfVjlViWfOL9nt/avKNbKYizwf6gsCfq9NYY/ceYRMFD8XDdrjJ9abJyScWmhmIiy+XRtQ==",
       "dependencies": {
-        "@hapi/hoek": "^9.0.0",
-        "@hapi/topo": "^5.0.0",
-        "@sideway/address": "^4.1.3",
+        "@hapi/hoek": "^9.3.0",
+        "@hapi/topo": "^5.1.0",
+        "@sideway/address": "^4.1.5",
         "@sideway/formula": "^3.0.1",
         "@sideway/pinpoint": "^2.0.0"
       }

package.json

@@ -19,6 +19,7 @@
     "typescript": "^5.3.3"
   },
   "dependencies": {
+    "@hapi/joi": "^17.1.1",
     "@types/glob": "^8.1.0",
     "bcrypt": "^5.1.1",
     "cors": "^2.8.5",
@@ -28,7 +29,7 @@
     "glob": "^10.3.10",
     "http": "^0.0.1-security",
     "i": "^0.3.7",
-    "joi": "^17.11.0",
+    "joi": "^17.12.1",
     "jsonwebtoken": "^9.0.2",
     "mongoose": "^8.0.3",
     "npm": "^10.2.5",

src/helpers/create-schema.ts

@@ -0,0 +1,7 @@
+import * as joi from "joi";
+
+export const createSchema = <T>(
+  schema: joi.SchemaMap<T>
+): joi.ObjectSchema<T> => {
+  return joi.object().required().keys(schema);
+};

src/modules/common/users/enums/roles.enum.ts

@@ -36,7 +36,7 @@ export enum PreferredEquipment {
   RESISTANCE_BAND = "resistance band",
   BODYWEIGHT = "bodyweight"
 }
-export enum Injurie {
+export enum Injury {
   NECK = "neck",
   SHOULDERS = "shoulders",
   BACK = "back",

src/modules/common/users/models/user.model.ts

@@ -1,7 +1,7 @@
 import mongoose from "mongoose";
 import bcrypt from "bcrypt";
 export const saltrounds = 5;
-import { Role, Gender, FitnessLevel, FitnessGoal, WorkoutPlace, PreferredDay, PreferredEquipment, Injurie } from "../enums/roles.enum";
+import { Role, Gender, FitnessLevel, FitnessGoal, WorkoutPlace, PreferredDay, PreferredEquipment, Injury } from "../enums/roles.enum";
 const { Schema } = mongoose;
 
 export interface IUser {
@@ -23,7 +23,7 @@ export interface IUser {
         workout_place: WorkoutPlace;
         preferred_equipment: [PreferredEquipment];
     };
-    injuries: [Injurie];
+    injuries: [Injury];
   }
   
 const userSchema = new Schema({
@@ -69,7 +69,7 @@ const userSchema = new Schema({
     },
     injuries: [{
         type: String,
-        enum: Injurie,
+        enum: Injury,
         required: true
     }],
     dob: { type: Date },

src/modules/common/users/validation/user-register.validation.ts

@@ -1,140 +1,196 @@
 import * as joi from "joi";
-import { Role, Gender, FitnessLevel, FitnessGoal, WorkoutPlace, PreferredDay, PreferredEquipment, Injurie } from "../enums/roles.enum";
+import {
+  Role,
+  Gender,
+  FitnessLevel,
+  FitnessGoal,
+  WorkoutPlace,
+  PreferredDay,
+  PreferredEquipment,
+  Injury,
+} from "../enums/roles.enum";
+import { createSchema } from "src/helpers/create-schema";
 
-export const userRegisterValidation = joi
-  .object()
-  .required()
-  .keys({
-    name: joi.string().empty().required().messages({
-      "string.base": "please enter a valid name",
-      "any.required": "name is required",
-      "string.empty": "name can not be empty",
+export interface IUserRegister {
+  name: string;
+  email: string;
+  password: string;
+  confirmPassword: string;
+  image?: {
+    url: string;
+    public_id: string;
+  };
+  gender: string;
+  height: number;
+  weight: number;
+  fitness_level: string;
+  preferences?: {
+    fitness_goal: string;
+    target_weight: number;
+    workout_frequency: number;
+    preferred_days: string[];
+    workout_place: string;
+    preferred_equipment: string[];
+  };
+  injuries: string[];
+  dob?: Date;
+  role?: Role;
+}
+
+export const userRegisterKeys = {
+  name: joi.string().empty().required().messages({
+    "string.base": "please enter a valid name",
+    "any.required": "name is required",
+    "string.empty": "name can not be empty",
+  }),
+  email: joi
+    .string()
+    .required()
+    .email({
+      minDomainSegments: 2,
+      tlds: { allow: ["com", "net", "org", "eg", "io"] },
+    })
+    .empty()
+    .messages({
+      "string.email": "please enter a valid email",
+      "any.required": "email must be entered",
+      "string.empty": "email can not be empty",
     }),
-    email: joi
-      .string()
-      .required()
-      .email({
-        minDomainSegments: 2,
-        tlds: { allow: ["com", "net", "org", "eg", "io"] },
-      })
-      .empty()
-      .messages({
-        "string.email": "please enter a valid email",
-        "any.required": "email must be entered",
-        "string.empty": "email can not be empty",
+  password: joi.string().empty().min(8).required().messages({
+    "string.base": "please enter a valid password",
+    "any.required": "password must be entered",
+    "string.empty": "password cannot be empty",
+    "string.min": "password must be at least 8 characters",
+  }),
+  confirmPassword: joi.string().empty().min(8).required().messages({
+    "string.base": "please enter a valid password",
+    "any.required": "password must be entered",
+    "string.empty": "password cannot be empty",
+    "string.min": "password must be at least 8 characters",
+  }),
+  image: joi
+    .object()
+    .optional()
+    .keys({
+      url: joi.string().optional().messages({
+        "string.base": "please enter a valid url",
       }),
-    password: joi.string().empty().min(8).required().messages({
-      "string.base": "please enter a valid password",
-      "any.required": "password must be entered",
-      "string.empty": "password cannot be empty",
-      "string.min": "password must be at least 8 characters",
-    }),
-    confirmPassword: joi.string().empty().min(8).required().messages({
-      "string.base": "please enter a valid password",
-      "any.required": "password must be entered",
-      "string.empty": "password cannot be empty",
-      "string.min": "password must be at least 8 characters",
-    }),
-    image: joi
-      .object()
-      .optional()
-      .keys({
-        url: joi.string().optional().messages({
-          "string.base": "please enter a valid url",
-        }),
-        public_id: joi.string().optional().messages({
-          "string.base": "please enter a valid public_id",
-        }),
+      public_id: joi.string().optional().messages({
+        "string.base": "please enter a valid public_id",
       }),
-    gender: joi.string().valid(...Object.values(Gender)).empty().required().messages({
+    }),
+  gender: joi
+    .string()
+    .valid(...Object.values(Gender))
+    .empty()
+    .required()
+    .messages({
       "string.base": "please enter a valid gender",
       "any.required": "gender must be entered",
       "string.empty": "gender cannot be empty",
     }),
-    height: joi.number().empty().required().messages({
-      "number.base": "please enter a valid height number",
-      "any.required": "height must be entered",
-      "number.empty": "height cannot be empty",
-    }),
-    weight: joi.number().empty().required().messages({
-      "number.base": "please enter a valid weight number",
-      "any.required": "weight must be entered",
-      "number.empty": "weight cannot be empty",
-    }),
-    fitness_level: joi.string().valid(...Object.values(FitnessLevel)).empty().required().messages({
+  height: joi.number().empty().required().messages({
+    "number.base": "please enter a valid height number",
+    "any.required": "height must be entered",
+    "number.empty": "height cannot be empty",
+  }),
+  weight: joi.number().empty().required().messages({
+    "number.base": "please enter a valid weight number",
+    "any.required": "weight must be entered",
+    "number.empty": "weight cannot be empty",
+  }),
+  fitness_level: joi
+    .string()
+    .valid(...Object.values(FitnessLevel))
+    .empty()
+    .required()
+    .messages({
       "string.base": "please enter a valid fitness_level",
       "any.required": "fitness_level must be entered",
       "string.empty": "fitness_level cannot be empty",
     }),
-    preferences: joi
-      .object()
-      .optional()
-      .keys({
-        fitness_goal: joi.string().valid(...Object.values(FitnessGoal)).empty().required().messages({
+  preferences: joi
+    .object()
+    .optional()
+    .keys({
+      fitness_goal: joi
+        .string()
+        .valid(...Object.values(FitnessGoal))
+        .empty()
+        .required()
+        .messages({
           "string.base": "please enter a valid fitness_goal",
           "any.required": "fitness_goal must be entered",
           "string.empty": "fitness_goal cannot be empty",
         }),
-        target_weight: joi.number().empty().required().messages({
-          "number.base": "please enter a valid target_weight number",
-          "any.required": "target_weight must be entered",
-          "number.empty": "target_weight cannot be empty",
-        }),
-        workout_frequency: joi.number().empty().required().messages({
-          "number.base": "please enter a valid workout_frequency number",
-          "any.required": "workout_frequency must be entered",
-          "number.empty": "workout_frequency cannot be empty",
-        }),
-        preferred_days: joi
-          .array()
-          .valid(...Object.values(PreferredDay))
-          .empty()
-          .required()
-          .items(
-            joi.string().empty().required().messages({
-              "string.base": "please enter a valid preferred_days",
-              "any.required": "preferred_days must be entered",
-              "string.empty": "preferred_days cannot be empty",
-            })
-          ),
-        workout_place: joi.string().valid(...Object.values(WorkoutPlace)).empty().required().messages({
+      target_weight: joi.number().empty().required().messages({
+        "number.base": "please enter a valid target_weight number",
+        "any.required": "target_weight must be entered",
+        "number.empty": "target_weight cannot be empty",
+      }),
+      workout_frequency: joi.number().empty().required().messages({
+        "number.base": "please enter a valid workout_frequency number",
+        "any.required": "workout_frequency must be entered",
+        "number.empty": "workout_frequency cannot be empty",
+      }),
+      preferred_days: joi
+        .array()
+        .valid(...Object.values(PreferredDay))
+        .empty()
+        .required()
+        .items(
+          joi.string().empty().required().messages({
+            "string.base": "please enter a valid preferred_days",
+            "any.required": "preferred_days must be entered",
+            "string.empty": "preferred_days cannot be empty",
+          })
+        ),
+      workout_place: joi
+        .string()
+        .valid(...Object.values(WorkoutPlace))
+        .empty()
+        .required()
+        .messages({
           "string.base": "please enter a valid workout_place",
           "any.required": "workout_place must be entered",
           "string.empty": "workout_place cannot be empty",
         }),
-        preferred_equipment: joi
-          .array()
-          .valid(...Object.values(PreferredEquipment))
-          .empty()
-          .required()
-          .items(
-            joi.string().empty().required().messages({
-              "string.base": "please enter a valid preferred_equipment",
-              "any.required": "preferred_equipment must be entered",
-              "string.empty": "preferred_equipment cannot be empty",
-            })
-          ),
-      }),
-    injuries: joi
-      .array()
-      .valid(...Object.values(Injurie))
-      .empty()
-      .required()
-      .items(
-        joi.string().empty().required().messages({
-          "string.base": "please enter a valid injuries",
-          "any.required": "injuries must be entered",
-          "string.empty": "injuries cannot be empty",
-        })
-      ),
-    dob: joi.date().empty().optional().messages({
-      "date.base": "please enter a valid date",
+      preferred_equipment: joi
+        .array()
+        .valid(...Object.values(PreferredEquipment))
+        .empty()
+        .required()
+        .items(
+          joi.string().empty().required().messages({
+            "string.base": "please enter a valid preferred_equipment",
+            "any.required": "preferred_equipment must be entered",
+            "string.empty": "preferred_equipment cannot be empty",
+          })
+        ),
     }),
-    role: joi
-      .string()
-      .valid(...Object.values(Role))
-      .optional().messages({
-        "string.base": "please enter a valid role",
-        "string.empty": "role cannot be empty"
-      }),
-  });
+  injuries: joi
+    .array()
+    .valid(...Object.values(Injury))
+    .empty()
+    .required()
+    .items(
+      joi.string().empty().required().messages({
+        "string.base": "please enter a valid injuries",
+        "any.required": "injuries must be entered",
+        "string.empty": "injuries cannot be empty",
+      })
+    ),
+  dob: joi.date().empty().optional().messages({
+    "date.base": "please enter a valid date",
+  }),
+  role: joi
+    .string()
+    .valid(...Object.values(Role))
+    .optional()
+    .messages({
+      "string.base": "please enter a valid role",
+      "string.empty": "role cannot be empty",
+    }),
+};
+
+export const userRegisterSchema = createSchema<IUserRegister>(userRegisterKeys);

src/modules/console/admins/validations/create-admin.validation.ts

@@ -1,47 +1,55 @@
 import * as joi from "joi";
 import { Role } from "../enums/roles.enum";
+import { createSchema } from "src/helpers/create-schema";
 
-export const createAdminSchema = joi
-  .object()
-  .required()
-  .keys({
-    name: joi.string().empty().required().messages({
-      "string.base": "please enter a valid name",
-      "any.required": "name is required",
-      "string.empty": "name can not be empty",
-    }),
-    email: joi
-      .string()
-      .required()
-      .email({
-        minDomainSegments: 2,
-        tlds: { allow: ["com", "net", "org", "eg", "io"] },
-      })
-      .empty()
-      .messages({
-        "string.email": "please enter a valid email",
-        "any.required": "email must be entered",
-        "string.empty": "email can not be empty",
-      }),
-    password: joi.string().empty().min(8).required().messages({
-      "string.base": "please enter a valid password",
-      "any.required": "password must be entered",
-      "string.empty": "password cannot be empty",
-      "string.min": "password must be at least 8 characters",
+export interface ICreateAdmin {
+  name: string;
+  email: string;
+  password: string;
+  dob: Date;
+  role?: Role;
+  gender: string;
+}
+
+export const createAdminSchema = createSchema<ICreateAdmin>({
+  name: joi.string().empty().required().messages({
+    "string.base": "please enter a valid name",
+    "any.required": "name is required",
+    "string.empty": "name can not be empty",
+  }),
+  email: joi
+    .string()
+    .required()
+    .email({
+      minDomainSegments: 2,
+      tlds: { allow: ["com", "net", "org", "eg", "io"] },
+    })
+    .empty()
+    .messages({
+      "string.email": "please enter a valid email",
+      "any.required": "email must be entered",
+      "string.empty": "email can not be empty",
     }),
-    dob: joi.date().empty().optional().messages({
-      "date.base": "please enter a valid date",
+  password: joi.string().empty().min(8).required().messages({
+    "string.base": "please enter a valid password",
+    "any.required": "password must be entered",
+    "string.empty": "password cannot be empty",
+    "string.min": "password must be at least 8 characters",
+  }),
+  dob: joi.date().empty().optional().messages({
+    "date.base": "please enter a valid date",
+  }),
+  role: joi
+    .string()
+    .valid(...Object.values(Role))
+    .optional()
+    .messages({
+      "string.base": "please enter a valid role",
+      "string.empty": "role cannot be empty",
     }),
-    role: joi
-      .string()
-      .valid(...Object.values(Role))
-      .optional().messages({
-        "string.base": "please enter a valid role",
-        "string.empty": "role cannot be empty"
-      }),
-    gender: joi.string().empty().required().messages({
-      "string.base": "please enter a valid gender",
-      "any.required": "gender must be entered",
-      "string.empty": "gender cannot be empty"
-    })
-  });
+  gender: joi.string().empty().required().messages({
+    "string.base": "please enter a valid gender",
+    "any.required": "gender must be entered",
+    "string.empty": "gender cannot be empty",
+  }),
+});

src/modules/console/users/controllers/users.controller.ts

@@ -1,9 +1,9 @@
+import { userRegisterSchema } from "src/modules/common/users/validation/user-register.validation";
 import { asyncHandler } from "../../../../helpers/async-handler";
 import { jwtHelper } from "../../../../helpers/jwt.helper";
 import { bodyValidator } from "../../../../helpers/validation.helper";
 import { BaseController } from "../../../../lib/controllers/controller.base";
 import { Prefix } from "../../../../lib/decorators/prefix.decorator";
-import { userRegisterValidation } from "../../../common/users/validation/user-register.validation";
 import { UsersService } from "../services/users.service";
 
 const allowedRoles = ["superAdmin", "admin"];
@@ -16,7 +16,7 @@ export class AdminUsersController extends BaseController {
     this.router.post(
       "/create",
       jwtHelper.verifyToken(allowedRoles),
-      bodyValidator(userRegisterValidation),
+      bodyValidator(userRegisterSchema),
       asyncHandler(this.create)
     );
   }

src/modules/user/auth/validation/user.Validation.ts

@@ -1,26 +0,0 @@
-import joi from "joi";
-
-export const loginValidation = joi
-  .object()
-  .required()
-  .keys({
-    email: joi
-      .string()
-      .required()
-      .email({
-        minDomainSegments: 2,
-        tlds: { allow: ["com", "net", "org", "eg", "io"] },
-      })
-      .empty()
-      .messages({
-        "string.email": "please enter a valid email",
-        "any.required": "email must be entered",
-        "string.empty": "email can not be empty",
-      }),
-    password: joi.string().empty().min(8).required().messages({
-      "string.base": "please enter a valid password",
-      "any.required": "password must be entered",
-      "string.empty": "password cannot be empty",
-      "string.min": "password must be at least 8 characters",
-    }),
-  });

src/modules/{user → users}/auth/controllers/auth.controller.ts

@@ -1,25 +1,25 @@
-import { UsersService } from "../services/users.service";
+import { UsersAuthService } from "../services/users.service";
 import { jwtHelper } from "../../../../helpers/jwt.helper";
 import { BaseController } from "../../../../lib/controllers/controller.base";
 import { bodyValidator } from "../../../../helpers/validation.helper";
-import { userRegisterValidation } from "../../../common/users/validation/user-register.validation";
-import { loginValidation } from "../validation/user.Validation";
 import { asyncHandler } from "../../../../helpers/async-handler";
 import { Prefix } from "../../../../lib/decorators/prefix.decorator";
+import { loginValidationSchema } from "../validation/user.Validation";
+import { userRegisterSchema } from "src/modules/common/users/validation/user-register.validation";
 
-@Prefix("/user/auth")
-export class AuthController extends BaseController {
-  private usersService = new UsersService();
+@Prefix("/users/auth")
+export class UsersAuthController extends BaseController {
+  private usersService = new UsersAuthService();
 
   setRoutes(): void {
     this.router.post(
       "/register",
-      bodyValidator(userRegisterValidation),
+      bodyValidator(userRegisterSchema),
       asyncHandler(this.register)
     );
     this.router.post(
       "/login",
-      bodyValidator(loginValidation),
+      bodyValidator(loginValidationSchema),
       asyncHandler(this.login)
     );
   }

src/modules/{user → users}/auth/services/users.service.ts

@@ -1,7 +1,7 @@
 import { UsersBaseService } from "../../../common/users/services/users.base.service";
 import bcrypt from "bcrypt";
 
-export class UsersService extends UsersBaseService {
+export class UsersAuthService extends UsersBaseService {
   async comparePassword(email: string, password: string) {
     try {
       if (email != undefined) {
@@ -34,54 +34,4 @@ export class UsersService extends UsersBaseService {
       };
     }
   }
-
-  // async resetPassword(_id: any, currentPassword: string, newPassword: string, confirmPassword: string) {
-  //     try {
-  //         let user = await UserBaseService.find({ _id })
-  //         let saltrouds = 5;
-  //         let oldPassword = user.record.password;
-  //         let ok = await bcrypt.compare(currentPassword, oldPassword)
-
-  //         if (user.success) {
-
-  //             if (!ok) return {
-  //                 success: false,
-  //                 code: 409,
-  //                 message: "current password isn't correct"
-  //             };
-
-  //             if (newPassword == currentPassword) return {
-  //                 success: false,
-  //                 code: 409,
-  //                 message: "new password must be different from current password"
-  //             };
-
-  //             if (newPassword != confirmPassword) return {
-  //                 success: false,
-  //                 code: 409,
-  //                 message: "passwords don't match"
-  //             };
-
-  //             const hashedPassword = await bcrypt.hash(newPassword, saltrouds)
-  //             await userModel.findByIdAndUpdate(_id, { password: hashedPassword })
-  //             return {
-  //                 success: true,
-  //                 code: 200,
-  //                 message: "password changed successfully"
-  //             };
-  //         }
-  //         else return {
-  //             success: false,
-  //             code: 404,
-  //             error: user.error
-  //         };
-  //     } catch (err) {
-  //         console.log(`err.message`, err.message);
-  //         return {
-  //             success: false,
-  //             code: 500,
-  //             error: err.message
-  //         };
-  //     }
-  // }
 }

src/modules/users/auth/validation/user.Validation.ts

@@ -0,0 +1,31 @@
+import joi from "joi";
+import { createSchema } from "src/helpers/create-schema";
+
+export interface ILogin {
+  email: string;
+  password: string;
+}
+
+export const loginValidationKeys = {
+  email: joi
+    .string()
+    .required()
+    .email({
+      minDomainSegments: 2,
+      tlds: { allow: ["com", "net", "org", "eg", "io"] },
+    })
+    .empty()
+    .messages({
+      "string.email": "please enter a valid email",
+      "any.required": "email must be entered",
+      "string.empty": "email can not be empty",
+    }),
+  password: joi.string().empty().min(8).required().messages({
+    "string.base": "please enter a valid password",
+    "any.required": "password must be entered",
+    "string.empty": "password cannot be empty",
+    "string.min": "password must be at least 8 characters",
+  }),
+};
+
+export const loginValidationSchema = createSchema<ILogin>(loginValidationKeys);