update with ajv

Author: alainabbas

package.json

@@ -63,6 +63,7 @@
     "@the-software-compagny/nestjs_module_restools": "^0.0.11",
     "ajv": "^8.16.0",
     "ajv-errors": "^3.0.0",
+    "ajv-formats": "^3.0.1",
     "argon2": "^0.41.1",
     "awesome-phonenumber": "^6.10.0",
     "bullmq": "^5.8.2",

src/management/identities/validations/_config/validSchema.ts

@@ -28,8 +28,8 @@ const validSchema = {
             },
             format: {
               type: 'string',
-              enum: ['date', 'email'],
-              errorMessage: "Le 'format' doit être 'date' ou 'email'.",
+              enum: ['date', 'email','number','time','date-time','duration','uri','uri-reference','hostname','ipv4','ipv6','regex','uuid'],
+              errorMessage: "Format invalide",
             },
             items: {
               type: 'object',
@@ -118,7 +118,7 @@ const validSchema = {
             camelCase: {
               type: 'boolean',
               errorMessage: "L'option 'camelCase' doit être un booléen.",
-            },
+            }
           },
           required: ['type'],
           additionalProperties: false,

src/management/identities/validations/_dto/config.dto.ts

@@ -1,4 +1,4 @@
-import { IsString, ArrayNotEmpty, ValidateNested, IsEnum, IsBoolean } from 'class-validator';
+import {IsString, ArrayNotEmpty, ValidateNested, IsEnum, IsBoolean, IsOptional} from 'class-validator';
 import { Type } from 'class-transformer';
 import { ConfigObjectType } from '../_enums/config.object';
 
@@ -15,6 +15,10 @@ export class ConfigObjectAttributeDTO {
 
   @IsBoolean()
   public required: boolean;
+
+  @IsString()
+  @IsOptional()
+  public format: string;
 }
 
 export class ConfigObjectObjectClassDTO {

src/management/identities/validations/identities.validation.service.ts

@@ -5,13 +5,12 @@ import {ConfigObjectSchemaDTO} from './_dto/config.dto';
 import {diff} from 'radash';
 import {AdditionalFieldsPart} from '../_schemas/_parts/additionalFields.part.schema';
 import Ajv from 'ajv';
-import {buildYup} from 'schema-to-yup';
+import addFormats from 'ajv-formats';
 import validSchema from './_config/validSchema';
 import ajvErrors from 'ajv-errors';
 import {ValidationConfigException, ValidationSchemaException} from '~/_common/errors/ValidationException';
 import {additionalFieldsPartDto} from '../_dto/_parts/additionalFields.dto';
 
-
 /**
  * Service responsible for validating identities.
  */
@@ -22,7 +21,9 @@ export class IdentitiesValidationService implements OnApplicationBootstrap {
   private logger: Logger;
 
   public constructor() {
+    addFormats(this.ajv);
     ajvErrors(this.ajv);
+    this.ajv.addFormat('number',/^\d*$/);
     this.validateSchema = this.ajv.compile(validSchema);
     this.logger = new Logger(IdentitiesValidationService.name);
   }
@@ -242,7 +243,7 @@ export class IdentitiesValidationService implements OnApplicationBootstrap {
    * @param attribute - The attribute value to validate.
    * @returns A promise that resolves with an error message if validation fails, otherwise null.
    */
-  public async validateAttribute(key: string, attribute: any, data: any): Promise<string | null> {
+  public async validateAttribute(key: string, attribute: any, data: any): Promise<any | null> {
     const path = this.resolveConfigPath(key);
     const schema: any = parse(readFileSync(path, 'utf8'));
 
@@ -269,17 +270,15 @@ export class IdentitiesValidationService implements OnApplicationBootstrap {
     }
 
     this.logger.debug(`Additionalfields object validation: ${JSON.stringify(data[key])}`);
-
-    const yupSchema = buildYup(schema, {noSortEdges: true});
-    try {
-      await yupSchema.validate(attribute, {strict: true, abortEarly: false});
-      return null;
-    } catch (error) {
-      return error.inner.reduce((acc, err) => {
-        acc[err.path] = err.message;
-        return acc;
-      }, {});
+    const ok= await this.ajv.validate(schema,data[key]);
+    if (ok === false) {
+      const retErrors = {};
+      for (const err of this.ajv.errors) {
+        retErrors[err['instancePath'].substring(1)]= err['instancePath'].substring(1) + ' ' +  err['message']
+      }
+      return(retErrors)
     }
+    return null
   }
 
   public async findAll(): Promise<any> {

yarn.lock

@@ -4210,7 +4210,7 @@ ajv-formats@2.1.1:
   dependencies:
     ajv "^8.0.0"
 
-ajv-formats@3.0.1:
+ajv-formats@3.0.1, ajv-formats@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-3.0.1.tgz#3d5dc762bca17679c3c2ea7e90ad6b7532309578"
   integrity sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==