From 116b00cb4358fa6592f32145b0224b1a5c67c147 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Minelli?= <michael@minelli.me>
Date: Fri, 13 Oct 2023 17:00:23 +0200
Subject: [PATCH] Config => Move gitlab URL tu shared
---
ExpressAPI/src/config/Config.ts | 3 +--
ExpressAPI/src/managers/GitlabManager.ts | 3 ++-
ExpressAPI/src/managers/HttpManager.ts | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ExpressAPI/src/config/Config.ts b/ExpressAPI/src/config/Config.ts
index 4916165..574f9b2 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 fc80949..fca3977 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 80da4d4..6d04c68 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;
}
--
GitLab