@structured-world/gitlab-mcp 10.1.0 → 11.0.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 +7 -7
- package/README.md.in +1 -1
- package/dist/src/channel-gateway/format.js +7 -1
- package/dist/src/channel-gateway/format.js.map +1 -1
- package/dist/src/channel-gateway/forwarding.d.ts +3 -0
- package/dist/src/channel-gateway/forwarding.js +8 -1
- package/dist/src/channel-gateway/forwarding.js.map +1 -1
- package/dist/src/channel-gateway/gateway.d.ts +7 -0
- package/dist/src/channel-gateway/gateway.js +80 -16
- package/dist/src/channel-gateway/gateway.js.map +1 -1
- package/dist/src/cli/docker/container-runtime.d.ts +1 -0
- package/dist/src/cli/docker/container-runtime.js +37 -5
- package/dist/src/cli/docker/container-runtime.js.map +1 -1
- package/dist/src/cli/docker/docker-command.js +11 -2
- package/dist/src/cli/docker/docker-command.js.map +1 -1
- package/dist/src/cli/docker/docker-utils.d.ts +1 -0
- package/dist/src/cli/docker/docker-utils.js +137 -27
- package/dist/src/cli/docker/docker-utils.js.map +1 -1
- package/dist/src/cli/docker/oauth-issuer-prompt.d.ts +2 -0
- package/dist/src/cli/docker/oauth-issuer-prompt.js +47 -0
- package/dist/src/cli/docker/oauth-issuer-prompt.js.map +1 -0
- package/dist/src/cli/docker/types.d.ts +18 -4
- package/dist/src/cli/docker/types.js.map +1 -1
- package/dist/src/cli/list-tools.js +14 -35
- package/dist/src/cli/list-tools.js.map +1 -1
- package/dist/src/cli/setup/flows/server-setup.js +15 -0
- package/dist/src/cli/setup/flows/server-setup.js.map +1 -1
- package/dist/src/config/instances-loader.js +17 -3
- package/dist/src/config/instances-loader.js.map +1 -1
- package/dist/src/config/instances-schema.d.ts +6 -3
- package/dist/src/config/instances-schema.js +7 -6
- package/dist/src/config/instances-schema.js.map +1 -1
- package/dist/src/config.js.map +1 -1
- package/dist/src/configuration/caller.d.ts +10 -0
- package/dist/src/configuration/caller.js +39 -0
- package/dist/src/configuration/caller.js.map +1 -0
- package/dist/src/configuration/composed-feeds.d.ts +31 -0
- package/dist/src/configuration/composed-feeds.js +698 -0
- package/dist/src/configuration/composed-feeds.js.map +1 -0
- package/dist/src/configuration/composed-listings.d.ts +14 -0
- package/dist/src/configuration/composed-listings.js +157 -0
- package/dist/src/configuration/composed-listings.js.map +1 -0
- package/dist/src/configuration/groups.d.ts +8 -0
- package/dist/src/configuration/groups.js +39 -0
- package/dist/src/configuration/groups.js.map +1 -0
- package/dist/src/configuration/index.d.ts +6 -0
- package/dist/src/configuration/index.js +87 -0
- package/dist/src/configuration/index.js.map +1 -0
- package/dist/src/configuration/policy.d.ts +34 -0
- package/dist/src/configuration/policy.js +122 -0
- package/dist/src/configuration/policy.js.map +1 -0
- package/dist/src/configuration/scope-ids.d.ts +7 -0
- package/dist/src/configuration/scope-ids.js +78 -0
- package/dist/src/configuration/scope-ids.js.map +1 -0
- package/dist/src/configuration/scope-projects.d.ts +5 -0
- package/dist/src/configuration/scope-projects.js +76 -0
- package/dist/src/configuration/scope-projects.js.map +1 -0
- package/dist/src/configuration/scope-targets.d.ts +26 -0
- package/dist/src/configuration/scope-targets.js +307 -0
- package/dist/src/configuration/scope-targets.js.map +1 -0
- package/dist/src/configuration/scoped-execution.d.ts +6 -0
- package/dist/src/configuration/scoped-execution.js +577 -0
- package/dist/src/configuration/scoped-execution.js.map +1 -0
- package/dist/src/configuration/scoped-feeds.d.ts +22 -0
- package/dist/src/configuration/scoped-feeds.js +136 -0
- package/dist/src/configuration/scoped-feeds.js.map +1 -0
- package/dist/src/configuration/service.d.ts +53 -0
- package/dist/src/configuration/service.js +186 -0
- package/dist/src/configuration/service.js.map +1 -0
- package/dist/src/configuration/settings-store.d.ts +20 -0
- package/dist/src/configuration/settings-store.js +228 -0
- package/dist/src/configuration/settings-store.js.map +1 -0
- package/dist/src/configuration/types.d.ts +30 -0
- package/dist/src/configuration/types.js +20 -0
- package/dist/src/configuration/types.js.map +1 -0
- package/dist/src/contracts/storage.d.ts +2 -1
- package/dist/src/dashboard/html-template.js +8 -15
- package/dist/src/dashboard/html-template.js.map +1 -1
- package/dist/src/dashboard/metrics.d.ts +1 -1
- package/dist/src/entities/context/connection-check.d.ts +64 -0
- package/dist/src/entities/context/connection-check.js +117 -0
- package/dist/src/entities/context/connection-check.js.map +1 -0
- package/dist/src/entities/context/context-manager.d.ts +10 -22
- package/dist/src/entities/context/context-manager.js +108 -207
- package/dist/src/entities/context/context-manager.js.map +1 -1
- package/dist/src/entities/context/handlers.d.ts +3 -5
- package/dist/src/entities/context/handlers.js +2 -14
- package/dist/src/entities/context/handlers.js.map +1 -1
- package/dist/src/entities/context/output-schema.d.ts +272 -0
- package/dist/src/entities/context/output-schema.js +182 -0
- package/dist/src/entities/context/output-schema.js.map +1 -0
- package/dist/src/entities/context/profile.d.ts +29 -0
- package/dist/src/entities/context/profile.js +72 -0
- package/dist/src/entities/context/profile.js.map +1 -0
- package/dist/src/entities/context/registry.js +140 -3
- package/dist/src/entities/context/registry.js.map +1 -1
- package/dist/src/entities/context/schema.d.ts +6 -14
- package/dist/src/entities/context/schema.js +6 -13
- package/dist/src/entities/context/schema.js.map +1 -1
- package/dist/src/entities/context/scope-search.d.ts +49 -0
- package/dist/src/entities/context/scope-search.js +71 -0
- package/dist/src/entities/context/scope-search.js.map +1 -0
- package/dist/src/entities/context/settings-panel.d.ts +13 -0
- package/dist/src/entities/context/settings-panel.js +508 -0
- package/dist/src/entities/context/settings-panel.js.map +1 -0
- package/dist/src/entities/context/settings.d.ts +78 -0
- package/dist/src/entities/context/settings.js +239 -0
- package/dist/src/entities/context/settings.js.map +1 -0
- package/dist/src/entities/context/types.d.ts +3 -4
- package/dist/src/entities/context/whoami.js +39 -31
- package/dist/src/entities/context/whoami.js.map +1 -1
- package/dist/src/entities/core/registry.js +34 -33
- package/dist/src/entities/core/registry.js.map +1 -1
- package/dist/src/entities/environments/schema-readonly.d.ts +3 -3
- package/dist/src/entities/files/registry.js +3 -2
- package/dist/src/entities/files/registry.js.map +1 -1
- package/dist/src/entities/iterations/registry.js +3 -2
- package/dist/src/entities/iterations/registry.js.map +1 -1
- package/dist/src/entities/mrs/registry.js +6 -4
- package/dist/src/entities/mrs/registry.js.map +1 -1
- package/dist/src/entities/mrs/schema-readonly.d.ts +2 -2
- package/dist/src/entities/mrs/schema-readonly.js +19 -2
- package/dist/src/entities/mrs/schema-readonly.js.map +1 -1
- package/dist/src/entities/pipelines/registry.js +3 -2
- package/dist/src/entities/pipelines/registry.js.map +1 -1
- package/dist/src/entities/pipelines/schema-readonly.d.ts +3 -3
- package/dist/src/entities/runners/project-access.d.ts +14 -0
- package/dist/src/entities/runners/project-access.js +64 -0
- package/dist/src/entities/runners/project-access.js.map +1 -0
- package/dist/src/entities/runners/registry.js +54 -26
- package/dist/src/entities/runners/registry.js.map +1 -1
- package/dist/src/entities/search/schema-readonly.d.ts +28 -28
- package/dist/src/graphql/runners.d.ts +26 -1
- package/dist/src/graphql/runners.js +43 -6
- package/dist/src/graphql/runners.js.map +1 -1
- package/dist/src/graphql/vulnerabilities.d.ts +3 -0
- package/dist/src/graphql/vulnerabilities.js +1 -0
- package/dist/src/graphql/vulnerabilities.js.map +1 -1
- package/dist/src/handlers.js +218 -142
- package/dist/src/handlers.js.map +1 -1
- package/dist/src/mcp-apps.d.ts +6 -0
- package/dist/src/mcp-apps.js +8 -0
- package/dist/src/mcp-apps.js.map +1 -0
- package/dist/src/middleware/mcp-auth-routes.d.ts +3 -0
- package/dist/src/middleware/mcp-auth-routes.js +9 -0
- package/dist/src/middleware/mcp-auth-routes.js.map +1 -0
- package/dist/src/middleware/oauth-auth.js +83 -23
- package/dist/src/middleware/oauth-auth.js.map +1 -1
- package/dist/src/middleware/rate-limiter.js +11 -10
- package/dist/src/middleware/rate-limiter.js.map +1 -1
- package/dist/src/oauth/authorization-response.d.ts +1 -0
- package/dist/src/oauth/authorization-response.js +14 -0
- package/dist/src/oauth/authorization-response.js.map +1 -0
- package/dist/src/oauth/client-auth.d.ts +16 -0
- package/dist/src/oauth/client-auth.js +73 -0
- package/dist/src/oauth/client-auth.js.map +1 -0
- package/dist/src/oauth/config.d.ts +2 -0
- package/dist/src/oauth/config.js +37 -0
- package/dist/src/oauth/config.js.map +1 -1
- package/dist/src/oauth/endpoints/authorize.d.ts +1 -0
- package/dist/src/oauth/endpoints/authorize.js +361 -102
- package/dist/src/oauth/endpoints/authorize.js.map +1 -1
- package/dist/src/oauth/endpoints/callback.js +78 -41
- package/dist/src/oauth/endpoints/callback.js.map +1 -1
- package/dist/src/oauth/endpoints/index.d.ts +1 -0
- package/dist/src/oauth/endpoints/index.js +3 -1
- package/dist/src/oauth/endpoints/index.js.map +1 -1
- package/dist/src/oauth/endpoints/metadata.d.ts +1 -1
- package/dist/src/oauth/endpoints/metadata.js +23 -8
- package/dist/src/oauth/endpoints/metadata.js.map +1 -1
- package/dist/src/oauth/endpoints/register.d.ts +3 -2
- package/dist/src/oauth/endpoints/register.js +70 -19
- package/dist/src/oauth/endpoints/register.js.map +1 -1
- package/dist/src/oauth/endpoints/revoke.d.ts +2 -0
- package/dist/src/oauth/endpoints/revoke.js +97 -0
- package/dist/src/oauth/endpoints/revoke.js.map +1 -0
- package/dist/src/oauth/endpoints/token.js +136 -62
- package/dist/src/oauth/endpoints/token.js.map +1 -1
- package/dist/src/oauth/gitlab-device-flow.d.ts +27 -8
- package/dist/src/oauth/gitlab-device-flow.js +119 -57
- package/dist/src/oauth/gitlab-device-flow.js.map +1 -1
- package/dist/src/oauth/gitlab-request-bound.d.ts +1 -0
- package/dist/src/oauth/gitlab-request-bound.js +6 -0
- package/dist/src/oauth/gitlab-request-bound.js.map +1 -0
- package/dist/src/oauth/gitlab-token-refresh.d.ts +6 -0
- package/dist/src/oauth/gitlab-token-refresh.js +130 -0
- package/dist/src/oauth/gitlab-token-refresh.js.map +1 -0
- package/dist/src/oauth/granted-scopes.d.ts +1 -0
- package/dist/src/oauth/granted-scopes.js +7 -0
- package/dist/src/oauth/granted-scopes.js.map +1 -0
- package/dist/src/oauth/index.d.ts +2 -2
- package/dist/src/oauth/index.js +4 -2
- package/dist/src/oauth/index.js.map +1 -1
- package/dist/src/oauth/instance-app.d.ts +4 -0
- package/dist/src/oauth/instance-app.js +45 -0
- package/dist/src/oauth/instance-app.js.map +1 -0
- package/dist/src/oauth/issued-tokens.d.ts +1 -0
- package/dist/src/oauth/issued-tokens.js +24 -0
- package/dist/src/oauth/issued-tokens.js.map +1 -0
- package/dist/src/oauth/oauth-app.d.ts +9 -0
- package/dist/src/oauth/oauth-app.js +14 -0
- package/dist/src/oauth/oauth-app.js.map +1 -0
- package/dist/src/oauth/request-params.d.ts +1 -0
- package/dist/src/oauth/request-params.js +17 -0
- package/dist/src/oauth/request-params.js.map +1 -0
- package/dist/src/oauth/resource.d.ts +12 -0
- package/dist/src/oauth/resource.js +66 -0
- package/dist/src/oauth/resource.js.map +1 -0
- package/dist/src/oauth/routes.d.ts +2 -0
- package/dist/src/oauth/routes.js +31 -0
- package/dist/src/oauth/routes.js.map +1 -0
- package/dist/src/oauth/session-store.d.ts +44 -36
- package/dist/src/oauth/session-store.js +125 -253
- package/dist/src/oauth/session-store.js.map +1 -1
- package/dist/src/oauth/storage/factory.js +1 -1
- package/dist/src/oauth/storage/factory.js.map +1 -1
- package/dist/src/oauth/storage/file.d.ts +23 -1
- package/dist/src/oauth/storage/file.js +168 -36
- package/dist/src/oauth/storage/file.js.map +1 -1
- package/dist/src/oauth/storage/memory.d.ts +23 -1
- package/dist/src/oauth/storage/memory.js +120 -22
- package/dist/src/oauth/storage/memory.js.map +1 -1
- package/dist/src/oauth/storage/types.d.ts +17 -1
- package/dist/src/oauth/storage/types.js.map +1 -1
- package/dist/src/oauth/tool-auth.d.ts +12 -0
- package/dist/src/oauth/tool-auth.js +108 -0
- package/dist/src/oauth/tool-auth.js.map +1 -0
- package/dist/src/oauth/types.d.ts +30 -0
- package/dist/src/profiles/scope-enforcer.d.ts +8 -0
- package/dist/src/profiles/scope-enforcer.js +86 -24
- package/dist/src/profiles/scope-enforcer.js.map +1 -1
- package/dist/src/profiles/types.js +4 -1
- package/dist/src/profiles/types.js.map +1 -1
- package/dist/src/registry-manager.d.ts +16 -4
- package/dist/src/registry-manager.js +115 -33
- package/dist/src/registry-manager.js.map +1 -1
- package/dist/src/server.js +66 -39
- package/dist/src/server.js.map +1 -1
- package/dist/src/services/ConnectionManager.d.ts +2 -1
- package/dist/src/services/ConnectionManager.js +26 -19
- package/dist/src/services/ConnectionManager.js.map +1 -1
- package/dist/src/services/TokenScopeDetector.d.ts +5 -1
- package/dist/src/services/TokenScopeDetector.js +19 -0
- package/dist/src/services/TokenScopeDetector.js.map +1 -1
- package/dist/src/session-manager.d.ts +3 -1
- package/dist/src/session-manager.js +35 -10
- package/dist/src/session-manager.js.map +1 -1
- package/dist/src/types.d.ts +3 -2
- package/dist/src/types.js.map +1 -1
- package/dist/src/utils/bounded-map.d.ts +1 -0
- package/dist/src/utils/bounded-map.js +23 -0
- package/dist/src/utils/bounded-map.js.map +1 -0
- package/dist/src/utils/fetch.d.ts +0 -1
- package/dist/src/utils/fetch.js +2 -12
- package/dist/src/utils/fetch.js.map +1 -1
- package/dist/src/utils/gitlab-api.js +2 -1
- package/dist/src/utils/gitlab-api.js.map +1 -1
- package/dist/src/utils/gitlab-base-url.d.ts +2 -0
- package/dist/src/utils/gitlab-base-url.js +30 -0
- package/dist/src/utils/gitlab-base-url.js.map +1 -0
- package/dist/src/utils/html.d.ts +1 -0
- package/dist/src/utils/html.js +12 -0
- package/dist/src/utils/html.js.map +1 -0
- package/dist/src/utils/namespace.d.ts +1 -0
- package/dist/src/utils/namespace.js +72 -24
- package/dist/src/utils/namespace.js.map +1 -1
- package/dist/src/utils/schema-utils.d.ts +5 -3
- package/dist/src/utils/schema-utils.js +50 -22
- package/dist/src/utils/schema-utils.js.map +1 -1
- package/dist/src/utils/smart-user-search.js +2 -1
- package/dist/src/utils/smart-user-search.js.map +1 -1
- package/dist/src/utils/sync-directory.d.ts +1 -0
- package/dist/src/utils/sync-directory.js +49 -0
- package/dist/src/utils/sync-directory.js.map +1 -0
- package/dist/src/utils/tool-result.d.ts +4 -0
- package/dist/src/utils/tool-result.js +41 -0
- package/dist/src/utils/tool-result.js.map +1 -0
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +60 -13
- package/skills/gitlab-ci/SKILL.md +16 -0
- package/skills/gitlab-discovery/SKILL.md +15 -0
- package/skills/gitlab-review/SKILL.md +16 -0
- package/skills/gitlab-setup/SKILL.md +16 -0
- package/skills/gitlab-work-items/SKILL.md +16 -0
|
@@ -1,22 +1,62 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.DeviceGrantRefusedError = exports.GitLabOAuthHttpError = void 0;
|
|
3
4
|
exports.initiateDeviceFlow = initiateDeviceFlow;
|
|
5
|
+
exports.pollDeviceFlowStep = pollDeviceFlowStep;
|
|
4
6
|
exports.pollDeviceFlowOnce = pollDeviceFlowOnce;
|
|
5
7
|
exports.pollForToken = pollForToken;
|
|
6
8
|
exports.refreshGitLabToken = refreshGitLabToken;
|
|
7
9
|
exports.getGitLabUser = getGitLabUser;
|
|
8
10
|
exports.validateGitLabToken = validateGitLabToken;
|
|
9
11
|
exports.exchangeGitLabAuthCode = exchangeGitLabAuthCode;
|
|
12
|
+
exports.revokeGitLabToken = revokeGitLabToken;
|
|
10
13
|
exports.buildGitLabAuthUrl = buildGitLabAuthUrl;
|
|
11
14
|
const config_1 = require("../config");
|
|
12
15
|
const logger_1 = require("../logger");
|
|
13
16
|
const fetch_1 = require("../utils/fetch");
|
|
17
|
+
const oauth_app_1 = require("./oauth-app");
|
|
18
|
+
class GitLabOAuthHttpError extends Error {
|
|
19
|
+
status;
|
|
20
|
+
oauthError;
|
|
21
|
+
constructor(message, status, oauthError) {
|
|
22
|
+
super(message);
|
|
23
|
+
this.status = status;
|
|
24
|
+
this.oauthError = oauthError;
|
|
25
|
+
this.name = 'GitLabOAuthHttpError';
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
exports.GitLabOAuthHttpError = GitLabOAuthHttpError;
|
|
29
|
+
function oauthErrorCode(body) {
|
|
30
|
+
try {
|
|
31
|
+
const parsed = JSON.parse(body);
|
|
32
|
+
if (typeof parsed === 'object' && parsed !== null && 'error' in parsed) {
|
|
33
|
+
return typeof parsed.error === 'string' ? parsed.error : undefined;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
catch {
|
|
37
|
+
}
|
|
38
|
+
return undefined;
|
|
39
|
+
}
|
|
40
|
+
class DeviceGrantRefusedError extends Error {
|
|
41
|
+
constructor(message) {
|
|
42
|
+
super(message);
|
|
43
|
+
this.name = 'DeviceGrantRefusedError';
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
exports.DeviceGrantRefusedError = DeviceGrantRefusedError;
|
|
47
|
+
const TERMINAL_DEVICE_ERRORS = new Set([
|
|
48
|
+
'invalid_request',
|
|
49
|
+
'invalid_client',
|
|
50
|
+
'unauthorized_client',
|
|
51
|
+
'unsupported_grant_type',
|
|
52
|
+
'invalid_scope',
|
|
53
|
+
]);
|
|
14
54
|
async function throwOnHttpError(response, operation) {
|
|
15
55
|
if (!response.ok) {
|
|
16
56
|
const rawText = await response.text();
|
|
17
57
|
const details = rawText.trim().slice(0, 500) || response.statusText;
|
|
18
58
|
(0, logger_1.logError)(`Failed to ${operation}`, { status: response.status, error: details });
|
|
19
|
-
throw new
|
|
59
|
+
throw new GitLabOAuthHttpError(`Failed to ${operation}: ${response.status} ${details}`, response.status, oauthErrorCode(rawText));
|
|
20
60
|
}
|
|
21
61
|
}
|
|
22
62
|
const OAUTH_FETCH_OPTS = {
|
|
@@ -25,10 +65,18 @@ const OAUTH_FETCH_OPTS = {
|
|
|
25
65
|
rateLimitBaseUrl: config_1.GITLAB_BASE_URL,
|
|
26
66
|
skipAuth: true,
|
|
27
67
|
};
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
68
|
+
function oauthFetchOpts(baseUrl) {
|
|
69
|
+
return { ...OAUTH_FETCH_OPTS, rateLimitBaseUrl: baseUrl };
|
|
70
|
+
}
|
|
71
|
+
function clientParams(app) {
|
|
72
|
+
return app.clientSecret
|
|
73
|
+
? { client_id: app.clientId, client_secret: app.clientSecret }
|
|
74
|
+
: { client_id: app.clientId };
|
|
75
|
+
}
|
|
76
|
+
async function initiateDeviceFlow(config, app = (0, oauth_app_1.defaultOAuthApp)(config)) {
|
|
77
|
+
const url = `${app.baseUrl}/oauth/authorize_device`;
|
|
78
|
+
(0, logger_1.logDebug)('Initiating GitLab device flow', { url, clientId: app.clientId });
|
|
79
|
+
const scopes = app.scopes.replaceAll(',', ' ');
|
|
32
80
|
const response = await (0, fetch_1.enhancedFetch)(url, {
|
|
33
81
|
method: 'POST',
|
|
34
82
|
headers: {
|
|
@@ -36,10 +84,10 @@ async function initiateDeviceFlow(config) {
|
|
|
36
84
|
Accept: 'application/json',
|
|
37
85
|
},
|
|
38
86
|
body: new URLSearchParams({
|
|
39
|
-
client_id:
|
|
87
|
+
client_id: app.clientId,
|
|
40
88
|
scope: scopes,
|
|
41
89
|
}),
|
|
42
|
-
...
|
|
90
|
+
...oauthFetchOpts(app.baseUrl),
|
|
43
91
|
});
|
|
44
92
|
await throwOnHttpError(response, 'initiate device flow');
|
|
45
93
|
const data = (await response.json());
|
|
@@ -50,57 +98,64 @@ async function initiateDeviceFlow(config) {
|
|
|
50
98
|
});
|
|
51
99
|
return data;
|
|
52
100
|
}
|
|
53
|
-
async function
|
|
54
|
-
const url = `${
|
|
55
|
-
const params = {
|
|
56
|
-
client_id: config.gitlabClientId,
|
|
57
|
-
device_code: deviceCode,
|
|
58
|
-
grant_type: 'urn:ietf:params:oauth:grant-type:device_code',
|
|
59
|
-
};
|
|
60
|
-
if (config.gitlabClientSecret) {
|
|
61
|
-
params.client_secret = config.gitlabClientSecret;
|
|
62
|
-
}
|
|
101
|
+
async function pollDeviceFlowStep(deviceCode, config, app = (0, oauth_app_1.defaultOAuthApp)(config)) {
|
|
102
|
+
const url = `${app.baseUrl}/oauth/token`;
|
|
63
103
|
const response = await (0, fetch_1.enhancedFetch)(url, {
|
|
64
104
|
method: 'POST',
|
|
65
105
|
headers: {
|
|
66
106
|
'Content-Type': 'application/x-www-form-urlencoded',
|
|
67
107
|
Accept: 'application/json',
|
|
68
108
|
},
|
|
69
|
-
body: new URLSearchParams(
|
|
70
|
-
|
|
109
|
+
body: new URLSearchParams({
|
|
110
|
+
...clientParams(app),
|
|
111
|
+
device_code: deviceCode,
|
|
112
|
+
grant_type: 'urn:ietf:params:oauth:grant-type:device_code',
|
|
113
|
+
}),
|
|
114
|
+
...oauthFetchOpts(app.baseUrl),
|
|
71
115
|
});
|
|
72
116
|
if (response.ok) {
|
|
73
|
-
const
|
|
117
|
+
const tokens = (await response.json());
|
|
74
118
|
(0, logger_1.logInfo)('Device flow authorization completed successfully');
|
|
75
|
-
return
|
|
119
|
+
return { status: 'complete', tokens };
|
|
76
120
|
}
|
|
77
121
|
const error = (await response.json());
|
|
78
122
|
switch (error.error) {
|
|
79
123
|
case 'authorization_pending':
|
|
80
|
-
return
|
|
124
|
+
return { status: 'pending' };
|
|
81
125
|
case 'slow_down':
|
|
82
|
-
(0, logger_1.logDebug)('Device flow: slow_down received,
|
|
83
|
-
return
|
|
126
|
+
(0, logger_1.logDebug)('Device flow: slow_down received, increasing poll interval');
|
|
127
|
+
return { status: 'slow_down' };
|
|
84
128
|
case 'expired_token':
|
|
85
|
-
throw new
|
|
129
|
+
throw new DeviceGrantRefusedError('Device code expired. Please start a new authorization.');
|
|
86
130
|
case 'access_denied':
|
|
87
|
-
throw new
|
|
131
|
+
throw new DeviceGrantRefusedError('User denied the authorization request.');
|
|
88
132
|
case 'invalid_grant':
|
|
89
|
-
throw new
|
|
90
|
-
default:
|
|
91
|
-
|
|
133
|
+
throw new DeviceGrantRefusedError('Invalid device code or grant.');
|
|
134
|
+
default: {
|
|
135
|
+
const message = `Device flow error: ${error.error_description ?? error.error ?? 'unexpected response'}`;
|
|
136
|
+
throw error.error !== undefined && TERMINAL_DEVICE_ERRORS.has(error.error)
|
|
137
|
+
? new DeviceGrantRefusedError(message)
|
|
138
|
+
: new Error(message);
|
|
139
|
+
}
|
|
92
140
|
}
|
|
93
141
|
}
|
|
94
|
-
async function
|
|
142
|
+
async function pollDeviceFlowOnce(deviceCode, config, app = (0, oauth_app_1.defaultOAuthApp)(config)) {
|
|
143
|
+
const step = await pollDeviceFlowStep(deviceCode, config, app);
|
|
144
|
+
return step.status === 'complete' ? step.tokens : null;
|
|
145
|
+
}
|
|
146
|
+
async function pollForToken(deviceCode, config, onPending, app = (0, oauth_app_1.defaultOAuthApp)(config)) {
|
|
95
147
|
const startTime = Date.now();
|
|
96
148
|
const timeout = config.deviceTimeout * 1000;
|
|
97
149
|
let interval = config.devicePollInterval * 1000;
|
|
98
150
|
while (Date.now() - startTime < timeout) {
|
|
99
151
|
await sleep(interval);
|
|
100
152
|
try {
|
|
101
|
-
const
|
|
102
|
-
if (
|
|
103
|
-
return
|
|
153
|
+
const step = await pollDeviceFlowStep(deviceCode, config, app);
|
|
154
|
+
if (step.status === 'complete') {
|
|
155
|
+
return step.tokens;
|
|
156
|
+
}
|
|
157
|
+
if (step.status === 'slow_down') {
|
|
158
|
+
interval += 5000;
|
|
104
159
|
}
|
|
105
160
|
onPending?.();
|
|
106
161
|
}
|
|
@@ -117,16 +172,13 @@ async function pollForToken(deviceCode, config, onPending) {
|
|
|
117
172
|
}
|
|
118
173
|
throw new Error(`Device flow timeout after ${config.deviceTimeout} seconds`);
|
|
119
174
|
}
|
|
120
|
-
async function refreshGitLabToken(refreshToken, config) {
|
|
121
|
-
const url = `${
|
|
175
|
+
async function refreshGitLabToken(refreshToken, config, app = (0, oauth_app_1.defaultOAuthApp)(config)) {
|
|
176
|
+
const url = `${app.baseUrl}/oauth/token`;
|
|
122
177
|
const params = {
|
|
123
|
-
|
|
178
|
+
...clientParams(app),
|
|
124
179
|
refresh_token: refreshToken,
|
|
125
180
|
grant_type: 'refresh_token',
|
|
126
181
|
};
|
|
127
|
-
if (config.gitlabClientSecret) {
|
|
128
|
-
params.client_secret = config.gitlabClientSecret;
|
|
129
|
-
}
|
|
130
182
|
(0, logger_1.logDebug)('Refreshing GitLab token');
|
|
131
183
|
const response = await (0, fetch_1.enhancedFetch)(url, {
|
|
132
184
|
method: 'POST',
|
|
@@ -135,21 +187,21 @@ async function refreshGitLabToken(refreshToken, config) {
|
|
|
135
187
|
Accept: 'application/json',
|
|
136
188
|
},
|
|
137
189
|
body: new URLSearchParams(params),
|
|
138
|
-
...
|
|
190
|
+
...oauthFetchOpts(app.baseUrl),
|
|
139
191
|
});
|
|
140
192
|
await throwOnHttpError(response, 'refresh token');
|
|
141
193
|
const data = (await response.json());
|
|
142
194
|
(0, logger_1.logInfo)('GitLab token refreshed successfully');
|
|
143
195
|
return data;
|
|
144
196
|
}
|
|
145
|
-
async function getGitLabUser(accessToken) {
|
|
146
|
-
const url = `${
|
|
197
|
+
async function getGitLabUser(accessToken, baseUrl = config_1.GITLAB_BASE_URL) {
|
|
198
|
+
const url = `${baseUrl}/api/v4/user`;
|
|
147
199
|
const response = await (0, fetch_1.enhancedFetch)(url, {
|
|
148
200
|
headers: {
|
|
149
201
|
Authorization: `Bearer ${accessToken}`,
|
|
150
202
|
Accept: 'application/json',
|
|
151
203
|
},
|
|
152
|
-
...
|
|
204
|
+
...oauthFetchOpts(baseUrl),
|
|
153
205
|
});
|
|
154
206
|
await throwOnHttpError(response, 'get GitLab user info');
|
|
155
207
|
const user = (await response.json());
|
|
@@ -161,15 +213,15 @@ async function getGitLabUser(accessToken) {
|
|
|
161
213
|
email: user.email,
|
|
162
214
|
};
|
|
163
215
|
}
|
|
164
|
-
async function validateGitLabToken(accessToken) {
|
|
216
|
+
async function validateGitLabToken(accessToken, baseUrl = config_1.GITLAB_BASE_URL) {
|
|
165
217
|
try {
|
|
166
|
-
const url = `${
|
|
218
|
+
const url = `${baseUrl}/api/v4/user`;
|
|
167
219
|
const response = await (0, fetch_1.enhancedFetch)(url, {
|
|
168
220
|
method: 'HEAD',
|
|
169
221
|
headers: {
|
|
170
222
|
Authorization: `Bearer ${accessToken}`,
|
|
171
223
|
},
|
|
172
|
-
...
|
|
224
|
+
...oauthFetchOpts(baseUrl),
|
|
173
225
|
});
|
|
174
226
|
return response.ok;
|
|
175
227
|
}
|
|
@@ -177,17 +229,14 @@ async function validateGitLabToken(accessToken) {
|
|
|
177
229
|
return false;
|
|
178
230
|
}
|
|
179
231
|
}
|
|
180
|
-
async function exchangeGitLabAuthCode(code, redirectUri, config) {
|
|
181
|
-
const url = `${
|
|
232
|
+
async function exchangeGitLabAuthCode(code, redirectUri, config, app = (0, oauth_app_1.defaultOAuthApp)(config)) {
|
|
233
|
+
const url = `${app.baseUrl}/oauth/token`;
|
|
182
234
|
const params = {
|
|
183
|
-
|
|
235
|
+
...clientParams(app),
|
|
184
236
|
code: code,
|
|
185
237
|
grant_type: 'authorization_code',
|
|
186
238
|
redirect_uri: redirectUri,
|
|
187
239
|
};
|
|
188
|
-
if (config.gitlabClientSecret) {
|
|
189
|
-
params.client_secret = config.gitlabClientSecret;
|
|
190
|
-
}
|
|
191
240
|
(0, logger_1.logDebug)('Exchanging GitLab authorization code for tokens', { redirectUri });
|
|
192
241
|
const response = await (0, fetch_1.enhancedFetch)(url, {
|
|
193
242
|
method: 'POST',
|
|
@@ -196,23 +245,36 @@ async function exchangeGitLabAuthCode(code, redirectUri, config) {
|
|
|
196
245
|
Accept: 'application/json',
|
|
197
246
|
},
|
|
198
247
|
body: new URLSearchParams(params),
|
|
199
|
-
...
|
|
248
|
+
...oauthFetchOpts(app.baseUrl),
|
|
200
249
|
});
|
|
201
250
|
await throwOnHttpError(response, 'exchange authorization code');
|
|
202
251
|
const data = (await response.json());
|
|
203
252
|
(0, logger_1.logInfo)('GitLab authorization code exchanged successfully');
|
|
204
253
|
return data;
|
|
205
254
|
}
|
|
206
|
-
function
|
|
207
|
-
const
|
|
255
|
+
async function revokeGitLabToken(token, config, app = (0, oauth_app_1.defaultOAuthApp)(config)) {
|
|
256
|
+
const response = await (0, fetch_1.enhancedFetch)(`${app.baseUrl}/oauth/revoke`, {
|
|
257
|
+
method: 'POST',
|
|
258
|
+
headers: {
|
|
259
|
+
'Content-Type': 'application/x-www-form-urlencoded',
|
|
260
|
+
Accept: 'application/json',
|
|
261
|
+
},
|
|
262
|
+
body: new URLSearchParams({ ...clientParams(app), token }),
|
|
263
|
+
...oauthFetchOpts(app.baseUrl),
|
|
264
|
+
});
|
|
265
|
+
await throwOnHttpError(response, 'revoke GitLab token');
|
|
266
|
+
(0, logger_1.logInfo)('GitLab token revoked');
|
|
267
|
+
}
|
|
268
|
+
function buildGitLabAuthUrl(config, redirectUri, state, app = (0, oauth_app_1.defaultOAuthApp)(config)) {
|
|
269
|
+
const scopes = app.scopes.replaceAll(',', ' ');
|
|
208
270
|
const params = new URLSearchParams({
|
|
209
|
-
client_id:
|
|
271
|
+
client_id: app.clientId,
|
|
210
272
|
redirect_uri: redirectUri,
|
|
211
273
|
response_type: 'code',
|
|
212
274
|
state: state,
|
|
213
275
|
scope: scopes,
|
|
214
276
|
});
|
|
215
|
-
return `${
|
|
277
|
+
return `${app.baseUrl}/oauth/authorize?${params.toString()}`;
|
|
216
278
|
}
|
|
217
279
|
function sleep(ms) {
|
|
218
280
|
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gitlab-device-flow.js","sourceRoot":"","sources":["../../../src/oauth/gitlab-device-flow.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"gitlab-device-flow.js","sourceRoot":"","sources":["../../../src/oauth/gitlab-device-flow.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare const GITLAB_REQUEST_MAX_MS: number;
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.GITLAB_REQUEST_MAX_MS = void 0;
|
|
4
|
+
const config_1 = require("../config");
|
|
5
|
+
exports.GITLAB_REQUEST_MAX_MS = 2 * config_1.CONNECT_TIMEOUT_MS + config_1.HEADERS_TIMEOUT_MS + config_1.BODY_TIMEOUT_MS;
|
|
6
|
+
//# sourceMappingURL=gitlab-request-bound.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"gitlab-request-bound.js","sourceRoot":"","sources":["../../../src/oauth/gitlab-request-bound.ts"],"names":[],"mappings":";;;AAOA,sCAAoF;AAEvE,QAAA,qBAAqB,GAAG,CAAC,GAAG,2BAAkB,GAAG,2BAAkB,GAAG,wBAAe,CAAC"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import type { OAuthConfig } from './config';
|
|
2
|
+
import type { OAuthSession } from './types';
|
|
3
|
+
export declare class GitLabGrantRevokedError extends Error {
|
|
4
|
+
constructor(message: string, options?: ErrorOptions);
|
|
5
|
+
}
|
|
6
|
+
export declare function withFreshGitLabToken(session: OAuthSession, config: OAuthConfig): Promise<OAuthSession | undefined>;
|
|
@@ -0,0 +1,130 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.GitLabGrantRevokedError = void 0;
|
|
4
|
+
exports.withFreshGitLabToken = withFreshGitLabToken;
|
|
5
|
+
const session_store_1 = require("./session-store");
|
|
6
|
+
const gitlab_device_flow_1 = require("./gitlab-device-flow");
|
|
7
|
+
const instance_app_1 = require("./instance-app");
|
|
8
|
+
const token_utils_1 = require("./token-utils");
|
|
9
|
+
const gitlab_request_bound_1 = require("./gitlab-request-bound");
|
|
10
|
+
const logger_1 = require("../logger");
|
|
11
|
+
const STORE_BUDGET_MS = 15_000;
|
|
12
|
+
const REFRESH_LEASE_MS = gitlab_request_bound_1.GITLAB_REQUEST_MAX_MS + STORE_BUDGET_MS;
|
|
13
|
+
const LEASE_POLL_MS = 200;
|
|
14
|
+
const STORE_RETRY_MS = 200;
|
|
15
|
+
class GitLabGrantRevokedError extends Error {
|
|
16
|
+
constructor(message, options) {
|
|
17
|
+
super(message, options);
|
|
18
|
+
this.name = 'GitLabGrantRevokedError';
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
exports.GitLabGrantRevokedError = GitLabGrantRevokedError;
|
|
22
|
+
function isGrantRejection(error) {
|
|
23
|
+
return error instanceof gitlab_device_flow_1.GitLabOAuthHttpError && error.oauthError === 'invalid_grant';
|
|
24
|
+
}
|
|
25
|
+
const inflight = new Map();
|
|
26
|
+
function releaseLease(sessionId, leaseUntil) {
|
|
27
|
+
return session_store_1.sessionStore.releaseGitLabRefresh(sessionId, leaseUntil).catch((error) => {
|
|
28
|
+
(0, logger_1.logWarn)('Failed to release GitLab refresh lease', { err: error });
|
|
29
|
+
});
|
|
30
|
+
}
|
|
31
|
+
async function storeRefreshedTokens(sessionId, updates, leaseUntil, delay = STORE_RETRY_MS) {
|
|
32
|
+
try {
|
|
33
|
+
return await session_store_1.sessionStore.updateSession(sessionId, updates);
|
|
34
|
+
}
|
|
35
|
+
catch (error) {
|
|
36
|
+
if (Date.now() + delay >= leaseUntil)
|
|
37
|
+
throw error;
|
|
38
|
+
(0, logger_1.logWarn)('Storing refreshed GitLab tokens failed, retrying', { err: error });
|
|
39
|
+
await sleep(delay);
|
|
40
|
+
return storeRefreshedTokens(sessionId, updates, leaseUntil, delay * 2);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
async function revokeOrphanedTokens(accessToken, config, app) {
|
|
44
|
+
try {
|
|
45
|
+
await (0, gitlab_device_flow_1.revokeGitLabToken)(accessToken, config, app);
|
|
46
|
+
}
|
|
47
|
+
catch (error) {
|
|
48
|
+
(0, logger_1.logWarn)('Failed to revoke GitLab tokens of a removed session', { err: error });
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
function sleep(ms) {
|
|
52
|
+
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
53
|
+
}
|
|
54
|
+
async function refreshHoldingLease(session, spentToken, config, leaseUntil) {
|
|
55
|
+
let tokens;
|
|
56
|
+
let app;
|
|
57
|
+
try {
|
|
58
|
+
app = await (0, instance_app_1.oauthAppFor)(config, session.gitlabApiUrl);
|
|
59
|
+
if (!app) {
|
|
60
|
+
throw new GitLabGrantRevokedError('GitLab instance is no longer configured');
|
|
61
|
+
}
|
|
62
|
+
tokens = await (0, gitlab_device_flow_1.refreshGitLabToken)(spentToken, config, app);
|
|
63
|
+
}
|
|
64
|
+
catch (error) {
|
|
65
|
+
await releaseLease(session.id, leaseUntil);
|
|
66
|
+
const current = await session_store_1.sessionStore.getSession(session.id);
|
|
67
|
+
if (current &&
|
|
68
|
+
current.gitlabRefreshToken !== spentToken &&
|
|
69
|
+
!(0, token_utils_1.isTokenExpiringSoon)(current.gitlabTokenExpiry)) {
|
|
70
|
+
return current;
|
|
71
|
+
}
|
|
72
|
+
if (isGrantRejection(error)) {
|
|
73
|
+
throw new GitLabGrantRevokedError('GitLab refused the refresh token', { cause: error });
|
|
74
|
+
}
|
|
75
|
+
throw error;
|
|
76
|
+
}
|
|
77
|
+
const updates = {
|
|
78
|
+
gitlabAccessToken: tokens.access_token,
|
|
79
|
+
gitlabRefreshToken: tokens.refresh_token,
|
|
80
|
+
gitlabTokenExpiry: (0, token_utils_1.calculateTokenExpiry)(tokens.expires_in),
|
|
81
|
+
...(tokens.scope !== undefined && {
|
|
82
|
+
gitlabScopes: tokens.scope.split(/\s+/).filter(Boolean),
|
|
83
|
+
}),
|
|
84
|
+
};
|
|
85
|
+
try {
|
|
86
|
+
if (!(await storeRefreshedTokens(session.id, updates, leaseUntil))) {
|
|
87
|
+
await revokeOrphanedTokens(tokens.access_token, config, app);
|
|
88
|
+
return undefined;
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
finally {
|
|
92
|
+
await releaseLease(session.id, leaseUntil);
|
|
93
|
+
}
|
|
94
|
+
(0, logger_1.logDebug)('GitLab token refreshed', { sessionId: (0, logger_1.truncateId)(session.id) });
|
|
95
|
+
return session_store_1.sessionStore.getSession(session.id);
|
|
96
|
+
}
|
|
97
|
+
async function refreshSession(session, config) {
|
|
98
|
+
const spentToken = session.gitlabRefreshToken;
|
|
99
|
+
const deadline = Date.now() + REFRESH_LEASE_MS + 2 * LEASE_POLL_MS;
|
|
100
|
+
return claimOrWait(session, spentToken, config, deadline);
|
|
101
|
+
}
|
|
102
|
+
async function claimOrWait(session, spentToken, config, deadline) {
|
|
103
|
+
const now = Date.now();
|
|
104
|
+
const leaseUntil = now + REFRESH_LEASE_MS;
|
|
105
|
+
if (await session_store_1.sessionStore.claimGitLabRefresh(session.id, spentToken, now, leaseUntil)) {
|
|
106
|
+
return refreshHoldingLease(session, spentToken, config, leaseUntil);
|
|
107
|
+
}
|
|
108
|
+
const current = await session_store_1.sessionStore.getSession(session.id);
|
|
109
|
+
if (!current)
|
|
110
|
+
return undefined;
|
|
111
|
+
if (current.gitlabRefreshToken !== spentToken)
|
|
112
|
+
return current;
|
|
113
|
+
if (Date.now() >= deadline) {
|
|
114
|
+
throw new Error('GitLab token refresh on another replica did not finish');
|
|
115
|
+
}
|
|
116
|
+
await sleep(LEASE_POLL_MS);
|
|
117
|
+
return claimOrWait(session, spentToken, config, deadline);
|
|
118
|
+
}
|
|
119
|
+
async function withFreshGitLabToken(session, config) {
|
|
120
|
+
if (!(0, token_utils_1.isTokenExpiringSoon)(session.gitlabTokenExpiry)) {
|
|
121
|
+
return session;
|
|
122
|
+
}
|
|
123
|
+
let pending = inflight.get(session.id);
|
|
124
|
+
if (!pending) {
|
|
125
|
+
pending = refreshSession(session, config).finally(() => inflight.delete(session.id));
|
|
126
|
+
inflight.set(session.id, pending);
|
|
127
|
+
}
|
|
128
|
+
return pending;
|
|
129
|
+
}
|
|
130
|
+
//# sourceMappingURL=gitlab-token-refresh.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"gitlab-token-refresh.js","sourceRoot":"","sources":["../../../src/oauth/gitlab-token-refresh.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function grantedGitlabScopes(scope: string | undefined, requested: string[] | undefined): string[] | undefined;
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.grantedGitlabScopes = grantedGitlabScopes;
|
|
4
|
+
function grantedGitlabScopes(scope, requested) {
|
|
5
|
+
return scope === undefined ? requested : scope.split(/\s+/).filter(Boolean);
|
|
6
|
+
}
|
|
7
|
+
//# sourceMappingURL=granted-scopes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"granted-scopes.js","sourceRoot":"","sources":["../../../src/oauth/granted-scopes.ts"],"names":[],"mappings":";;AAKA,kDAKC;AALD,SAAgB,mBAAmB,CACjC,KAAyB,EACzB,SAA+B;IAE/B,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AAC9E,CAAC"}
|
|
@@ -6,5 +6,5 @@ export { createStorageBackend, getStorageType, validateStorageConfig, MemoryStor
|
|
|
6
6
|
export type { SessionStorageBackend, StorageConfig, SessionStorageStats, StorageData, } from './storage';
|
|
7
7
|
export { runWithTokenContext, getTokenContext, getGitLabTokenFromContext, getGitLabUserIdFromContext, getGitLabUsernameFromContext, getSessionIdFromContext, getGitLabApiUrlFromContext, getInstanceLabelFromContext, isInOAuthContext, } from './token-context';
|
|
8
8
|
export { createJWT, verifyJWT, verifyMCPToken, generateCodeVerifier, generateCodeChallenge, verifyCodeChallenge, generateRandomString, generateUUID, generateAuthorizationCode, generateSessionId, generateRefreshToken, isTokenExpiringSoon, calculateTokenExpiry, } from './token-utils';
|
|
9
|
-
export { initiateDeviceFlow, pollDeviceFlowOnce, pollForToken, refreshGitLabToken, getGitLabUser, validateGitLabToken, exchangeGitLabAuthCode, buildGitLabAuthUrl, } from './gitlab-device-flow';
|
|
10
|
-
export { metadataHandler, protectedResourceHandler, getBaseUrl, authorizeHandler, pollHandler, callbackHandler, tokenHandler, registerHandler, getRegisteredClient, isValidRedirectUri, } from './endpoints/index';
|
|
9
|
+
export { initiateDeviceFlow, pollDeviceFlowOnce, pollForToken, refreshGitLabToken, getGitLabUser, validateGitLabToken, exchangeGitLabAuthCode, buildGitLabAuthUrl, revokeGitLabToken, } from './gitlab-device-flow';
|
|
10
|
+
export { metadataHandler, protectedResourceHandler, getBaseUrl, authorizeHandler, pollHandler, callbackHandler, tokenHandler, registerHandler, getRegisteredClient, isValidRedirectUri, revokeHandler, } from './endpoints/index';
|
package/dist/src/oauth/index.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
exports.isValidRedirectUri = exports.getRegisteredClient = exports.registerHandler = exports.tokenHandler = exports.callbackHandler = exports.pollHandler = void 0;
|
|
3
|
+
exports.getBaseUrl = exports.protectedResourceHandler = exports.metadataHandler = exports.revokeGitLabToken = exports.buildGitLabAuthUrl = exports.exchangeGitLabAuthCode = exports.validateGitLabToken = exports.getGitLabUser = exports.refreshGitLabToken = exports.pollForToken = exports.pollDeviceFlowOnce = exports.initiateDeviceFlow = exports.calculateTokenExpiry = exports.isTokenExpiringSoon = exports.generateRefreshToken = exports.generateSessionId = exports.generateAuthorizationCode = exports.generateUUID = exports.generateRandomString = exports.verifyCodeChallenge = exports.generateCodeChallenge = exports.generateCodeVerifier = exports.verifyMCPToken = exports.verifyJWT = exports.createJWT = exports.isInOAuthContext = exports.getInstanceLabelFromContext = exports.getGitLabApiUrlFromContext = exports.getSessionIdFromContext = exports.getGitLabUsernameFromContext = exports.getGitLabUserIdFromContext = exports.getGitLabTokenFromContext = exports.getTokenContext = exports.runWithTokenContext = exports.STORAGE_DATA_VERSION = exports.FileStorageBackend = exports.MemoryStorageBackend = exports.validateStorageConfig = exports.getStorageType = exports.createStorageBackend = exports.SessionStore = exports.sessionStore = exports.isAuthenticationConfigured = exports.isStaticTokenConfigured = exports.resetOAuthConfigCache = exports.getAuthModeDescription = exports.isOAuthEnabled = exports.ConfigurationError = exports.validateStaticConfig = exports.loadOAuthConfig = void 0;
|
|
4
|
+
exports.revokeHandler = exports.isValidRedirectUri = exports.getRegisteredClient = exports.registerHandler = exports.tokenHandler = exports.callbackHandler = exports.pollHandler = exports.authorizeHandler = void 0;
|
|
5
5
|
var config_1 = require("./config");
|
|
6
6
|
Object.defineProperty(exports, "loadOAuthConfig", { enumerable: true, get: function () { return config_1.loadOAuthConfig; } });
|
|
7
7
|
Object.defineProperty(exports, "validateStaticConfig", { enumerable: true, get: function () { return config_1.validateStaticConfig; } });
|
|
@@ -54,6 +54,7 @@ Object.defineProperty(exports, "getGitLabUser", { enumerable: true, get: functio
|
|
|
54
54
|
Object.defineProperty(exports, "validateGitLabToken", { enumerable: true, get: function () { return gitlab_device_flow_1.validateGitLabToken; } });
|
|
55
55
|
Object.defineProperty(exports, "exchangeGitLabAuthCode", { enumerable: true, get: function () { return gitlab_device_flow_1.exchangeGitLabAuthCode; } });
|
|
56
56
|
Object.defineProperty(exports, "buildGitLabAuthUrl", { enumerable: true, get: function () { return gitlab_device_flow_1.buildGitLabAuthUrl; } });
|
|
57
|
+
Object.defineProperty(exports, "revokeGitLabToken", { enumerable: true, get: function () { return gitlab_device_flow_1.revokeGitLabToken; } });
|
|
57
58
|
var index_1 = require("./endpoints/index");
|
|
58
59
|
Object.defineProperty(exports, "metadataHandler", { enumerable: true, get: function () { return index_1.metadataHandler; } });
|
|
59
60
|
Object.defineProperty(exports, "protectedResourceHandler", { enumerable: true, get: function () { return index_1.protectedResourceHandler; } });
|
|
@@ -65,4 +66,5 @@ Object.defineProperty(exports, "tokenHandler", { enumerable: true, get: function
|
|
|
65
66
|
Object.defineProperty(exports, "registerHandler", { enumerable: true, get: function () { return index_1.registerHandler; } });
|
|
66
67
|
Object.defineProperty(exports, "getRegisteredClient", { enumerable: true, get: function () { return index_1.getRegisteredClient; } });
|
|
67
68
|
Object.defineProperty(exports, "isValidRedirectUri", { enumerable: true, get: function () { return index_1.isValidRedirectUri; } });
|
|
69
|
+
Object.defineProperty(exports, "revokeHandler", { enumerable: true, get: function () { return index_1.revokeHandler; } });
|
|
68
70
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/oauth/index.ts"],"names":[],"mappings":";;;;AAQA,mCASkB;AARhB,yGAAA,eAAe,OAAA;AACf,8GAAA,oBAAoB,OAAA;AACpB,4GAAA,kBAAkB,OAAA;AAClB,wGAAA,cAAc,OAAA;AACd,gHAAA,sBAAsB,OAAA;AACtB,+GAAA,qBAAqB,OAAA;AACrB,iHAAA,uBAAuB,OAAA;AACvB,oHAAA,0BAA0B,OAAA;AAsB5B,iDAA6D;AAApD,6GAAA,YAAY,OAAA;AAAE,6GAAA,YAAY,OAAA;AAGnC,qCAOmB;AANjB,+GAAA,oBAAoB,OAAA;AACpB,yGAAA,cAAc,OAAA;AACd,gHAAA,qBAAqB,OAAA;AACrB,+GAAA,oBAAoB,OAAA;AACpB,6GAAA,kBAAkB,OAAA;AAClB,+GAAA,oBAAoB,OAAA;AAUtB,iDAUyB;AATvB,oHAAA,mBAAmB,OAAA;AACnB,gHAAA,eAAe,OAAA;AACf,0HAAA,yBAAyB,OAAA;AACzB,2HAAA,0BAA0B,OAAA;AAC1B,6HAAA,4BAA4B,OAAA;AAC5B,wHAAA,uBAAuB,OAAA;AACvB,2HAAA,0BAA0B,OAAA;AAC1B,4HAAA,2BAA2B,OAAA;AAC3B,iHAAA,gBAAgB,OAAA;AAIlB,6CAcuB;AAbrB,wGAAA,SAAS,OAAA;AACT,wGAAA,SAAS,OAAA;AACT,6GAAA,cAAc,OAAA;AACd,mHAAA,oBAAoB,OAAA;AACpB,oHAAA,qBAAqB,OAAA;AACrB,kHAAA,mBAAmB,OAAA;AACnB,mHAAA,oBAAoB,OAAA;AACpB,2GAAA,YAAY,OAAA;AACZ,wHAAA,yBAAyB,OAAA;AACzB,gHAAA,iBAAiB,OAAA;AACjB,mHAAA,oBAAoB,OAAA;AACpB,kHAAA,mBAAmB,OAAA;AACnB,mHAAA,oBAAoB,OAAA;AAItB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/oauth/index.ts"],"names":[],"mappings":";;;;AAQA,mCASkB;AARhB,yGAAA,eAAe,OAAA;AACf,8GAAA,oBAAoB,OAAA;AACpB,4GAAA,kBAAkB,OAAA;AAClB,wGAAA,cAAc,OAAA;AACd,gHAAA,sBAAsB,OAAA;AACtB,+GAAA,qBAAqB,OAAA;AACrB,iHAAA,uBAAuB,OAAA;AACvB,oHAAA,0BAA0B,OAAA;AAsB5B,iDAA6D;AAApD,6GAAA,YAAY,OAAA;AAAE,6GAAA,YAAY,OAAA;AAGnC,qCAOmB;AANjB,+GAAA,oBAAoB,OAAA;AACpB,yGAAA,cAAc,OAAA;AACd,gHAAA,qBAAqB,OAAA;AACrB,+GAAA,oBAAoB,OAAA;AACpB,6GAAA,kBAAkB,OAAA;AAClB,+GAAA,oBAAoB,OAAA;AAUtB,iDAUyB;AATvB,oHAAA,mBAAmB,OAAA;AACnB,gHAAA,eAAe,OAAA;AACf,0HAAA,yBAAyB,OAAA;AACzB,2HAAA,0BAA0B,OAAA;AAC1B,6HAAA,4BAA4B,OAAA;AAC5B,wHAAA,uBAAuB,OAAA;AACvB,2HAAA,0BAA0B,OAAA;AAC1B,4HAAA,2BAA2B,OAAA;AAC3B,iHAAA,gBAAgB,OAAA;AAIlB,6CAcuB;AAbrB,wGAAA,SAAS,OAAA;AACT,wGAAA,SAAS,OAAA;AACT,6GAAA,cAAc,OAAA;AACd,mHAAA,oBAAoB,OAAA;AACpB,oHAAA,qBAAqB,OAAA;AACrB,kHAAA,mBAAmB,OAAA;AACnB,mHAAA,oBAAoB,OAAA;AACpB,2GAAA,YAAY,OAAA;AACZ,wHAAA,yBAAyB,OAAA;AACzB,gHAAA,iBAAiB,OAAA;AACjB,mHAAA,oBAAoB,OAAA;AACpB,kHAAA,mBAAmB,OAAA;AACnB,mHAAA,oBAAoB,OAAA;AAItB,2DAU8B;AAT5B,wHAAA,kBAAkB,OAAA;AAClB,wHAAA,kBAAkB,OAAA;AAClB,kHAAA,YAAY,OAAA;AACZ,wHAAA,kBAAkB,OAAA;AAClB,mHAAA,aAAa,OAAA;AACb,yHAAA,mBAAmB,OAAA;AACnB,4HAAA,sBAAsB,OAAA;AACtB,wHAAA,kBAAkB,OAAA;AAClB,uHAAA,iBAAiB,OAAA;AAInB,2CAY2B;AAXzB,wGAAA,eAAe,OAAA;AACf,iHAAA,wBAAwB,OAAA;AACxB,mGAAA,UAAU,OAAA;AACV,yGAAA,gBAAgB,OAAA;AAChB,oGAAA,WAAW,OAAA;AACX,wGAAA,eAAe,OAAA;AACf,qGAAA,YAAY,OAAA;AACZ,wGAAA,eAAe,OAAA;AACf,4GAAA,mBAAmB,OAAA;AACnB,2GAAA,kBAAkB,OAAA;AAClB,sGAAA,aAAa,OAAA"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import type { OAuthConfig } from './config';
|
|
2
|
+
import { type GitLabOAuthApp } from './oauth-app';
|
|
3
|
+
export declare function selectableOAuthApps(config: OAuthConfig): Promise<GitLabOAuthApp[]>;
|
|
4
|
+
export declare function oauthAppFor(config: OAuthConfig, instanceUrl: string | undefined): Promise<GitLabOAuthApp | undefined>;
|