diff --git a/config/SharedConfig.ts b/config/SharedConfig.ts index a4fdb6b31fe75d5a7755c9beba501d91bcd90315..38b48d6aec1e08d2258aa7a10160977f78ca4043 100644 --- a/config/SharedConfig.ts +++ b/config/SharedConfig.ts @@ -12,7 +12,7 @@ class SharedConfig { client: { id: string }, url: { - redirect: string + redirect: string, token: string } } }; @@ -24,15 +24,18 @@ class SharedConfig { this.logsFolder = process.env.LOGS_FOLDER || ''; this.gitlab = { - URL: process.env.GITLAB_URL || '', apiURL: process.env.GITLAB_API_URL || '' + URL : process.env.GITLAB_URL || '', + apiURL: process.env.GITLAB_API_URL || '' }; this.login = { gitlab: { client: { id: process.env.LOGIN_GITLAB_CLIENT_ID || '' - }, url: { - redirect: process.env.LOGIN_GITLAB_URL_REDIRECT || '' + }, + url : { + redirect: process.env.LOGIN_GITLAB_URL_REDIRECT || '', + token : process.env.LOGIN_GITLAB_URL_TOKEN || '' } } }; diff --git a/managers/SharedGitlabManager.ts b/managers/SharedGitlabManager.ts index e55fbcb7c264c29e433c31f60be53310e210f443..68ff699a036044872cb7f33ead08782afbbdb830 100644 --- a/managers/SharedGitlabManager.ts +++ b/managers/SharedGitlabManager.ts @@ -11,7 +11,7 @@ class GitlabManager { } async getTokens(codeOrRefresh: string, isRefresh: boolean = false, clientSecret: string = ''): Promise<GitlabToken> { - const response = await axios.post<GitlabToken>(`${ SharedConfig.gitlab.URL }/oauth/token`, { + const response = await axios.post<GitlabToken>(SharedConfig.login.gitlab.url.token, { client_id : SharedConfig.login.gitlab.client.id, client_secret: clientSecret, grant_type : isRefresh ? 'refresh_token' : 'authorization_code',