From d64489e60c333afb306df2b5dcec909d5775307b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Minelli?= <michael@minelli.me>
Date: Fri, 20 Oct 2023 09:25:09 +0200
Subject: [PATCH] Config => Add gitlab token url
---
config/SharedConfig.ts | 11 +++++++----
managers/SharedGitlabManager.ts | 2 +-
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/config/SharedConfig.ts b/config/SharedConfig.ts
index a4fdb6b..38b48d6 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 e55fbcb..68ff699 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',
--
GitLab