diff --git a/ExpressAPI/src/config/Config.ts b/ExpressAPI/src/config/Config.ts index 49161651818ac940bc706b709375255564acaaff..574f9b2ea0e987c896a5075d4ac6dac7f7dbac55 100644 --- a/ExpressAPI/src/config/Config.ts +++ b/ExpressAPI/src/config/Config.ts @@ -24,7 +24,7 @@ class Config { }; public readonly gitlab: { - apiURL: string; urls: Array<string>; account: { id: number; username: string; token: string; }; group: { root: number; templates: number; assignments: number; exercises: number; }, badges: { pipeline: ConfigGitlabBadge } + urls: Array<string>; account: { id: number; username: string; token: string; }; group: { root: number; templates: number; assignments: number; exercises: number; }, badges: { pipeline: ConfigGitlabBadge } }; public readonly assignment: { @@ -55,7 +55,6 @@ class Config { }; this.gitlab = { - apiURL : process.env.GITLAB_API_URL || '', urls : JSON5.parse(process.env.GITLAB_URLS || '[]'), account: { id : Number(process.env.GITLAB_DOJO_ACCOUNT_ID || 0), diff --git a/ExpressAPI/src/managers/GitlabManager.ts b/ExpressAPI/src/managers/GitlabManager.ts index fc80949e8f8a4878cf3d891a3467c907ecd09c2a..fca3977ce07f14eada038511f9106ccf539fba0a 100644 --- a/ExpressAPI/src/managers/GitlabManager.ts +++ b/ExpressAPI/src/managers/GitlabManager.ts @@ -11,11 +11,12 @@ import parseLinkHeader from 'parse-link-header'; import GitlabFile from '../shared/types/Gitlab/GitlabFile'; import express from 'express'; import GitlabRoute from '../shared/types/Gitlab/GitlabRoute'; +import SharedConfig from '../shared/config/SharedConfig'; class GitlabManager { private getApiUrl(route: GitlabRoute): string { - return `${ Config.gitlab.apiURL }${ route }`; + return `${ SharedConfig.gitlab.apiURL }${ route }`; } public async getUserById(id: number): Promise<GitlabUser | undefined> { diff --git a/ExpressAPI/src/managers/HttpManager.ts b/ExpressAPI/src/managers/HttpManager.ts index 80da4d4ec8abf644fa67a3bc6503f462e7625a07..6d04c68f0b0536bfa9bead9a6e78978bf5946c9b 100644 --- a/ExpressAPI/src/managers/HttpManager.ts +++ b/ExpressAPI/src/managers/HttpManager.ts @@ -2,6 +2,7 @@ import axios, { AxiosError, AxiosRequestHeaders } from 'axios'; import Config from '../config/Config'; import FormData from 'form-data'; import logger from '../shared/logging/WinstonLogger'; +import SharedConfig from '../shared/config/SharedConfig'; class HttpManager { @@ -16,7 +17,7 @@ class HttpManager { config.headers = { ...config.headers, ...(config.data as FormData).getHeaders() } as AxiosRequestHeaders; } - if ( config.url && config.url.indexOf(Config.gitlab.apiURL) !== -1 ) { + if ( config.url && config.url.indexOf(SharedConfig.gitlab.apiURL) !== -1 ) { config.headers['PRIVATE-TOKEN'] = Config.gitlab.account.token; }