@google/gemini-cli-core 0.1.21 → 0.2.0-preview.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 +26 -28
- package/dist/src/code_assist/converter.d.ts +1 -0
- package/dist/src/code_assist/converter.js +1 -0
- package/dist/src/code_assist/converter.js.map +1 -1
- package/dist/src/code_assist/oauth2.d.ts +2 -0
- package/dist/src/code_assist/oauth2.js +44 -22
- package/dist/src/code_assist/oauth2.js.map +1 -1
- package/dist/src/code_assist/oauth2.test.js +99 -8
- package/dist/src/code_assist/oauth2.test.js.map +1 -1
- package/dist/src/code_assist/server.js +1 -1
- package/dist/src/code_assist/server.js.map +1 -1
- package/dist/src/code_assist/setup.js +1 -1
- package/dist/src/code_assist/setup.js.map +1 -1
- package/dist/src/code_assist/setup.test.js +14 -8
- package/dist/src/code_assist/setup.test.js.map +1 -1
- package/dist/src/config/config.d.ts +21 -2
- package/dist/src/config/config.js +36 -10
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +22 -0
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/core/client.d.ts +4 -11
- package/dist/src/core/client.js +51 -30
- package/dist/src/core/client.js.map +1 -1
- package/dist/src/core/client.test.js +296 -1
- package/dist/src/core/client.test.js.map +1 -1
- package/dist/src/core/contentGenerator.js +19 -9
- package/dist/src/core/contentGenerator.js.map +1 -1
- package/dist/src/core/contentGenerator.test.js +39 -15
- package/dist/src/core/contentGenerator.test.js.map +1 -1
- package/dist/src/core/coreToolScheduler.d.ts +2 -1
- package/dist/src/core/coreToolScheduler.js +26 -4
- package/dist/src/core/coreToolScheduler.js.map +1 -1
- package/dist/src/core/coreToolScheduler.test.js +230 -69
- package/dist/src/core/coreToolScheduler.test.js.map +1 -1
- package/dist/src/core/geminiChat.js +1 -1
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/logger.d.ts +22 -1
- package/dist/src/core/logger.js +103 -17
- package/dist/src/core/logger.js.map +1 -1
- package/dist/src/core/logger.test.js +86 -20
- package/dist/src/core/logger.test.js.map +1 -1
- package/dist/src/core/loggingContentGenerator.d.ts +1 -5
- package/dist/src/core/loggingContentGenerator.js +4 -6
- package/dist/src/core/loggingContentGenerator.js.map +1 -1
- package/dist/src/core/nonInteractiveToolExecutor.d.ts +2 -2
- package/dist/src/core/nonInteractiveToolExecutor.js +11 -3
- package/dist/src/core/nonInteractiveToolExecutor.js.map +1 -1
- package/dist/src/core/nonInteractiveToolExecutor.test.js +95 -46
- package/dist/src/core/nonInteractiveToolExecutor.test.js.map +1 -1
- package/dist/src/core/prompts.js +4 -4
- package/dist/src/core/prompts.js.map +1 -1
- package/dist/src/core/subagent.js +5 -5
- package/dist/src/core/subagent.js.map +1 -1
- package/dist/src/core/subagent.test.js +3 -3
- package/dist/src/core/subagent.test.js.map +1 -1
- package/dist/src/generated/git-commit.d.ts +7 -0
- package/dist/src/generated/git-commit.js +10 -0
- package/dist/src/generated/git-commit.js.map +1 -0
- package/dist/src/ide/constants.d.ts +6 -0
- package/dist/src/ide/constants.js +7 -0
- package/dist/src/ide/constants.js.map +1 -0
- package/dist/src/ide/detect-ide.js +8 -8
- package/dist/src/ide/detect-ide.js.map +1 -1
- package/dist/src/ide/ide-client.d.ts +9 -1
- package/dist/src/ide/ide-client.js +92 -22
- package/dist/src/ide/ide-client.js.map +1 -1
- package/dist/src/ide/ide-client.test.d.ts +6 -0
- package/dist/src/ide/ide-client.test.js +43 -0
- package/dist/src/ide/ide-client.test.js.map +1 -0
- package/dist/src/ide/ide-installer.js +22 -8
- package/dist/src/ide/ide-installer.js.map +1 -1
- package/dist/src/ide/ide-installer.test.js +6 -4
- package/dist/src/ide/ide-installer.test.js.map +1 -1
- package/dist/src/ide/ideContext.d.ts +6 -6
- package/dist/src/ide/process-utils.d.ts +19 -0
- package/dist/src/ide/process-utils.js +140 -0
- package/dist/src/ide/process-utils.js.map +1 -0
- package/dist/src/index.d.ts +4 -0
- package/dist/src/index.js +4 -0
- package/dist/src/index.js.map +1 -1
- package/dist/src/mcp/oauth-provider.js +176 -58
- package/dist/src/mcp/oauth-provider.js.map +1 -1
- package/dist/src/mcp/oauth-provider.test.js +132 -62
- package/dist/src/mcp/oauth-provider.test.js.map +1 -1
- package/dist/src/mcp/oauth-utils.d.ts +3 -1
- package/dist/src/mcp/oauth-utils.js +50 -12
- package/dist/src/mcp/oauth-utils.js.map +1 -1
- package/dist/src/mcp/oauth-utils.test.js +17 -2
- package/dist/src/mcp/oauth-utils.test.js.map +1 -1
- package/dist/src/services/chatRecordingService.d.ts +150 -0
- package/dist/src/services/chatRecordingService.js +318 -0
- package/dist/src/services/chatRecordingService.js.map +1 -0
- package/dist/src/services/chatRecordingService.test.d.ts +6 -0
- package/dist/src/services/chatRecordingService.test.js +288 -0
- package/dist/src/services/chatRecordingService.test.js.map +1 -0
- package/dist/src/services/fileSystemService.d.ts +31 -0
- package/dist/src/services/fileSystemService.js +18 -0
- package/dist/src/services/fileSystemService.js.map +1 -0
- package/dist/src/services/fileSystemService.test.d.ts +6 -0
- package/dist/src/services/fileSystemService.test.js +41 -0
- package/dist/src/services/fileSystemService.test.js.map +1 -0
- package/dist/src/services/loopDetectionService.js +5 -5
- package/dist/src/services/loopDetectionService.js.map +1 -1
- package/dist/src/services/shellExecutionService.d.ts +8 -10
- package/dist/src/services/shellExecutionService.js +289 -133
- package/dist/src/services/shellExecutionService.js.map +1 -1
- package/dist/src/services/shellExecutionService.test.js +274 -30
- package/dist/src/services/shellExecutionService.test.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.d.ts +31 -6
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js +101 -121
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.d.ts +11 -0
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js +97 -36
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.d.ts +6 -2
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js +12 -11
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js.map +1 -1
- package/dist/src/telemetry/constants.d.ts +1 -0
- package/dist/src/telemetry/constants.js +1 -0
- package/dist/src/telemetry/constants.js.map +1 -1
- package/dist/src/telemetry/index.d.ts +2 -2
- package/dist/src/telemetry/index.js +2 -2
- package/dist/src/telemetry/index.js.map +1 -1
- package/dist/src/telemetry/integration.test.circular.js +1 -0
- package/dist/src/telemetry/integration.test.circular.js.map +1 -1
- package/dist/src/telemetry/loggers.d.ts +2 -1
- package/dist/src/telemetry/loggers.js +24 -6
- package/dist/src/telemetry/loggers.js.map +1 -1
- package/dist/src/telemetry/loggers.test.js +37 -7
- package/dist/src/telemetry/loggers.test.js.map +1 -1
- package/dist/src/telemetry/metrics.d.ts +5 -1
- package/dist/src/telemetry/metrics.js +23 -9
- package/dist/src/telemetry/metrics.js.map +1 -1
- package/dist/src/telemetry/metrics.test.js +31 -1
- package/dist/src/telemetry/metrics.test.js.map +1 -1
- package/dist/src/telemetry/sdk.js +67 -39
- package/dist/src/telemetry/sdk.js.map +1 -1
- package/dist/src/telemetry/sdk.test.d.ts +6 -0
- package/dist/src/telemetry/sdk.test.js +82 -0
- package/dist/src/telemetry/sdk.test.js.map +1 -0
- package/dist/src/telemetry/types.d.ts +9 -1
- package/dist/src/telemetry/types.js +14 -0
- package/dist/src/telemetry/types.js.map +1 -1
- package/dist/src/telemetry/uiTelemetry.d.ts +4 -0
- package/dist/src/telemetry/uiTelemetry.js +14 -1
- package/dist/src/telemetry/uiTelemetry.js.map +1 -1
- package/dist/src/telemetry/uiTelemetry.test.js +45 -9
- package/dist/src/telemetry/uiTelemetry.test.js.map +1 -1
- package/dist/src/test-utils/tools.d.ts +29 -8
- package/dist/src/test-utils/tools.js +79 -15
- package/dist/src/test-utils/tools.js.map +1 -1
- package/dist/src/tools/edit.d.ts +1 -1
- package/dist/src/tools/edit.js +15 -9
- package/dist/src/tools/edit.js.map +1 -1
- package/dist/src/tools/edit.test.js +11 -1
- package/dist/src/tools/edit.test.js.map +1 -1
- package/dist/src/tools/glob.d.ts +1 -1
- package/dist/src/tools/glob.js +8 -8
- package/dist/src/tools/glob.js.map +1 -1
- package/dist/src/tools/glob.test.js +20 -0
- package/dist/src/tools/glob.test.js.map +1 -1
- package/dist/src/tools/grep.d.ts +1 -1
- package/dist/src/tools/grep.js +1 -6
- package/dist/src/tools/grep.js.map +1 -1
- package/dist/src/tools/ls.d.ts +1 -1
- package/dist/src/tools/ls.js +1 -6
- package/dist/src/tools/ls.js.map +1 -1
- package/dist/src/tools/mcp-client-manager.d.ts +38 -0
- package/dist/src/tools/mcp-client-manager.js +74 -0
- package/dist/src/tools/mcp-client-manager.js.map +1 -0
- package/dist/src/tools/mcp-client-manager.test.d.ts +6 -0
- package/dist/src/tools/mcp-client-manager.test.js +39 -0
- package/dist/src/tools/mcp-client-manager.test.js.map +1 -0
- package/dist/src/tools/mcp-client.d.ts +43 -0
- package/dist/src/tools/mcp-client.js +157 -11
- package/dist/src/tools/mcp-client.js.map +1 -1
- package/dist/src/tools/mcp-client.test.js +59 -273
- package/dist/src/tools/mcp-client.test.js.map +1 -1
- package/dist/src/tools/mcp-tool.js +21 -3
- package/dist/src/tools/mcp-tool.js.map +1 -1
- package/dist/src/tools/mcp-tool.test.js +74 -17
- package/dist/src/tools/mcp-tool.test.js.map +1 -1
- package/dist/src/tools/memoryTool.d.ts +1 -1
- package/dist/src/tools/memoryTool.js +1 -6
- package/dist/src/tools/memoryTool.js.map +1 -1
- package/dist/src/tools/read-file.d.ts +1 -1
- package/dist/src/tools/read-file.js +5 -7
- package/dist/src/tools/read-file.js.map +1 -1
- package/dist/src/tools/read-file.test.js +8 -0
- package/dist/src/tools/read-file.test.js.map +1 -1
- package/dist/src/tools/read-many-files.d.ts +0 -1
- package/dist/src/tools/read-many-files.js +16 -11
- package/dist/src/tools/read-many-files.js.map +1 -1
- package/dist/src/tools/read-many-files.test.js +34 -0
- package/dist/src/tools/read-many-files.test.js.map +1 -1
- package/dist/src/tools/shell.d.ts +1 -1
- package/dist/src/tools/shell.js +35 -32
- package/dist/src/tools/shell.js.map +1 -1
- package/dist/src/tools/shell.test.js +23 -19
- package/dist/src/tools/shell.test.js.map +1 -1
- package/dist/src/tools/tool-error.d.ts +1 -0
- package/dist/src/tools/tool-error.js +1 -0
- package/dist/src/tools/tool-error.js.map +1 -1
- package/dist/src/tools/tool-registry.d.ts +8 -3
- package/dist/src/tools/tool-registry.js +58 -34
- package/dist/src/tools/tool-registry.js.map +1 -1
- package/dist/src/tools/tool-registry.test.js +9 -21
- package/dist/src/tools/tool-registry.test.js.map +1 -1
- package/dist/src/tools/tools.d.ts +17 -74
- package/dist/src/tools/tools.js +60 -104
- package/dist/src/tools/tools.js.map +1 -1
- package/dist/src/tools/tools.test.js +91 -2
- package/dist/src/tools/tools.test.js.map +1 -1
- package/dist/src/tools/web-fetch.d.ts +1 -1
- package/dist/src/tools/web-fetch.js +1 -6
- package/dist/src/tools/web-fetch.js.map +1 -1
- package/dist/src/tools/web-search.d.ts +4 -5
- package/dist/src/tools/web-search.js +47 -51
- package/dist/src/tools/web-search.js.map +1 -1
- package/dist/src/tools/web-search.test.d.ts +6 -0
- package/dist/src/tools/web-search.test.js +139 -0
- package/dist/src/tools/web-search.test.js.map +1 -0
- package/dist/src/tools/write-file.d.ts +15 -11
- package/dist/src/tools/write-file.js +133 -145
- package/dist/src/tools/write-file.js.map +1 -1
- package/dist/src/tools/write-file.test.js +82 -126
- package/dist/src/tools/write-file.test.js.map +1 -1
- package/dist/src/utils/browser.js +4 -3
- package/dist/src/utils/browser.js.map +1 -1
- package/dist/src/utils/editCorrector.js +13 -13
- package/dist/src/utils/editCorrector.js.map +1 -1
- package/dist/src/utils/editor.js +1 -1
- package/dist/src/utils/editor.js.map +1 -1
- package/dist/src/utils/editor.test.js +10 -10
- package/dist/src/utils/editor.test.js.map +1 -1
- package/dist/src/utils/environmentContext.js +2 -2
- package/dist/src/utils/environmentContext.js.map +1 -1
- package/dist/src/utils/environmentContext.test.js +3 -2
- package/dist/src/utils/environmentContext.test.js.map +1 -1
- package/dist/src/utils/fileUtils.d.ts +2 -1
- package/dist/src/utils/fileUtils.js +3 -3
- package/dist/src/utils/fileUtils.js.map +1 -1
- package/dist/src/utils/fileUtils.test.js +18 -17
- package/dist/src/utils/fileUtils.test.js.map +1 -1
- package/dist/src/utils/filesearch/crawler.d.ts +15 -0
- package/dist/src/utils/filesearch/crawler.js +50 -0
- package/dist/src/utils/filesearch/crawler.js.map +1 -0
- package/dist/src/utils/filesearch/crawler.test.d.ts +6 -0
- package/dist/src/utils/filesearch/crawler.test.js +468 -0
- package/dist/src/utils/filesearch/crawler.test.js.map +1 -0
- package/dist/src/utils/filesearch/fileSearch.d.ts +9 -53
- package/dist/src/utils/filesearch/fileSearch.js +62 -117
- package/dist/src/utils/filesearch/fileSearch.js.map +1 -1
- package/dist/src/utils/filesearch/fileSearch.test.js +95 -197
- package/dist/src/utils/filesearch/fileSearch.test.js.map +1 -1
- package/dist/src/utils/filesearch/ignore.d.ts +7 -0
- package/dist/src/utils/filesearch/ignore.js +25 -0
- package/dist/src/utils/filesearch/ignore.js.map +1 -1
- package/dist/src/utils/filesearch/ignore.test.js +89 -2
- package/dist/src/utils/filesearch/ignore.test.js.map +1 -1
- package/dist/src/utils/getPty.d.ts +19 -0
- package/dist/src/utils/getPty.js +23 -0
- package/dist/src/utils/getPty.js.map +1 -0
- package/dist/src/utils/memoryDiscovery.js +3 -3
- package/dist/src/utils/memoryDiscovery.js.map +1 -1
- package/dist/src/utils/memoryDiscovery.test.js +3 -2
- package/dist/src/utils/memoryDiscovery.test.js.map +1 -1
- package/dist/src/utils/memoryImportProcessor.js +2 -6
- package/dist/src/utils/memoryImportProcessor.js.map +1 -1
- package/dist/src/utils/paths.d.ts +7 -0
- package/dist/src/utils/paths.js +15 -0
- package/dist/src/utils/paths.js.map +1 -1
- package/dist/src/utils/paths.test.js +74 -2
- package/dist/src/utils/paths.test.js.map +1 -1
- package/dist/src/utils/secure-browser-launcher.js +4 -3
- package/dist/src/utils/secure-browser-launcher.js.map +1 -1
- package/dist/src/utils/shell-utils.d.ts +39 -0
- package/dist/src/utils/shell-utils.js +72 -2
- package/dist/src/utils/shell-utils.js.map +1 -1
- package/dist/src/utils/shell-utils.test.js +132 -4
- package/dist/src/utils/shell-utils.test.js.map +1 -1
- package/dist/src/utils/systemEncoding.js +1 -1
- package/dist/src/utils/systemEncoding.js.map +1 -1
- package/dist/src/utils/systemEncoding.test.js +23 -23
- package/dist/src/utils/systemEncoding.test.js.map +1 -1
- package/dist/src/utils/user_account.js +58 -48
- package/dist/src/utils/user_account.js.map +1 -1
- package/dist/src/utils/user_account.test.js +76 -9
- package/dist/src/utils/user_account.test.js.map +1 -1
- package/dist/src/utils/workspaceContext.d.ts +22 -7
- package/dist/src/utils/workspaceContext.js +81 -55
- package/dist/src/utils/workspaceContext.js.map +1 -1
- package/dist/src/utils/workspaceContext.test.js +221 -137
- package/dist/src/utils/workspaceContext.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +20 -7
|
@@ -19,6 +19,36 @@ import { MCPOAuthTokenStorage } from './oauth-token-storage.js';
|
|
|
19
19
|
// Mock fetch globally
|
|
20
20
|
const mockFetch = vi.fn();
|
|
21
21
|
global.fetch = mockFetch;
|
|
22
|
+
// Helper function to create mock fetch responses with proper headers
|
|
23
|
+
const createMockResponse = (options) => {
|
|
24
|
+
const response = {
|
|
25
|
+
ok: options.ok,
|
|
26
|
+
headers: {
|
|
27
|
+
get: (name) => {
|
|
28
|
+
if (name.toLowerCase() === 'content-type') {
|
|
29
|
+
return options.contentType || null;
|
|
30
|
+
}
|
|
31
|
+
return null;
|
|
32
|
+
},
|
|
33
|
+
},
|
|
34
|
+
};
|
|
35
|
+
if (options.status !== undefined) {
|
|
36
|
+
response.status = options.status;
|
|
37
|
+
}
|
|
38
|
+
if (options.text !== undefined) {
|
|
39
|
+
response.text =
|
|
40
|
+
typeof options.text === 'string'
|
|
41
|
+
? () => Promise.resolve(options.text)
|
|
42
|
+
: options.text;
|
|
43
|
+
}
|
|
44
|
+
if (options.json !== undefined) {
|
|
45
|
+
response.json =
|
|
46
|
+
typeof options.json === 'function'
|
|
47
|
+
? options.json
|
|
48
|
+
: () => Promise.resolve(options.json);
|
|
49
|
+
}
|
|
50
|
+
return response;
|
|
51
|
+
};
|
|
22
52
|
// Define a reusable mock server with .listen, .close, and .on methods
|
|
23
53
|
const mockHttpServer = {
|
|
24
54
|
listen: vi.fn(),
|
|
@@ -111,10 +141,12 @@ describe('MCPOAuthProvider', () => {
|
|
|
111
141
|
}, 10);
|
|
112
142
|
});
|
|
113
143
|
// Mock token exchange
|
|
114
|
-
mockFetch.mockResolvedValueOnce({
|
|
144
|
+
mockFetch.mockResolvedValueOnce(createMockResponse({
|
|
115
145
|
ok: true,
|
|
116
|
-
|
|
117
|
-
|
|
146
|
+
contentType: 'application/json',
|
|
147
|
+
text: JSON.stringify(mockTokenResponse),
|
|
148
|
+
json: mockTokenResponse,
|
|
149
|
+
}));
|
|
118
150
|
const result = await MCPOAuthProvider.authenticate('test-server', mockConfig);
|
|
119
151
|
expect(result).toEqual({
|
|
120
152
|
accessToken: 'access_token_123',
|
|
@@ -128,7 +160,11 @@ describe('MCPOAuthProvider', () => {
|
|
|
128
160
|
});
|
|
129
161
|
it('should handle OAuth discovery when no authorization URL provided', async () => {
|
|
130
162
|
// Use a mutable config object
|
|
131
|
-
const configWithoutAuth = {
|
|
163
|
+
const configWithoutAuth = {
|
|
164
|
+
...mockConfig,
|
|
165
|
+
clientId: 'test-client-id',
|
|
166
|
+
clientSecret: 'test-client-secret',
|
|
167
|
+
};
|
|
132
168
|
delete configWithoutAuth.authorizationUrl;
|
|
133
169
|
delete configWithoutAuth.tokenUrl;
|
|
134
170
|
const mockResourceMetadata = {
|
|
@@ -139,20 +175,24 @@ describe('MCPOAuthProvider', () => {
|
|
|
139
175
|
token_endpoint: 'https://discovered.auth.com/token',
|
|
140
176
|
scopes_supported: ['read', 'write'],
|
|
141
177
|
};
|
|
178
|
+
// Mock HEAD request for WWW-Authenticate check
|
|
142
179
|
mockFetch
|
|
143
|
-
.mockResolvedValueOnce({
|
|
180
|
+
.mockResolvedValueOnce(createMockResponse({
|
|
144
181
|
ok: true,
|
|
145
|
-
|
|
146
|
-
})
|
|
147
|
-
.mockResolvedValueOnce({
|
|
182
|
+
status: 200,
|
|
183
|
+
}))
|
|
184
|
+
.mockResolvedValueOnce(createMockResponse({
|
|
148
185
|
ok: true,
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
186
|
+
contentType: 'application/json',
|
|
187
|
+
text: JSON.stringify(mockResourceMetadata),
|
|
188
|
+
json: mockResourceMetadata,
|
|
189
|
+
}))
|
|
190
|
+
.mockResolvedValueOnce(createMockResponse({
|
|
191
|
+
ok: true,
|
|
192
|
+
contentType: 'application/json',
|
|
193
|
+
text: JSON.stringify(mockAuthServerMetadata),
|
|
194
|
+
json: mockAuthServerMetadata,
|
|
195
|
+
}));
|
|
156
196
|
// Setup callback handler
|
|
157
197
|
let callbackHandler;
|
|
158
198
|
vi.mocked(http.createServer).mockImplementation((handler) => {
|
|
@@ -173,15 +213,19 @@ describe('MCPOAuthProvider', () => {
|
|
|
173
213
|
}, 10);
|
|
174
214
|
});
|
|
175
215
|
// Mock token exchange with discovered endpoint
|
|
176
|
-
mockFetch.mockResolvedValueOnce({
|
|
216
|
+
mockFetch.mockResolvedValueOnce(createMockResponse({
|
|
177
217
|
ok: true,
|
|
178
|
-
|
|
179
|
-
|
|
218
|
+
contentType: 'application/json',
|
|
219
|
+
text: JSON.stringify(mockTokenResponse),
|
|
220
|
+
json: mockTokenResponse,
|
|
221
|
+
}));
|
|
180
222
|
const result = await MCPOAuthProvider.authenticate('test-server', configWithoutAuth, 'https://api.example.com');
|
|
181
223
|
expect(result).toBeDefined();
|
|
182
224
|
expect(mockFetch).toHaveBeenCalledWith('https://discovered.auth.com/token', expect.objectContaining({
|
|
183
225
|
method: 'POST',
|
|
184
|
-
headers: {
|
|
226
|
+
headers: expect.objectContaining({
|
|
227
|
+
'Content-Type': 'application/x-www-form-urlencoded',
|
|
228
|
+
}),
|
|
185
229
|
}));
|
|
186
230
|
});
|
|
187
231
|
it('should perform dynamic client registration when no client ID provided', async () => {
|
|
@@ -201,14 +245,18 @@ describe('MCPOAuthProvider', () => {
|
|
|
201
245
|
registration_endpoint: 'https://auth.example.com/register',
|
|
202
246
|
};
|
|
203
247
|
mockFetch
|
|
204
|
-
.mockResolvedValueOnce({
|
|
248
|
+
.mockResolvedValueOnce(createMockResponse({
|
|
205
249
|
ok: true,
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
250
|
+
contentType: 'application/json',
|
|
251
|
+
text: JSON.stringify(mockAuthServerMetadata),
|
|
252
|
+
json: mockAuthServerMetadata,
|
|
253
|
+
}))
|
|
254
|
+
.mockResolvedValueOnce(createMockResponse({
|
|
209
255
|
ok: true,
|
|
210
|
-
|
|
211
|
-
|
|
256
|
+
contentType: 'application/json',
|
|
257
|
+
text: JSON.stringify(mockRegistrationResponse),
|
|
258
|
+
json: mockRegistrationResponse,
|
|
259
|
+
}));
|
|
212
260
|
// Setup callback handler
|
|
213
261
|
let callbackHandler;
|
|
214
262
|
vi.mocked(http.createServer).mockImplementation((handler) => {
|
|
@@ -229,10 +277,12 @@ describe('MCPOAuthProvider', () => {
|
|
|
229
277
|
}, 10);
|
|
230
278
|
});
|
|
231
279
|
// Mock token exchange
|
|
232
|
-
mockFetch.mockResolvedValueOnce({
|
|
280
|
+
mockFetch.mockResolvedValueOnce(createMockResponse({
|
|
233
281
|
ok: true,
|
|
234
|
-
|
|
235
|
-
|
|
282
|
+
contentType: 'application/json',
|
|
283
|
+
text: JSON.stringify(mockTokenResponse),
|
|
284
|
+
json: mockTokenResponse,
|
|
285
|
+
}));
|
|
236
286
|
const result = await MCPOAuthProvider.authenticate('test-server', configWithoutClient);
|
|
237
287
|
expect(result).toBeDefined();
|
|
238
288
|
expect(mockFetch).toHaveBeenCalledWith('https://auth.example.com/register', expect.objectContaining({
|
|
@@ -301,12 +351,13 @@ describe('MCPOAuthProvider', () => {
|
|
|
301
351
|
callbackHandler(mockReq, mockRes);
|
|
302
352
|
}, 10);
|
|
303
353
|
});
|
|
304
|
-
mockFetch.mockResolvedValueOnce({
|
|
354
|
+
mockFetch.mockResolvedValueOnce(createMockResponse({
|
|
305
355
|
ok: false,
|
|
306
356
|
status: 400,
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
357
|
+
contentType: 'application/x-www-form-urlencoded',
|
|
358
|
+
text: 'error=invalid_grant&error_description=Invalid grant',
|
|
359
|
+
}));
|
|
360
|
+
await expect(MCPOAuthProvider.authenticate('test-server', mockConfig)).rejects.toThrow('Token exchange failed: invalid_grant - Invalid grant');
|
|
310
361
|
});
|
|
311
362
|
it('should handle callback timeout', async () => {
|
|
312
363
|
vi.mocked(http.createServer).mockImplementation(() => mockHttpServer);
|
|
@@ -335,34 +386,42 @@ describe('MCPOAuthProvider', () => {
|
|
|
335
386
|
expires_in: 3600,
|
|
336
387
|
refresh_token: 'new_refresh_token',
|
|
337
388
|
};
|
|
338
|
-
mockFetch.mockResolvedValueOnce({
|
|
389
|
+
mockFetch.mockResolvedValueOnce(createMockResponse({
|
|
339
390
|
ok: true,
|
|
340
|
-
|
|
341
|
-
|
|
391
|
+
contentType: 'application/json',
|
|
392
|
+
text: JSON.stringify(refreshResponse),
|
|
393
|
+
json: refreshResponse,
|
|
394
|
+
}));
|
|
342
395
|
const result = await MCPOAuthProvider.refreshAccessToken(mockConfig, 'old_refresh_token', 'https://auth.example.com/token');
|
|
343
396
|
expect(result).toEqual(refreshResponse);
|
|
344
397
|
expect(mockFetch).toHaveBeenCalledWith('https://auth.example.com/token', expect.objectContaining({
|
|
345
398
|
method: 'POST',
|
|
346
|
-
headers: {
|
|
399
|
+
headers: {
|
|
400
|
+
'Content-Type': 'application/x-www-form-urlencoded',
|
|
401
|
+
Accept: 'application/json, application/x-www-form-urlencoded',
|
|
402
|
+
},
|
|
347
403
|
body: expect.stringContaining('grant_type=refresh_token'),
|
|
348
404
|
}));
|
|
349
405
|
});
|
|
350
406
|
it('should include client secret in refresh request when available', async () => {
|
|
351
|
-
mockFetch.mockResolvedValueOnce({
|
|
407
|
+
mockFetch.mockResolvedValueOnce(createMockResponse({
|
|
352
408
|
ok: true,
|
|
353
|
-
|
|
354
|
-
|
|
409
|
+
contentType: 'application/json',
|
|
410
|
+
text: JSON.stringify(mockTokenResponse),
|
|
411
|
+
json: mockTokenResponse,
|
|
412
|
+
}));
|
|
355
413
|
await MCPOAuthProvider.refreshAccessToken(mockConfig, 'refresh_token', 'https://auth.example.com/token');
|
|
356
414
|
const fetchCall = mockFetch.mock.calls[0];
|
|
357
415
|
expect(fetchCall[1].body).toContain('client_secret=test-client-secret');
|
|
358
416
|
});
|
|
359
417
|
it('should handle refresh token failure', async () => {
|
|
360
|
-
mockFetch.mockResolvedValueOnce({
|
|
418
|
+
mockFetch.mockResolvedValueOnce(createMockResponse({
|
|
361
419
|
ok: false,
|
|
362
420
|
status: 400,
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
421
|
+
contentType: 'application/x-www-form-urlencoded',
|
|
422
|
+
text: 'error=invalid_request&error_description=Invalid refresh token',
|
|
423
|
+
}));
|
|
424
|
+
await expect(MCPOAuthProvider.refreshAccessToken(mockConfig, 'invalid_refresh_token', 'https://auth.example.com/token')).rejects.toThrow('Token refresh failed: invalid_request - Invalid refresh token');
|
|
366
425
|
});
|
|
367
426
|
});
|
|
368
427
|
describe('getValidToken', () => {
|
|
@@ -395,10 +454,12 @@ describe('MCPOAuthProvider', () => {
|
|
|
395
454
|
expires_in: 3600,
|
|
396
455
|
refresh_token: 'new_refresh_token',
|
|
397
456
|
};
|
|
398
|
-
mockFetch.mockResolvedValueOnce({
|
|
457
|
+
mockFetch.mockResolvedValueOnce(createMockResponse({
|
|
399
458
|
ok: true,
|
|
400
|
-
|
|
401
|
-
|
|
459
|
+
contentType: 'application/json',
|
|
460
|
+
text: JSON.stringify(refreshResponse),
|
|
461
|
+
json: refreshResponse,
|
|
462
|
+
}));
|
|
402
463
|
const result = await MCPOAuthProvider.getValidToken('test-server', mockConfig);
|
|
403
464
|
expect(result).toBe('new_access_token');
|
|
404
465
|
expect(MCPOAuthTokenStorage.saveToken).toHaveBeenCalledWith('test-server', expect.objectContaining({ accessToken: 'new_access_token' }), 'test-client-id', 'https://auth.example.com/token', undefined);
|
|
@@ -419,11 +480,12 @@ describe('MCPOAuthProvider', () => {
|
|
|
419
480
|
vi.mocked(MCPOAuthTokenStorage.getToken).mockResolvedValue(expiredCredentials);
|
|
420
481
|
vi.mocked(MCPOAuthTokenStorage.isTokenExpired).mockReturnValue(true);
|
|
421
482
|
vi.mocked(MCPOAuthTokenStorage.removeToken).mockResolvedValue(undefined);
|
|
422
|
-
mockFetch.mockResolvedValueOnce({
|
|
483
|
+
mockFetch.mockResolvedValueOnce(createMockResponse({
|
|
423
484
|
ok: false,
|
|
424
485
|
status: 400,
|
|
425
|
-
|
|
426
|
-
|
|
486
|
+
contentType: 'application/x-www-form-urlencoded',
|
|
487
|
+
text: 'error=invalid_request&error_description=Invalid refresh token',
|
|
488
|
+
}));
|
|
427
489
|
const result = await MCPOAuthProvider.getValidToken('test-server', mockConfig);
|
|
428
490
|
expect(result).toBeNull();
|
|
429
491
|
expect(MCPOAuthTokenStorage.removeToken).toHaveBeenCalledWith('test-server');
|
|
@@ -469,10 +531,12 @@ describe('MCPOAuthProvider', () => {
|
|
|
469
531
|
callbackHandler(mockReq, mockRes);
|
|
470
532
|
}, 10);
|
|
471
533
|
});
|
|
472
|
-
mockFetch.mockResolvedValueOnce({
|
|
534
|
+
mockFetch.mockResolvedValueOnce(createMockResponse({
|
|
473
535
|
ok: true,
|
|
474
|
-
|
|
475
|
-
|
|
536
|
+
contentType: 'application/json',
|
|
537
|
+
text: JSON.stringify(mockTokenResponse),
|
|
538
|
+
json: mockTokenResponse,
|
|
539
|
+
}));
|
|
476
540
|
await MCPOAuthProvider.authenticate('test-server', mockConfig);
|
|
477
541
|
expect(crypto.randomBytes).toHaveBeenCalledWith(32); // code verifier
|
|
478
542
|
expect(crypto.randomBytes).toHaveBeenCalledWith(16); // state
|
|
@@ -505,11 +569,13 @@ describe('MCPOAuthProvider', () => {
|
|
|
505
569
|
callbackHandler(mockReq, mockRes);
|
|
506
570
|
}, 10);
|
|
507
571
|
});
|
|
508
|
-
mockFetch.mockResolvedValueOnce({
|
|
572
|
+
mockFetch.mockResolvedValueOnce(createMockResponse({
|
|
509
573
|
ok: true,
|
|
510
|
-
|
|
511
|
-
|
|
512
|
-
|
|
574
|
+
contentType: 'application/json',
|
|
575
|
+
text: JSON.stringify(mockTokenResponse),
|
|
576
|
+
json: mockTokenResponse,
|
|
577
|
+
}));
|
|
578
|
+
await MCPOAuthProvider.authenticate('test-server', mockConfig, 'https://auth.example.com');
|
|
513
579
|
expect(capturedUrl).toBeDefined();
|
|
514
580
|
expect(capturedUrl).toContain('response_type=code');
|
|
515
581
|
expect(capturedUrl).toContain('client_id=test-client-id');
|
|
@@ -544,10 +610,12 @@ describe('MCPOAuthProvider', () => {
|
|
|
544
610
|
callbackHandler(mockReq, mockRes);
|
|
545
611
|
}, 10);
|
|
546
612
|
});
|
|
547
|
-
mockFetch.mockResolvedValueOnce({
|
|
613
|
+
mockFetch.mockResolvedValueOnce(createMockResponse({
|
|
548
614
|
ok: true,
|
|
549
|
-
|
|
550
|
-
|
|
615
|
+
contentType: 'application/json',
|
|
616
|
+
text: JSON.stringify(mockTokenResponse),
|
|
617
|
+
json: mockTokenResponse,
|
|
618
|
+
}));
|
|
551
619
|
const configWithParamsInUrl = {
|
|
552
620
|
...mockConfig,
|
|
553
621
|
authorizationUrl: 'https://auth.example.com/authorize?audience=1234',
|
|
@@ -583,10 +651,12 @@ describe('MCPOAuthProvider', () => {
|
|
|
583
651
|
callbackHandler(mockReq, mockRes);
|
|
584
652
|
}, 10);
|
|
585
653
|
});
|
|
586
|
-
mockFetch.mockResolvedValueOnce({
|
|
654
|
+
mockFetch.mockResolvedValueOnce(createMockResponse({
|
|
587
655
|
ok: true,
|
|
588
|
-
|
|
589
|
-
|
|
656
|
+
contentType: 'application/json',
|
|
657
|
+
text: JSON.stringify(mockTokenResponse),
|
|
658
|
+
json: mockTokenResponse,
|
|
659
|
+
}));
|
|
590
660
|
const configWithFragment = {
|
|
591
661
|
...mockConfig,
|
|
592
662
|
authorizationUrl: 'https://auth.example.com/authorize#login',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-provider.test.js","sourceRoot":"","sources":["../../../src/mcp/oauth-provider.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"oauth-provider.test.js","sourceRoot":"","sources":["../../../src/mcp/oauth-provider.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,8 +38,10 @@ export interface OAuthProtectedResourceMetadata {
|
|
|
38
38
|
export declare class OAuthUtils {
|
|
39
39
|
/**
|
|
40
40
|
* Construct well-known OAuth endpoint URLs.
|
|
41
|
+
* By default, uses standard root-based well-known URLs.
|
|
42
|
+
* If includePathSuffix is true, appends any path from the base URL to the well-known endpoints.
|
|
41
43
|
*/
|
|
42
|
-
static buildWellKnownUrls(baseUrl: string): {
|
|
44
|
+
static buildWellKnownUrls(baseUrl: string, includePathSuffix?: boolean): {
|
|
43
45
|
protectedResource: string;
|
|
44
46
|
authorizationServer: string;
|
|
45
47
|
};
|
|
@@ -10,13 +10,24 @@ import { getErrorMessage } from '../utils/errors.js';
|
|
|
10
10
|
export class OAuthUtils {
|
|
11
11
|
/**
|
|
12
12
|
* Construct well-known OAuth endpoint URLs.
|
|
13
|
+
* By default, uses standard root-based well-known URLs.
|
|
14
|
+
* If includePathSuffix is true, appends any path from the base URL to the well-known endpoints.
|
|
13
15
|
*/
|
|
14
|
-
static buildWellKnownUrls(baseUrl) {
|
|
16
|
+
static buildWellKnownUrls(baseUrl, includePathSuffix = false) {
|
|
15
17
|
const serverUrl = new URL(baseUrl);
|
|
16
18
|
const base = `${serverUrl.protocol}//${serverUrl.host}`;
|
|
19
|
+
if (!includePathSuffix) {
|
|
20
|
+
// Standard discovery: use root-based well-known URLs
|
|
21
|
+
return {
|
|
22
|
+
protectedResource: new URL('/.well-known/oauth-protected-resource', base).toString(),
|
|
23
|
+
authorizationServer: new URL('/.well-known/oauth-authorization-server', base).toString(),
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
// Path-based discovery: append path suffix to well-known URLs
|
|
27
|
+
const pathSuffix = serverUrl.pathname.replace(/\/$/, ''); // Remove trailing slash
|
|
17
28
|
return {
|
|
18
|
-
protectedResource: new URL(
|
|
19
|
-
authorizationServer: new URL(
|
|
29
|
+
protectedResource: new URL(`/.well-known/oauth-protected-resource${pathSuffix}`, base).toString(),
|
|
30
|
+
authorizationServer: new URL(`/.well-known/oauth-authorization-server${pathSuffix}`, base).toString(),
|
|
20
31
|
};
|
|
21
32
|
}
|
|
22
33
|
/**
|
|
@@ -78,14 +89,33 @@ export class OAuthUtils {
|
|
|
78
89
|
*/
|
|
79
90
|
static async discoverOAuthConfig(serverUrl) {
|
|
80
91
|
try {
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
92
|
+
// First try standard root-based discovery
|
|
93
|
+
const wellKnownUrls = this.buildWellKnownUrls(serverUrl, false);
|
|
94
|
+
// Try to get the protected resource metadata at root
|
|
95
|
+
let resourceMetadata = await this.fetchProtectedResourceMetadata(wellKnownUrls.protectedResource);
|
|
96
|
+
// If root discovery fails and we have a path, try path-based discovery
|
|
97
|
+
if (!resourceMetadata) {
|
|
98
|
+
const url = new URL(serverUrl);
|
|
99
|
+
if (url.pathname && url.pathname !== '/') {
|
|
100
|
+
const pathBasedUrls = this.buildWellKnownUrls(serverUrl, true);
|
|
101
|
+
resourceMetadata = await this.fetchProtectedResourceMetadata(pathBasedUrls.protectedResource);
|
|
102
|
+
}
|
|
103
|
+
}
|
|
84
104
|
if (resourceMetadata?.authorization_servers?.length) {
|
|
85
105
|
// Use the first authorization server
|
|
86
106
|
const authServerUrl = resourceMetadata.authorization_servers[0];
|
|
87
|
-
|
|
88
|
-
|
|
107
|
+
// The authorization server URL may include a path (e.g., https://github.com/login/oauth)
|
|
108
|
+
// We need to preserve this path when constructing the metadata URL
|
|
109
|
+
const authServerUrlObj = new URL(authServerUrl);
|
|
110
|
+
const authServerPath = authServerUrlObj.pathname === '/' ? '' : authServerUrlObj.pathname;
|
|
111
|
+
// Try with the authorization server's path first
|
|
112
|
+
let authServerMetadataUrl = new URL(`/.well-known/oauth-authorization-server${authServerPath}`, `${authServerUrlObj.protocol}//${authServerUrlObj.host}`).toString();
|
|
113
|
+
let authServerMetadata = await this.fetchAuthorizationServerMetadata(authServerMetadataUrl);
|
|
114
|
+
// If that fails, try root as fallback
|
|
115
|
+
if (!authServerMetadata && authServerPath) {
|
|
116
|
+
authServerMetadataUrl = new URL('/.well-known/oauth-authorization-server', `${authServerUrlObj.protocol}//${authServerUrlObj.host}`).toString();
|
|
117
|
+
authServerMetadata = await this.fetchAuthorizationServerMetadata(authServerMetadataUrl);
|
|
118
|
+
}
|
|
89
119
|
if (authServerMetadata) {
|
|
90
120
|
const config = this.metadataToOAuthConfig(authServerMetadata);
|
|
91
121
|
if (authServerMetadata.registration_endpoint) {
|
|
@@ -136,16 +166,24 @@ export class OAuthUtils {
|
|
|
136
166
|
if (!resourceMetadataUri) {
|
|
137
167
|
return null;
|
|
138
168
|
}
|
|
139
|
-
console.log(`Found resource metadata URI from www-authenticate header: ${resourceMetadataUri}`);
|
|
140
169
|
const resourceMetadata = await this.fetchProtectedResourceMetadata(resourceMetadataUri);
|
|
141
170
|
if (!resourceMetadata?.authorization_servers?.length) {
|
|
142
171
|
return null;
|
|
143
172
|
}
|
|
144
173
|
const authServerUrl = resourceMetadata.authorization_servers[0];
|
|
145
|
-
|
|
146
|
-
|
|
174
|
+
// The authorization server URL may include a path (e.g., https://github.com/login/oauth)
|
|
175
|
+
// We need to preserve this path when constructing the metadata URL
|
|
176
|
+
const authServerUrlObj = new URL(authServerUrl);
|
|
177
|
+
const authServerPath = authServerUrlObj.pathname === '/' ? '' : authServerUrlObj.pathname;
|
|
178
|
+
// Build auth server metadata URL with the authorization server's path
|
|
179
|
+
const authServerMetadataUrl = new URL(`/.well-known/oauth-authorization-server${authServerPath}`, `${authServerUrlObj.protocol}//${authServerUrlObj.host}`).toString();
|
|
180
|
+
let authServerMetadata = await this.fetchAuthorizationServerMetadata(authServerMetadataUrl);
|
|
181
|
+
// If that fails and we have a path, also try the root path as a fallback
|
|
182
|
+
if (!authServerMetadata && authServerPath) {
|
|
183
|
+
const rootAuthServerMetadataUrl = new URL('/.well-known/oauth-authorization-server', `${authServerUrlObj.protocol}//${authServerUrlObj.host}`).toString();
|
|
184
|
+
authServerMetadata = await this.fetchAuthorizationServerMetadata(rootAuthServerMetadataUrl);
|
|
185
|
+
}
|
|
147
186
|
if (authServerMetadata) {
|
|
148
|
-
console.log('OAuth configuration discovered successfully from www-authenticate header');
|
|
149
187
|
return this.metadataToOAuthConfig(authServerMetadata);
|
|
150
188
|
}
|
|
151
189
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-utils.js","sourceRoot":"","sources":["../../../src/mcp/oauth-utils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAgCrD;;GAEG;AACH,MAAM,OAAO,UAAU;IACrB
|
|
1
|
+
{"version":3,"file":"oauth-utils.js","sourceRoot":"","sources":["../../../src/mcp/oauth-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,11 +19,26 @@ describe('OAuthUtils', () => {
|
|
|
19
19
|
vi.restoreAllMocks();
|
|
20
20
|
});
|
|
21
21
|
describe('buildWellKnownUrls', () => {
|
|
22
|
-
it('should build
|
|
23
|
-
const urls = OAuthUtils.buildWellKnownUrls('https://example.com/
|
|
22
|
+
it('should build standard root-based URLs by default', () => {
|
|
23
|
+
const urls = OAuthUtils.buildWellKnownUrls('https://example.com/mcp');
|
|
24
24
|
expect(urls.protectedResource).toBe('https://example.com/.well-known/oauth-protected-resource');
|
|
25
25
|
expect(urls.authorizationServer).toBe('https://example.com/.well-known/oauth-authorization-server');
|
|
26
26
|
});
|
|
27
|
+
it('should build path-based URLs when includePathSuffix is true', () => {
|
|
28
|
+
const urls = OAuthUtils.buildWellKnownUrls('https://example.com/mcp', true);
|
|
29
|
+
expect(urls.protectedResource).toBe('https://example.com/.well-known/oauth-protected-resource/mcp');
|
|
30
|
+
expect(urls.authorizationServer).toBe('https://example.com/.well-known/oauth-authorization-server/mcp');
|
|
31
|
+
});
|
|
32
|
+
it('should handle root path correctly', () => {
|
|
33
|
+
const urls = OAuthUtils.buildWellKnownUrls('https://example.com', true);
|
|
34
|
+
expect(urls.protectedResource).toBe('https://example.com/.well-known/oauth-protected-resource');
|
|
35
|
+
expect(urls.authorizationServer).toBe('https://example.com/.well-known/oauth-authorization-server');
|
|
36
|
+
});
|
|
37
|
+
it('should handle trailing slash in path', () => {
|
|
38
|
+
const urls = OAuthUtils.buildWellKnownUrls('https://example.com/mcp/', true);
|
|
39
|
+
expect(urls.protectedResource).toBe('https://example.com/.well-known/oauth-protected-resource/mcp');
|
|
40
|
+
expect(urls.authorizationServer).toBe('https://example.com/.well-known/oauth-authorization-server/mcp');
|
|
41
|
+
});
|
|
27
42
|
});
|
|
28
43
|
describe('fetchProtectedResourceMetadata', () => {
|
|
29
44
|
const mockResourceMetadata = {
|