@structured-world/gitlab-mcp 6.46.0 → 6.47.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/src/cli-utils.js +4 -4
- package/dist/src/cli-utils.js.map +1 -1
- package/dist/src/discovery/auto.js +14 -14
- package/dist/src/discovery/auto.js.map +1 -1
- package/dist/src/discovery/git-remote.js +7 -7
- package/dist/src/discovery/git-remote.js.map +1 -1
- package/dist/src/discovery/profile-matcher.js +11 -3
- package/dist/src/discovery/profile-matcher.js.map +1 -1
- package/dist/src/entities/context/context-manager.js +13 -9
- package/dist/src/entities/context/context-manager.js.map +1 -1
- package/dist/src/entities/context/whoami.js +10 -6
- package/dist/src/entities/context/whoami.js.map +1 -1
- package/dist/src/entities/pipelines/registry.js +9 -2
- package/dist/src/entities/pipelines/registry.js.map +1 -1
- package/dist/src/graphql/DynamicWorkItemsQuery.js +2 -2
- package/dist/src/graphql/DynamicWorkItemsQuery.js.map +1 -1
- package/dist/src/handlers.js +17 -13
- package/dist/src/handlers.js.map +1 -1
- package/dist/src/logger.d.ts +4 -0
- package/dist/src/logger.js +64 -0
- package/dist/src/logger.js.map +1 -1
- package/dist/src/logging/connection-tracker.js +4 -4
- package/dist/src/logging/connection-tracker.js.map +1 -1
- package/dist/src/logging/request-tracker.js +8 -4
- package/dist/src/logging/request-tracker.js.map +1 -1
- package/dist/src/main.js +30 -21
- package/dist/src/main.js.map +1 -1
- package/dist/src/middleware/oauth-auth.js +11 -5
- package/dist/src/middleware/oauth-auth.js.map +1 -1
- package/dist/src/middleware/rate-limiter.js +9 -9
- package/dist/src/middleware/rate-limiter.js.map +1 -1
- package/dist/src/oauth/config.js +3 -3
- package/dist/src/oauth/config.js.map +1 -1
- package/dist/src/oauth/endpoints/authorize.js +10 -10
- package/dist/src/oauth/endpoints/authorize.js.map +1 -1
- package/dist/src/oauth/endpoints/callback.js +7 -5
- package/dist/src/oauth/endpoints/callback.js.map +1 -1
- package/dist/src/oauth/endpoints/register.js +3 -3
- package/dist/src/oauth/endpoints/register.js.map +1 -1
- package/dist/src/oauth/endpoints/token.js +8 -8
- package/dist/src/oauth/endpoints/token.js.map +1 -1
- package/dist/src/oauth/gitlab-device-flow.js +15 -15
- package/dist/src/oauth/gitlab-device-flow.js.map +1 -1
- package/dist/src/oauth/session-store.js +38 -29
- package/dist/src/oauth/session-store.js.map +1 -1
- package/dist/src/oauth/storage/factory.js +3 -5
- package/dist/src/oauth/storage/factory.js.map +1 -1
- package/dist/src/oauth/storage/file.d.ts +0 -2
- package/dist/src/oauth/storage/file.js +39 -19
- package/dist/src/oauth/storage/file.js.map +1 -1
- package/dist/src/oauth/storage/memory.js +22 -19
- package/dist/src/oauth/storage/memory.js.map +1 -1
- package/dist/src/oauth/storage/postgresql.js +12 -7
- package/dist/src/oauth/storage/postgresql.js.map +1 -1
- package/dist/src/oauth/storage/types.d.ts +0 -1
- package/dist/src/oauth/storage/types.js.map +1 -1
- package/dist/src/profiles/applicator.js +13 -11
- package/dist/src/profiles/applicator.js.map +1 -1
- package/dist/src/profiles/loader.js +11 -8
- package/dist/src/profiles/loader.js.map +1 -1
- package/dist/src/profiles/project-loader.js +10 -10
- package/dist/src/profiles/project-loader.js.map +1 -1
- package/dist/src/profiles/scope-enforcer.js +10 -8
- package/dist/src/profiles/scope-enforcer.js.map +1 -1
- package/dist/src/registry-manager.js +11 -9
- package/dist/src/registry-manager.js.map +1 -1
- package/dist/src/server.js +66 -54
- package/dist/src/server.js.map +1 -1
- package/dist/src/services/ConnectionManager.js +31 -20
- package/dist/src/services/ConnectionManager.js.map +1 -1
- package/dist/src/services/GitLabVersionDetector.js +12 -4
- package/dist/src/services/GitLabVersionDetector.js.map +1 -1
- package/dist/src/services/SchemaIntrospector.js +6 -4
- package/dist/src/services/SchemaIntrospector.js.map +1 -1
- package/dist/src/services/TokenScopeDetector.js +29 -15
- package/dist/src/services/TokenScopeDetector.js.map +1 -1
- package/dist/src/services/ToolAvailability.js +12 -5
- package/dist/src/services/ToolAvailability.js.map +1 -1
- package/dist/src/services/WidgetAvailability.js +1 -1
- package/dist/src/services/WidgetAvailability.js.map +1 -1
- package/dist/src/session-manager.js +14 -11
- package/dist/src/session-manager.js.map +1 -1
- package/dist/src/utils/fetch.js +36 -21
- package/dist/src/utils/fetch.js.map +1 -1
- package/dist/src/utils/schema-utils.js +11 -8
- package/dist/src/utils/schema-utils.js.map +1 -1
- package/dist/structured-world-gitlab-mcp-6.47.0.tgz +0 -0
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +3 -2
- package/dist/structured-world-gitlab-mcp-6.46.0.tgz +0 -0
package/dist/src/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,qCAAuC;AACvC,
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"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"}
|
|
@@ -53,10 +53,12 @@ async function oauthAuthMiddleware(req, res, next) {
|
|
|
53
53
|
gitlabRefreshToken: newTokens.refresh_token,
|
|
54
54
|
gitlabTokenExpiry: (0, token_utils_1.calculateTokenExpiry)(newTokens.expires_in),
|
|
55
55
|
});
|
|
56
|
-
|
|
56
|
+
(0, logger_1.logDebug)("GitLab token refreshed during request", {
|
|
57
|
+
sessionId: sessionId.substring(0, 8) + "...",
|
|
58
|
+
});
|
|
57
59
|
}
|
|
58
60
|
catch (error) {
|
|
59
|
-
logger_1.
|
|
61
|
+
(0, logger_1.logError)("Failed to refresh GitLab token during request", { err: error });
|
|
60
62
|
sendUnauthorized(req, res, "invalid_token", "GitLab token refresh failed. Please re-authenticate.");
|
|
61
63
|
return;
|
|
62
64
|
}
|
|
@@ -70,7 +72,11 @@ async function oauthAuthMiddleware(req, res, next) {
|
|
|
70
72
|
res.locals.gitlabToken = updatedSession.gitlabAccessToken;
|
|
71
73
|
res.locals.gitlabUserId = updatedSession.gitlabUserId;
|
|
72
74
|
res.locals.gitlabUsername = updatedSession.gitlabUsername;
|
|
73
|
-
|
|
75
|
+
(0, logger_1.logDebug)("OAuth session validated, passing to route handler", {
|
|
76
|
+
sessionId: updatedSession.id.substring(0, 8) + "...",
|
|
77
|
+
method: req.method,
|
|
78
|
+
path: req.path,
|
|
79
|
+
});
|
|
74
80
|
next();
|
|
75
81
|
}
|
|
76
82
|
function createOAuthMiddleware() {
|
|
@@ -109,12 +115,12 @@ async function optionalOAuthMiddleware(req, res, next) {
|
|
|
109
115
|
next();
|
|
110
116
|
}
|
|
111
117
|
function sendUnauthorized(req, res, error, description) {
|
|
112
|
-
logger_1.
|
|
118
|
+
(0, logger_1.logWarn)("Authentication rejected", {
|
|
113
119
|
event: "auth_rejected",
|
|
114
120
|
...(0, request_logger_1.getMinimalRequestContext)(req),
|
|
115
121
|
reason: error,
|
|
116
122
|
description,
|
|
117
|
-
}
|
|
123
|
+
});
|
|
118
124
|
const response = {
|
|
119
125
|
error,
|
|
120
126
|
error_description: description,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-auth.js","sourceRoot":"","sources":["../../../src/middleware/oauth-auth.ts"],"names":[],"mappings":";;AAkCA,kDAiHC;AAQD,sDAEC;AAWD,0DA8CC;AAvMD,4CAAkD;AAClD,0DAAsD;AACtD,sDAAiG;AACjG,oEAAiE;AACjE,0DAAyD;AACzD,
|
|
1
|
+
{"version":3,"file":"oauth-auth.js","sourceRoot":"","sources":["../../../src/middleware/oauth-auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@ function startCleanup() {
|
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
24
|
if (cleaned > 0) {
|
|
25
|
-
logger_1.
|
|
25
|
+
(0, logger_1.logDebug)("Rate limiter cleanup: removed expired entries", { cleaned });
|
|
26
26
|
}
|
|
27
27
|
}, CLEANUP_INTERVAL_MS);
|
|
28
28
|
cleanupInterval.unref();
|
|
@@ -94,22 +94,22 @@ function rateLimiterMiddleware() {
|
|
|
94
94
|
const usagePercent = (info.used / info.total) * 100;
|
|
95
95
|
if (info.allowed && usagePercent >= 80) {
|
|
96
96
|
const rateLimitInfo = (0, request_logger_1.buildRateLimitInfo)("session", sessionId, info.used, info.total, info.resetAt);
|
|
97
|
-
logger_1.
|
|
97
|
+
(0, logger_1.logDebug)("Approaching session rate limit threshold", {
|
|
98
98
|
event: "rate_limit_warning",
|
|
99
99
|
...(0, request_logger_1.getMinimalRequestContext)(req),
|
|
100
100
|
rateLimit: rateLimitInfo,
|
|
101
|
-
}
|
|
101
|
+
});
|
|
102
102
|
}
|
|
103
103
|
if (!info.allowed) {
|
|
104
104
|
const retryAfter = Math.ceil((info.resetAt - Date.now()) / 1000);
|
|
105
105
|
const rateLimitInfo = (0, request_logger_1.buildRateLimitInfo)("session", sessionId, info.used, info.total, info.resetAt);
|
|
106
|
-
logger_1.
|
|
106
|
+
(0, logger_1.logWarn)("Session rate limit exceeded", {
|
|
107
107
|
event: "rate_limit_exceeded",
|
|
108
108
|
...(0, request_logger_1.getMinimalRequestContext)(req),
|
|
109
109
|
rateLimit: rateLimitInfo,
|
|
110
110
|
hasOAuthSession: !!res.locals.oauthSessionId,
|
|
111
111
|
hasMcpSessionHeader: !!req.headers["mcp-session-id"],
|
|
112
|
-
}
|
|
112
|
+
});
|
|
113
113
|
res.set("Retry-After", retryAfter.toString());
|
|
114
114
|
res.status(429).json({
|
|
115
115
|
error: "Too Many Requests",
|
|
@@ -135,26 +135,26 @@ function rateLimiterMiddleware() {
|
|
|
135
135
|
const usagePercent = (info.used / info.total) * 100;
|
|
136
136
|
if (info.allowed && usagePercent >= 80) {
|
|
137
137
|
const rateLimitInfo = (0, request_logger_1.buildRateLimitInfo)("ip", ip, info.used, info.total, info.resetAt);
|
|
138
|
-
logger_1.
|
|
138
|
+
(0, logger_1.logDebug)("Approaching IP rate limit threshold", {
|
|
139
139
|
event: "rate_limit_warning",
|
|
140
140
|
...(0, request_logger_1.getMinimalRequestContext)(req),
|
|
141
141
|
rateLimit: rateLimitInfo,
|
|
142
142
|
authClassification: "anonymous",
|
|
143
143
|
authReason: "no OAuth session and no MCP-Session-Id header",
|
|
144
|
-
}
|
|
144
|
+
});
|
|
145
145
|
}
|
|
146
146
|
if (!info.allowed) {
|
|
147
147
|
const retryAfter = Math.ceil((info.resetAt - Date.now()) / 1000);
|
|
148
148
|
const rateLimitInfo = (0, request_logger_1.buildRateLimitInfo)("ip", ip, info.used, info.total, info.resetAt);
|
|
149
149
|
const mcpSessionHeader = req.headers["mcp-session-id"];
|
|
150
|
-
logger_1.
|
|
150
|
+
(0, logger_1.logWarn)("IP rate limit exceeded", {
|
|
151
151
|
event: "rate_limit_exceeded",
|
|
152
152
|
...(0, request_logger_1.getMinimalRequestContext)(req),
|
|
153
153
|
rateLimit: rateLimitInfo,
|
|
154
154
|
authClassification: "anonymous",
|
|
155
155
|
authReason: "no OAuth session and no MCP-Session-Id header",
|
|
156
156
|
mcpSessionId: (0, request_logger_1.truncateId)(mcpSessionHeader),
|
|
157
|
-
}
|
|
157
|
+
});
|
|
158
158
|
res.set("Retry-After", retryAfter.toString());
|
|
159
159
|
res.status(429).json({
|
|
160
160
|
error: "Too Many Requests",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rate-limiter.js","sourceRoot":"","sources":["../../../src/middleware/rate-limiter.ts"],"names":[],"mappings":";;AAiEA,kCAKC;AA+FD,
|
|
1
|
+
{"version":3,"file":"rate-limiter.js","sourceRoot":"","sources":["../../../src/middleware/rate-limiter.ts"],"names":[],"mappings":"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"}
|
package/dist/src/oauth/config.js
CHANGED
|
@@ -26,7 +26,7 @@ function loadOAuthConfig() {
|
|
|
26
26
|
}
|
|
27
27
|
if (process.env.OAUTH_ENABLED !== "true") {
|
|
28
28
|
cachedOAuthConfig = null;
|
|
29
|
-
logger_1.
|
|
29
|
+
(0, logger_1.logDebug)("OAuth mode disabled (OAUTH_ENABLED !== 'true')");
|
|
30
30
|
return null;
|
|
31
31
|
}
|
|
32
32
|
const result = OAuthConfigSchema.safeParse({
|
|
@@ -47,7 +47,7 @@ function loadOAuthConfig() {
|
|
|
47
47
|
throw new Error(`Invalid OAuth configuration: ${errorMessages}`);
|
|
48
48
|
}
|
|
49
49
|
cachedOAuthConfig = result.data;
|
|
50
|
-
logger_1.
|
|
50
|
+
(0, logger_1.logInfo)("OAuth mode enabled with valid configuration");
|
|
51
51
|
return result.data;
|
|
52
52
|
}
|
|
53
53
|
class ConfigurationError extends Error {
|
|
@@ -81,7 +81,7 @@ function validateStaticConfig() {
|
|
|
81
81
|
if (!process.env.GITLAB_TOKEN) {
|
|
82
82
|
throw new ConfigurationError(MISSING_TOKEN_GUIDANCE);
|
|
83
83
|
}
|
|
84
|
-
logger_1.
|
|
84
|
+
(0, logger_1.logDebug)("Static token mode: GITLAB_TOKEN configured");
|
|
85
85
|
}
|
|
86
86
|
function isOAuthEnabled() {
|
|
87
87
|
return loadOAuthConfig() !== null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/oauth/config.ts"],"names":[],"mappings":";;;AAqDA,0CAoCC;AA2CD,oDAKC;AAOD,wCAEC;AAKD,sDAEC;AAOD,wDAKC;AA9JD,6BAAwB;AACxB,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/oauth/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -65,10 +65,10 @@ async function handleAuthorizationCodeFlow(req, res, config, params) {
|
|
|
65
65
|
expiresAt: Date.now() + 10 * 60 * 1000,
|
|
66
66
|
});
|
|
67
67
|
const gitlabAuthUrl = (0, gitlab_device_flow_1.buildGitLabAuthUrl)(config, callbackUri, internalState);
|
|
68
|
-
logger_1.
|
|
68
|
+
(0, logger_1.logInfo)("Authorization Code Flow initiated, redirecting to GitLab", {
|
|
69
69
|
internalState: internalState.substring(0, 8) + "...",
|
|
70
70
|
clientRedirectUri: params.redirectUri,
|
|
71
|
-
}
|
|
71
|
+
});
|
|
72
72
|
res.redirect(gitlabAuthUrl);
|
|
73
73
|
}
|
|
74
74
|
async function handleDeviceFlow(req, res, config, params) {
|
|
@@ -88,10 +88,10 @@ async function handleDeviceFlow(req, res, config, params) {
|
|
|
88
88
|
state: params.state,
|
|
89
89
|
redirectUri: undefined,
|
|
90
90
|
});
|
|
91
|
-
logger_1.
|
|
91
|
+
(0, logger_1.logInfo)("Device flow initiated for authorization", {
|
|
92
92
|
flowState: flowState.substring(0, 8) + "...",
|
|
93
93
|
userCode: deviceResponse.user_code,
|
|
94
|
-
}
|
|
94
|
+
});
|
|
95
95
|
const baseUrl = (0, metadata_1.getBaseUrl)(req);
|
|
96
96
|
const html = getDeviceFlowHTML({
|
|
97
97
|
userCode: deviceResponse.user_code,
|
|
@@ -105,7 +105,7 @@ async function handleDeviceFlow(req, res, config, params) {
|
|
|
105
105
|
res.send(html);
|
|
106
106
|
}
|
|
107
107
|
catch (error) {
|
|
108
|
-
logger_1.
|
|
108
|
+
(0, logger_1.logError)("Failed to initiate device flow", { err: error });
|
|
109
109
|
sendError(req, res, 500, "server_error", "Failed to initiate authentication");
|
|
110
110
|
}
|
|
111
111
|
}
|
|
@@ -166,11 +166,11 @@ async function pollHandler(req, res) {
|
|
|
166
166
|
updatedAt: now,
|
|
167
167
|
});
|
|
168
168
|
session_store_1.sessionStore.deleteDeviceFlow(flow_state);
|
|
169
|
-
logger_1.
|
|
169
|
+
(0, logger_1.logInfo)("Device flow authorization completed", {
|
|
170
170
|
sessionId: sessionId.substring(0, 8) + "...",
|
|
171
171
|
userId: userInfo.id,
|
|
172
172
|
username: userInfo.username,
|
|
173
|
-
}
|
|
173
|
+
});
|
|
174
174
|
const response = {
|
|
175
175
|
status: "complete",
|
|
176
176
|
redirect_uri: flow.redirectUri,
|
|
@@ -190,19 +190,19 @@ async function pollHandler(req, res) {
|
|
|
190
190
|
res.json({ status: "failed", error: message });
|
|
191
191
|
}
|
|
192
192
|
else {
|
|
193
|
-
logger_1.
|
|
193
|
+
(0, logger_1.logWarn)("Device flow poll error", { err: error });
|
|
194
194
|
res.json({ status: "pending" });
|
|
195
195
|
}
|
|
196
196
|
}
|
|
197
197
|
}
|
|
198
198
|
function sendError(req, res, status, error, description) {
|
|
199
|
-
logger_1.
|
|
199
|
+
(0, logger_1.logWarn)("OAuth authorize request failed", {
|
|
200
200
|
event: "oauth_error",
|
|
201
201
|
endpoint: "/authorize",
|
|
202
202
|
ip: (0, request_logger_1.getIpAddress)(req),
|
|
203
203
|
error,
|
|
204
204
|
description,
|
|
205
|
-
}
|
|
205
|
+
});
|
|
206
206
|
const response = {
|
|
207
207
|
error,
|
|
208
208
|
error_description: description,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authorize.js","sourceRoot":"","sources":["../../../../src/oauth/endpoints/authorize.ts"],"names":[],"mappings":";;AA+DA,4CAoDC;
|
|
1
|
+
{"version":3,"file":"authorize.js","sourceRoot":"","sources":["../../../../src/oauth/endpoints/authorize.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@ async function callbackHandler(req, res) {
|
|
|
17
17
|
}
|
|
18
18
|
const { code, state, error, error_description } = req.query;
|
|
19
19
|
if (error) {
|
|
20
|
-
logger_1.
|
|
20
|
+
(0, logger_1.logWarn)("GitLab authorization error", { error, error_description });
|
|
21
21
|
if (state) {
|
|
22
22
|
const flow = session_store_1.sessionStore.getAuthCodeFlow(state);
|
|
23
23
|
if (flow) {
|
|
@@ -101,21 +101,23 @@ async function callbackHandler(req, res) {
|
|
|
101
101
|
updatedAt: now,
|
|
102
102
|
});
|
|
103
103
|
session_store_1.sessionStore.deleteAuthCodeFlow(state);
|
|
104
|
-
logger_1.
|
|
104
|
+
(0, logger_1.logInfo)("Authorization Code Flow completed successfully", {
|
|
105
105
|
sessionId: sessionId.substring(0, 8) + "...",
|
|
106
106
|
userId: userInfo.id,
|
|
107
107
|
username: userInfo.username,
|
|
108
|
-
}
|
|
108
|
+
});
|
|
109
109
|
const redirectUrl = new URL(flow.clientRedirectUri);
|
|
110
110
|
redirectUrl.searchParams.set("code", mcpAuthCode);
|
|
111
111
|
if (flow.clientState) {
|
|
112
112
|
redirectUrl.searchParams.set("state", flow.clientState);
|
|
113
113
|
}
|
|
114
|
-
logger_1.
|
|
114
|
+
(0, logger_1.logDebug)("Redirecting to client with authorization code", {
|
|
115
|
+
redirectUri: flow.clientRedirectUri,
|
|
116
|
+
});
|
|
115
117
|
res.redirect(redirectUrl.toString());
|
|
116
118
|
}
|
|
117
119
|
catch (error) {
|
|
118
|
-
logger_1.
|
|
120
|
+
(0, logger_1.logError)("Failed to complete authorization code flow", { err: error });
|
|
119
121
|
session_store_1.sessionStore.deleteAuthCodeFlow(state);
|
|
120
122
|
const redirectUrl = new URL(flow.clientRedirectUri);
|
|
121
123
|
redirectUrl.searchParams.set("error", "server_error");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"callback.js","sourceRoot":"","sources":["../../../../src/oauth/endpoints/callback.ts"],"names":[],"mappings":";;AAoCA,
|
|
1
|
+
{"version":3,"file":"callback.js","sourceRoot":"","sources":["../../../../src/oauth/endpoints/callback.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,12 +45,12 @@ async function registerHandler(req, res) {
|
|
|
45
45
|
created_at: Date.now(),
|
|
46
46
|
};
|
|
47
47
|
registeredClients.set(client_id, clientData);
|
|
48
|
-
logger_1.
|
|
48
|
+
(0, logger_1.logInfo)("New OAuth client registered via DCR", {
|
|
49
49
|
client_id,
|
|
50
50
|
client_name,
|
|
51
51
|
redirect_uris,
|
|
52
52
|
token_endpoint_auth_method,
|
|
53
|
-
}
|
|
53
|
+
});
|
|
54
54
|
const response = {
|
|
55
55
|
client_id,
|
|
56
56
|
redirect_uris,
|
|
@@ -65,7 +65,7 @@ async function registerHandler(req, res) {
|
|
|
65
65
|
res.status(201).json(response);
|
|
66
66
|
}
|
|
67
67
|
catch (error) {
|
|
68
|
-
logger_1.
|
|
68
|
+
(0, logger_1.logError)("Error in dynamic client registration", { err: error });
|
|
69
69
|
res.status(500).json({
|
|
70
70
|
error: "server_error",
|
|
71
71
|
error_description: "Failed to register client",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../../src/oauth/endpoints/register.ts"],"names":[],"mappings":";;AA2CA,
|
|
1
|
+
{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../../src/oauth/endpoints/register.ts"],"names":[],"mappings":"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"}
|
|
@@ -75,10 +75,10 @@ async function handleAuthorizationCode(req, res, config) {
|
|
|
75
75
|
mcpTokenExpiry: (0, token_utils_1.calculateTokenExpiry)(config.tokenTtl),
|
|
76
76
|
});
|
|
77
77
|
session_store_1.sessionStore.deleteAuthCode(code);
|
|
78
|
-
logger_1.
|
|
78
|
+
(0, logger_1.logInfo)("MCP tokens issued via authorization_code grant", {
|
|
79
79
|
sessionId: session.id.substring(0, 8) + "...",
|
|
80
80
|
userId: session.gitlabUserId,
|
|
81
|
-
}
|
|
81
|
+
});
|
|
82
82
|
const response = {
|
|
83
83
|
access_token: accessToken,
|
|
84
84
|
token_type: "Bearer",
|
|
@@ -114,10 +114,10 @@ async function handleRefreshToken(req, res, config) {
|
|
|
114
114
|
return;
|
|
115
115
|
}
|
|
116
116
|
updatedSession = refreshedSession;
|
|
117
|
-
logger_1.
|
|
117
|
+
(0, logger_1.logDebug)("GitLab token refreshed", { sessionId: session.id.substring(0, 8) + "..." });
|
|
118
118
|
}
|
|
119
119
|
catch (error) {
|
|
120
|
-
logger_1.
|
|
120
|
+
(0, logger_1.logError)("Failed to refresh GitLab token", { err: error });
|
|
121
121
|
sendError(req, res, 400, "invalid_grant", "Failed to refresh underlying GitLab token");
|
|
122
122
|
return;
|
|
123
123
|
}
|
|
@@ -137,10 +137,10 @@ async function handleRefreshToken(req, res, config) {
|
|
|
137
137
|
mcpRefreshToken: newRefreshToken,
|
|
138
138
|
mcpTokenExpiry: (0, token_utils_1.calculateTokenExpiry)(config.tokenTtl),
|
|
139
139
|
});
|
|
140
|
-
logger_1.
|
|
140
|
+
(0, logger_1.logInfo)("MCP tokens refreshed via refresh_token grant", {
|
|
141
141
|
sessionId: updatedSession.id.substring(0, 8) + "...",
|
|
142
142
|
userId: updatedSession.gitlabUserId,
|
|
143
|
-
}
|
|
143
|
+
});
|
|
144
144
|
const response = {
|
|
145
145
|
access_token: accessToken,
|
|
146
146
|
token_type: "Bearer",
|
|
@@ -151,13 +151,13 @@ async function handleRefreshToken(req, res, config) {
|
|
|
151
151
|
res.json(response);
|
|
152
152
|
}
|
|
153
153
|
function sendError(req, res, status, error, description) {
|
|
154
|
-
logger_1.
|
|
154
|
+
(0, logger_1.logWarn)("OAuth token request failed", {
|
|
155
155
|
event: "oauth_error",
|
|
156
156
|
endpoint: "/token",
|
|
157
157
|
ip: (0, request_logger_1.getIpAddress)(req),
|
|
158
158
|
error,
|
|
159
159
|
description,
|
|
160
|
-
}
|
|
160
|
+
});
|
|
161
161
|
const response = {
|
|
162
162
|
error,
|
|
163
163
|
error_description: description,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../../../src/oauth/endpoints/token.ts"],"names":[],"mappings":";;AAoCA,oCA2BC;AAnDD,sCAAyD;AACzD,oDAAgD;AAChD,gDAMwB;AACxB,8DAA2D;AAC3D,yCAAwC;AACxC,
|
|
1
|
+
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../../../src/oauth/endpoints/token.ts"],"names":[],"mappings":"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"}
|