From 44b065070e9016da18585c32dd940598297c0f48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Minelli?= <michael@minelli.me>
Date: Thu, 18 Jan 2024 03:18:06 +0100
Subject: [PATCH] Update shared
---
ExpressAPI/src/helpers/DojoValidators.ts | 5 +++--
ExpressAPI/src/shared | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ExpressAPI/src/helpers/DojoValidators.ts b/ExpressAPI/src/helpers/DojoValidators.ts
index 0293660..98a2825 100644
--- a/ExpressAPI/src/helpers/DojoValidators.ts
+++ b/ExpressAPI/src/helpers/DojoValidators.ts
@@ -4,8 +4,9 @@ import { CustomValidator, ErrorMessage, FieldMessageFactory, Meta } from 'expres
import { BailOptions, ValidationChain } from 'express-validator/src/chain';
import GitlabManager from '../managers/GitlabManager';
import express from 'express';
-import SharedExerciseHelper from '../shared/helpers/Dojo/SharedExerciseHelper';
import logger from '../shared/logging/WinstonLogger';
+import Json5FileValidator from '../shared/helpers/Json5FileValidator';
+import ExerciseResultsFile from '../shared/types/Dojo/ExerciseResultsFile';
declare type DojoMeta = Meta & {
@@ -98,7 +99,7 @@ class DojoValidators {
return new Promise((resolve, reject) => {
const results = this.getParamValue(req, path) as string;
if ( results ) {
- SharedExerciseHelper.validateResultFile(results, false).isValid ? resolve(true) : reject();
+ Json5FileValidator.validateFile(ExerciseResultsFile, results, false).isValid ? resolve(true) : reject();
} else {
reject();
}
diff --git a/ExpressAPI/src/shared b/ExpressAPI/src/shared
index 039c8b4..f370f8b 160000
--- a/ExpressAPI/src/shared
+++ b/ExpressAPI/src/shared
@@ -1 +1 @@
-Subproject commit 039c8b4e10096a1c5036d01087d56443da636078
+Subproject commit f370f8b0a6e7b059d12f1980cdd21e3f2daa2f04
--
GitLab