make custom validator as optional

Author: janishar

src/auth/schema.ts

@@ -7,6 +7,6 @@ export default {
 	}).unknown(true),
 	auth: Joi.object().keys({
 		'x-access-token': Joi.string().required().min(1),
-		'x-user-id': JoiObjectId(),
+		'x-user-id': JoiObjectId().required(),
 	}).unknown(true)
 };

src/helpers/validator.ts

@@ -11,12 +11,16 @@ export enum ValidationSource {
 	PARAM = 'params'
 }
 
-export const JoiObjectId = () => Joi.string().required().custom((value: string, helpers) => {
-	if (!Types.ObjectId.isValid(value))
-		return helpers.error('any.invalid');
+export const JoiObjectId = () => Joi.string().custom((value: string, helpers) => {
+	if (!Types.ObjectId.isValid(value)) return helpers.error('any.invalid');
 	return value;
 }, 'Object Id Validation');
 
+export const JoiUrlEndpoint = () => Joi.string().custom((value: string, helpers) => {
+	if (!value.startsWith('/')) return helpers.error('any.invalid');
+	return value;
+}, 'Url Endpoint Validation');
+
 
 export default (schema: Joi.ObjectSchema, source: ValidationSource = ValidationSource.BODY) =>
 	(req: Request, res: Response, next: NextFunction) => {

src/routes/v1/access/schema.ts

@@ -11,7 +11,7 @@ export default {
 	}),
 	auth: Joi.object().keys({
 		'x-access-token': Joi.string().required().min(1),
-		'x-user-id': JoiObjectId(),
+		'x-user-id': JoiObjectId().required(),
 	}).unknown(true),
 	signup: Joi.object().keys({
 		name: Joi.string().required().min(3),

src/routes/v1/blog/schema.ts

@@ -1,12 +1,12 @@
 import Joi from '@hapi/joi';
-import { JoiObjectId } from '../../../helpers/validator';
+import { JoiObjectId, JoiUrlEndpoint } from '../../../helpers/validator';
 
 export default {
 	blogUrl: Joi.object().keys({
 		url: Joi.string().required().uri()
 	}),
 	blogId: Joi.object().keys({
-		id: JoiObjectId()
+		id: JoiObjectId().required()
 	}),
 	blogTag: Joi.object().keys({
 		tag: Joi.string().required().min(1)
@@ -16,13 +16,13 @@ export default {
 		pageItemCount: Joi.number().required().integer().min(1),
 	}),
 	authorId: Joi.object().keys({
-		id: JoiObjectId()
+		id: JoiObjectId().required()
 	}),
 	blogCreate: Joi.object().keys({
 		title: Joi.string().required().min(3).max(500),
 		description: Joi.string().required().min(3).max(2000),
 		text: Joi.string().required().max(50000),
-		blogUrl: Joi.string().required().uri().max(200),
+		blogUrl: JoiUrlEndpoint().required().max(200),
 		imgUrl: Joi.string().optional().uri().max(200),
 		score: Joi.number().optional().min(0).max(1),
 		tags: Joi.array().optional().items(Joi.string().uppercase().min(1)),
@@ -31,7 +31,7 @@ export default {
 		title: Joi.string().optional().min(3).max(500),
 		description: Joi.string().optional().min(3).max(2000),
 		text: Joi.string().optional().max(50000),
-		blogUrl: Joi.string().optional().uri().max(200),
+		blogUrl: JoiUrlEndpoint().required().max(200),
 		imgUrl: Joi.string().optional().uri().max(200),
 		score: Joi.number().optional().min(0).max(1),
 		tags: Joi.array().optional().items(Joi.string().uppercase().min(1))

src/routes/v1/profile/schema.ts

@@ -3,7 +3,7 @@ import { JoiObjectId } from '../../../helpers/validator';
 
 export default {
 	userId: Joi.object().keys({
-		id: JoiObjectId()
+		id: JoiObjectId().required()
 	}),
 	profile: Joi.object().keys({
 		name: Joi.string().optional().min(1).max(200),