@structured-world/gitlab-mcp 11.0.0 → 12.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.
Files changed (173) hide show
  1. package/README.md +4 -4
  2. package/README.md.in +1 -1
  3. package/dist/src/accounts/chat-accounts.d.ts +17 -0
  4. package/dist/src/accounts/chat-accounts.js +245 -0
  5. package/dist/src/accounts/chat-accounts.js.map +1 -0
  6. package/dist/src/accounts/instance-tokens.d.ts +2 -0
  7. package/dist/src/accounts/instance-tokens.js +43 -0
  8. package/dist/src/accounts/instance-tokens.js.map +1 -0
  9. package/dist/src/accounts/link.d.ts +16 -0
  10. package/dist/src/accounts/link.js +469 -0
  11. package/dist/src/accounts/link.js.map +1 -0
  12. package/dist/src/accounts/token-account.d.ts +6 -0
  13. package/dist/src/accounts/token-account.js +13 -0
  14. package/dist/src/accounts/token-account.js.map +1 -0
  15. package/dist/src/cli/init/config-generator.d.ts +3 -2
  16. package/dist/src/cli/init/config-generator.js +15 -0
  17. package/dist/src/cli/init/config-generator.js.map +1 -1
  18. package/dist/src/cli/init/types.d.ts +7 -2
  19. package/dist/src/cli/init/types.js +9 -0
  20. package/dist/src/cli/init/types.js.map +1 -1
  21. package/dist/src/cli/init/wizard.js +31 -1
  22. package/dist/src/cli/init/wizard.js.map +1 -1
  23. package/dist/src/cli/install/codex.d.ts +25 -0
  24. package/dist/src/cli/install/codex.js +261 -0
  25. package/dist/src/cli/install/codex.js.map +1 -0
  26. package/dist/src/cli/install/detector.js +22 -0
  27. package/dist/src/cli/install/detector.js.map +1 -1
  28. package/dist/src/cli/install/index.d.ts +2 -1
  29. package/dist/src/cli/install/index.js +3 -1
  30. package/dist/src/cli/install/index.js.map +1 -1
  31. package/dist/src/cli/install/install-command.d.ts +5 -2
  32. package/dist/src/cli/install/install-command.js +52 -8
  33. package/dist/src/cli/install/install-command.js.map +1 -1
  34. package/dist/src/cli/install/installers.d.ts +8 -8
  35. package/dist/src/cli/install/installers.js +18 -3
  36. package/dist/src/cli/install/installers.js.map +1 -1
  37. package/dist/src/cli/install/notes.d.ts +2 -0
  38. package/dist/src/cli/install/notes.js +8 -0
  39. package/dist/src/cli/install/notes.js.map +1 -0
  40. package/dist/src/cli/install/types.d.ts +1 -0
  41. package/dist/src/cli/install/types.js +12 -0
  42. package/dist/src/cli/install/types.js.map +1 -1
  43. package/dist/src/cli/plugin/build.d.ts +23 -0
  44. package/dist/src/cli/plugin/build.js +165 -0
  45. package/dist/src/cli/plugin/build.js.map +1 -0
  46. package/dist/src/cli/plugin/command.d.ts +4 -0
  47. package/dist/src/cli/plugin/command.js +89 -0
  48. package/dist/src/cli/plugin/command.js.map +1 -0
  49. package/dist/src/cli/plugin/index.d.ts +5 -0
  50. package/dist/src/cli/plugin/index.js +15 -0
  51. package/dist/src/cli/plugin/index.js.map +1 -0
  52. package/dist/src/cli/plugin/listing.d.ts +21 -0
  53. package/dist/src/cli/plugin/listing.js +44 -0
  54. package/dist/src/cli/plugin/listing.js.map +1 -0
  55. package/dist/src/cli/plugin/validate.d.ts +21 -0
  56. package/dist/src/cli/plugin/validate.js +496 -0
  57. package/dist/src/cli/plugin/validate.js.map +1 -0
  58. package/dist/src/cli/plugin/zip.d.ts +6 -0
  59. package/dist/src/cli/plugin/zip.js +83 -0
  60. package/dist/src/cli/plugin/zip.js.map +1 -0
  61. package/dist/src/cli/setup/flows/configure-existing.js +5 -0
  62. package/dist/src/cli/setup/flows/configure-existing.js.map +1 -1
  63. package/dist/src/cli/setup/flows/local-setup.js +3 -0
  64. package/dist/src/cli/setup/flows/local-setup.js.map +1 -1
  65. package/dist/src/cli-utils.d.ts +2 -0
  66. package/dist/src/cli-utils.js +6 -0
  67. package/dist/src/cli-utils.js.map +1 -1
  68. package/dist/src/config/instances-schema.d.ts +2 -0
  69. package/dist/src/config/instances-schema.js +5 -0
  70. package/dist/src/config/instances-schema.js.map +1 -1
  71. package/dist/src/configuration/service.d.ts +0 -1
  72. package/dist/src/configuration/service.js +0 -17
  73. package/dist/src/configuration/service.js.map +1 -1
  74. package/dist/src/contracts/storage.d.ts +2 -2
  75. package/dist/src/entities/context/accounts.d.ts +19 -0
  76. package/dist/src/entities/context/accounts.js +115 -0
  77. package/dist/src/entities/context/accounts.js.map +1 -0
  78. package/dist/src/entities/context/context-manager.d.ts +0 -1
  79. package/dist/src/entities/context/context-manager.js +0 -82
  80. package/dist/src/entities/context/context-manager.js.map +1 -1
  81. package/dist/src/entities/context/handlers.d.ts +3 -1
  82. package/dist/src/entities/context/handlers.js +9 -0
  83. package/dist/src/entities/context/handlers.js.map +1 -1
  84. package/dist/src/entities/context/output-schema.d.ts +49 -1
  85. package/dist/src/entities/context/output-schema.js +28 -0
  86. package/dist/src/entities/context/output-schema.js.map +1 -1
  87. package/dist/src/entities/context/registry.js +1 -1
  88. package/dist/src/entities/context/registry.js.map +1 -1
  89. package/dist/src/entities/context/schema.d.ts +26 -0
  90. package/dist/src/entities/context/schema.js +30 -0
  91. package/dist/src/entities/context/schema.js.map +1 -1
  92. package/dist/src/entities/core/schema-readonly.d.ts +4 -4
  93. package/dist/src/entities/environments/schema-readonly.d.ts +1 -1
  94. package/dist/src/entities/mrs/schema.d.ts +1 -1
  95. package/dist/src/entities/pipelines/registry.js +20 -29
  96. package/dist/src/entities/pipelines/registry.js.map +1 -1
  97. package/dist/src/entities/pipelines/schema-readonly.d.ts +8 -8
  98. package/dist/src/entities/pipelines/schema-readonly.js +5 -2
  99. package/dist/src/entities/pipelines/schema-readonly.js.map +1 -1
  100. package/dist/src/entities/pipelines/trace.d.ts +20 -0
  101. package/dist/src/entities/pipelines/trace.js +156 -0
  102. package/dist/src/entities/pipelines/trace.js.map +1 -0
  103. package/dist/src/handlers.js +142 -57
  104. package/dist/src/handlers.js.map +1 -1
  105. package/dist/src/main.js +23 -5
  106. package/dist/src/main.js.map +1 -1
  107. package/dist/src/mcp-server-context.d.ts +3 -0
  108. package/dist/src/mcp-server-context.js +13 -0
  109. package/dist/src/mcp-server-context.js.map +1 -0
  110. package/dist/src/middleware/oauth-auth.js +5 -2
  111. package/dist/src/middleware/oauth-auth.js.map +1 -1
  112. package/dist/src/oauth/code-exchange.d.ts +7 -0
  113. package/dist/src/oauth/code-exchange.js +38 -0
  114. package/dist/src/oauth/code-exchange.js.map +1 -0
  115. package/dist/src/oauth/endpoints/callback.js +15 -17
  116. package/dist/src/oauth/endpoints/callback.js.map +1 -1
  117. package/dist/src/oauth/endpoints/revoke.js +2 -21
  118. package/dist/src/oauth/endpoints/revoke.js.map +1 -1
  119. package/dist/src/oauth/gitlab-token-refresh.d.ts +1 -0
  120. package/dist/src/oauth/gitlab-token-refresh.js +17 -0
  121. package/dist/src/oauth/gitlab-token-refresh.js.map +1 -1
  122. package/dist/src/oauth/grant-revocation.d.ts +10 -0
  123. package/dist/src/oauth/grant-revocation.js +179 -0
  124. package/dist/src/oauth/grant-revocation.js.map +1 -0
  125. package/dist/src/oauth/session-store.d.ts +8 -1
  126. package/dist/src/oauth/session-store.js +36 -3
  127. package/dist/src/oauth/session-store.js.map +1 -1
  128. package/dist/src/oauth/storage/file.d.ts +7 -2
  129. package/dist/src/oauth/storage/file.js +30 -10
  130. package/dist/src/oauth/storage/file.js.map +1 -1
  131. package/dist/src/oauth/storage/memory.d.ts +13 -2
  132. package/dist/src/oauth/storage/memory.js +211 -14
  133. package/dist/src/oauth/storage/memory.js.map +1 -1
  134. package/dist/src/oauth/storage/types.d.ts +21 -1
  135. package/dist/src/oauth/storage/types.js +6 -1
  136. package/dist/src/oauth/storage/types.js.map +1 -1
  137. package/dist/src/oauth/types.d.ts +11 -0
  138. package/dist/src/registry-manager.js +7 -0
  139. package/dist/src/registry-manager.js.map +1 -1
  140. package/dist/src/server.js +21 -16
  141. package/dist/src/server.js.map +1 -1
  142. package/dist/src/services/AdminDetector.d.ts +1 -1
  143. package/dist/src/services/AdminDetector.js +4 -4
  144. package/dist/src/services/AdminDetector.js.map +1 -1
  145. package/dist/src/services/ConnectionManager.d.ts +0 -1
  146. package/dist/src/services/ConnectionManager.js +18 -52
  147. package/dist/src/services/ConnectionManager.js.map +1 -1
  148. package/dist/src/services/HealthMonitor.js +4 -2
  149. package/dist/src/services/HealthMonitor.js.map +1 -1
  150. package/dist/src/services/NamespaceTierDetector.js +26 -27
  151. package/dist/src/services/NamespaceTierDetector.js.map +1 -1
  152. package/dist/src/services/TokenScopeDetector.d.ts +1 -1
  153. package/dist/src/services/TokenScopeDetector.js +3 -3
  154. package/dist/src/services/TokenScopeDetector.js.map +1 -1
  155. package/dist/src/session-manager.d.ts +1 -1
  156. package/dist/src/session-manager.js +13 -5
  157. package/dist/src/session-manager.js.map +1 -1
  158. package/dist/src/utils/fetch.d.ts +1 -1
  159. package/dist/src/utils/fetch.js +10 -5
  160. package/dist/src/utils/fetch.js.map +1 -1
  161. package/dist/src/utils/gitlab-base-url.js +4 -0
  162. package/dist/src/utils/gitlab-base-url.js.map +1 -1
  163. package/dist/tsconfig.build.tsbuildinfo +1 -1
  164. package/package.json +24 -18
  165. package/plugin/assets/composer-icon-dark.png +0 -0
  166. package/plugin/assets/composer-icon-dark.svg +17 -0
  167. package/plugin/assets/composer-icon.png +0 -0
  168. package/plugin/assets/composer-icon.svg +17 -0
  169. package/plugin/assets/logo.png +0 -0
  170. package/plugin/assets/screenshot-1.png +0 -0
  171. package/plugin/assets/screenshot-2.png +0 -0
  172. package/plugin/schemas/mcp.schema.json +120 -0
  173. package/plugin/schemas/plugin.schema.json +65 -0
@@ -0,0 +1,38 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.AccountLinkFlowUnavailableError = void 0;
4
+ exports.exchangeFlowCode = exchangeFlowCode;
5
+ const session_store_1 = require("./session-store");
6
+ const issued_tokens_1 = require("./issued-tokens");
7
+ const gitlab_device_flow_1 = require("./gitlab-device-flow");
8
+ class AccountLinkFlowUnavailableError extends Error {
9
+ constructor() {
10
+ super('The account-link flow is no longer available for this grant');
11
+ }
12
+ }
13
+ exports.AccountLinkFlowUnavailableError = AccountLinkFlowUnavailableError;
14
+ async function exchangeFlowCode(state, flow, code, config, app) {
15
+ let tokens;
16
+ try {
17
+ tokens = await (0, gitlab_device_flow_1.exchangeGitLabAuthCode)(code, flow.callbackUri, config, app);
18
+ }
19
+ catch (error) {
20
+ const current = await session_store_1.sessionStore.getAuthCodeFlow(state);
21
+ if (current?.gitlabTokens)
22
+ return current.gitlabTokens;
23
+ throw error;
24
+ }
25
+ if (flow.link) {
26
+ let active;
27
+ await (0, issued_tokens_1.keepIssuedTokens)(async () => {
28
+ active = await session_store_1.sessionStore.cacheLinkedFlowTokens(flow, tokens);
29
+ });
30
+ if (active === false)
31
+ throw new AccountLinkFlowUnavailableError();
32
+ }
33
+ else {
34
+ await (0, issued_tokens_1.keepIssuedTokens)(() => session_store_1.sessionStore.storeAuthCodeFlow(state, { ...flow, gitlabTokens: tokens }));
35
+ }
36
+ return tokens;
37
+ }
38
+ //# sourceMappingURL=code-exchange.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"code-exchange.js","sourceRoot":"","sources":["../../../src/oauth/code-exchange.ts"],"names":[],"mappings":";;;AAuBA,4CA2BC;AA3CD,mDAA+C;AAC/C,mDAAmD;AACnD,6DAA8D;AAG9D,MAAa,+BAAgC,SAAQ,KAAK;IACxD;QACE,KAAK,CAAC,6DAA6D,CAAC,CAAC;IACvE,CAAC;CACF;AAJD,0EAIC;AAOM,KAAK,UAAU,gBAAgB,CACpC,KAAa,EACb,IAAuB,EACvB,IAAY,EACZ,MAAmB,EACnB,GAAmB;IAEnB,IAAI,MAA2B,CAAC;IAChC,IAAI,CAAC;QACH,MAAM,GAAG,MAAM,IAAA,2CAAsB,EAAC,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7E,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACxB,MAAM,OAAO,GAAG,MAAM,4BAAY,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAC1D,IAAI,OAAO,EAAE,YAAY;YAAE,OAAO,OAAO,CAAC,YAAY,CAAC;QACvD,MAAM,KAAK,CAAC;IACd,CAAC;IACD,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;QACd,IAAI,MAA2B,CAAC;QAChC,MAAM,IAAA,gCAAgB,EAAC,KAAK,IAAI,EAAE;YAChC,MAAM,GAAG,MAAM,4BAAY,CAAC,qBAAqB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAClE,CAAC,CAAC,CAAC;QACH,IAAI,MAAM,KAAK,KAAK;YAAE,MAAM,IAAI,+BAA+B,EAAE,CAAC;IACpE,CAAC;SAAM,CAAC;QACN,MAAM,IAAA,gCAAgB,EAAC,GAAG,EAAE,CAC1B,4BAAY,CAAC,iBAAiB,CAAC,KAAK,EAAE,EAAE,GAAG,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,CACzE,CAAC;IACJ,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
@@ -3,8 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.callbackHandler = callbackHandler;
4
4
  const config_1 = require("../config");
5
5
  const session_store_1 = require("../session-store");
6
- const issued_tokens_1 = require("../issued-tokens");
6
+ const code_exchange_1 = require("../code-exchange");
7
+ const grant_revocation_1 = require("../grant-revocation");
7
8
  const gitlab_device_flow_1 = require("../gitlab-device-flow");
9
+ const link_1 = require("../../accounts/link");
8
10
  const token_utils_1 = require("../token-utils");
9
11
  const logger_1 = require("../../logger");
10
12
  const config_2 = require("../../config");
@@ -30,6 +32,12 @@ async function callbackHandler(req, res) {
30
32
  (0, logger_1.logError)('Failed to read authorization flow', { err: err });
31
33
  return undefined;
32
34
  });
35
+ if (flow)
36
+ await (0, grant_revocation_1.revokeAbandonedFlowGrant)(flow, config);
37
+ if (flow?.link) {
38
+ (0, link_1.failAccountLink)(res, 'GitLab did not authorize the account. Ask for a new link in the chat to try again.');
39
+ return;
40
+ }
33
41
  if (flow) {
34
42
  res.redirect((0, authorization_response_1.authorizationRedirect)(flow.clientRedirectUri, config.issuer, {
35
43
  error,
@@ -78,8 +86,12 @@ async function callbackHandler(req, res) {
78
86
  });
79
87
  return;
80
88
  }
89
+ if (flow.link) {
90
+ await (0, link_1.completeAccountLink)(res, state, flow, code, config);
91
+ return;
92
+ }
81
93
  if (Date.now() > flow.expiresAt) {
82
- await session_store_1.sessionStore.deleteAuthCodeFlow(state).catch(() => false);
94
+ await (0, grant_revocation_1.discardAuthCodeFlow)(state, flow, config);
83
95
  res.status(400).json({
84
96
  error: 'invalid_request',
85
97
  error_description: 'Authorization flow expired. Please start again.',
@@ -91,7 +103,7 @@ async function callbackHandler(req, res) {
91
103
  if (!app) {
92
104
  throw new Error('GitLab instance is no longer configured');
93
105
  }
94
- const gitlabTokens = flow.gitlabTokens ?? (await exchangeCode(state, flow, code, config, app));
106
+ const gitlabTokens = flow.gitlabTokens ?? (await (0, code_exchange_1.exchangeFlowCode)(state, flow, code, config, app));
95
107
  const userInfo = await (0, gitlab_device_flow_1.getGitLabUser)(gitlabTokens.access_token, app.baseUrl);
96
108
  const sessionId = (0, token_utils_1.generateSessionId)();
97
109
  const now = Date.now();
@@ -154,18 +166,4 @@ async function callbackHandler(req, res) {
154
166
  }));
155
167
  }
156
168
  }
157
- async function exchangeCode(state, flow, code, config, app) {
158
- let tokens;
159
- try {
160
- tokens = await (0, gitlab_device_flow_1.exchangeGitLabAuthCode)(code, flow.callbackUri, config, app);
161
- }
162
- catch (error) {
163
- const current = await session_store_1.sessionStore.getAuthCodeFlow(state);
164
- if (current?.gitlabTokens)
165
- return current.gitlabTokens;
166
- throw error;
167
- }
168
- await (0, issued_tokens_1.keepIssuedTokens)(() => session_store_1.sessionStore.storeAuthCodeFlow(state, { ...flow, gitlabTokens: tokens }));
169
- return tokens;
170
- }
171
169
  //# sourceMappingURL=callback.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"callback.js","sourceRoot":"","sources":["../../../../src/oauth/endpoints/callback.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"callback.js","sourceRoot":"","sources":["../../../../src/oauth/endpoints/callback.ts"],"names":[],"mappings":"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"}
@@ -3,9 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.revokeHandler = revokeHandler;
4
4
  const config_1 = require("../config");
5
5
  const session_store_1 = require("../session-store");
6
- const instance_app_1 = require("../instance-app");
7
- const gitlab_device_flow_1 = require("../gitlab-device-flow");
8
- const gitlab_token_refresh_1 = require("../gitlab-token-refresh");
6
+ const grant_revocation_1 = require("../grant-revocation");
9
7
  const logger_1 = require("../../logger");
10
8
  const request_params_1 = require("../request-params");
11
9
  const client_auth_1 = require("../client-auth");
@@ -66,31 +64,14 @@ async function revokeHandler(req, res) {
66
64
  sendError(res, 400, 'invalid_request', 'Token was issued to another client');
67
65
  return;
68
66
  }
69
- let gitlabAccessToken = session.gitlabAccessToken;
70
67
  try {
71
- gitlabAccessToken =
72
- (await (0, gitlab_token_refresh_1.withFreshGitLabToken)(session, config))?.gitlabAccessToken ?? gitlabAccessToken;
73
- }
74
- catch (error) {
75
- (0, logger_1.logWarn)('Could not refresh the GitLab grant before revoking it', { err: error });
76
- }
77
- try {
78
- await session_store_1.sessionStore.deleteSession(session.id);
68
+ await (0, grant_revocation_1.endSession)(session, config);
79
69
  }
80
70
  catch (error) {
81
71
  (0, logger_1.logError)('Token revocation failed', { err: error });
82
72
  sendError(res, 503, 'temporarily_unavailable', 'Revocation is temporarily unavailable');
83
73
  return;
84
74
  }
85
- try {
86
- const app = await (0, instance_app_1.oauthAppFor)(config, session.gitlabApiUrl);
87
- if (app) {
88
- await (0, gitlab_device_flow_1.revokeGitLabToken)(gitlabAccessToken, config, app);
89
- }
90
- }
91
- catch (error) {
92
- (0, logger_1.logWarn)('GitLab token revocation failed', { err: error });
93
- }
94
75
  (0, logger_1.logInfo)('OAuth session revoked', { sessionId: (0, logger_1.truncateId)(session.id) });
95
76
  res.status(200).end();
96
77
  }
@@ -1 +1 @@
1
- {"version":3,"file":"revoke.js","sourceRoot":"","sources":["../../../../src/oauth/endpoints/revoke.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"revoke.js","sourceRoot":"","sources":["../../../../src/oauth/endpoints/revoke.ts"],"names":[],"mappings":"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"}
@@ -3,4 +3,5 @@ import type { OAuthSession } from './types';
3
3
  export declare class GitLabGrantRevokedError extends Error {
4
4
  constructor(message: string, options?: ErrorOptions);
5
5
  }
6
+ export declare function claimSessionLease(sessionId: string, leaseMs: number, deadline?: number): Promise<number | undefined>;
6
7
  export declare function withFreshGitLabToken(session: OAuthSession, config: OAuthConfig): Promise<OAuthSession | undefined>;
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.GitLabGrantRevokedError = void 0;
4
+ exports.claimSessionLease = claimSessionLease;
4
5
  exports.withFreshGitLabToken = withFreshGitLabToken;
5
6
  const session_store_1 = require("./session-store");
6
7
  const gitlab_device_flow_1 = require("./gitlab-device-flow");
@@ -116,6 +117,22 @@ async function claimOrWait(session, spentToken, config, deadline) {
116
117
  await sleep(LEASE_POLL_MS);
117
118
  return claimOrWait(session, spentToken, config, deadline);
118
119
  }
120
+ async function claimSessionLease(sessionId, leaseMs, deadline = Date.now() + REFRESH_LEASE_MS + 2 * LEASE_POLL_MS) {
121
+ const current = await session_store_1.sessionStore.getSession(sessionId);
122
+ if (!current)
123
+ return undefined;
124
+ const now = Date.now();
125
+ const leaseUntil = now + leaseMs;
126
+ const refreshToken = current.gitlabRefreshToken;
127
+ if (await session_store_1.sessionStore.claimGitLabRefresh(sessionId, refreshToken, now, leaseUntil)) {
128
+ return leaseUntil;
129
+ }
130
+ if (Date.now() >= deadline) {
131
+ throw new Error('The session is held by another operation');
132
+ }
133
+ await sleep(LEASE_POLL_MS);
134
+ return claimSessionLease(sessionId, leaseMs, deadline);
135
+ }
119
136
  async function withFreshGitLabToken(session, config) {
120
137
  if (!(0, token_utils_1.isTokenExpiringSoon)(session.gitlabTokenExpiry)) {
121
138
  return session;
@@ -1 +1 @@
1
- {"version":3,"file":"gitlab-token-refresh.js","sourceRoot":"","sources":["../../../src/oauth/gitlab-token-refresh.ts"],"names":[],"mappings":"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"}
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,10 @@
1
+ import type { OAuthConfig } from './config';
2
+ import type { AuthCodeFlowState, OAuthSession } from './types';
3
+ import type { AbandonedFlowGrantHandler } from './storage/types';
4
+ export declare function liveGitLabAccessToken(session: OAuthSession, config: OAuthConfig): Promise<string>;
5
+ export declare function revokeGitLabGrant(session: OAuthSession, accessToken: string, config: OAuthConfig): Promise<void>;
6
+ export declare function endSession(session: OAuthSession, config: OAuthConfig): Promise<void>;
7
+ export declare function endAbandonedFlowGrant(flow: AuthCodeFlowState, config: OAuthConfig, persistTokens: Parameters<AbandonedFlowGrantHandler>[1], leaseUntil?: number): Promise<void>;
8
+ export declare function revokeAbandonedFlowGrant(flow: AuthCodeFlowState, config: OAuthConfig): Promise<void>;
9
+ export declare function startSessionStore(config: OAuthConfig): Promise<void>;
10
+ export declare function discardAuthCodeFlow(state: string, flow: AuthCodeFlowState, config: OAuthConfig): Promise<void>;
@@ -0,0 +1,179 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.liveGitLabAccessToken = liveGitLabAccessToken;
4
+ exports.revokeGitLabGrant = revokeGitLabGrant;
5
+ exports.endSession = endSession;
6
+ exports.endAbandonedFlowGrant = endAbandonedFlowGrant;
7
+ exports.revokeAbandonedFlowGrant = revokeAbandonedFlowGrant;
8
+ exports.startSessionStore = startSessionStore;
9
+ exports.discardAuthCodeFlow = discardAuthCodeFlow;
10
+ const instance_app_1 = require("./instance-app");
11
+ const gitlab_device_flow_1 = require("./gitlab-device-flow");
12
+ const gitlab_token_refresh_1 = require("./gitlab-token-refresh");
13
+ const session_store_1 = require("./session-store");
14
+ const gitlab_request_bound_1 = require("./gitlab-request-bound");
15
+ const logger_1 = require("../logger");
16
+ async function liveGitLabAccessToken(session, config) {
17
+ try {
18
+ return ((await (0, gitlab_token_refresh_1.withFreshGitLabToken)(session, config))?.gitlabAccessToken ?? session.gitlabAccessToken);
19
+ }
20
+ catch (error) {
21
+ (0, logger_1.logWarn)('Could not refresh the GitLab grant before revoking it', { err: error });
22
+ return session.gitlabAccessToken;
23
+ }
24
+ }
25
+ async function revokeGitLabGrant(session, accessToken, config) {
26
+ try {
27
+ const app = await (0, instance_app_1.oauthAppFor)(config, session.gitlabApiUrl);
28
+ if (app)
29
+ await (0, gitlab_device_flow_1.revokeGitLabToken)(accessToken, config, app);
30
+ }
31
+ catch (error) {
32
+ (0, logger_1.logWarn)('GitLab token revocation failed', { err: error });
33
+ }
34
+ }
35
+ const REMOVAL_LEASE_MS = 15_000;
36
+ function releaseRemovalLease(sessionId, leaseUntil) {
37
+ return session_store_1.sessionStore.releaseGitLabRefresh(sessionId, leaseUntil).catch(() => undefined);
38
+ }
39
+ async function grantsToEnd(session, config) {
40
+ const links = session_store_1.sessionStore.linksAccounts();
41
+ const before = links ? await session_store_1.sessionStore.getLinkedSessions(session.id) : [];
42
+ const known = await Promise.all([session, ...before].map(async (account) => ({
43
+ session: account,
44
+ accessToken: await liveGitLabAccessToken(account, config),
45
+ })));
46
+ const leaseUntil = await (0, gitlab_token_refresh_1.claimSessionLease)(session.id, REMOVAL_LEASE_MS);
47
+ const current = leaseUntil === undefined ? undefined : await session_store_1.sessionStore.getSession(session.id);
48
+ if (!current || leaseUntil === undefined)
49
+ return { grants: known };
50
+ try {
51
+ const linked = links ? await session_store_1.sessionStore.getLinkedSessions(session.id) : [];
52
+ const grants = [current, ...linked].map((account) => ({
53
+ session: account,
54
+ accessToken: account.gitlabAccessToken,
55
+ }));
56
+ return { grants, leaseUntil };
57
+ }
58
+ catch (error) {
59
+ await releaseRemovalLease(session.id, leaseUntil);
60
+ throw error;
61
+ }
62
+ }
63
+ async function endSession(session, config) {
64
+ const { grants, leaseUntil } = await grantsToEnd(session, config);
65
+ if (leaseUntil !== undefined) {
66
+ try {
67
+ await session_store_1.sessionStore.deleteSession(session.id);
68
+ }
69
+ catch (error) {
70
+ await releaseRemovalLease(session.id, leaseUntil);
71
+ throw error;
72
+ }
73
+ }
74
+ await Promise.all(grants.map(({ session: account, accessToken }) => revokeGitLabGrant(account, accessToken, config)));
75
+ }
76
+ const OWNERSHIP_CHECK_LEASE_MS = 5_000;
77
+ const FLOW_STORE_BUDGET_MS = 15_000;
78
+ const FLOW_CLEANUP_LEASE_MS = OWNERSHIP_CHECK_LEASE_MS + 2 * gitlab_request_bound_1.GITLAB_REQUEST_MAX_MS + FLOW_STORE_BUDGET_MS;
79
+ function assertCleanupLease(leaseUntil, requiredMs) {
80
+ if (leaseUntil !== undefined && Date.now() + requiredMs > leaseUntil) {
81
+ throw new Error('Authorization-flow cleanup lease has insufficient time remaining');
82
+ }
83
+ }
84
+ async function linkedAccountHolds(flow) {
85
+ const tokens = flow.gitlabTokens;
86
+ if (!tokens || flow.link?.stage !== 'connect' || !session_store_1.sessionStore.linksAccounts())
87
+ return false;
88
+ const sessionId = flow.link.sessionId;
89
+ const turn = await (0, gitlab_token_refresh_1.claimSessionLease)(sessionId, OWNERSHIP_CHECK_LEASE_MS, Date.now() + OWNERSHIP_CHECK_LEASE_MS);
90
+ if (turn === undefined)
91
+ return false;
92
+ try {
93
+ const linked = await session_store_1.sessionStore.getLinkedSessions(sessionId);
94
+ return linked.some((account) => account.gitlabAccessToken === tokens.access_token ||
95
+ account.gitlabRefreshToken === tokens.refresh_token);
96
+ }
97
+ finally {
98
+ await session_store_1.sessionStore.releaseGitLabRefresh(sessionId, turn).catch(() => undefined);
99
+ }
100
+ }
101
+ async function endAbandonedFlowGrant(flow, config, persistTokens, leaseUntil) {
102
+ if (!flow.gitlabTokens || (await linkedAccountHolds(flow)))
103
+ return;
104
+ const app = await (0, instance_app_1.oauthAppFor)(config, flow.selectedInstance);
105
+ if (!app)
106
+ return;
107
+ let tokens = flow.gitlabTokens;
108
+ if ((tokens.created_at + tokens.expires_in) * 1000 <= Date.now() + gitlab_request_bound_1.GITLAB_REQUEST_MAX_MS) {
109
+ assertCleanupLease(leaseUntil, 2 * gitlab_request_bound_1.GITLAB_REQUEST_MAX_MS + FLOW_STORE_BUDGET_MS);
110
+ tokens = await (0, gitlab_device_flow_1.refreshGitLabToken)(tokens.refresh_token, config, app);
111
+ flow.gitlabTokens = tokens;
112
+ const deadline = Date.now() + FLOW_STORE_BUDGET_MS;
113
+ for (let delay = 200;; delay *= 2) {
114
+ try {
115
+ await persistTokens(tokens);
116
+ break;
117
+ }
118
+ catch (error) {
119
+ if (Date.now() + delay >= deadline) {
120
+ await (0, gitlab_device_flow_1.revokeGitLabToken)(tokens.access_token, config, app);
121
+ return;
122
+ }
123
+ (0, logger_1.logWarn)('Could not persist refreshed abandoned-flow tokens, retrying', {
124
+ err: error,
125
+ });
126
+ await new Promise((resolve) => setTimeout(resolve, delay));
127
+ }
128
+ }
129
+ }
130
+ assertCleanupLease(leaseUntil, gitlab_request_bound_1.GITLAB_REQUEST_MAX_MS);
131
+ await (0, gitlab_device_flow_1.revokeGitLabToken)(tokens.access_token, config, app);
132
+ }
133
+ async function revokeAbandonedFlowGrant(flow, config) {
134
+ const pending = { ...flow, expiresAt: Math.min(flow.expiresAt, Date.now() - 1) };
135
+ let persisted = false;
136
+ try {
137
+ await endAbandonedFlowGrant(pending, config, async (tokens) => {
138
+ pending.gitlabTokens = tokens;
139
+ await session_store_1.sessionStore.storeAuthCodeFlow(pending.internalState, pending);
140
+ persisted = true;
141
+ });
142
+ if (persisted)
143
+ await session_store_1.sessionStore.deleteAuthCodeFlow(pending.internalState);
144
+ }
145
+ catch (error) {
146
+ (0, logger_1.logWarn)('Failed to revoke the GitLab grant of an abandoned authorization', {
147
+ err: error,
148
+ });
149
+ await session_store_1.sessionStore
150
+ .storeAuthCodeFlow(pending.internalState, pending)
151
+ .catch((restoreError) => {
152
+ (0, logger_1.logWarn)('Could not keep an abandoned authorization for cleanup', {
153
+ err: restoreError,
154
+ expiresAt: pending.expiresAt,
155
+ });
156
+ });
157
+ }
158
+ }
159
+ async function startSessionStore(config) {
160
+ await session_store_1.sessionStore.initialize();
161
+ session_store_1.sessionStore.onAbandonedFlowGrant((flow, persistTokens, leaseUntil) => endAbandonedFlowGrant(flow, config, persistTokens, leaseUntil), FLOW_CLEANUP_LEASE_MS);
162
+ session_store_1.sessionStore.onExpiredSession((session) => endSession(session, config));
163
+ session_store_1.sessionStore.cleanup().catch((error) => {
164
+ (0, logger_1.logWarn)('Startup session cleanup failed', { err: error });
165
+ });
166
+ }
167
+ async function discardAuthCodeFlow(state, flow, config) {
168
+ const taken = await session_store_1.sessionStore.consumeAuthCodeFlow(state).catch((error) => {
169
+ (0, logger_1.logWarn)('Could not take an abandoned authorization out of reach; cleanup ends its grant', {
170
+ err: error,
171
+ expiresAt: flow.expiresAt,
172
+ });
173
+ return undefined;
174
+ });
175
+ if (!taken)
176
+ return;
177
+ await revokeAbandonedFlowGrant({ ...taken, internalState: state }, config);
178
+ }
179
+ //# sourceMappingURL=grant-revocation.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"grant-revocation.js","sourceRoot":"","sources":["../../../src/oauth/grant-revocation.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,6 @@
1
- import { OAuthSession, DeviceFlowState, AuthorizationCode, AuthCodeFlowState, RegisteredOAuthClient } from './types';
1
+ import { OAuthSession, DeviceFlowState, AuthorizationCode, AuthCodeFlowState, RegisteredOAuthClient, GitLabTokenResponse } from './types';
2
2
  import { SessionStorageBackend } from './storage';
3
+ import type { AbandonedFlowGrantHandler, ExpiredSessionHandler, LinkedAccountCommit } from './storage/types';
3
4
  import type { AccountSettings, AccountSettingsRecord } from '../configuration/types';
4
5
  export declare class SessionStore {
5
6
  private backend;
@@ -18,6 +19,9 @@ export declare class SessionStore {
18
19
  releaseGitLabRefresh(sessionId: string, leaseUntil: number): Promise<void>;
19
20
  deleteSession(sessionId: string): Promise<boolean>;
20
21
  getAllSessions(): Promise<OAuthSession[]>;
22
+ linksAccounts(): boolean;
23
+ getLinkedSessions(sessionId: string): Promise<OAuthSession[]>;
24
+ commitLinkedAccount(commit: LinkedAccountCommit): Promise<boolean>;
21
25
  getSessionCount(): Promise<number>;
22
26
  storeDeviceFlow(state: string, flow: DeviceFlowState): Promise<void>;
23
27
  getDeviceFlow(state: string): Promise<DeviceFlowState | undefined>;
@@ -27,6 +31,7 @@ export declare class SessionStore {
27
31
  claimDevicePoll(state: string, now: number, nextPollAt: number): Promise<DeviceFlowState | undefined>;
28
32
  getDeviceFlowCount(): Promise<number>;
29
33
  storeAuthCodeFlow(internalState: string, flow: AuthCodeFlowState): Promise<void>;
34
+ cacheLinkedFlowTokens(flow: AuthCodeFlowState, tokens: GitLabTokenResponse): Promise<boolean>;
30
35
  getAuthCodeFlow(internalState: string): Promise<AuthCodeFlowState | undefined>;
31
36
  deleteAuthCodeFlow(internalState: string): Promise<boolean>;
32
37
  consumeAuthCodeFlow(internalState: string): Promise<AuthCodeFlowState | undefined>;
@@ -47,6 +52,8 @@ export declare class SessionStore {
47
52
  getSessionByMcpSessionId(mcpSessionId: string): Promise<OAuthSession | undefined>;
48
53
  getGitLabTokenByMcpSessionId(mcpSessionId: string): Promise<string | undefined>;
49
54
  removeMcpSessionAssociation(mcpSessionId: string): Promise<boolean>;
55
+ onAbandonedFlowGrant(handler: AbandonedFlowGrantHandler, leaseMs: number): void;
56
+ onExpiredSession(handler: ExpiredSessionHandler): void;
50
57
  cleanup(): Promise<void>;
51
58
  private startCleanupInterval;
52
59
  stopCleanupInterval(): void;
@@ -2,8 +2,12 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.sessionStore = exports.SessionStore = void 0;
4
4
  const storage_1 = require("./storage");
5
+ const types_1 = require("./storage/types");
5
6
  const memory_1 = require("./storage/memory");
6
7
  const logger_1 = require("../logger");
8
+ function withinAgeLimit(session) {
9
+ return session && !(0, types_1.isPastAgeLimit)(session) ? session : undefined;
10
+ }
7
11
  class SessionStore {
8
12
  backend;
9
13
  initialized = false;
@@ -30,10 +34,10 @@ class SessionStore {
30
34
  return this.backend.getSession(sessionId);
31
35
  }
32
36
  async getSessionByToken(token) {
33
- return this.backend.getSessionByToken(token);
37
+ return withinAgeLimit(await this.backend.getSessionByToken(token));
34
38
  }
35
39
  async getSessionByRefreshToken(refreshToken) {
36
- return this.backend.getSessionByRefreshToken(refreshToken);
40
+ return withinAgeLimit(await this.backend.getSessionByRefreshToken(refreshToken));
37
41
  }
38
42
  async updateSession(sessionId, updates) {
39
43
  return this.backend.updateSession(sessionId, updates);
@@ -53,6 +57,21 @@ class SessionStore {
53
57
  async getAllSessions() {
54
58
  return this.backend.getAllSessions();
55
59
  }
60
+ linksAccounts() {
61
+ const backend = this.backend;
62
+ return (typeof backend.getLinkedSessions === 'function' &&
63
+ typeof backend.commitLinkedAccount === 'function' &&
64
+ typeof backend.cacheLinkedFlowTokens === 'function');
65
+ }
66
+ async getLinkedSessions(sessionId) {
67
+ return this.backend.getLinkedSessions(sessionId);
68
+ }
69
+ async commitLinkedAccount(commit) {
70
+ if (!this.backend.commitLinkedAccount) {
71
+ throw new Error('The session storage backend cannot commit account links atomically');
72
+ }
73
+ return this.backend.commitLinkedAccount(commit);
74
+ }
56
75
  async getSessionCount() {
57
76
  return (await this.backend.getStats()).sessions;
58
77
  }
@@ -80,6 +99,12 @@ class SessionStore {
80
99
  async storeAuthCodeFlow(internalState, flow) {
81
100
  await this.backend.storeAuthCodeFlow(internalState, flow);
82
101
  }
102
+ async cacheLinkedFlowTokens(flow, tokens) {
103
+ if (!this.backend.cacheLinkedFlowTokens) {
104
+ throw new Error('The session storage backend cannot safely cache account-link tokens');
105
+ }
106
+ return this.backend.cacheLinkedFlowTokens(flow, tokens);
107
+ }
83
108
  async getAuthCodeFlow(internalState) {
84
109
  return this.backend.getAuthCodeFlow(internalState);
85
110
  }
@@ -135,7 +160,7 @@ class SessionStore {
135
160
  await this.backend.associateMcpSession(mcpSessionId, oauthSessionId);
136
161
  }
137
162
  async getSessionByMcpSessionId(mcpSessionId) {
138
- return this.backend.getSessionByMcpSessionId(mcpSessionId);
163
+ return withinAgeLimit(await this.backend.getSessionByMcpSessionId(mcpSessionId));
139
164
  }
140
165
  async getGitLabTokenByMcpSessionId(mcpSessionId) {
141
166
  const session = await this.getSessionByMcpSessionId(mcpSessionId);
@@ -144,6 +169,14 @@ class SessionStore {
144
169
  async removeMcpSessionAssociation(mcpSessionId) {
145
170
  return this.backend.removeMcpSessionAssociation(mcpSessionId);
146
171
  }
172
+ onAbandonedFlowGrant(handler, leaseMs) {
173
+ const backend = this.backend;
174
+ backend.onAbandonedFlowGrant?.(handler, leaseMs);
175
+ }
176
+ onExpiredSession(handler) {
177
+ const backend = this.backend;
178
+ backend.onExpiredSession?.(handler);
179
+ }
147
180
  async cleanup() {
148
181
  await this.backend.cleanup();
149
182
  }
@@ -1 +1 @@
1
- {"version":3,"file":"session-store.js","sourceRoot":"","sources":["../../../src/oauth/session-store.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"session-store.js","sourceRoot":"","sources":["../../../src/oauth/session-store.ts"],"names":[],"mappings":"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"}