From fcb3d06f24f69c948fd407b13d34d4e0f0f46cca Mon Sep 17 00:00:00 2001 From: Florian Porrmann Date: Mon, 3 Aug 2026 17:59:31 +0200 Subject: [PATCH] GitLab Synchronization: Replaced tabs with spaces to keep the style consistent --- .../gitlab-sync/app/src/GitLabApiClient.mjs | 10 +-- .../app/src/GitLabSyncController.mjs | 4 +- .../gitlab-sync/app/src/GitLabSyncHandler.mjs | 2 +- .../gitlab-sync/app/src/TokenManager.mjs | 72 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/services/web/modules/gitlab-sync/app/src/GitLabApiClient.mjs b/services/web/modules/gitlab-sync/app/src/GitLabApiClient.mjs index 81024ffef5..85e7d0ea3b 100644 --- a/services/web/modules/gitlab-sync/app/src/GitLabApiClient.mjs +++ b/services/web/modules/gitlab-sync/app/src/GitLabApiClient.mjs @@ -190,7 +190,7 @@ async function fetchAllPages(url, options, operation) { } function getTokenRefreshTimestamp(token, safetyMarginInSec = 300) { - return token.created_at + token.expires_in - safetyMarginInSec; + return token.created_at + token.expires_in - safetyMarginInSec; } @@ -200,8 +200,8 @@ async function compareCommitsFull(token, repoFullName, from, to) { url.searchParams.set('to', to) return await fetchGitLabJson(url.toString(), { - headers: buildHeaders(token), - signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS) + headers: buildHeaders(token), + signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS) }, 'compareCommitsFull') } @@ -224,8 +224,8 @@ function exchangeCodeForToken(code) { headers: buildHeaders(), json: { client_id: Settings.gitlabSync.clientID, - client_secret: Settings.gitlabSync.clientSecret, - code: code, + client_secret: Settings.gitlabSync.clientSecret, + code: code, grant_type: 'authorization_code', redirect_uri: Settings.gitlabSync.callbackURL, }, diff --git a/services/web/modules/gitlab-sync/app/src/GitLabSyncController.mjs b/services/web/modules/gitlab-sync/app/src/GitLabSyncController.mjs index 3b4ddaa873..f0fa85050f 100644 --- a/services/web/modules/gitlab-sync/app/src/GitLabSyncController.mjs +++ b/services/web/modules/gitlab-sync/app/src/GitLabSyncController.mjs @@ -118,14 +118,14 @@ async function oauth2Callback(req, res) { let refresh_token let refresh_timestamp try { - [token, refresh_token, refresh_timestamp] = await api.exchangeCodeForToken(code) + [token, refresh_token, refresh_timestamp] = await api.exchangeCodeForToken(code) if (!token || !refresh_token) { HttpErrorHandler.badRequest(req, res, 'Failed to obtain access token from Git server') return } } catch (err) { const info = OError.getFullInfo(err) - const err_body = err.body + const err_body = err.body logger.error(OError.getFullStack(err)) logger.error({ info, err_body, userId }, 'Failed to obtain access token from Git server') HttpErrorHandler.badRequest(req, res, err.message || 'Bad request') diff --git a/services/web/modules/gitlab-sync/app/src/GitLabSyncHandler.mjs b/services/web/modules/gitlab-sync/app/src/GitLabSyncHandler.mjs index 026ad93b04..1507313a81 100644 --- a/services/web/modules/gitlab-sync/app/src/GitLabSyncHandler.mjs +++ b/services/web/modules/gitlab-sync/app/src/GitLabSyncHandler.mjs @@ -27,7 +27,7 @@ async function getGitConnState(userId) { if (err instanceof InvalidTokenError) { logger.debug( { err, userId }, 'token invalid, treating as not connected') return false - } + } throw OError.tag(err, 'failed to validate token', { userId }) } } diff --git a/services/web/modules/gitlab-sync/app/src/TokenManager.mjs b/services/web/modules/gitlab-sync/app/src/TokenManager.mjs index 10c54cea93..efcf3699d6 100644 --- a/services/web/modules/gitlab-sync/app/src/TokenManager.mjs +++ b/services/web/modules/gitlab-sync/app/src/TokenManager.mjs @@ -25,43 +25,43 @@ async function decryptAccessToken(tokenEncrypted) { } async function refreshToken(userId, decData) { - logger.info({ userId }, "refreshing GitLab token") + logger.info({ userId }, "refreshing GitLab token") - if (!decData.refresh_token) { - logger.error("refresh_token invalid") - return false - } + if (!decData.refresh_token) { + logger.error("refresh_token invalid") + return false + } - let token - let refresh_token - let refresh_timestamp + let token + let refresh_token + let refresh_timestamp - try { - [token, refresh_token, refresh_timestamp] = await api.refreshToken(decData.refresh_token) - if (!token || !refresh_token) { - HttpErrorHandler.badRequest(req, res, 'Failed to refresh access token') - return false - } - } catch (err) { - const info = OError.getFullInfo(err) - logger.error(OError.getFullStack(err)) - logger.error({ info, userId }, 'Failed to refresh access token') - HttpErrorHandler.badRequest(req, res, err.message || 'Bad request') - return false - } + try { + [token, refresh_token, refresh_timestamp] = await api.refreshToken(decData.refresh_token) + if (!token || !refresh_token) { + HttpErrorHandler.badRequest(req, res, 'Failed to refresh access token') + return false + } + } catch (err) { + const info = OError.getFullInfo(err) + logger.error(OError.getFullStack(err)) + logger.error({ info, userId }, 'Failed to refresh access token') + HttpErrorHandler.badRequest(req, res, err.message || 'Bad request') + return false + } - try { - await saveUserToken(userId, { token, refresh_token, refresh_timestamp }) - } catch (err) { - const info = OError.getFullInfo(err) - const errStatus = info?.status || 500 - logger.error(OError.getFullStack(err)) - logger.error({ info, userId }, 'Error saving user token') - HttpErrorHandler.handleErrorByStatusCode(req, res, err, errStatus) - return false - } + try { + await saveUserToken(userId, { token, refresh_token, refresh_timestamp }) + } catch (err) { + const info = OError.getFullInfo(err) + const errStatus = info?.status || 500 + logger.error(OError.getFullStack(err)) + logger.error({ info, userId }, 'Error saving user token') + HttpErrorHandler.handleErrorByStatusCode(req, res, err, errStatus) + return false + } - return true + return true } // ------------------------- exports -------------------------- // @@ -72,10 +72,10 @@ async function getUserToken(userId) { const now = Math.floor(Date.now() / 1000); if (!decData.refresh_timestamp || decData.refresh_timestamp < now) { - const refreshed = await refreshToken(userId, decData) - if (refreshed) { - return await getUserToken(userId) - } + const refreshed = await refreshToken(userId, decData) + if (refreshed) { + return await getUserToken(userId) + } } return decData.token