refactor: inline methods in auth.rules into auth.routes

It was redundant
opengovsg · Sep 2, 2020 · 435b856 · 435b856
1 parent 4852630
commit 435b856
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 37 deletions.
diff --git a/src/app/modules/auth/auth.routes.ts b/src/app/modules/auth/auth.routes.ts
@@ -1,9 +1,8 @@
-import { celebrate } from 'celebrate'
+import { celebrate, Joi, Segments } from 'celebrate'
 import { Router } from 'express'
 
 import * as AuthController from './auth.controller'
 import * as AuthMiddlewares from './auth.middlewares'
-import * as AuthRules from './auth.rules'
 
 export const AuthRouter = Router()
 
@@ -17,7 +16,14 @@ export const AuthRouter = Router()
  */
 AuthRouter.post(
   '/checkuser',
-  celebrate(AuthRules.forCheckUser),
+  celebrate({
+    [Segments.BODY]: Joi.object().keys({
+      email: Joi.string()
+        .required()
+        .email()
+        .message('Please enter a valid email'),
+    }),
+  }),
   AuthMiddlewares.validateDomain,
   AuthController.handleCheckUser,
 )
@@ -36,7 +42,14 @@ AuthRouter.post(
  */
 AuthRouter.post(
   '/sendotp',
-  celebrate(AuthRules.forSendOtp),
+  celebrate({
+    [Segments.BODY]: Joi.object().keys({
+      email: Joi.string()
+        .required()
+        .email()
+        .message('Please enter a valid email'),
+    }),
+  }),
   AuthMiddlewares.validateDomain,
   AuthController.handleLoginSendOtp,
 )
@@ -56,7 +69,18 @@ AuthRouter.post(
  */
 AuthRouter.post(
   '/verifyotp',
-  celebrate(AuthRules.forVerifyOtp),
+  celebrate({
+    [Segments.BODY]: Joi.object().keys({
+      email: Joi.string()
+        .required()
+        .email()
+        .message('Please enter a valid email'),
+      otp: Joi.string()
+        .required()
+        .regex(/^\d{6}$/)
+        .message('Please enter a valid otp'),
+    }),
+  }),
   AuthMiddlewares.validateDomain,
   AuthController.handleLoginVerifyOtp,
 )

diff --git a/src/app/modules/auth/auth.rules.ts b/src/app/modules/auth/auth.rules.ts