Used schemasafe library for validating all OAS version including OAS …

…3.1.0 and code refactoring
beckn · Oct 14, 2024 · 5c410bc · 5c410bc
1 parent 28b8aca
commit 5c410bc
Show file tree

Hide file tree

Showing 3 changed files with 102 additions and 263 deletions.
diff --git a/src/app.ts b/src/app.ts
@@ -135,7 +135,6 @@ const main = async () => {
       getConfig().app.gateway.mode.toLocaleUpperCase().substring(0, 1) +
       getConfig().app.gateway.mode.toLocaleUpperCase().substring(1)
     );
-    await OpenApiValidatorMiddleware.getInstance().initOpenApiMiddleware();
     await Validator.getInstance().initialize();
     logger.info('Initialized openapi validator middleware');
   } catch (err) {

diff --git a/src/middlewares/schemaValidator.middleware.ts b/src/middlewares/schemaValidator.middleware.ts
@@ -298,15 +298,11 @@ export const openApiValidatorMiddleware = async (
   }
   const apiSpecYAML = fs.readFileSync(specFile, "utf8");
   const apiSpec = YAML.parse(apiSpecYAML);
-  if (apiSpec.openapi === '3.1.0') {
-    const ajvValidatorInstance = Validator.getInstance();
-    const openApiValidator = await ajvValidatorInstance.getValidationMiddleware(specFile, specFileName);
-    (await openApiValidator)(req, res, () => {
-      logger.info('Validation Success');
-      next()
-    });
-  } else {
-    const openApiValidator = OpenApiValidatorMiddleware.getInstance().getOpenApiMiddleware(specFile);
-    walkSubstack([...openApiValidator], req, res, next);
-  }
+  const ajvValidatorInstance = Validator.getInstance();
+  const openApiValidator = await ajvValidatorInstance.getValidationMiddleware(specFile, specFileName);
+  (await openApiValidator)(req, res, () => {
+    logger.info('Validation Success');
+    next()
+  });
+
 };