Skip to content
Snippets Groups Projects
Commit c574fcaf authored by joel.vonderwe's avatar joel.vonderwe Committed by michael.minelli
Browse files

Add languages to sonar route

parent 8a4afa83
No related branches found
No related tags found
No related merge requests found
...@@ -34,9 +34,7 @@ class SonarManager { ...@@ -34,9 +34,7 @@ class SonarManager {
} }
private async executePostRequest<T>(url: string, data?: FormData) { private async executePostRequest<T>(url: string, data?: FormData) {
console.log("dhdidid");
await this.setPAT(); // Always set PAT to be sure it has been set await this.setPAT(); // Always set PAT to be sure it has been set
console.log("hehe",btoa(SharedConfig.sonar.token));
return (await this.instance.post<T>(url, data, { return (await this.instance.post<T>(url, data, {
headers: { headers: {
...@@ -45,14 +43,26 @@ class SonarManager { ...@@ -45,14 +43,26 @@ class SonarManager {
})).data; })).data;
} }
private async executeGetRequest<T>(url: string) {
return (await this.instance.get<T>(url, {
headers: {
Authorization: `Basic ${ btoa(SharedConfig.sonar.token + ":") }`
}
})).data;
}
async createProjectFromGitlab(projectId: number) { async createProjectFromGitlab(projectId: number) {
const formData = new FormData(); const formData = new FormData();
formData.append('almSetting', 'dojo'); formData.append('almSetting', 'dojo');
formData.append('gitlabProjectId', projectId.toString()); formData.append('gitlabProjectId', projectId.toString());
console.log(formData);
return await this.executePostRequest<SonarProjectCreation>(this.getApiUrl(SonarRoute.PROJECT_CREATE_GITLAB), formData) return await this.executePostRequest<SonarProjectCreation>(this.getApiUrl(SonarRoute.PROJECT_CREATE_GITLAB), formData)
} }
async getLanguages() {
const resp = await this.executeGetRequest<{ languages: { key: string, name: string }[]}>(this.getApiUrl(SonarRoute.GET_LANGUAGES))
return resp.languages.map(l => l.key)
}
} }
export default new SonarManager(); export default new SonarManager();
\ No newline at end of file
...@@ -6,6 +6,7 @@ import Config from '../config/Config'; ...@@ -6,6 +6,7 @@ import Config from '../config/Config';
import SharedConfig from '../shared/config/SharedConfig'; import SharedConfig from '../shared/config/SharedConfig';
import GlobalHelper from '../helpers/GlobalHelper'; import GlobalHelper from '../helpers/GlobalHelper';
import SharedSonarManager from '../shared/managers/SharedSonarManager'; import SharedSonarManager from '../shared/managers/SharedSonarManager';
import SonarManager from '../managers/SonarManager';
class BaseRoutes implements RoutesManager { class BaseRoutes implements RoutesManager {
...@@ -38,7 +39,8 @@ class BaseRoutes implements RoutesManager { ...@@ -38,7 +39,8 @@ class BaseRoutes implements RoutesManager {
private async sonar(req: express.Request, res: express.Response) { private async sonar(req: express.Request, res: express.Response) {
const data = { const data = {
sonarEnabled: await SharedSonarManager.isSonarSupported() sonarEnabled: await SharedSonarManager.isSonarSupported(),
languages: await SonarManager.getLanguages()
}; };
return req.session.sendResponse(res, StatusCodes.OK, data); return req.session.sendResponse(res, StatusCodes.OK, data);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment