✨ Consistent validations

Author: AnandChowdhary

package.json

@@ -1,6 +1,6 @@
 {
   "name": "staart-manager",
-  "version": "1.0.53",
+  "version": "1.0.54",
   "main": "index.js",
   "repository": "git@github.com:AnandChowdhary/staart.git",
   "author": "Anand Chowdhary <mail@anandchowdhary.com>",

src/controllers/auth.ts

@@ -205,19 +205,12 @@ export class AuthController {
 
   @Post("impersonate/:id")
   @Middleware(authHandler)
+  @Middleware(
+    validator({ impersonateUserId: Joi.number().required() }, "params")
+  )
   async getImpersonate(req: Request, res: Response) {
     const tokenUserId = res.locals.token.id;
     const impersonateUserId = req.params.id;
-    joiValidate(
-      {
-        tokenUserId: Joi.number().required(),
-        impersonateUserId: Joi.number().required()
-      },
-      {
-        tokenUserId,
-        impersonateUserId
-      }
-    );
     res.json(await impersonate(tokenUserId, impersonateUserId));
   }
 

src/controllers/membership.ts

@@ -13,9 +13,10 @@ import {
   Delete,
   Controller,
   ClassMiddleware,
-  ClassWrapper
+  ClassWrapper,
+  Middleware
 } from "@overnightjs/core";
-import { authHandler } from "../helpers/middleware";
+import { authHandler, validator } from "../helpers/middleware";
 import asyncHandler from "express-async-handler";
 import Joi from "@hapi/joi";
 import { joiValidate } from "../helpers/utils";
@@ -26,45 +27,27 @@ import i18n from "../i18n";
 @ClassMiddleware(authHandler)
 export class MembershipController {
   @Get(":id")
+  @Middleware(validator({ id: Joi.number().required() }, "params"))
   async get(req: Request, res: Response) {
     const membershipId = req.params.id;
     const userId = res.locals.token.id;
-    joiValidate(
-      {
-        membershipId: Joi.number().required(),
-        userId: Joi.number().required()
-      },
-      { membershipId, userId }
-    );
     res.json(await getMembershipDetailsForUser(userId, membershipId));
   }
 
   @Delete(":id")
+  @Middleware(validator({ id: Joi.number().required() }, "params"))
   async delete(req: Request, res: Response) {
     const userId = res.locals.token.id;
     const membershipId = req.params.id;
-    joiValidate(
-      {
-        membershipId: Joi.number().required(),
-        userId: Joi.number().required()
-      },
-      { membershipId, userId }
-    );
     await deleteMembershipForUser(userId, membershipId, res.locals);
     res.json({ deleted: true });
   }
 
   @Patch(":id")
+  @Middleware(validator({ id: Joi.number().required() }, "params"))
   async patch(req: Request, res: Response) {
     const userId = res.locals.token.id;
     const membershipId = req.params.id;
-    joiValidate(
-      {
-        membershipId: Joi.number().required(),
-        userId: Joi.number().required()
-      },
-      { membershipId, userId }
-    );
     const data = req.body;
     delete req.body.id;
     await updateMembershipForUser(userId, membershipId, data, res.locals);

src/controllers/user.ts

@@ -23,9 +23,10 @@ import {
   Delete,
   Controller,
   ClassMiddleware,
-  ClassWrapper
+  ClassWrapper,
+  Middleware
 } from "@overnightjs/core";
-import { authHandler } from "../helpers/middleware";
+import { authHandler, validator } from "../helpers/middleware";
 import {
   getAllEmailsForUser,
   addEmailToUserForUser,
@@ -54,6 +55,30 @@ export class UserController {
   }
 
   @Patch(":id")
+  @Middleware(
+    validator(
+      {
+        name: Joi.string()
+          .min(3)
+          .regex(/^[a-zA-Z ]*$/),
+        username: Joi.string(),
+        nickname: Joi.string(),
+        primaryEmail: Joi.number(),
+        countryCode: Joi.string().length(2),
+        password: Joi.string().min(6),
+        gender: Joi.string().length(1),
+        preferredLanguage: Joi.string()
+          .min(2)
+          .max(5),
+        timezone: Joi.string(),
+        notificationEmails: Joi.number(),
+        prefersReducedMotion: Joi.boolean(),
+        prefersColorSchemeDark: Joi.boolean(),
+        profilePicture: Joi.string()
+      },
+      "body"
+    )
+  )
   async patch(req: Request, res: Response) {
     let id = req.params.id;
     if (id === "me") id = res.locals.token.id;
@@ -77,22 +102,29 @@ export class UserController {
   }
 
   @Put(":id/password")
-  async updatePassword(req: Request, res: Response) {
-    let id = req.params.id;
-    if (id === "me") id = res.locals.token.id;
-    const oldPassword = req.body.oldPassword;
-    const newPassword = req.body.newPassword;
-    joiValidate(
+  @Middleware(
+    validator(
       {
-        id: [Joi.string().required(), Joi.number().required()],
         oldPassword: Joi.string()
           .min(6)
           .required(),
         newPassword: Joi.string()
           .min(6)
           .required()
       },
-      { id, oldPassword, newPassword }
+      "body"
+    )
+  )
+  async updatePassword(req: Request, res: Response) {
+    let id = req.params.id;
+    if (id === "me") id = res.locals.token.id;
+    const oldPassword = req.body.oldPassword;
+    const newPassword = req.body.newPassword;
+    joiValidate(
+      {
+        id: [Joi.string().required(), Joi.number().required()]
+      },
+      { id }
     );
     await updatePasswordForUser(
       res.locals.token.id,

src/internal/staart-version

@@ -1 +1 @@
-1.0.53
+1.0.54