From 8a2449ebd6a25bc70b375e0150c14755fed01289 Mon Sep 17 00:00:00 2001
From: Joel von der Weid <joel.von-der-weid@hesge.ch>
Date: Wed, 12 Jun 2024 08:36:40 +0200
Subject: [PATCH] Move config keys to ClientShared
---
AssignmentChecker/.idea/vcs.xml | 1 +
AssignmentChecker/src/config/Config.ts | 10 ----------
AssignmentChecker/src/managers/HttpManager.ts | 2 +-
3 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/AssignmentChecker/.idea/vcs.xml b/AssignmentChecker/.idea/vcs.xml
index d86e73b..8bd3f89 100644
--- a/AssignmentChecker/.idea/vcs.xml
+++ b/AssignmentChecker/.idea/vcs.xml
@@ -2,6 +2,7 @@
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+ <mapping directory="$PROJECT_DIR$/.idea/jetbrainsConfiguration" vcs="Git" />
<mapping directory="$PROJECT_DIR$/src/shared" vcs="Git" />
<mapping directory="$PROJECT_DIR$/src/sharedByClients" vcs="Git" />
</component>
diff --git a/AssignmentChecker/src/config/Config.ts b/AssignmentChecker/src/config/Config.ts
index f08e4c0..642afdc 100644
--- a/AssignmentChecker/src/config/Config.ts
+++ b/AssignmentChecker/src/config/Config.ts
@@ -23,11 +23,6 @@ class Config {
}
};
- public readonly assignment!: {
- name: string; secret: string;
- };
-
-
constructor() { }
async init() {
@@ -60,11 +55,6 @@ class Config {
assignmentChecker: getEnvVar('DOCKERHUB_ASSIGNMENT_CHECKER_REPOSITORY', '')
}
};
-
- this.assignment = {
- name : process.env.DOJO_ASSIGNMENT_NAME || '',
- secret: process.env.DOJO_ASSIGNMENT_SECRET || ''
- };
}
private resetResultsVolume(): void {
diff --git a/AssignmentChecker/src/managers/HttpManager.ts b/AssignmentChecker/src/managers/HttpManager.ts
index 30f6519..0b378eb 100644
--- a/AssignmentChecker/src/managers/HttpManager.ts
+++ b/AssignmentChecker/src/managers/HttpManager.ts
@@ -41,7 +41,7 @@ class HttpManager {
config.headers['Content-Type'] = 'multipart/form-data';
}
- config.headers.assignmentsecret = Config.assignment.secret;
+ config.headers.assignmentsecret = ClientsSharedConfig.assignment.secret;
config.headers['client'] = 'DojoAssignmentChecker';
config.headers['client-version'] = version;
--
GitLab