moved vali to another file and fixed password req

5-semesterprojekt · Nov 14, 2023 · ecb9906 · ecb9906
1 parent 62f95ed
commit ecb9906
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 13 deletions.
diff --git a/Src/errorHandler/validations.ts b/Src/errorHandler/validations.ts
@@ -1,4 +1,5 @@
 import { User } from '../models/user';
+import { body } from 'express-validator';
 
 export function isValidUser(user: User): boolean {
   if (user.password) {
@@ -34,3 +35,20 @@ export function isValidPassword(password: string): boolean {
   const passwordRegex = /^(?=.*\d)(?=.*[!@#$%^&*])(?=.*[a-zæøå)(?=.*[A-ZÆØÅ]).{8,}$/;
   return passwordRegex.test(password);
 }
+
+export const userValidationRules = [
+  body('firstName').notEmpty().withMessage('firstName is required'),
+  body('lastName').notEmpty().withMessage('firstName is required'),
+  body('email').notEmpty().withMessage('email is required'),
+  body('password').notEmpty().withMessage('password is required'),
+];
+export const userLoginValidationRules = [
+  body('email').notEmpty().withMessage('email is required'),
+  body('password').notEmpty().withMessage('password is required'),
+];
+
+export const eventValidationRules = [
+  body('title').notEmpty().withMessage('Title is required'),
+  body('start').isISO8601().toDate().withMessage('Must have a time and date'),
+  body('end').isISO8601().toDate().withMessage('Must have a time and date'),
+];
diff --git a/Src/routes/events.ts b/Src/routes/events.ts
@@ -1,5 +1,5 @@
 import { Router, Request, Response } from 'express';
-import { body, validationResult } from 'express-validator';
+import { validationResult } from 'express-validator';
 import { Event } from '../models/event';
 import { asyncHandler } from '../errorHandler/asyncHandler';
 import {
@@ -9,14 +9,11 @@ import {
   deleteEvent,
   updateEvent,
 } from '../firebase/events';
+import { eventValidationRules } from '../errorHandler/validations';
 
 const router = Router();
 
-const eventValidationRules = [
-  body('title').notEmpty().withMessage('Title is required'),
-  body('start').isISO8601().toDate().withMessage('Must have a time and date'),
-  body('end').isISO8601().toDate().withMessage('Must have a time and date'),
-];
+
 
 // create new
 router.post(

diff --git a/Src/routes/users.ts b/Src/routes/users.ts
@@ -1,6 +1,6 @@
 import { Router, Request, Response } from 'express';
 
-import { body, validationResult } from 'express-validator';
+import { validationResult } from 'express-validator';
 import { User } from '../models/user';
 import { asyncHandler } from '../errorHandler/asyncHandler';
 import {
@@ -14,15 +14,10 @@ import {
 } from '../firebase/users';
 import { auth, CustomRequest } from './auth';
 import bcrypt from 'bcrypt';
+import { userValidationRules, userLoginValidationRules } from '../errorHandler/validations';
 
 const router = Router();
 
-const userValidationRules = [
-  body('firstName').notEmpty().withMessage('firstName is required'),
-  body('lastName').notEmpty().withMessage('firstName is required'),
-  body('email').notEmpty().withMessage('email is required'),
-  body('password').notEmpty().withMessage('password is required'),
-];
 // create user
 router.post(
   '/:orgId/',
@@ -51,6 +46,7 @@ router.post(
 //user logs in
 router.post(
   `/:orgId/login`,
+  userLoginValidationRules,
   asyncHandler(async (req: Request, res: Response) => {
     const user: { user: User } = await userLogin(
       req.body.email,