diff --git a/AssignmentChecker/.idea/vcs.xml b/AssignmentChecker/.idea/vcs.xml index d86e73b516141a07b5ba1f16f6f315749512bedc..8bd3f8944d87804b8c8764a48898c52d5ff89c64 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 124a2b2b1ed1be5a1df1a7cb0d7ed0fa7d9405d9..94cb8b6e67ed34c99a7046ed25445296059b71af 100644 --- a/AssignmentChecker/src/config/Config.ts +++ b/AssignmentChecker/src/config/Config.ts @@ -15,10 +15,6 @@ class Config { } }; - public readonly assignment: { - name: string; secret: string; - }; - constructor() { this.appName = process.env.APP_NAME || ''; @@ -35,11 +31,6 @@ class Config { assignmentChecker: process.env.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 390d337cd17022b2c0e80593f4272aecaa2a089a..0292b2221559f08505adc3961e980cfb03a523cd 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; diff --git a/AssignmentChecker/src/sharedByClients b/AssignmentChecker/src/sharedByClients index 3cd3c507acfe4d758fb7d4d3b7c43ad7d8ab4730..6ca55f11e67f26d83efe1745e4a83d9ac09fa99d 160000 --- a/AssignmentChecker/src/sharedByClients +++ b/AssignmentChecker/src/sharedByClients @@ -1 +1 @@ -Subproject commit 3cd3c507acfe4d758fb7d4d3b7c43ad7d8ab4730 +Subproject commit 6ca55f11e67f26d83efe1745e4a83d9ac09fa99d