From cfebb53209d5d197bf2d0ce94f8074a89ab706ad Mon Sep 17 00:00:00 2001
From: Joel von der Weid <joel.von-der-weid@hesge.ch>
Date: Tue, 11 Jun 2024 15:51:02 +0200
Subject: [PATCH] Correct config
---
config/ClientsSharedConfig.ts | 7 ++++---
helpers/Dojo/AssignmentValidator.ts | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/config/ClientsSharedConfig.ts b/config/ClientsSharedConfig.ts
index 97a9958..c8fe801 100644
--- a/config/ClientsSharedConfig.ts
+++ b/config/ClientsSharedConfig.ts
@@ -32,9 +32,8 @@ class ClientsSharedConfig {
}
};
-
public assignment!: {
- filename: string, neededFiles: Array<string>
+ filename: string, neededFiles: Array<string>, name: string, secret: string;
};
public exercise!: {
@@ -121,7 +120,9 @@ class ClientsSharedConfig {
this.assignment = {
filename : getEnvVar('ASSIGNMENT_FILENAME', ''),
- neededFiles: JSON.parse(getEnvVar('EXERCISE_NEEDED_FILES', '[]'))
+ neededFiles: JSON.parse(getEnvVar('EXERCISE_NEEDED_FILES', '[]')),
+ name : process.env.DOJO_ASSIGNMENT_NAME || '',
+ secret : process.env.DOJO_ASSIGNMENT_SECRET || ''
};
this.dockerCompose = {
diff --git a/helpers/Dojo/AssignmentValidator.ts b/helpers/Dojo/AssignmentValidator.ts
index f6e6ed2..9caa62f 100644
--- a/helpers/Dojo/AssignmentValidator.ts
+++ b/helpers/Dojo/AssignmentValidator.ts
@@ -138,7 +138,7 @@ class AssignmentValidator {
this.newStep('ASSIGNMENT_CHECKING', 'Please wait while we are checking the assignment...');
- const resp = await ClientsSharedAssignmentHelper.getAssignmentByName(this.folderAssignment);
+ const resp = await ClientsSharedAssignmentHelper.getAssignmentByName(ClientsSharedConfig.assignment.name);
if ( resp == undefined ) {
this.emitError(`The assignment doesn't exist. An assignment must be created with "assignment create" before checking it.`, `Assignment doesn't exists`, AssignmentCheckerError.ASSIGNMENT_MISSING);
return;
--
GitLab