@mcp-z/mcp-outlook 2.4.0 → 2.4.2
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 +5 -1
- package/dist/cjs/constants.d.cts +1 -0
- package/dist/cjs/constants.d.ts +1 -0
- package/dist/cjs/constants.js +4 -0
- package/dist/cjs/constants.js.map +1 -1
- package/dist/cjs/email/querying/query-builder.d.cts +2 -2
- package/dist/cjs/email/querying/query-builder.d.ts +2 -2
- package/dist/cjs/email/querying/query-builder.js +35 -28
- package/dist/cjs/email/querying/query-builder.js.map +1 -1
- package/dist/cjs/lib/create-store.js +1 -1
- package/dist/cjs/lib/create-store.js.map +1 -1
- package/dist/cjs/mcp/tools/label-delete.d.cts +11 -1
- package/dist/cjs/mcp/tools/label-delete.d.ts +11 -1
- package/dist/cjs/mcp/tools/label-delete.js +32 -4
- package/dist/cjs/mcp/tools/label-delete.js.map +1 -1
- package/dist/cjs/mcp/tools/message-search.js +1 -0
- package/dist/cjs/mcp/tools/message-search.js.map +1 -1
- package/dist/cjs/mcp/tools/messages-export-csv.js +1 -0
- package/dist/cjs/mcp/tools/messages-export-csv.js.map +1 -1
- package/dist/cjs/schemas/outlook-query-schema.d.cts +7 -0
- package/dist/cjs/schemas/outlook-query-schema.d.ts +7 -0
- package/dist/cjs/schemas/outlook-query-schema.js +116 -3
- package/dist/cjs/schemas/outlook-query-schema.js.map +1 -1
- package/dist/cjs/setup/config.d.cts +2 -6
- package/dist/cjs/setup/config.d.ts +2 -6
- package/dist/cjs/setup/config.js +22 -0
- package/dist/cjs/setup/config.js.map +1 -1
- package/dist/cjs/setup/http.js +2 -1
- package/dist/cjs/setup/http.js.map +1 -1
- package/dist/cjs/setup/oauth-microsoft.d.cts +6 -1
- package/dist/cjs/setup/oauth-microsoft.d.ts +6 -1
- package/dist/cjs/setup/oauth-microsoft.js +5 -1
- package/dist/cjs/setup/oauth-microsoft.js.map +1 -1
- package/dist/cjs/setup/runtime.d.cts +1 -1
- package/dist/cjs/setup/runtime.d.ts +1 -1
- package/dist/cjs/setup/runtime.js +11 -6
- package/dist/cjs/setup/runtime.js.map +1 -1
- package/dist/cjs/setup/version-help.js +1 -1
- package/dist/cjs/setup/version-help.js.map +1 -1
- package/dist/esm/constants.d.ts +1 -0
- package/dist/esm/constants.js +2 -0
- package/dist/esm/constants.js.map +1 -1
- package/dist/esm/email/querying/query-builder.d.ts +2 -2
- package/dist/esm/email/querying/query-builder.js +16 -20
- package/dist/esm/email/querying/query-builder.js.map +1 -1
- package/dist/esm/lib/create-store.js +1 -1
- package/dist/esm/lib/create-store.js.map +1 -1
- package/dist/esm/mcp/tools/label-delete.d.ts +11 -1
- package/dist/esm/mcp/tools/label-delete.js +21 -0
- package/dist/esm/mcp/tools/label-delete.js.map +1 -1
- package/dist/esm/mcp/tools/message-search.js +2 -1
- package/dist/esm/mcp/tools/message-search.js.map +1 -1
- package/dist/esm/mcp/tools/messages-export-csv.js +2 -1
- package/dist/esm/mcp/tools/messages-export-csv.js.map +1 -1
- package/dist/esm/schemas/outlook-query-schema.d.ts +7 -0
- package/dist/esm/schemas/outlook-query-schema.js +12 -3
- package/dist/esm/schemas/outlook-query-schema.js.map +1 -1
- package/dist/esm/setup/config.d.ts +2 -6
- package/dist/esm/setup/config.js +24 -6
- package/dist/esm/setup/config.js.map +1 -1
- package/dist/esm/setup/http.js +2 -1
- package/dist/esm/setup/http.js.map +1 -1
- package/dist/esm/setup/oauth-microsoft.d.ts +6 -1
- package/dist/esm/setup/oauth-microsoft.js +6 -2
- package/dist/esm/setup/oauth-microsoft.js.map +1 -1
- package/dist/esm/setup/runtime.d.ts +1 -1
- package/dist/esm/setup/runtime.js +11 -5
- package/dist/esm/setup/runtime.js.map +1 -1
- package/dist/esm/setup/version-help.js +3 -7
- package/dist/esm/setup/version-help.js.map +1 -1
- package/package.json +10 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["/Users/kevin/Dev/open-source/ai/mcp-z/mcp-outlook/src/schemas/outlook-query-schema.ts"],"sourcesContent":["import { type BaseEmailQueryFields, baseEmailQueryFields, type FieldOperator, FieldOperatorSchema } from '@mcp-z/email';\nimport { z } from 'zod';\n\n/**\n * Outlook system category values.\n * These are the built-in category types that Outlook recognizes.\n * Note: This is distinct from OutlookCategory (user-created category objects with id/displayName/color).\n */\nexport type OutlookSystemCategory = 'work' | 'personal' | 'family' | 'travel' | 'important' | 'urgent';\n\n/** Zod schema for validating OutlookSystemCategory values */\nexport const OutlookSystemCategorySchema = z.enum(['work', 'personal', 'family', 'travel', 'important', 'urgent']);\n\n/**\n * Outlook-specific query schema with recursive operators and Outlook features.\n *\n * Includes Microsoft Graph/Outlook-specific features:\n * - exactPhrase: Strict exact phrase matching via KQL $search parameter\n * - categories: Outlook system categories (work, personal, family, travel, important, urgent)\n * - label: User-created Outlook categories (case-sensitive, discovered via outlook-categories-list)\n * - importance: Message importance level (high, normal, low)\n * - kqlQuery: Escape hatch for advanced KQL (Keyword Query Language) syntax\n *\n * Plus all base fields from baseEmailQueryFields:\n * - Email addresses: from, to, cc, bcc (support string or field operators)\n * - Content: subject, body, text\n * - Flags: hasAttachment, isRead\n * - Date range: date { $gte, $lt }\n * - Logical operators: $and, $or, $not (recursive)\n *\n * Note: Cast through unknown to work around Zod's lazy schema type inference issue\n * with exactOptionalPropertyTypes. The runtime schema is correct; this cast ensures\n * TypeScript sees the strict OutlookQuery type everywhere the schema is used.\n */\nexport const OutlookQuerySchema = z.lazy(() =>\n z\n .object({\n // Logical operators for combining conditions (recursive)\n $and: z.array(OutlookQuerySchema).optional().describe('Array of conditions that must ALL match'),\n $or: z.array(OutlookQuerySchema).optional().describe('Array of conditions where ANY must match'),\n $not: OutlookQuerySchema.optional().describe('Nested condition that must NOT match'),\n\n // Spread base email query fields (from, to, subject, body, etc.)\n ...baseEmailQueryFields,\n\n // Outlook-specific features\n\n // Exact phrase matching - KQL strict search with double quotes\n exactPhrase: z.string().min(1).optional().describe('Exact phrase matching - words must appear together in exact order (strict matching). Outlook uses KQL.'),\n\n // Outlook system categories with field operator support\n categories: z\n .union([\n OutlookSystemCategorySchema,\n z\n .object({\n $any: z.array(OutlookSystemCategorySchema).optional(),\n $all: z.array(OutlookSystemCategorySchema).optional(),\n $none: z.array(OutlookSystemCategorySchema).optional(),\n })\n .strict(),\n ])\n .optional()\n .describe('Filter by Outlook system categories (work, personal, family, travel, important, urgent)'),\n\n // User-created categories\n label: z\n .union([z.string().min(1), FieldOperatorSchema])\n .optional()\n .describe('Filter by user-created categories (case-sensitive). Use outlook-categories-list to see available categories'),\n\n // Message importance level - Outlook-specific property\n importance: z.enum(['high', 'normal', 'low']).optional().describe('Filter by message importance level (high, normal, low)'),\n\n // Raw KQL query string - escape hatch for advanced syntax\n kqlQuery: z.string().min(1).optional().describe('Raw KQL (Keyword Query Language) syntax for advanced use cases. Bypasses schema validation - use sparingly.'),\n })\n .strict()\n) as unknown as z.ZodType<OutlookQuery>;\n\nconst OutlookQueryStringSchema = z\n .string()\n .min(1)\n .transform((value, ctx) => {\n try {\n return parseOutlookQueryString(value);\n } catch (error) {\n const message = error instanceof Error ? error.message : 'Invalid query input';\n ctx.addIssue({\n code: z.ZodIssueCode.custom,\n message,\n });\n return z.NEVER;\n }\n });\n\nexport const OutlookQueryParameterSchema = z.union([OutlookQuerySchema, OutlookQueryStringSchema]) as z.ZodType<OutlookQuery | string>;\nexport type OutlookQueryParameter = z.infer<typeof OutlookQueryParameterSchema>;\n\nexport function parseOutlookQueryParameter(input: OutlookQuery | string | undefined): OutlookQuery | undefined {\n if (input === undefined) return undefined;\n if (typeof input === 'string') {\n return parseOutlookQueryString(input);\n }\n const validated = OutlookQuerySchema.safeParse(input);\n if (!validated.success) {\n throw new
|
|
1
|
+
{"version":3,"sources":["/Users/kevin/Dev/open-source/ai/mcp-z/mcp-outlook/src/schemas/outlook-query-schema.ts"],"sourcesContent":["import { type BaseEmailQueryFields, baseEmailQueryFields, type FieldOperator, FieldOperatorSchema } from '@mcp-z/email';\nimport { z } from 'zod';\n\n/**\n * The caller's query is invalid (unparseable JSON, a shape the schema rejects, or an unknown category).\n * Tools report it as an invalid-parameters error rather than an internal error.\n */\nexport class InvalidQueryError extends Error {\n constructor(message: string) {\n super(message);\n this.name = 'InvalidQueryError';\n }\n}\n\n/**\n * Outlook system category values.\n * These are the built-in category types that Outlook recognizes.\n * Note: This is distinct from OutlookCategory (user-created category objects with id/displayName/color).\n */\nexport type OutlookSystemCategory = 'work' | 'personal' | 'family' | 'travel' | 'important' | 'urgent';\n\n/** Zod schema for validating OutlookSystemCategory values */\nexport const OutlookSystemCategorySchema = z.enum(['work', 'personal', 'family', 'travel', 'important', 'urgent']);\n\n/**\n * Outlook-specific query schema with recursive operators and Outlook features.\n *\n * Includes Microsoft Graph/Outlook-specific features:\n * - exactPhrase: Strict exact phrase matching via KQL $search parameter\n * - categories: Outlook system categories (work, personal, family, travel, important, urgent)\n * - label: User-created Outlook categories (case-sensitive, discovered via outlook-categories-list)\n * - importance: Message importance level (high, normal, low)\n * - kqlQuery: Escape hatch for advanced KQL (Keyword Query Language) syntax\n *\n * Plus all base fields from baseEmailQueryFields:\n * - Email addresses: from, to, cc, bcc (support string or field operators)\n * - Content: subject, body, text\n * - Flags: hasAttachment, isRead\n * - Date range: date { $gte, $lt }\n * - Logical operators: $and, $or, $not (recursive)\n *\n * Note: Cast through unknown to work around Zod's lazy schema type inference issue\n * with exactOptionalPropertyTypes. The runtime schema is correct; this cast ensures\n * TypeScript sees the strict OutlookQuery type everywhere the schema is used.\n */\nexport const OutlookQuerySchema = z.lazy(() =>\n z\n .object({\n // Logical operators for combining conditions (recursive)\n $and: z.array(OutlookQuerySchema).optional().describe('Array of conditions that must ALL match'),\n $or: z.array(OutlookQuerySchema).optional().describe('Array of conditions where ANY must match'),\n $not: OutlookQuerySchema.optional().describe('Nested condition that must NOT match'),\n\n // Spread base email query fields (from, to, subject, body, etc.)\n ...baseEmailQueryFields,\n\n // Outlook-specific features\n\n // Exact phrase matching - KQL strict search with double quotes\n exactPhrase: z.string().min(1).optional().describe('Exact phrase matching - words must appear together in exact order (strict matching). Outlook uses KQL.'),\n\n // Outlook system categories with field operator support\n categories: z\n .union([\n OutlookSystemCategorySchema,\n z\n .object({\n $any: z.array(OutlookSystemCategorySchema).optional(),\n $all: z.array(OutlookSystemCategorySchema).optional(),\n $none: z.array(OutlookSystemCategorySchema).optional(),\n })\n .strict(),\n ])\n .optional()\n .describe('Filter by Outlook system categories (work, personal, family, travel, important, urgent)'),\n\n // User-created categories\n label: z\n .union([z.string().min(1), FieldOperatorSchema])\n .optional()\n .describe('Filter by user-created categories (case-sensitive). Use outlook-categories-list to see available categories'),\n\n // Message importance level - Outlook-specific property\n importance: z.enum(['high', 'normal', 'low']).optional().describe('Filter by message importance level (high, normal, low)'),\n\n // Raw KQL query string - escape hatch for advanced syntax\n kqlQuery: z.string().min(1).optional().describe('Raw KQL (Keyword Query Language) syntax for advanced use cases. Bypasses schema validation - use sparingly.'),\n })\n .strict()\n) as unknown as z.ZodType<OutlookQuery>;\n\nconst OutlookQueryStringSchema = z\n .string()\n .min(1)\n .transform((value, ctx) => {\n try {\n return parseOutlookQueryString(value);\n } catch (error) {\n const message = error instanceof Error ? error.message : 'Invalid query input';\n ctx.addIssue({\n code: z.ZodIssueCode.custom,\n message,\n });\n return z.NEVER;\n }\n });\n\nexport const OutlookQueryParameterSchema = z.union([OutlookQuerySchema, OutlookQueryStringSchema]) as z.ZodType<OutlookQuery | string>;\nexport type OutlookQueryParameter = z.infer<typeof OutlookQueryParameterSchema>;\n\nexport function parseOutlookQueryParameter(input: OutlookQuery | string | undefined): OutlookQuery | undefined {\n if (input === undefined) return undefined;\n if (typeof input === 'string') {\n return parseOutlookQueryString(input);\n }\n const validated = OutlookQuerySchema.safeParse(input);\n if (!validated.success) {\n throw new InvalidQueryError(`Invalid query JSON: ${validated.error.message}. Use {\"kqlQuery\":\"<query>\"} for KQL syntax.`);\n }\n return validated.data;\n}\n\nfunction parseOutlookQueryString(value: string): OutlookQuery {\n const raw = safeJsonParse(value, 'kqlQuery');\n const validated = OutlookQuerySchema.safeParse(raw);\n if (!validated.success) {\n throw new InvalidQueryError(`Invalid query JSON: ${validated.error.message}. Use {\"kqlQuery\":\"<query>\"} for KQL syntax.`);\n }\n return validated.data;\n}\n\nfunction safeJsonParse(value: string, rawField: 'kqlQuery'): unknown {\n try {\n return JSON.parse(value);\n } catch (error) {\n const message = error instanceof Error ? error.message : 'Invalid JSON';\n throw new InvalidQueryError(`Query must be valid JSON. ${message}. Wrap KQL syntax in {\"${rawField}\":\"<query>\"} if needed.`);\n }\n}\n\nexport type OutlookQuery = BaseEmailQueryFields & {\n $and?: OutlookQuery[];\n $or?: OutlookQuery[];\n $not?: OutlookQuery;\n exactPhrase?: string;\n categories?:\n | OutlookSystemCategory\n | {\n $any?: OutlookSystemCategory[];\n $all?: OutlookSystemCategory[];\n $none?: OutlookSystemCategory[];\n };\n label?: string | FieldOperator;\n importance?: 'high' | 'normal' | 'low';\n kqlQuery?: string;\n};\n"],"names":["baseEmailQueryFields","FieldOperatorSchema","z","InvalidQueryError","Error","message","name","OutlookSystemCategorySchema","enum","OutlookQuerySchema","lazy","object","$and","array","optional","describe","$or","$not","exactPhrase","string","min","categories","union","$any","$all","$none","strict","label","importance","kqlQuery","OutlookQueryStringSchema","transform","value","ctx","parseOutlookQueryString","error","addIssue","code","ZodIssueCode","custom","NEVER","OutlookQueryParameterSchema","parseOutlookQueryParameter","input","undefined","validated","safeParse","success","data","raw","safeJsonParse","rawField","JSON","parse"],"mappings":"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"}
|
|
@@ -8,13 +8,11 @@ import type { ServerConfig } from '../types.js';
|
|
|
8
8
|
* - --headless Disable browser auto-open, return auth URL instead
|
|
9
9
|
* - --redirect-uri=<uri> OAuth redirect URI (default: ephemeral loopback)
|
|
10
10
|
* - --tenant-id=<id> Microsoft tenant ID (overrides MS_TENANT_ID env var)
|
|
11
|
-
* - --dcr-
|
|
12
|
-
* - --dcr-verify-url=<url> External verification endpoint (required for external mode)
|
|
13
|
-
* - --dcr-store-uri=<uri> DCR client storage URI (required for self-hosted mode)
|
|
11
|
+
* - --dcr-store-uri=<uri> DCR client storage URI (default: .mcp-z/dcr.json)
|
|
14
12
|
* - --port=<port> Enable HTTP transport on specified port
|
|
15
13
|
* - --stdio Enable stdio transport (default if no port)
|
|
16
14
|
* - --log-level=<level> Logging level (default: info)
|
|
17
|
-
* - --resource-store-uri=<uri> Resource store URI for CSV file storage (default:
|
|
15
|
+
* - --resource-store-uri=<uri> Resource store URI for CSV file storage (default: .mcp-z/mcp-outlook/files beside the nearest .mcp.json, else ~/.mcp-z/mcp-outlook/files)
|
|
18
16
|
* - --base-url=<url> Base URL for HTTP file serving (default: http://localhost for HTTP transports)
|
|
19
17
|
*
|
|
20
18
|
* Environment Variables:
|
|
@@ -23,8 +21,6 @@ import type { ServerConfig } from '../types.js';
|
|
|
23
21
|
* - MS_CLIENT_SECRET OAuth client secret (optional)
|
|
24
22
|
* - AUTH_MODE Default authentication mode (optional)
|
|
25
23
|
* - HEADLESS Disable browser auto-open (optional)
|
|
26
|
-
* - DCR_MODE DCR mode (optional, same format as --dcr-mode)
|
|
27
|
-
* - DCR_VERIFY_URL External verification URL (optional, same as --dcr-verify-url)
|
|
28
24
|
* - DCR_STORE_URI DCR storage URI (optional, same as --dcr-store-uri)
|
|
29
25
|
* - TOKEN_STORE_URI Token storage URI (optional)
|
|
30
26
|
* - PORT Default HTTP port (optional)
|
package/dist/esm/setup/config.js
CHANGED
|
@@ -19,13 +19,11 @@ const _require = typeof require === 'undefined' ? Module.createRequire(import.me
|
|
|
19
19
|
* - --headless Disable browser auto-open, return auth URL instead
|
|
20
20
|
* - --redirect-uri=<uri> OAuth redirect URI (default: ephemeral loopback)
|
|
21
21
|
* - --tenant-id=<id> Microsoft tenant ID (overrides MS_TENANT_ID env var)
|
|
22
|
-
* - --dcr-
|
|
23
|
-
* - --dcr-verify-url=<url> External verification endpoint (required for external mode)
|
|
24
|
-
* - --dcr-store-uri=<uri> DCR client storage URI (required for self-hosted mode)
|
|
22
|
+
* - --dcr-store-uri=<uri> DCR client storage URI (default: .mcp-z/dcr.json)
|
|
25
23
|
* - --port=<port> Enable HTTP transport on specified port
|
|
26
24
|
* - --stdio Enable stdio transport (default if no port)
|
|
27
25
|
* - --log-level=<level> Logging level (default: info)
|
|
28
|
-
* - --resource-store-uri=<uri> Resource store URI for CSV file storage (default:
|
|
26
|
+
* - --resource-store-uri=<uri> Resource store URI for CSV file storage (default: .mcp-z/mcp-outlook/files beside the nearest .mcp.json, else ~/.mcp-z/mcp-outlook/files)
|
|
29
27
|
* - --base-url=<url> Base URL for HTTP file serving (default: http://localhost for HTTP transports)
|
|
30
28
|
*
|
|
31
29
|
* Environment Variables:
|
|
@@ -34,8 +32,6 @@ const _require = typeof require === 'undefined' ? Module.createRequire(import.me
|
|
|
34
32
|
* - MS_CLIENT_SECRET OAuth client secret (optional)
|
|
35
33
|
* - AUTH_MODE Default authentication mode (optional)
|
|
36
34
|
* - HEADLESS Disable browser auto-open (optional)
|
|
37
|
-
* - DCR_MODE DCR mode (optional, same format as --dcr-mode)
|
|
38
|
-
* - DCR_VERIFY_URL External verification URL (optional, same as --dcr-verify-url)
|
|
39
35
|
* - DCR_STORE_URI DCR storage URI (optional, same as --dcr-store-uri)
|
|
40
36
|
* - TOKEN_STORE_URI Token storage URI (optional)
|
|
41
37
|
* - PORT Default HTTP port (optional)
|
|
@@ -51,6 +47,7 @@ const _require = typeof require === 'undefined' ? Module.createRequire(import.me
|
|
|
51
47
|
const mcpServer = _require('@mcp-z/server');
|
|
52
48
|
const transportConfig = mcpServer.parseConfig(args, env);
|
|
53
49
|
const oauthConfig = oauthMicrosoft.parseConfig(args, env);
|
|
50
|
+
if (oauthConfig.auth === 'dcr') rejectExternalDcr(args, env);
|
|
54
51
|
// Parse DCR configuration if DCR mode is enabled
|
|
55
52
|
const dcrConfig = oauthConfig.auth === 'dcr' ? oauthMicrosoft.parseDcrConfig(args, env, MS_SCOPE) : undefined;
|
|
56
53
|
// Parse application-level config (LOG_LEVEL, RESOURCE_STORE_URI, BASE_URL)
|
|
@@ -129,6 +126,27 @@ const _require = typeof require === 'undefined' ? Module.createRequire(import.me
|
|
|
129
126
|
throw new Error(`${error.message}\n${mcpServer.formatServerEnvSearch(envResult)}`);
|
|
130
127
|
}
|
|
131
128
|
}
|
|
129
|
+
// With --auth=dcr the server always runs its own sign-in endpoints; the external-mode settings never had an effect, so they are refused rather than ignored there. Other auth modes never read them.
|
|
130
|
+
function rejectExternalDcr(args, env) {
|
|
131
|
+
const { values } = parseArgs({
|
|
132
|
+
args,
|
|
133
|
+
options: {
|
|
134
|
+
'dcr-mode': {
|
|
135
|
+
type: 'string'
|
|
136
|
+
},
|
|
137
|
+
'dcr-verify-url': {
|
|
138
|
+
type: 'string'
|
|
139
|
+
}
|
|
140
|
+
},
|
|
141
|
+
strict: false,
|
|
142
|
+
allowPositionals: true
|
|
143
|
+
});
|
|
144
|
+
const mode = (typeof values['dcr-mode'] === 'string' ? values['dcr-mode'] : undefined) || env.DCR_MODE;
|
|
145
|
+
if (mode === 'external') throw new Error('external DCR mode is not supported: the server runs its own sign-in endpoints (use --dcr-mode=self-hosted or leave it unset)');
|
|
146
|
+
if (mode && mode !== 'self-hosted') throw new Error(`Invalid DCR mode "${mode}": only self-hosted is supported`);
|
|
147
|
+
const verifyUrl = typeof values['dcr-verify-url'] === 'string' ? values['dcr-verify-url'] : env.DCR_VERIFY_URL;
|
|
148
|
+
if (verifyUrl) throw new Error('--dcr-verify-url / DCR_VERIFY_URL is not supported: the server runs its own sign-in endpoints and verifies tokens itself');
|
|
149
|
+
}
|
|
132
150
|
function normalizeResourceStoreUri(resourceStoreUri) {
|
|
133
151
|
const filePrefix = 'file://';
|
|
134
152
|
if (resourceStoreUri.startsWith(filePrefix)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["/Users/kevin/Dev/open-source/ai/mcp-z/mcp-outlook/src/setup/config.ts"],"sourcesContent":["import { fileURLToPath, pathToFileURL } from 'node:url';\nimport type * as OAuthMicrosoft from '@mcp-z/oauth-microsoft';\nimport type * as McpServer from '@mcp-z/server';\nimport { Module } from 'module';\nimport { homedir } from 'os';\nimport * as path from 'path';\nimport { parseArgs } from 'util';\nimport { MS_SCOPE } from '../constants.ts';\nimport type { ServerConfig } from '../types.ts';\nimport { readPkg } from './version-help.ts';\n\nconst pkg = readPkg();\nconst SERVER_NAME = pkg.name.replace(/^@[^/]+\\//, '');\n\n// @mcp-z/oauth-microsoft and @mcp-z/server are requireable at the >=20 floor; deferred so\n// --version/--help (handled via version-help.ts, never this file) load neither package.\nconst _require = typeof require === 'undefined' ? Module.createRequire(import.meta.url) : require;\n\n/**\n * Parse Outlook server configuration from CLI arguments and environment.\n *\n * CLI Arguments (all optional):\n * - --auth=<mode> Authentication mode (default: loopback-oauth)\n * Modes: loopback-oauth, device-code, dcr\n * - --headless Disable browser auto-open, return auth URL instead\n * - --redirect-uri=<uri> OAuth redirect URI (default: ephemeral loopback)\n * - --tenant-id=<id> Microsoft tenant ID (overrides MS_TENANT_ID env var)\n * - --dcr-mode=<mode> DCR mode (self-hosted or external, default: self-hosted)\n * - --dcr-verify-url=<url> External verification endpoint (required for external mode)\n * - --dcr-store-uri=<uri> DCR client storage URI (required for self-hosted mode)\n * - --port=<port> Enable HTTP transport on specified port\n * - --stdio Enable stdio transport (default if no port)\n * - --log-level=<level> Logging level (default: info)\n * - --resource-store-uri=<uri> Resource store URI for CSV file storage (default: file://~/.mcp-z/mcp-outlook/files)\n * - --base-url=<url> Base URL for HTTP file serving (default: http://localhost for HTTP transports)\n *\n * Environment Variables:\n * - MS_CLIENT_ID OAuth client ID (REQUIRED)\n * - MS_TENANT_ID Microsoft tenant ID (REQUIRED)\n * - MS_CLIENT_SECRET OAuth client secret (optional)\n * - AUTH_MODE Default authentication mode (optional)\n * - HEADLESS Disable browser auto-open (optional)\n * - DCR_MODE DCR mode (optional, same format as --dcr-mode)\n * - DCR_VERIFY_URL External verification URL (optional, same as --dcr-verify-url)\n * - DCR_STORE_URI DCR storage URI (optional, same as --dcr-store-uri)\n * - TOKEN_STORE_URI Token storage URI (optional)\n * - PORT Default HTTP port (optional)\n * - LOG_LEVEL Default logging level (optional)\n * - RESOURCE_STORE_URI Resource store URI (optional, file://)\n * - BASE_URL Base URL for HTTP file serving (optional)\n *\n * OAuth Scopes (from constants.ts):\n * openid profile offline_access https://graph.microsoft.com/User.Read https://graph.microsoft.com/Mail.ReadWrite https://graph.microsoft.com/Mail.Send https://graph.microsoft.com/MailboxSettings.ReadWrite\n */\nexport function parseConfig(args: string[], env: Record<string, string | undefined>): ServerConfig {\n const oauthMicrosoft = _require('@mcp-z/oauth-microsoft') as typeof OAuthMicrosoft;\n const mcpServer = _require('@mcp-z/server') as typeof McpServer;\n\n const transportConfig = mcpServer.parseConfig(args, env);\n const oauthConfig = oauthMicrosoft.parseConfig(args, env);\n\n // Parse DCR configuration if DCR mode is enabled\n const dcrConfig = oauthConfig.auth === 'dcr' ? oauthMicrosoft.parseDcrConfig(args, env, MS_SCOPE) : undefined;\n\n // Parse application-level config (LOG_LEVEL, RESOURCE_STORE_URI, BASE_URL)\n const { values } = parseArgs({\n args,\n options: {\n 'log-level': { type: 'string' },\n 'base-url': { type: 'string' },\n 'resource-store-uri': { type: 'string' },\n },\n strict: false, // Allow other arguments\n allowPositionals: true,\n });\n\n const name = SERVER_NAME;\n // Parse repository URL from package.json, stripping git+ prefix and .git suffix\n const rawRepoUrl = typeof pkg.repository === 'object' ? pkg.repository.url : pkg.repository;\n const repositoryUrl = rawRepoUrl?.replace(/^git\\+/, '').replace(/\\.git$/, '') ?? `https://github.com/mcp-z/${name}`;\n const baseDir = resolveBaseDir();\n const cliLogLevel = typeof values['log-level'] === 'string' ? values['log-level'] : undefined;\n const envLogLevel = env.LOG_LEVEL;\n const logLevel = cliLogLevel ?? envLogLevel ?? 'info';\n\n // Parse file storage configuration\n const cliResourceStoreUri = typeof values['resource-store-uri'] === 'string' ? values['resource-store-uri'] : undefined;\n const envResourceStoreUri = env.RESOURCE_STORE_URI;\n const defaultResourceStorePath = path.join(baseDir, name, 'files');\n const resourceStoreUri = normalizeResourceStoreUri(cliResourceStoreUri ?? envResourceStoreUri ?? defaultResourceStorePath);\n\n const cliBaseUrl = typeof values['base-url'] === 'string' ? values['base-url'] : undefined;\n const envBaseUrl = env.BASE_URL;\n const baseUrl = cliBaseUrl ?? envBaseUrl;\n\n // Combine configs\n const result: ServerConfig = {\n ...oauthConfig, // Includes clientId, auth, headless, redirectUri\n transport: transportConfig.transport,\n logLevel,\n baseDir,\n name,\n version: pkg.version,\n repositoryUrl,\n resourceStoreUri,\n };\n if (baseUrl !== undefined) result.baseUrl = baseUrl;\n if (dcrConfig !== undefined) result.dcrConfig = dcrConfig;\n return result;\n}\n\n/** The server's data directory: `.mcp-z` beside the nearest .mcp.json (searched from cwd up to home), else in the home directory. */\nfunction resolveBaseDir(): string {\n const mcpServer = _require('@mcp-z/server') as typeof McpServer;\n try {\n const configPath = mcpServer.findConfigPath({ config: '.mcp.json', cwd: process.cwd(), stopDir: homedir() });\n return path.join(path.dirname(configPath), '.mcp-z');\n } catch {\n return path.join(homedir(), '.mcp-z');\n }\n}\n\n/**\n * Build production configuration from process globals.\n * Entry point for production server.\n */\nexport function createConfig(): ServerConfig {\n const mcpServer = _require('@mcp-z/server') as typeof McpServer;\n const envResult = mcpServer.loadServerEnv({ name: SERVER_NAME, baseDir: resolveBaseDir() });\n try {\n return parseConfig(process.argv, process.env);\n } catch (error) {\n throw new Error(`${(error as Error).message}\\n${mcpServer.formatServerEnvSearch(envResult)}`);\n }\n}\n\nfunction normalizeResourceStoreUri(resourceStoreUri: string): string {\n const filePrefix = 'file://';\n if (resourceStoreUri.startsWith(filePrefix)) {\n const rawPath = resourceStoreUri.slice(filePrefix.length);\n const filePath = rawPath.startsWith('~') ? rawPath.replace(/^~/, homedir()) : rawPath.startsWith('/') ? fileURLToPath(resourceStoreUri) : rawPath;\n return pathToFileURL(path.resolve(filePath)).href;\n }\n\n if (resourceStoreUri.includes('://')) return resourceStoreUri;\n\n const expandedPath = resourceStoreUri.startsWith('~') ? resourceStoreUri.replace(/^~/, homedir()) : resourceStoreUri;\n return pathToFileURL(path.resolve(expandedPath)).href;\n}\n"],"names":["fileURLToPath","pathToFileURL","Module","homedir","path","parseArgs","MS_SCOPE","readPkg","pkg","SERVER_NAME","name","replace","_require","require","createRequire","url","parseConfig","args","env","cliLogLevel","cliResourceStoreUri","oauthMicrosoft","mcpServer","transportConfig","oauthConfig","dcrConfig","auth","parseDcrConfig","undefined","values","options","type","strict","allowPositionals","rawRepoUrl","repository","repositoryUrl","baseDir","resolveBaseDir","envLogLevel","LOG_LEVEL","logLevel","envResourceStoreUri","RESOURCE_STORE_URI","defaultResourceStorePath","join","resourceStoreUri","normalizeResourceStoreUri","cliBaseUrl","envBaseUrl","BASE_URL","baseUrl","result","transport","version","configPath","findConfigPath","config","cwd","process","stopDir","dirname","createConfig","envResult","loadServerEnv","argv","error","Error","message","formatServerEnvSearch","filePrefix","startsWith","rawPath","slice","length","filePath","resolve","href","includes","expandedPath"],"mappings":"AAAA,SAASA,aAAa,EAAEC,aAAa,QAAQ,WAAW;AAGxD,SAASC,MAAM,QAAQ,SAAS;AAChC,SAASC,OAAO,QAAQ,KAAK;AAC7B,YAAYC,UAAU,OAAO;AAC7B,SAASC,SAAS,QAAQ,OAAO;AACjC,SAASC,QAAQ,QAAQ,kBAAkB;AAE3C,SAASC,OAAO,QAAQ,oBAAoB;AAE5C,MAAMC,MAAMD;AACZ,MAAME,cAAcD,IAAIE,IAAI,CAACC,OAAO,CAAC,aAAa;AAElD,0FAA0F;AAC1F,wFAAwF;AACxF,MAAMC,WAAW,OAAOC,YAAY,cAAcX,OAAOY,aAAa,CAAC,YAAYC,GAAG,IAAIF;AAE1F;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmCC,GACD,OAAO,SAASG,YAAYC,IAAc,EAAEC,GAAuC;cA6BhEC,OAMkCC;IAlCnD,MAAMC,iBAAiBT,SAAS;IAChC,MAAMU,YAAYV,SAAS;IAE3B,MAAMW,kBAAkBD,UAAUN,WAAW,CAACC,MAAMC;IACpD,MAAMM,cAAcH,eAAeL,WAAW,CAACC,MAAMC;IAErD,iDAAiD;IACjD,MAAMO,YAAYD,YAAYE,IAAI,KAAK,QAAQL,eAAeM,cAAc,CAACV,MAAMC,KAAKZ,YAAYsB;IAEpG,2EAA2E;IAC3E,MAAM,EAAEC,MAAM,EAAE,GAAGxB,UAAU;QAC3BY;QACAa,SAAS;YACP,aAAa;gBAAEC,MAAM;YAAS;YAC9B,YAAY;gBAAEA,MAAM;YAAS;YAC7B,sBAAsB;gBAAEA,MAAM;YAAS;QACzC;QACAC,QAAQ;QACRC,kBAAkB;IACpB;IAEA,MAAMvB,OAAOD;IACb,gFAAgF;IAChF,MAAMyB,aAAa,OAAO1B,IAAI2B,UAAU,KAAK,WAAW3B,IAAI2B,UAAU,CAACpB,GAAG,GAAGP,IAAI2B,UAAU;IAC3F,MAAMC,wBAAgBF,uBAAAA,iCAAAA,WAAYvB,OAAO,CAAC,UAAU,IAAIA,OAAO,CAAC,UAAU,0CAAO,CAAC,yBAAyB,EAAED,MAAM;IACnH,MAAM2B,UAAUC;IAChB,MAAMnB,cAAc,OAAOU,MAAM,CAAC,YAAY,KAAK,WAAWA,MAAM,CAAC,YAAY,GAAGD;IACpF,MAAMW,cAAcrB,IAAIsB,SAAS;IACjC,MAAMC,YAAWtB,QAAAA,wBAAAA,yBAAAA,cAAeoB,yBAAfpB,mBAAAA,QAA8B;IAE/C,mCAAmC;IACnC,MAAMC,sBAAsB,OAAOS,MAAM,CAAC,qBAAqB,KAAK,WAAWA,MAAM,CAAC,qBAAqB,GAAGD;IAC9G,MAAMc,sBAAsBxB,IAAIyB,kBAAkB;IAClD,MAAMC,2BAA2BxC,KAAKyC,IAAI,CAACR,SAAS3B,MAAM;IAC1D,MAAMoC,mBAAmBC,2BAA0B3B,QAAAA,gCAAAA,iCAAAA,sBAAuBsB,iCAAvBtB,mBAAAA,QAA8CwB;IAEjG,MAAMI,aAAa,OAAOnB,MAAM,CAAC,WAAW,KAAK,WAAWA,MAAM,CAAC,WAAW,GAAGD;IACjF,MAAMqB,aAAa/B,IAAIgC,QAAQ;IAC/B,MAAMC,UAAUH,uBAAAA,wBAAAA,aAAcC;IAE9B,kBAAkB;IAClB,MAAMG,SAAuB;QAC3B,GAAG5B,WAAW;QACd6B,WAAW9B,gBAAgB8B,SAAS;QACpCZ;QACAJ;QACA3B;QACA4C,SAAS9C,IAAI8C,OAAO;QACpBlB;QACAU;IACF;IACA,IAAIK,YAAYvB,WAAWwB,OAAOD,OAAO,GAAGA;IAC5C,IAAI1B,cAAcG,WAAWwB,OAAO3B,SAAS,GAAGA;IAChD,OAAO2B;AACT;AAEA,mIAAmI,GACnI,SAASd;IACP,MAAMhB,YAAYV,SAAS;IAC3B,IAAI;QACF,MAAM2C,aAAajC,UAAUkC,cAAc,CAAC;YAAEC,QAAQ;YAAaC,KAAKC,QAAQD,GAAG;YAAIE,SAASzD;QAAU;QAC1G,OAAOC,KAAKyC,IAAI,CAACzC,KAAKyD,OAAO,CAACN,aAAa;IAC7C,EAAE,OAAM;QACN,OAAOnD,KAAKyC,IAAI,CAAC1C,WAAW;IAC9B;AACF;AAEA;;;CAGC,GACD,OAAO,SAAS2D;IACd,MAAMxC,YAAYV,SAAS;IAC3B,MAAMmD,YAAYzC,UAAU0C,aAAa,CAAC;QAAEtD,MAAMD;QAAa4B,SAASC;IAAiB;IACzF,IAAI;QACF,OAAOtB,YAAY2C,QAAQM,IAAI,EAAEN,QAAQzC,GAAG;IAC9C,EAAE,OAAOgD,OAAO;QACd,MAAM,IAAIC,MAAM,GAAG,AAACD,MAAgBE,OAAO,CAAC,EAAE,EAAE9C,UAAU+C,qBAAqB,CAACN,YAAY;IAC9F;AACF;AAEA,SAAShB,0BAA0BD,gBAAwB;IACzD,MAAMwB,aAAa;IACnB,IAAIxB,iBAAiByB,UAAU,CAACD,aAAa;QAC3C,MAAME,UAAU1B,iBAAiB2B,KAAK,CAACH,WAAWI,MAAM;QACxD,MAAMC,WAAWH,QAAQD,UAAU,CAAC,OAAOC,QAAQ7D,OAAO,CAAC,MAAMR,aAAaqE,QAAQD,UAAU,CAAC,OAAOvE,cAAc8C,oBAAoB0B;QAC1I,OAAOvE,cAAcG,KAAKwE,OAAO,CAACD,WAAWE,IAAI;IACnD;IAEA,IAAI/B,iBAAiBgC,QAAQ,CAAC,QAAQ,OAAOhC;IAE7C,MAAMiC,eAAejC,iBAAiByB,UAAU,CAAC,OAAOzB,iBAAiBnC,OAAO,CAAC,MAAMR,aAAa2C;IACpG,OAAO7C,cAAcG,KAAKwE,OAAO,CAACG,eAAeF,IAAI;AACvD"}
|
|
1
|
+
{"version":3,"sources":["/Users/kevin/Dev/open-source/ai/mcp-z/mcp-outlook/src/setup/config.ts"],"sourcesContent":["import { fileURLToPath, pathToFileURL } from 'node:url';\nimport type * as OAuthMicrosoft from '@mcp-z/oauth-microsoft';\nimport type * as McpServer from '@mcp-z/server';\nimport { Module } from 'module';\nimport { homedir } from 'os';\nimport * as path from 'path';\nimport { parseArgs } from 'util';\nimport { MS_SCOPE } from '../constants.ts';\nimport type { ServerConfig } from '../types.ts';\nimport { readPkg } from './version-help.ts';\n\nconst pkg = readPkg();\nconst SERVER_NAME = pkg.name.replace(/^@[^/]+\\//, '');\n\n// @mcp-z/oauth-microsoft and @mcp-z/server are requireable at the >=20 floor; deferred so\n// --version/--help (handled via version-help.ts, never this file) load neither package.\nconst _require = typeof require === 'undefined' ? Module.createRequire(import.meta.url) : require;\n\n/**\n * Parse Outlook server configuration from CLI arguments and environment.\n *\n * CLI Arguments (all optional):\n * - --auth=<mode> Authentication mode (default: loopback-oauth)\n * Modes: loopback-oauth, device-code, dcr\n * - --headless Disable browser auto-open, return auth URL instead\n * - --redirect-uri=<uri> OAuth redirect URI (default: ephemeral loopback)\n * - --tenant-id=<id> Microsoft tenant ID (overrides MS_TENANT_ID env var)\n * - --dcr-store-uri=<uri> DCR client storage URI (default: .mcp-z/dcr.json)\n * - --port=<port> Enable HTTP transport on specified port\n * - --stdio Enable stdio transport (default if no port)\n * - --log-level=<level> Logging level (default: info)\n * - --resource-store-uri=<uri> Resource store URI for CSV file storage (default: .mcp-z/mcp-outlook/files beside the nearest .mcp.json, else ~/.mcp-z/mcp-outlook/files)\n * - --base-url=<url> Base URL for HTTP file serving (default: http://localhost for HTTP transports)\n *\n * Environment Variables:\n * - MS_CLIENT_ID OAuth client ID (REQUIRED)\n * - MS_TENANT_ID Microsoft tenant ID (REQUIRED)\n * - MS_CLIENT_SECRET OAuth client secret (optional)\n * - AUTH_MODE Default authentication mode (optional)\n * - HEADLESS Disable browser auto-open (optional)\n * - DCR_STORE_URI DCR storage URI (optional, same as --dcr-store-uri)\n * - TOKEN_STORE_URI Token storage URI (optional)\n * - PORT Default HTTP port (optional)\n * - LOG_LEVEL Default logging level (optional)\n * - RESOURCE_STORE_URI Resource store URI (optional, file://)\n * - BASE_URL Base URL for HTTP file serving (optional)\n *\n * OAuth Scopes (from constants.ts):\n * openid profile offline_access https://graph.microsoft.com/User.Read https://graph.microsoft.com/Mail.ReadWrite https://graph.microsoft.com/Mail.Send https://graph.microsoft.com/MailboxSettings.ReadWrite\n */\nexport function parseConfig(args: string[], env: Record<string, string | undefined>): ServerConfig {\n const oauthMicrosoft = _require('@mcp-z/oauth-microsoft') as typeof OAuthMicrosoft;\n const mcpServer = _require('@mcp-z/server') as typeof McpServer;\n\n const transportConfig = mcpServer.parseConfig(args, env);\n const oauthConfig = oauthMicrosoft.parseConfig(args, env);\n\n if (oauthConfig.auth === 'dcr') rejectExternalDcr(args, env);\n\n // Parse DCR configuration if DCR mode is enabled\n const dcrConfig = oauthConfig.auth === 'dcr' ? oauthMicrosoft.parseDcrConfig(args, env, MS_SCOPE) : undefined;\n\n // Parse application-level config (LOG_LEVEL, RESOURCE_STORE_URI, BASE_URL)\n const { values } = parseArgs({\n args,\n options: {\n 'log-level': { type: 'string' },\n 'base-url': { type: 'string' },\n 'resource-store-uri': { type: 'string' },\n },\n strict: false, // Allow other arguments\n allowPositionals: true,\n });\n\n const name = SERVER_NAME;\n // Parse repository URL from package.json, stripping git+ prefix and .git suffix\n const rawRepoUrl = typeof pkg.repository === 'object' ? pkg.repository.url : pkg.repository;\n const repositoryUrl = rawRepoUrl?.replace(/^git\\+/, '').replace(/\\.git$/, '') ?? `https://github.com/mcp-z/${name}`;\n const baseDir = resolveBaseDir();\n const cliLogLevel = typeof values['log-level'] === 'string' ? values['log-level'] : undefined;\n const envLogLevel = env.LOG_LEVEL;\n const logLevel = cliLogLevel ?? envLogLevel ?? 'info';\n\n // Parse file storage configuration\n const cliResourceStoreUri = typeof values['resource-store-uri'] === 'string' ? values['resource-store-uri'] : undefined;\n const envResourceStoreUri = env.RESOURCE_STORE_URI;\n const defaultResourceStorePath = path.join(baseDir, name, 'files');\n const resourceStoreUri = normalizeResourceStoreUri(cliResourceStoreUri ?? envResourceStoreUri ?? defaultResourceStorePath);\n\n const cliBaseUrl = typeof values['base-url'] === 'string' ? values['base-url'] : undefined;\n const envBaseUrl = env.BASE_URL;\n const baseUrl = cliBaseUrl ?? envBaseUrl;\n\n // Combine configs\n const result: ServerConfig = {\n ...oauthConfig, // Includes clientId, auth, headless, redirectUri\n transport: transportConfig.transport,\n logLevel,\n baseDir,\n name,\n version: pkg.version,\n repositoryUrl,\n resourceStoreUri,\n };\n if (baseUrl !== undefined) result.baseUrl = baseUrl;\n if (dcrConfig !== undefined) result.dcrConfig = dcrConfig;\n return result;\n}\n\n/** The server's data directory: `.mcp-z` beside the nearest .mcp.json (searched from cwd up to home), else in the home directory. */\nfunction resolveBaseDir(): string {\n const mcpServer = _require('@mcp-z/server') as typeof McpServer;\n try {\n const configPath = mcpServer.findConfigPath({ config: '.mcp.json', cwd: process.cwd(), stopDir: homedir() });\n return path.join(path.dirname(configPath), '.mcp-z');\n } catch {\n return path.join(homedir(), '.mcp-z');\n }\n}\n\n/**\n * Build production configuration from process globals.\n * Entry point for production server.\n */\nexport function createConfig(): ServerConfig {\n const mcpServer = _require('@mcp-z/server') as typeof McpServer;\n const envResult = mcpServer.loadServerEnv({ name: SERVER_NAME, baseDir: resolveBaseDir() });\n try {\n return parseConfig(process.argv, process.env);\n } catch (error) {\n throw new Error(`${(error as Error).message}\\n${mcpServer.formatServerEnvSearch(envResult)}`);\n }\n}\n\n// With --auth=dcr the server always runs its own sign-in endpoints; the external-mode settings never had an effect, so they are refused rather than ignored there. Other auth modes never read them.\nfunction rejectExternalDcr(args: string[], env: Record<string, string | undefined>): void {\n const { values } = parseArgs({ args, options: { 'dcr-mode': { type: 'string' }, 'dcr-verify-url': { type: 'string' } }, strict: false, allowPositionals: true });\n const mode = (typeof values['dcr-mode'] === 'string' ? values['dcr-mode'] : undefined) || env.DCR_MODE;\n if (mode === 'external') throw new Error('external DCR mode is not supported: the server runs its own sign-in endpoints (use --dcr-mode=self-hosted or leave it unset)');\n if (mode && mode !== 'self-hosted') throw new Error(`Invalid DCR mode \"${mode}\": only self-hosted is supported`);\n const verifyUrl = typeof values['dcr-verify-url'] === 'string' ? values['dcr-verify-url'] : env.DCR_VERIFY_URL;\n if (verifyUrl) throw new Error('--dcr-verify-url / DCR_VERIFY_URL is not supported: the server runs its own sign-in endpoints and verifies tokens itself');\n}\n\nfunction normalizeResourceStoreUri(resourceStoreUri: string): string {\n const filePrefix = 'file://';\n if (resourceStoreUri.startsWith(filePrefix)) {\n const rawPath = resourceStoreUri.slice(filePrefix.length);\n const filePath = rawPath.startsWith('~') ? rawPath.replace(/^~/, homedir()) : rawPath.startsWith('/') ? fileURLToPath(resourceStoreUri) : rawPath;\n return pathToFileURL(path.resolve(filePath)).href;\n }\n\n if (resourceStoreUri.includes('://')) return resourceStoreUri;\n\n const expandedPath = resourceStoreUri.startsWith('~') ? resourceStoreUri.replace(/^~/, homedir()) : resourceStoreUri;\n return pathToFileURL(path.resolve(expandedPath)).href;\n}\n"],"names":["fileURLToPath","pathToFileURL","Module","homedir","path","parseArgs","MS_SCOPE","readPkg","pkg","SERVER_NAME","name","replace","_require","require","createRequire","url","parseConfig","args","env","cliLogLevel","cliResourceStoreUri","oauthMicrosoft","mcpServer","transportConfig","oauthConfig","auth","rejectExternalDcr","dcrConfig","parseDcrConfig","undefined","values","options","type","strict","allowPositionals","rawRepoUrl","repository","repositoryUrl","baseDir","resolveBaseDir","envLogLevel","LOG_LEVEL","logLevel","envResourceStoreUri","RESOURCE_STORE_URI","defaultResourceStorePath","join","resourceStoreUri","normalizeResourceStoreUri","cliBaseUrl","envBaseUrl","BASE_URL","baseUrl","result","transport","version","configPath","findConfigPath","config","cwd","process","stopDir","dirname","createConfig","envResult","loadServerEnv","argv","error","Error","message","formatServerEnvSearch","mode","DCR_MODE","verifyUrl","DCR_VERIFY_URL","filePrefix","startsWith","rawPath","slice","length","filePath","resolve","href","includes","expandedPath"],"mappings":"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"}
|
package/dist/esm/setup/http.js
CHANGED
|
@@ -53,7 +53,8 @@ export async function createHTTPServer(config, overrides) {
|
|
|
53
53
|
] : undefined,
|
|
54
54
|
allowedHosts: publicUrl ? [
|
|
55
55
|
publicUrl.host
|
|
56
|
-
] : undefined
|
|
56
|
+
] : undefined,
|
|
57
|
+
bearerAuth: runtime.deps.oauthAdapters.bearerAuth
|
|
57
58
|
});
|
|
58
59
|
// The loopback OAuth callback, the file-export download, and the DCR discovery/
|
|
59
60
|
// registration endpoints are all meant to be reached from a browser on another
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["/Users/kevin/Dev/open-source/ai/mcp-z/mcp-outlook/src/setup/http.ts"],"sourcesContent":["import { composeMiddleware, connectHttp, createFileServingRouter, defaultCacheHints, McpServer, registerPrompts, registerResources, registerTools } from '@mcp-z/server';\nimport cors from 'cors';\nimport express from 'express';\nimport type { RuntimeOverrides, ServerConfig } from '../types.ts';\nimport { createDefaultRuntime } from './runtime.ts';\n\nexport async function createHTTPServer(config: ServerConfig, overrides?: RuntimeOverrides) {\n const runtime = await createDefaultRuntime(config, overrides);\n const modules = runtime.createDomainModules();\n const layers = runtime.middlewareFactories.map((factory) => factory(runtime.deps));\n const composed = composeMiddleware(modules, layers);\n const logger = runtime.deps.logger;\n const port = config.transport.port;\n if (!port) throw new Error('Port is required for HTTP transport');\n\n const tools = [...composed.tools, ...runtime.deps.oauthAdapters.accountTools];\n const filteredTools =\n config.auth === 'dcr'\n ? tools.filter((tool) => tool.name !== 'messages-export-csv') // No file storage in DCR (public cloud responsibility)\n : tools;\n const prompts = [...composed.prompts, ...runtime.deps.oauthAdapters.accountPrompts];\n\n // Built per request (HTTP) and per connection (stdio), not shared. The SDK caches the\n // negotiated protocol revision on the McpServer instance - its own docs say a negotiated\n // session never re-routes a method onto the other era - so one shared instance pins itself\n // to whichever revision reaches it first and answers the other with -32601.\n const buildServer = () => {\n const mcpServer = new McpServer({ name: config.name, version: config.version }, { cacheHints: defaultCacheHints });\n registerTools(mcpServer, filteredTools);\n registerResources(mcpServer, composed.resources);\n registerPrompts(mcpServer, prompts);\n return mcpServer;\n };\n\n const app = express();\n app.use(express.json({ limit: '10mb' }));\n\n // Must mount '/mcp' before any permissive app-level cors(), or that layer answers its\n // preflight first; pass baseUrl's origin/host below or a public deployment 403s itself.\n const publicUrl = config.baseUrl ? new URL(config.baseUrl) : undefined;\n logger.info(`Starting ${config.name} MCP server (http)`);\n const { close, httpServer } = await connectHttp(buildServer, {\n logger,\n app,\n port,\n allowedOrigins: publicUrl ? [publicUrl.origin] : undefined,\n allowedHosts: publicUrl ? [publicUrl.host] : undefined,\n });\n\n // The loopback OAuth callback, the file-export download, and the DCR discovery/\n // registration endpoints are all meant to be reached from a browser on another\n // origin. Keep cors() for them, scoped to their own routes - never in front of '/mcp'.\n if (runtime.deps.oauthAdapters.loopbackRouter) {\n app.use('/', cors(), runtime.deps.oauthAdapters.loopbackRouter);\n logger.info('Mounted loopback OAuth callback router');\n }\n\n if (config.auth !== 'dcr') {\n const fileRouter = createFileServingRouter({ resourceStoreUri: config.resourceStoreUri }, { contentType: 'text/csv', contentDisposition: 'attachment' });\n app.use('/files', cors(), fileRouter);\n }\n\n if (runtime.deps.oauthAdapters.dcrRouter) {\n app.use('/', cors(), runtime.deps.oauthAdapters.dcrRouter);\n logger.info('Mounted DCR router with OAuth endpoints');\n }\n\n logger.info('http transport ready');\n\n return {\n httpServer,\n logger,\n close: async () => {\n await close();\n await runtime.close();\n },\n };\n}\n"],"names":["composeMiddleware","connectHttp","createFileServingRouter","defaultCacheHints","McpServer","registerPrompts","registerResources","registerTools","cors","express","createDefaultRuntime","createHTTPServer","config","overrides","runtime","modules","createDomainModules","layers","middlewareFactories","map","factory","deps","composed","logger","port","transport","Error","tools","oauthAdapters","accountTools","filteredTools","auth","filter","tool","name","prompts","accountPrompts","buildServer","mcpServer","version","cacheHints","resources","app","use","json","limit","publicUrl","baseUrl","URL","undefined","info","close","httpServer","allowedOrigins","origin","allowedHosts","host","loopbackRouter","fileRouter","resourceStoreUri","contentType","contentDisposition","dcrRouter"],"mappings":"AAAA,SAASA,iBAAiB,EAAEC,WAAW,EAAEC,uBAAuB,EAAEC,iBAAiB,EAAEC,SAAS,EAAEC,eAAe,EAAEC,iBAAiB,EAAEC,aAAa,QAAQ,gBAAgB;AACzK,OAAOC,UAAU,OAAO;AACxB,OAAOC,aAAa,UAAU;AAE9B,SAASC,oBAAoB,QAAQ,eAAe;AAEpD,OAAO,eAAeC,iBAAiBC,MAAoB,EAAEC,SAA4B;IACvF,MAAMC,UAAU,MAAMJ,qBAAqBE,QAAQC;IACnD,MAAME,UAAUD,QAAQE,mBAAmB;IAC3C,MAAMC,SAASH,QAAQI,mBAAmB,CAACC,GAAG,CAAC,CAACC,UAAYA,QAAQN,QAAQO,IAAI;IAChF,MAAMC,WAAWtB,kBAAkBe,SAASE;IAC5C,MAAMM,SAAST,QAAQO,IAAI,CAACE,MAAM;IAClC,MAAMC,OAAOZ,OAAOa,SAAS,CAACD,IAAI;IAClC,IAAI,CAACA,MAAM,MAAM,IAAIE,MAAM;IAE3B,MAAMC,QAAQ;WAAIL,SAASK,KAAK;WAAKb,QAAQO,IAAI,CAACO,aAAa,CAACC,YAAY;KAAC;IAC7E,MAAMC,gBACJlB,OAAOmB,IAAI,KAAK,QACZJ,MAAMK,MAAM,CAAC,CAACC,OAASA,KAAKC,IAAI,KAAK,uBAAuB,uDAAuD;OACnHP;IACN,MAAMQ,UAAU;WAAIb,SAASa,OAAO;WAAKrB,QAAQO,IAAI,CAACO,aAAa,CAACQ,cAAc;KAAC;IAEnF,sFAAsF;IACtF,yFAAyF;IACzF,2FAA2F;IAC3F,4EAA4E;IAC5E,MAAMC,cAAc;QAClB,MAAMC,YAAY,IAAIlC,UAAU;YAAE8B,MAAMtB,OAAOsB,IAAI;YAAEK,SAAS3B,OAAO2B,OAAO;QAAC,GAAG;YAAEC,YAAYrC;QAAkB;QAChHI,cAAc+B,WAAWR;QACzBxB,kBAAkBgC,WAAWhB,SAASmB,SAAS;QAC/CpC,gBAAgBiC,WAAWH;QAC3B,OAAOG;IACT;IAEA,MAAMI,MAAMjC;IACZiC,IAAIC,GAAG,CAAClC,QAAQmC,IAAI,CAAC;QAAEC,OAAO;IAAO;IAErC,sFAAsF;IACtF,wFAAwF;IACxF,MAAMC,YAAYlC,OAAOmC,OAAO,GAAG,IAAIC,IAAIpC,OAAOmC,OAAO,IAAIE;IAC7D1B,OAAO2B,IAAI,CAAC,CAAC,SAAS,EAAEtC,OAAOsB,IAAI,CAAC,kBAAkB,CAAC;IACvD,MAAM,EAAEiB,KAAK,EAAEC,UAAU,EAAE,GAAG,MAAMnD,YAAYoC,aAAa;QAC3Dd;QACAmB;QACAlB;QACA6B,gBAAgBP,YAAY;YAACA,UAAUQ,MAAM;SAAC,GAAGL;QACjDM,cAAcT,YAAY;YAACA,UAAUU,IAAI;SAAC,GAAGP;
|
|
1
|
+
{"version":3,"sources":["/Users/kevin/Dev/open-source/ai/mcp-z/mcp-outlook/src/setup/http.ts"],"sourcesContent":["import { composeMiddleware, connectHttp, createFileServingRouter, defaultCacheHints, McpServer, registerPrompts, registerResources, registerTools } from '@mcp-z/server';\nimport cors from 'cors';\nimport express from 'express';\nimport type { RuntimeOverrides, ServerConfig } from '../types.ts';\nimport { createDefaultRuntime } from './runtime.ts';\n\nexport async function createHTTPServer(config: ServerConfig, overrides?: RuntimeOverrides) {\n const runtime = await createDefaultRuntime(config, overrides);\n const modules = runtime.createDomainModules();\n const layers = runtime.middlewareFactories.map((factory) => factory(runtime.deps));\n const composed = composeMiddleware(modules, layers);\n const logger = runtime.deps.logger;\n const port = config.transport.port;\n if (!port) throw new Error('Port is required for HTTP transport');\n\n const tools = [...composed.tools, ...runtime.deps.oauthAdapters.accountTools];\n const filteredTools =\n config.auth === 'dcr'\n ? tools.filter((tool) => tool.name !== 'messages-export-csv') // No file storage in DCR (public cloud responsibility)\n : tools;\n const prompts = [...composed.prompts, ...runtime.deps.oauthAdapters.accountPrompts];\n\n // Built per request (HTTP) and per connection (stdio), not shared. The SDK caches the\n // negotiated protocol revision on the McpServer instance - its own docs say a negotiated\n // session never re-routes a method onto the other era - so one shared instance pins itself\n // to whichever revision reaches it first and answers the other with -32601.\n const buildServer = () => {\n const mcpServer = new McpServer({ name: config.name, version: config.version }, { cacheHints: defaultCacheHints });\n registerTools(mcpServer, filteredTools);\n registerResources(mcpServer, composed.resources);\n registerPrompts(mcpServer, prompts);\n return mcpServer;\n };\n\n const app = express();\n app.use(express.json({ limit: '10mb' }));\n\n // Must mount '/mcp' before any permissive app-level cors(), or that layer answers its\n // preflight first; pass baseUrl's origin/host below or a public deployment 403s itself.\n const publicUrl = config.baseUrl ? new URL(config.baseUrl) : undefined;\n logger.info(`Starting ${config.name} MCP server (http)`);\n const { close, httpServer } = await connectHttp(buildServer, {\n logger,\n app,\n port,\n allowedOrigins: publicUrl ? [publicUrl.origin] : undefined,\n allowedHosts: publicUrl ? [publicUrl.host] : undefined,\n bearerAuth: runtime.deps.oauthAdapters.bearerAuth,\n });\n\n // The loopback OAuth callback, the file-export download, and the DCR discovery/\n // registration endpoints are all meant to be reached from a browser on another\n // origin. Keep cors() for them, scoped to their own routes - never in front of '/mcp'.\n if (runtime.deps.oauthAdapters.loopbackRouter) {\n app.use('/', cors(), runtime.deps.oauthAdapters.loopbackRouter);\n logger.info('Mounted loopback OAuth callback router');\n }\n\n if (config.auth !== 'dcr') {\n const fileRouter = createFileServingRouter({ resourceStoreUri: config.resourceStoreUri }, { contentType: 'text/csv', contentDisposition: 'attachment' });\n app.use('/files', cors(), fileRouter);\n }\n\n if (runtime.deps.oauthAdapters.dcrRouter) {\n app.use('/', cors(), runtime.deps.oauthAdapters.dcrRouter);\n logger.info('Mounted DCR router with OAuth endpoints');\n }\n\n logger.info('http transport ready');\n\n return {\n httpServer,\n logger,\n close: async () => {\n await close();\n await runtime.close();\n },\n };\n}\n"],"names":["composeMiddleware","connectHttp","createFileServingRouter","defaultCacheHints","McpServer","registerPrompts","registerResources","registerTools","cors","express","createDefaultRuntime","createHTTPServer","config","overrides","runtime","modules","createDomainModules","layers","middlewareFactories","map","factory","deps","composed","logger","port","transport","Error","tools","oauthAdapters","accountTools","filteredTools","auth","filter","tool","name","prompts","accountPrompts","buildServer","mcpServer","version","cacheHints","resources","app","use","json","limit","publicUrl","baseUrl","URL","undefined","info","close","httpServer","allowedOrigins","origin","allowedHosts","host","bearerAuth","loopbackRouter","fileRouter","resourceStoreUri","contentType","contentDisposition","dcrRouter"],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type AccountAuthProvider } from '@mcp-z/oauth';
|
|
2
|
-
import { DcrOAuthProvider, DeviceCodeProvider, LoopbackOAuthProvider } from '@mcp-z/oauth-microsoft';
|
|
2
|
+
import { DcrOAuthProvider, DcrTokenVerifier, DeviceCodeProvider, LoopbackOAuthProvider } from '@mcp-z/oauth-microsoft';
|
|
3
3
|
import type { Logger, PromptModule, ToolModule } from '@mcp-z/server';
|
|
4
4
|
import type { Router } from 'express';
|
|
5
5
|
import type { Keyv } from 'keyv';
|
|
@@ -38,6 +38,11 @@ export interface OAuthAdapters {
|
|
|
38
38
|
accountTools: ToolModule[];
|
|
39
39
|
accountPrompts: PromptModule[];
|
|
40
40
|
dcrRouter?: Router;
|
|
41
|
+
/** Bearer gate for '/mcp' in DCR mode: every request is verified against this server's /oauth/verify. */
|
|
42
|
+
bearerAuth?: {
|
|
43
|
+
verifier: DcrTokenVerifier;
|
|
44
|
+
resourceMetadataUrl: string;
|
|
45
|
+
};
|
|
41
46
|
loopbackRouter?: Router;
|
|
42
47
|
}
|
|
43
48
|
/**
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { AccountServer } from '@mcp-z/oauth';
|
|
2
|
-
import { createDcrRouter, createLoopbackCallbackRouter, DcrOAuthProvider, DeviceCodeProvider, LoopbackOAuthProvider } from '@mcp-z/oauth-microsoft';
|
|
2
|
+
import { createDcrRouter, createLoopbackCallbackRouter, DcrOAuthProvider, DcrTokenVerifier, DeviceCodeProvider, LoopbackOAuthProvider } from '@mcp-z/oauth-microsoft';
|
|
3
3
|
import { MS_SCOPE } from '../constants.js';
|
|
4
4
|
/**
|
|
5
5
|
* Create Outlook OAuth adapters based on transport configuration
|
|
@@ -86,7 +86,11 @@ import { MS_SCOPE } from '../constants.js';
|
|
|
86
86
|
authAdapter,
|
|
87
87
|
accountTools,
|
|
88
88
|
accountPrompts,
|
|
89
|
-
dcrRouter
|
|
89
|
+
dcrRouter,
|
|
90
|
+
bearerAuth: {
|
|
91
|
+
verifier: new DcrTokenVerifier(`${oauthStaticConfig.baseUrl}/oauth/verify`),
|
|
92
|
+
resourceMetadataUrl: `${oauthStaticConfig.baseUrl}/.well-known/oauth-protected-resource/mcp`
|
|
93
|
+
}
|
|
90
94
|
};
|
|
91
95
|
}
|
|
92
96
|
// Device code mode - similar to service accounts (single static identity)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["/Users/kevin/Dev/open-source/ai/mcp-z/mcp-outlook/src/setup/oauth-microsoft.ts"],"sourcesContent":["import { type AccountAuthProvider, AccountServer } from '@mcp-z/oauth';\nimport { createDcrRouter, createLoopbackCallbackRouter, DcrOAuthProvider, DeviceCodeProvider, LoopbackOAuthProvider } from '@mcp-z/oauth-microsoft';\nimport type { Logger, PromptModule, ToolModule } from '@mcp-z/server';\nimport type { Router } from 'express';\nimport type { Keyv } from 'keyv';\nimport { MS_SCOPE } from '../constants.ts';\nimport type { ServerConfig } from '../types.ts';\n\n/**\n * Outlook OAuth runtime dependencies\n *\n * Contains the required dependencies for OAuth functionality including logger,\n * token storage, and optional DCR store.\n */\nexport interface OAuthRuntimeDeps {\n logger: Logger;\n tokenStore: Keyv<unknown>;\n dcrStore?: Keyv<unknown>;\n}\n\n/**\n * Auth middleware wrapper with withToolAuth/withResourceAuth/withPromptAuth methods\n *\n * Provides authentication middleware methods for tools, resources, and prompts.\n */\nexport interface AuthMiddleware {\n withToolAuth<T extends ToolModule>(module: T): T;\n withResourceAuth<T>(module: T): T;\n withPromptAuth<T>(module: T): T;\n}\n\n/**\n * Result of OAuth adapter creation\n *\n * Contains the primary OAuth adapter, middleware, auth adapter,\n * account tools, prompts, and optional routers.\n */\nexport interface OAuthAdapters {\n primary: LoopbackOAuthProvider | DeviceCodeProvider | DcrOAuthProvider;\n middleware: AuthMiddleware;\n authAdapter: AccountAuthProvider;\n accountTools: ToolModule[];\n accountPrompts: PromptModule[];\n dcrRouter?: Router; // DCR OAuth endpoints (only for dcr mode)\n loopbackRouter?: Router;\n}\n\n/**\n * Create Outlook OAuth adapters based on transport configuration\n *\n * Returns primary adapter, pre-configured middleware, auth email provider,\n * and pre-selected account tools based on auth mode.\n * @param config - Outlook server configuration\n * @param deps - Runtime dependencies (logger, tokenStore, etc.)\n * @returns OAuth adapters with pre-configured middleware and account tools\n */\nexport async function createOAuthAdapters(config: ServerConfig, deps: OAuthRuntimeDeps, baseUrl?: string): Promise<OAuthAdapters> {\n const { logger, tokenStore, dcrStore } = deps;\n const oauthStaticConfig = {\n service: config.name,\n clientId: config.clientId,\n clientSecret: config.clientSecret,\n scope: MS_SCOPE,\n tenantId: config.tenantId,\n auth: config.auth,\n headless: config.headless,\n redirectUri: config.transport.type === 'stdio' ? undefined : config.redirectUri,\n ...(baseUrl && { baseUrl }),\n };\n\n let primary: LoopbackOAuthProvider | DeviceCodeProvider | DcrOAuthProvider;\n\n // DCR mode - Dynamic Client Registration with HTTP-only support\n if (oauthStaticConfig.auth === 'dcr') {\n logger.debug('Creating DCR provider', { service: oauthStaticConfig.service });\n\n // DCR requires dcrStore and baseUrl\n if (!dcrStore) {\n throw new Error('DCR mode requires dcrStore to be configured');\n }\n if (!oauthStaticConfig.baseUrl) {\n throw new Error('DCR mode requires baseUrl to be configured');\n }\n\n // Create DcrOAuthProvider (stateless provider that receives tokens from verification context)\n primary = new DcrOAuthProvider({\n clientId: oauthStaticConfig.clientId,\n ...(oauthStaticConfig.clientSecret && { clientSecret: oauthStaticConfig.clientSecret }),\n tenantId: oauthStaticConfig.tenantId,\n scope: oauthStaticConfig.scope,\n verifyEndpoint: `${oauthStaticConfig.baseUrl}/oauth/verify`,\n logger,\n });\n\n // Create DCR OAuth router with authorization server endpoints\n const dcrRouter = createDcrRouter({\n store: dcrStore,\n issuerUrl: oauthStaticConfig.baseUrl,\n baseUrl: oauthStaticConfig.baseUrl,\n scopesSupported: oauthStaticConfig.scope.split(' '), // Convert space-separated scope to array\n clientConfig: {\n clientId: oauthStaticConfig.clientId,\n ...(oauthStaticConfig.clientSecret && { clientSecret: oauthStaticConfig.clientSecret }),\n tenantId: oauthStaticConfig.tenantId,\n },\n });\n\n // DCR uses bearer token authentication with middleware validation\n const middleware = primary.authMiddleware();\n\n // Create auth email provider (stateless, no token storage)\n const authAdapter: AccountAuthProvider = {\n getAccessToken: () => {\n throw new Error('DCR mode does not support getAccessToken - tokens are provided via bearer auth');\n },\n getUserEmail: () => {\n throw new Error('DCR mode does not support getUserEmail - tokens are provided via bearer auth');\n },\n };\n\n // No account management tools for DCR (multi-user management at client registration level)\n const accountTools: ToolModule[] = [];\n const accountPrompts: PromptModule[] = [];\n\n logger.info('DCR provider created for Outlook', {\n service: oauthStaticConfig.service,\n baseUrl: oauthStaticConfig.baseUrl,\n });\n\n return { primary, middleware: middleware as AuthMiddleware, authAdapter, accountTools, accountPrompts, dcrRouter };\n }\n\n // Device code mode - similar to service accounts (single static identity)\n if (oauthStaticConfig.auth === 'device-code') {\n logger.debug('Creating device code provider', { service: oauthStaticConfig.service });\n const deviceCodeProvider = new DeviceCodeProvider({\n service: oauthStaticConfig.service,\n clientId: oauthStaticConfig.clientId,\n tenantId: oauthStaticConfig.tenantId,\n scope: oauthStaticConfig.scope,\n logger,\n tokenStore,\n headless: oauthStaticConfig.headless,\n });\n primary = deviceCodeProvider;\n\n // Device code uses single-user middleware (no account management needed)\n const middleware = deviceCodeProvider.authMiddleware();\n\n // Create auth email provider\n const authAdapter: AccountAuthProvider = {\n getAccessToken: (accountId) => deviceCodeProvider.getAccessToken(accountId),\n getUserEmail: (accountId) => deviceCodeProvider.getUserEmail(accountId),\n };\n\n // No account management tools for device code (like service accounts)\n const accountTools: ToolModule[] = [];\n const accountPrompts: PromptModule[] = [];\n\n logger.info('Device code provider created for Outlook', {\n service: oauthStaticConfig.service,\n });\n\n return { primary, middleware: middleware as AuthMiddleware, authAdapter, accountTools, accountPrompts };\n }\n\n // Always create primary adapter for file-based OAuth (loopback mode)\n primary = new LoopbackOAuthProvider({\n service: oauthStaticConfig.service,\n clientId: oauthStaticConfig.clientId,\n clientSecret: oauthStaticConfig.clientSecret,\n scope: oauthStaticConfig.scope,\n tenantId: oauthStaticConfig.tenantId,\n headless: oauthStaticConfig.headless,\n logger,\n tokenStore,\n ...(oauthStaticConfig.redirectUri !== undefined && { redirectUri: oauthStaticConfig.redirectUri }),\n });\n\n // Create auth email provider (used by account management tools)\n const authAdapter: AccountAuthProvider = primary;\n\n // Select middleware AND account tools based on auth mode\n const middleware: ReturnType<LoopbackOAuthProvider['authMiddleware']> = primary.authMiddleware();\n\n // Loopback OAuth - multi-account mode\n const result = AccountServer.createLoopback({\n service: oauthStaticConfig.service,\n store: tokenStore,\n logger,\n auth: authAdapter,\n });\n const accountTools: ToolModule[] = result.tools as ToolModule[];\n const accountPrompts: PromptModule[] = result.prompts as PromptModule[];\n logger.debug('Loopback OAuth (multi-account mode)', { service: oauthStaticConfig.service });\n\n const loopbackRouter = oauthStaticConfig.redirectUri ? createLoopbackCallbackRouter(primary) : undefined;\n\n return { primary, middleware: middleware as AuthMiddleware, authAdapter, accountTools, accountPrompts, loopbackRouter };\n}\n"],"names":["AccountServer","createDcrRouter","createLoopbackCallbackRouter","DcrOAuthProvider","DeviceCodeProvider","LoopbackOAuthProvider","MS_SCOPE","createOAuthAdapters","config","deps","baseUrl","logger","tokenStore","dcrStore","oauthStaticConfig","service","name","clientId","clientSecret","scope","tenantId","auth","headless","redirectUri","transport","type","undefined","primary","debug","Error","verifyEndpoint","dcrRouter","store","issuerUrl","scopesSupported","split","clientConfig","middleware","authMiddleware","authAdapter","getAccessToken","getUserEmail","accountTools","accountPrompts","info","deviceCodeProvider","accountId","result","createLoopback","tools","prompts","loopbackRouter"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["/Users/kevin/Dev/open-source/ai/mcp-z/mcp-outlook/src/setup/oauth-microsoft.ts"],"sourcesContent":["import { type AccountAuthProvider, AccountServer } from '@mcp-z/oauth';\nimport { createDcrRouter, createLoopbackCallbackRouter, DcrOAuthProvider, DcrTokenVerifier, DeviceCodeProvider, LoopbackOAuthProvider } from '@mcp-z/oauth-microsoft';\nimport type { Logger, PromptModule, ToolModule } from '@mcp-z/server';\nimport type { Router } from 'express';\nimport type { Keyv } from 'keyv';\nimport { MS_SCOPE } from '../constants.ts';\nimport type { ServerConfig } from '../types.ts';\n\n/**\n * Outlook OAuth runtime dependencies\n *\n * Contains the required dependencies for OAuth functionality including logger,\n * token storage, and optional DCR store.\n */\nexport interface OAuthRuntimeDeps {\n logger: Logger;\n tokenStore: Keyv<unknown>;\n dcrStore?: Keyv<unknown>;\n}\n\n/**\n * Auth middleware wrapper with withToolAuth/withResourceAuth/withPromptAuth methods\n *\n * Provides authentication middleware methods for tools, resources, and prompts.\n */\nexport interface AuthMiddleware {\n withToolAuth<T extends ToolModule>(module: T): T;\n withResourceAuth<T>(module: T): T;\n withPromptAuth<T>(module: T): T;\n}\n\n/**\n * Result of OAuth adapter creation\n *\n * Contains the primary OAuth adapter, middleware, auth adapter,\n * account tools, prompts, and optional routers.\n */\nexport interface OAuthAdapters {\n primary: LoopbackOAuthProvider | DeviceCodeProvider | DcrOAuthProvider;\n middleware: AuthMiddleware;\n authAdapter: AccountAuthProvider;\n accountTools: ToolModule[];\n accountPrompts: PromptModule[];\n dcrRouter?: Router; // DCR OAuth endpoints (only for dcr mode)\n /** Bearer gate for '/mcp' in DCR mode: every request is verified against this server's /oauth/verify. */\n bearerAuth?: { verifier: DcrTokenVerifier; resourceMetadataUrl: string };\n loopbackRouter?: Router;\n}\n\n/**\n * Create Outlook OAuth adapters based on transport configuration\n *\n * Returns primary adapter, pre-configured middleware, auth email provider,\n * and pre-selected account tools based on auth mode.\n * @param config - Outlook server configuration\n * @param deps - Runtime dependencies (logger, tokenStore, etc.)\n * @returns OAuth adapters with pre-configured middleware and account tools\n */\nexport async function createOAuthAdapters(config: ServerConfig, deps: OAuthRuntimeDeps, baseUrl?: string): Promise<OAuthAdapters> {\n const { logger, tokenStore, dcrStore } = deps;\n const oauthStaticConfig = {\n service: config.name,\n clientId: config.clientId,\n clientSecret: config.clientSecret,\n scope: MS_SCOPE,\n tenantId: config.tenantId,\n auth: config.auth,\n headless: config.headless,\n redirectUri: config.transport.type === 'stdio' ? undefined : config.redirectUri,\n ...(baseUrl && { baseUrl }),\n };\n\n let primary: LoopbackOAuthProvider | DeviceCodeProvider | DcrOAuthProvider;\n\n // DCR mode - Dynamic Client Registration with HTTP-only support\n if (oauthStaticConfig.auth === 'dcr') {\n logger.debug('Creating DCR provider', { service: oauthStaticConfig.service });\n\n // DCR requires dcrStore and baseUrl\n if (!dcrStore) {\n throw new Error('DCR mode requires dcrStore to be configured');\n }\n if (!oauthStaticConfig.baseUrl) {\n throw new Error('DCR mode requires baseUrl to be configured');\n }\n\n // Create DcrOAuthProvider (stateless provider that receives tokens from verification context)\n primary = new DcrOAuthProvider({\n clientId: oauthStaticConfig.clientId,\n ...(oauthStaticConfig.clientSecret && { clientSecret: oauthStaticConfig.clientSecret }),\n tenantId: oauthStaticConfig.tenantId,\n scope: oauthStaticConfig.scope,\n verifyEndpoint: `${oauthStaticConfig.baseUrl}/oauth/verify`,\n logger,\n });\n\n // Create DCR OAuth router with authorization server endpoints\n const dcrRouter = createDcrRouter({\n store: dcrStore,\n issuerUrl: oauthStaticConfig.baseUrl,\n baseUrl: oauthStaticConfig.baseUrl,\n scopesSupported: oauthStaticConfig.scope.split(' '), // Convert space-separated scope to array\n clientConfig: {\n clientId: oauthStaticConfig.clientId,\n ...(oauthStaticConfig.clientSecret && { clientSecret: oauthStaticConfig.clientSecret }),\n tenantId: oauthStaticConfig.tenantId,\n },\n });\n\n // DCR uses bearer token authentication with middleware validation\n const middleware = primary.authMiddleware();\n\n // Create auth email provider (stateless, no token storage)\n const authAdapter: AccountAuthProvider = {\n getAccessToken: () => {\n throw new Error('DCR mode does not support getAccessToken - tokens are provided via bearer auth');\n },\n getUserEmail: () => {\n throw new Error('DCR mode does not support getUserEmail - tokens are provided via bearer auth');\n },\n };\n\n // No account management tools for DCR (multi-user management at client registration level)\n const accountTools: ToolModule[] = [];\n const accountPrompts: PromptModule[] = [];\n\n logger.info('DCR provider created for Outlook', {\n service: oauthStaticConfig.service,\n baseUrl: oauthStaticConfig.baseUrl,\n });\n\n return {\n primary,\n middleware: middleware as AuthMiddleware,\n authAdapter,\n accountTools,\n accountPrompts,\n dcrRouter,\n bearerAuth: {\n verifier: new DcrTokenVerifier(`${oauthStaticConfig.baseUrl}/oauth/verify`),\n resourceMetadataUrl: `${oauthStaticConfig.baseUrl}/.well-known/oauth-protected-resource/mcp`,\n },\n };\n }\n\n // Device code mode - similar to service accounts (single static identity)\n if (oauthStaticConfig.auth === 'device-code') {\n logger.debug('Creating device code provider', { service: oauthStaticConfig.service });\n const deviceCodeProvider = new DeviceCodeProvider({\n service: oauthStaticConfig.service,\n clientId: oauthStaticConfig.clientId,\n tenantId: oauthStaticConfig.tenantId,\n scope: oauthStaticConfig.scope,\n logger,\n tokenStore,\n headless: oauthStaticConfig.headless,\n });\n primary = deviceCodeProvider;\n\n // Device code uses single-user middleware (no account management needed)\n const middleware = deviceCodeProvider.authMiddleware();\n\n // Create auth email provider\n const authAdapter: AccountAuthProvider = {\n getAccessToken: (accountId) => deviceCodeProvider.getAccessToken(accountId),\n getUserEmail: (accountId) => deviceCodeProvider.getUserEmail(accountId),\n };\n\n // No account management tools for device code (like service accounts)\n const accountTools: ToolModule[] = [];\n const accountPrompts: PromptModule[] = [];\n\n logger.info('Device code provider created for Outlook', {\n service: oauthStaticConfig.service,\n });\n\n return { primary, middleware: middleware as AuthMiddleware, authAdapter, accountTools, accountPrompts };\n }\n\n // Always create primary adapter for file-based OAuth (loopback mode)\n primary = new LoopbackOAuthProvider({\n service: oauthStaticConfig.service,\n clientId: oauthStaticConfig.clientId,\n clientSecret: oauthStaticConfig.clientSecret,\n scope: oauthStaticConfig.scope,\n tenantId: oauthStaticConfig.tenantId,\n headless: oauthStaticConfig.headless,\n logger,\n tokenStore,\n ...(oauthStaticConfig.redirectUri !== undefined && { redirectUri: oauthStaticConfig.redirectUri }),\n });\n\n // Create auth email provider (used by account management tools)\n const authAdapter: AccountAuthProvider = primary;\n\n // Select middleware AND account tools based on auth mode\n const middleware: ReturnType<LoopbackOAuthProvider['authMiddleware']> = primary.authMiddleware();\n\n // Loopback OAuth - multi-account mode\n const result = AccountServer.createLoopback({\n service: oauthStaticConfig.service,\n store: tokenStore,\n logger,\n auth: authAdapter,\n });\n const accountTools: ToolModule[] = result.tools as ToolModule[];\n const accountPrompts: PromptModule[] = result.prompts as PromptModule[];\n logger.debug('Loopback OAuth (multi-account mode)', { service: oauthStaticConfig.service });\n\n const loopbackRouter = oauthStaticConfig.redirectUri ? createLoopbackCallbackRouter(primary) : undefined;\n\n return { primary, middleware: middleware as AuthMiddleware, authAdapter, accountTools, accountPrompts, loopbackRouter };\n}\n"],"names":["AccountServer","createDcrRouter","createLoopbackCallbackRouter","DcrOAuthProvider","DcrTokenVerifier","DeviceCodeProvider","LoopbackOAuthProvider","MS_SCOPE","createOAuthAdapters","config","deps","baseUrl","logger","tokenStore","dcrStore","oauthStaticConfig","service","name","clientId","clientSecret","scope","tenantId","auth","headless","redirectUri","transport","type","undefined","primary","debug","Error","verifyEndpoint","dcrRouter","store","issuerUrl","scopesSupported","split","clientConfig","middleware","authMiddleware","authAdapter","getAccessToken","getUserEmail","accountTools","accountPrompts","info","bearerAuth","verifier","resourceMetadataUrl","deviceCodeProvider","accountId","result","createLoopback","tools","prompts","loopbackRouter"],"mappings":"AAAA,SAAmCA,aAAa,QAAQ,eAAe;AACvE,SAASC,eAAe,EAAEC,4BAA4B,EAAEC,gBAAgB,EAAEC,gBAAgB,EAAEC,kBAAkB,EAAEC,qBAAqB,QAAQ,yBAAyB;AAItK,SAASC,QAAQ,QAAQ,kBAAkB;AA4C3C;;;;;;;;CAQC,GACD,OAAO,eAAeC,oBAAoBC,MAAoB,EAAEC,IAAsB,EAAEC,OAAgB;IACtG,MAAM,EAAEC,MAAM,EAAEC,UAAU,EAAEC,QAAQ,EAAE,GAAGJ;IACzC,MAAMK,oBAAoB;QACxBC,SAASP,OAAOQ,IAAI;QACpBC,UAAUT,OAAOS,QAAQ;QACzBC,cAAcV,OAAOU,YAAY;QACjCC,OAAOb;QACPc,UAAUZ,OAAOY,QAAQ;QACzBC,MAAMb,OAAOa,IAAI;QACjBC,UAAUd,OAAOc,QAAQ;QACzBC,aAAaf,OAAOgB,SAAS,CAACC,IAAI,KAAK,UAAUC,YAAYlB,OAAOe,WAAW;QAC/E,GAAIb,WAAW;YAAEA;QAAQ,CAAC;IAC5B;IAEA,IAAIiB;IAEJ,gEAAgE;IAChE,IAAIb,kBAAkBO,IAAI,KAAK,OAAO;QACpCV,OAAOiB,KAAK,CAAC,yBAAyB;YAAEb,SAASD,kBAAkBC,OAAO;QAAC;QAE3E,oCAAoC;QACpC,IAAI,CAACF,UAAU;YACb,MAAM,IAAIgB,MAAM;QAClB;QACA,IAAI,CAACf,kBAAkBJ,OAAO,EAAE;YAC9B,MAAM,IAAImB,MAAM;QAClB;QAEA,8FAA8F;QAC9FF,UAAU,IAAIzB,iBAAiB;YAC7Be,UAAUH,kBAAkBG,QAAQ;YACpC,GAAIH,kBAAkBI,YAAY,IAAI;gBAAEA,cAAcJ,kBAAkBI,YAAY;YAAC,CAAC;YACtFE,UAAUN,kBAAkBM,QAAQ;YACpCD,OAAOL,kBAAkBK,KAAK;YAC9BW,gBAAgB,GAAGhB,kBAAkBJ,OAAO,CAAC,aAAa,CAAC;YAC3DC;QACF;QAEA,8DAA8D;QAC9D,MAAMoB,YAAY/B,gBAAgB;YAChCgC,OAAOnB;YACPoB,WAAWnB,kBAAkBJ,OAAO;YACpCA,SAASI,kBAAkBJ,OAAO;YAClCwB,iBAAiBpB,kBAAkBK,KAAK,CAACgB,KAAK,CAAC;YAC/CC,cAAc;gBACZnB,UAAUH,kBAAkBG,QAAQ;gBACpC,GAAIH,kBAAkBI,YAAY,IAAI;oBAAEA,cAAcJ,kBAAkBI,YAAY;gBAAC,CAAC;gBACtFE,UAAUN,kBAAkBM,QAAQ;YACtC;QACF;QAEA,kEAAkE;QAClE,MAAMiB,aAAaV,QAAQW,cAAc;QAEzC,2DAA2D;QAC3D,MAAMC,cAAmC;YACvCC,gBAAgB;gBACd,MAAM,IAAIX,MAAM;YAClB;YACAY,cAAc;gBACZ,MAAM,IAAIZ,MAAM;YAClB;QACF;QAEA,2FAA2F;QAC3F,MAAMa,eAA6B,EAAE;QACrC,MAAMC,iBAAiC,EAAE;QAEzChC,OAAOiC,IAAI,CAAC,oCAAoC;YAC9C7B,SAASD,kBAAkBC,OAAO;YAClCL,SAASI,kBAAkBJ,OAAO;QACpC;QAEA,OAAO;YACLiB;YACAU,YAAYA;YACZE;YACAG;YACAC;YACAZ;YACAc,YAAY;gBACVC,UAAU,IAAI3C,iBAAiB,GAAGW,kBAAkBJ,OAAO,CAAC,aAAa,CAAC;gBAC1EqC,qBAAqB,GAAGjC,kBAAkBJ,OAAO,CAAC,yCAAyC,CAAC;YAC9F;QACF;IACF;IAEA,0EAA0E;IAC1E,IAAII,kBAAkBO,IAAI,KAAK,eAAe;QAC5CV,OAAOiB,KAAK,CAAC,iCAAiC;YAAEb,SAASD,kBAAkBC,OAAO;QAAC;QACnF,MAAMiC,qBAAqB,IAAI5C,mBAAmB;YAChDW,SAASD,kBAAkBC,OAAO;YAClCE,UAAUH,kBAAkBG,QAAQ;YACpCG,UAAUN,kBAAkBM,QAAQ;YACpCD,OAAOL,kBAAkBK,KAAK;YAC9BR;YACAC;YACAU,UAAUR,kBAAkBQ,QAAQ;QACtC;QACAK,UAAUqB;QAEV,yEAAyE;QACzE,MAAMX,aAAaW,mBAAmBV,cAAc;QAEpD,6BAA6B;QAC7B,MAAMC,cAAmC;YACvCC,gBAAgB,CAACS,YAAcD,mBAAmBR,cAAc,CAACS;YACjER,cAAc,CAACQ,YAAcD,mBAAmBP,YAAY,CAACQ;QAC/D;QAEA,sEAAsE;QACtE,MAAMP,eAA6B,EAAE;QACrC,MAAMC,iBAAiC,EAAE;QAEzChC,OAAOiC,IAAI,CAAC,4CAA4C;YACtD7B,SAASD,kBAAkBC,OAAO;QACpC;QAEA,OAAO;YAAEY;YAASU,YAAYA;YAA8BE;YAAaG;YAAcC;QAAe;IACxG;IAEA,qEAAqE;IACrEhB,UAAU,IAAItB,sBAAsB;QAClCU,SAASD,kBAAkBC,OAAO;QAClCE,UAAUH,kBAAkBG,QAAQ;QACpCC,cAAcJ,kBAAkBI,YAAY;QAC5CC,OAAOL,kBAAkBK,KAAK;QAC9BC,UAAUN,kBAAkBM,QAAQ;QACpCE,UAAUR,kBAAkBQ,QAAQ;QACpCX;QACAC;QACA,GAAIE,kBAAkBS,WAAW,KAAKG,aAAa;YAAEH,aAAaT,kBAAkBS,WAAW;QAAC,CAAC;IACnG;IAEA,gEAAgE;IAChE,MAAMgB,cAAmCZ;IAEzC,yDAAyD;IACzD,MAAMU,aAAkEV,QAAQW,cAAc;IAE9F,sCAAsC;IACtC,MAAMY,SAASnD,cAAcoD,cAAc,CAAC;QAC1CpC,SAASD,kBAAkBC,OAAO;QAClCiB,OAAOpB;QACPD;QACAU,MAAMkB;IACR;IACA,MAAMG,eAA6BQ,OAAOE,KAAK;IAC/C,MAAMT,iBAAiCO,OAAOG,OAAO;IACrD1C,OAAOiB,KAAK,CAAC,uCAAuC;QAAEb,SAASD,kBAAkBC,OAAO;IAAC;IAEzF,MAAMuC,iBAAiBxC,kBAAkBS,WAAW,GAAGtB,6BAA6B0B,WAAWD;IAE/F,OAAO;QAAEC;QAASU,YAAYA;QAA8BE;QAAaG;QAAcC;QAAgBW;IAAe;AACxH"}
|
|
@@ -3,7 +3,7 @@ import type { CommonRuntime, RuntimeOverrides, ServerConfig, StorageContext } fr
|
|
|
3
3
|
import { type OAuthAdapters } from './oauth-microsoft.js';
|
|
4
4
|
export declare function createLogger(config: ServerConfig): Logger;
|
|
5
5
|
export declare function createTokenStore(baseDir: string, logger: Logger): Promise<import("keyv").Keyv<unknown>>;
|
|
6
|
-
export declare function createDcrStore(baseDir: string, required: boolean, logger: Logger): Promise<import("keyv").Keyv<unknown> | undefined>;
|
|
6
|
+
export declare function createDcrStore(baseDir: string, required: boolean, logger: Logger, storeUri?: string): Promise<import("keyv").Keyv<unknown> | undefined>;
|
|
7
7
|
export declare function createAuthLayer(authMiddleware: OAuthAdapters['middleware']): MiddlewareLayer;
|
|
8
8
|
export declare function createLoggingLayer(logger: Logger): MiddlewareLayer;
|
|
9
9
|
export declare function createStorageLayer(storageContext: StorageContext): MiddlewareLayer;
|
|
@@ -4,6 +4,7 @@ import { createLoggingMiddleware } from '@mcp-z/server';
|
|
|
4
4
|
import * as fs from 'fs';
|
|
5
5
|
import * as path from 'path';
|
|
6
6
|
import pino from 'pino';
|
|
7
|
+
import { SHARED_FILE_PROTOCOL } from '../constants.js';
|
|
7
8
|
import createStore from '../lib/create-store.js';
|
|
8
9
|
import * as mcp from '../mcp/index.js';
|
|
9
10
|
import { createOAuthAdapters } from './oauth-microsoft.js';
|
|
@@ -19,16 +20,20 @@ export function createLogger(config) {
|
|
|
19
20
|
formatters: sanitizeForLoggingFormatter()
|
|
20
21
|
}, hasStdio ? pino.destination({
|
|
21
22
|
dest: logsPath,
|
|
22
|
-
sync:
|
|
23
|
+
sync: true
|
|
23
24
|
}) : pino.destination(1));
|
|
24
25
|
}
|
|
26
|
+
// Several mcp-z processes share these files, so the default store merges each write under a lock.
|
|
27
|
+
function sharedFileUri(file) {
|
|
28
|
+
return pathToFileURL(file).href.replace(/^file:/, SHARED_FILE_PROTOCOL);
|
|
29
|
+
}
|
|
25
30
|
export async function createTokenStore(baseDir, logger) {
|
|
26
|
-
const tokenStoreUri = process.env.TOKEN_STORE_URI ||
|
|
31
|
+
const tokenStoreUri = process.env.TOKEN_STORE_URI || sharedFileUri(path.join(baseDir, 'tokens.json'));
|
|
27
32
|
return createStore(tokenStoreUri, logger);
|
|
28
33
|
}
|
|
29
|
-
export async function createDcrStore(baseDir, required, logger) {
|
|
34
|
+
export async function createDcrStore(baseDir, required, logger, storeUri) {
|
|
30
35
|
if (!required) return undefined;
|
|
31
|
-
const dcrStoreUri = process.env.DCR_STORE_URI ||
|
|
36
|
+
const dcrStoreUri = storeUri || process.env.DCR_STORE_URI || sharedFileUri(path.join(baseDir, 'dcr.json'));
|
|
32
37
|
return createStore(dcrStoreUri, logger);
|
|
33
38
|
}
|
|
34
39
|
export function createAuthLayer(authMiddleware) {
|
|
@@ -81,12 +86,13 @@ export function validateStorageConfig(config, logger) {
|
|
|
81
86
|
}
|
|
82
87
|
export async function createDefaultRuntime(config, overrides) {
|
|
83
88
|
var _config_baseUrl, _ref, _ref1;
|
|
89
|
+
var _config_dcrConfig;
|
|
84
90
|
if (config.auth === 'dcr' && config.transport.type !== 'http') throw new Error('DCR mode requires an HTTP transport');
|
|
85
91
|
const logger = createLogger(config);
|
|
86
92
|
validateStorageConfig(config, logger);
|
|
87
93
|
const tokenStore = await createTokenStore(config.baseDir, logger);
|
|
88
94
|
const baseUrl = (_config_baseUrl = config.baseUrl) !== null && _config_baseUrl !== void 0 ? _config_baseUrl : config.transport.type === 'http' && config.transport.port ? `http://localhost:${config.transport.port}` : undefined;
|
|
89
|
-
const dcrStore = await createDcrStore(config.baseDir, config.auth === 'dcr', logger);
|
|
95
|
+
const dcrStore = await createDcrStore(config.baseDir, config.auth === 'dcr', logger, (_config_dcrConfig = config.dcrConfig) === null || _config_dcrConfig === void 0 ? void 0 : _config_dcrConfig.storeUri);
|
|
90
96
|
const oauthAdapters = await createOAuthAdapters(config, {
|
|
91
97
|
logger,
|
|
92
98
|
tokenStore,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["/Users/kevin/Dev/open-source/ai/mcp-z/mcp-outlook/src/setup/runtime.ts"],"sourcesContent":["import { pathToFileURL } from 'node:url';\nimport { sanitizeForLoggingFormatter } from '@mcp-z/oauth';\nimport type { Logger, MiddlewareLayer } from '@mcp-z/server';\nimport { createLoggingMiddleware } from '@mcp-z/server';\nimport * as fs from 'fs';\nimport * as path from 'path';\nimport pino from 'pino';\nimport createStore from '../lib/create-store.ts';\nimport * as mcp from '../mcp/index.ts';\nimport type { CommonRuntime, RuntimeDeps, RuntimeOverrides, ServerConfig, StorageContext } from '../types.ts';\nimport { createOAuthAdapters, type OAuthAdapters } from './oauth-microsoft.ts';\n\nexport function createLogger(config: ServerConfig): Logger {\n const hasStdio = config.transport.type === 'stdio';\n const logsPath = path.join(config.baseDir, 'logs', `${config.name}.log`);\n if (hasStdio) fs.mkdirSync(path.dirname(logsPath), { recursive: true });\n return pino({ level: config.logLevel ?? 'info', formatters: sanitizeForLoggingFormatter() }, hasStdio ? pino.destination({ dest: logsPath, sync: false }) : pino.destination(1));\n}\n\nexport async function createTokenStore(baseDir: string, logger: Logger) {\n const tokenStoreUri = process.env.TOKEN_STORE_URI || pathToFileURL(path.join(baseDir, 'tokens.json')).href;\n return createStore<unknown>(tokenStoreUri, logger);\n}\n\nexport async function createDcrStore(baseDir: string, required: boolean, logger: Logger) {\n if (!required) return undefined;\n const dcrStoreUri = process.env.DCR_STORE_URI || pathToFileURL(path.join(baseDir, 'dcr.json')).href;\n return createStore<unknown>(dcrStoreUri, logger);\n}\n\nexport function createAuthLayer(authMiddleware: OAuthAdapters['middleware']): MiddlewareLayer {\n return {\n withTool: authMiddleware.withToolAuth,\n withResource: authMiddleware.withResourceAuth,\n withPrompt: authMiddleware.withPromptAuth,\n };\n}\n\nexport function createLoggingLayer(logger: Logger): MiddlewareLayer {\n const logging = createLoggingMiddleware({ logger });\n return {\n withTool: logging.withToolLogging,\n withResource: logging.withResourceLogging,\n withPrompt: logging.withPromptLogging,\n };\n}\n\nexport function createStorageLayer(storageContext: StorageContext): MiddlewareLayer {\n const wrapAtPosition = <T extends { name: string; handler: unknown; [key: string]: unknown }>(module: T, extraPosition: number): T => {\n const originalHandler = module.handler as (...args: unknown[]) => Promise<unknown>;\n\n const wrappedHandler = async (...allArgs: unknown[]) => {\n const extra = allArgs[extraPosition];\n (extra as { storageContext?: StorageContext }).storageContext = storageContext;\n return await originalHandler(...allArgs);\n };\n\n return {\n ...module,\n handler: wrappedHandler,\n } as T;\n };\n\n return {\n withTool: <T extends { name: string; config: unknown; handler: unknown }>(module: T): T => wrapAtPosition(module, 1) as T,\n };\n}\n\nexport function validateStorageConfig(config: ServerConfig, logger: Logger) {\n if (config.auth === 'dcr') {\n if (config.resourceStoreUri) {\n logger.warn('DCR mode does not support file storage; resourceStoreUri will be ignored.');\n }\n return;\n }\n if (!config.resourceStoreUri) {\n throw new Error('outlook-messages-export-csv: Server configuration missing resourceStoreUri.');\n }\n if (config.transport.type === 'http' && !config.baseUrl && !config.transport.port) {\n throw new Error('outlook-messages-export-csv: HTTP transport requires either baseUrl in server config or port in transport config. This is a server configuration error - please provide --base-url or --port.');\n }\n}\n\nexport async function createDefaultRuntime(config: ServerConfig, overrides?: RuntimeOverrides): Promise<CommonRuntime> {\n if (config.auth === 'dcr' && config.transport.type !== 'http') throw new Error('DCR mode requires an HTTP transport');\n\n const logger = createLogger(config);\n validateStorageConfig(config, logger);\n const tokenStore = await createTokenStore(config.baseDir, logger);\n const baseUrl = config.baseUrl ?? (config.transport.type === 'http' && config.transport.port ? `http://localhost:${config.transport.port}` : undefined);\n const dcrStore = await createDcrStore(config.baseDir, config.auth === 'dcr', logger);\n const oauthAdapters = await createOAuthAdapters(config, { logger, tokenStore, dcrStore }, baseUrl);\n const deps: RuntimeDeps = { config, logger, tokenStore, oauthAdapters, baseUrl };\n const createDomainModules =\n overrides?.createDomainModules ??\n (() => ({\n tools: Object.values(mcp.toolFactories).map((factory) => factory()),\n resources: Object.values(mcp.resourceFactories).map((factory) => factory()),\n prompts: Object.values(mcp.promptFactories).map((factory) => factory()),\n }));\n const middlewareFactories = overrides?.middlewareFactories ?? [() => createAuthLayer(oauthAdapters.middleware), () => createLoggingLayer(logger), ...(config.auth === 'dcr' ? [] : [() => createStorageLayer({ resourceStoreUri: config.resourceStoreUri, baseUrl: config.baseUrl, transport: config.transport })])];\n\n return {\n deps,\n middlewareFactories,\n createDomainModules,\n close: async () => {},\n };\n}\n"],"names":["pathToFileURL","sanitizeForLoggingFormatter","createLoggingMiddleware","fs","path","pino","createStore","mcp","createOAuthAdapters","createLogger","config","hasStdio","transport","type","logsPath","join","baseDir","name","mkdirSync","dirname","recursive","level","logLevel","formatters","destination","dest","sync","createTokenStore","logger","tokenStoreUri","process","env","TOKEN_STORE_URI","href","createDcrStore","required","undefined","dcrStoreUri","DCR_STORE_URI","createAuthLayer","authMiddleware","withTool","withToolAuth","withResource","withResourceAuth","withPrompt","withPromptAuth","createLoggingLayer","logging","withToolLogging","withResourceLogging","withPromptLogging","createStorageLayer","storageContext","wrapAtPosition","module","extraPosition","originalHandler","handler","wrappedHandler","allArgs","extra","validateStorageConfig","auth","resourceStoreUri","warn","Error","baseUrl","port","createDefaultRuntime","overrides","tokenStore","dcrStore","oauthAdapters","deps","createDomainModules","tools","Object","values","toolFactories","map","factory","resources","resourceFactories","prompts","promptFactories","middlewareFactories","middleware","close"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["/Users/kevin/Dev/open-source/ai/mcp-z/mcp-outlook/src/setup/runtime.ts"],"sourcesContent":["import { pathToFileURL } from 'node:url';\nimport { sanitizeForLoggingFormatter } from '@mcp-z/oauth';\nimport type { Logger, MiddlewareLayer } from '@mcp-z/server';\nimport { createLoggingMiddleware } from '@mcp-z/server';\nimport * as fs from 'fs';\nimport * as path from 'path';\nimport pino from 'pino';\nimport { SHARED_FILE_PROTOCOL } from '../constants.ts';\nimport createStore from '../lib/create-store.ts';\nimport * as mcp from '../mcp/index.ts';\nimport type { CommonRuntime, RuntimeDeps, RuntimeOverrides, ServerConfig, StorageContext } from '../types.ts';\nimport { createOAuthAdapters, type OAuthAdapters } from './oauth-microsoft.ts';\n\nexport function createLogger(config: ServerConfig): Logger {\n const hasStdio = config.transport.type === 'stdio';\n const logsPath = path.join(config.baseDir, 'logs', `${config.name}.log`);\n if (hasStdio) fs.mkdirSync(path.dirname(logsPath), { recursive: true });\n return pino({ level: config.logLevel ?? 'info', formatters: sanitizeForLoggingFormatter() }, hasStdio ? pino.destination({ dest: logsPath, sync: true }) : pino.destination(1));\n}\n\n// Several mcp-z processes share these files, so the default store merges each write under a lock.\nfunction sharedFileUri(file: string): string {\n return pathToFileURL(file).href.replace(/^file:/, SHARED_FILE_PROTOCOL);\n}\n\nexport async function createTokenStore(baseDir: string, logger: Logger) {\n const tokenStoreUri = process.env.TOKEN_STORE_URI || sharedFileUri(path.join(baseDir, 'tokens.json'));\n return createStore<unknown>(tokenStoreUri, logger);\n}\n\nexport async function createDcrStore(baseDir: string, required: boolean, logger: Logger, storeUri?: string) {\n if (!required) return undefined;\n const dcrStoreUri = storeUri || process.env.DCR_STORE_URI || sharedFileUri(path.join(baseDir, 'dcr.json'));\n return createStore<unknown>(dcrStoreUri, logger);\n}\n\nexport function createAuthLayer(authMiddleware: OAuthAdapters['middleware']): MiddlewareLayer {\n return {\n withTool: authMiddleware.withToolAuth,\n withResource: authMiddleware.withResourceAuth,\n withPrompt: authMiddleware.withPromptAuth,\n };\n}\n\nexport function createLoggingLayer(logger: Logger): MiddlewareLayer {\n const logging = createLoggingMiddleware({ logger });\n return {\n withTool: logging.withToolLogging,\n withResource: logging.withResourceLogging,\n withPrompt: logging.withPromptLogging,\n };\n}\n\nexport function createStorageLayer(storageContext: StorageContext): MiddlewareLayer {\n const wrapAtPosition = <T extends { name: string; handler: unknown; [key: string]: unknown }>(module: T, extraPosition: number): T => {\n const originalHandler = module.handler as (...args: unknown[]) => Promise<unknown>;\n\n const wrappedHandler = async (...allArgs: unknown[]) => {\n const extra = allArgs[extraPosition];\n (extra as { storageContext?: StorageContext }).storageContext = storageContext;\n return await originalHandler(...allArgs);\n };\n\n return {\n ...module,\n handler: wrappedHandler,\n } as T;\n };\n\n return {\n withTool: <T extends { name: string; config: unknown; handler: unknown }>(module: T): T => wrapAtPosition(module, 1) as T,\n };\n}\n\nexport function validateStorageConfig(config: ServerConfig, logger: Logger) {\n if (config.auth === 'dcr') {\n if (config.resourceStoreUri) {\n logger.warn('DCR mode does not support file storage; resourceStoreUri will be ignored.');\n }\n return;\n }\n if (!config.resourceStoreUri) {\n throw new Error('outlook-messages-export-csv: Server configuration missing resourceStoreUri.');\n }\n if (config.transport.type === 'http' && !config.baseUrl && !config.transport.port) {\n throw new Error('outlook-messages-export-csv: HTTP transport requires either baseUrl in server config or port in transport config. This is a server configuration error - please provide --base-url or --port.');\n }\n}\n\nexport async function createDefaultRuntime(config: ServerConfig, overrides?: RuntimeOverrides): Promise<CommonRuntime> {\n if (config.auth === 'dcr' && config.transport.type !== 'http') throw new Error('DCR mode requires an HTTP transport');\n\n const logger = createLogger(config);\n validateStorageConfig(config, logger);\n const tokenStore = await createTokenStore(config.baseDir, logger);\n const baseUrl = config.baseUrl ?? (config.transport.type === 'http' && config.transport.port ? `http://localhost:${config.transport.port}` : undefined);\n const dcrStore = await createDcrStore(config.baseDir, config.auth === 'dcr', logger, config.dcrConfig?.storeUri);\n const oauthAdapters = await createOAuthAdapters(config, { logger, tokenStore, dcrStore }, baseUrl);\n const deps: RuntimeDeps = { config, logger, tokenStore, oauthAdapters, baseUrl };\n const createDomainModules =\n overrides?.createDomainModules ??\n (() => ({\n tools: Object.values(mcp.toolFactories).map((factory) => factory()),\n resources: Object.values(mcp.resourceFactories).map((factory) => factory()),\n prompts: Object.values(mcp.promptFactories).map((factory) => factory()),\n }));\n const middlewareFactories = overrides?.middlewareFactories ?? [() => createAuthLayer(oauthAdapters.middleware), () => createLoggingLayer(logger), ...(config.auth === 'dcr' ? [] : [() => createStorageLayer({ resourceStoreUri: config.resourceStoreUri, baseUrl: config.baseUrl, transport: config.transport })])];\n\n return {\n deps,\n middlewareFactories,\n createDomainModules,\n close: async () => {},\n };\n}\n"],"names":["pathToFileURL","sanitizeForLoggingFormatter","createLoggingMiddleware","fs","path","pino","SHARED_FILE_PROTOCOL","createStore","mcp","createOAuthAdapters","createLogger","config","hasStdio","transport","type","logsPath","join","baseDir","name","mkdirSync","dirname","recursive","level","logLevel","formatters","destination","dest","sync","sharedFileUri","file","href","replace","createTokenStore","logger","tokenStoreUri","process","env","TOKEN_STORE_URI","createDcrStore","required","storeUri","undefined","dcrStoreUri","DCR_STORE_URI","createAuthLayer","authMiddleware","withTool","withToolAuth","withResource","withResourceAuth","withPrompt","withPromptAuth","createLoggingLayer","logging","withToolLogging","withResourceLogging","withPromptLogging","createStorageLayer","storageContext","wrapAtPosition","module","extraPosition","originalHandler","handler","wrappedHandler","allArgs","extra","validateStorageConfig","auth","resourceStoreUri","warn","Error","baseUrl","port","createDefaultRuntime","overrides","tokenStore","dcrStore","dcrConfig","oauthAdapters","deps","createDomainModules","tools","Object","values","toolFactories","map","factory","resources","resourceFactories","prompts","promptFactories","middlewareFactories","middleware","close"],"mappings":"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"}
|
|
@@ -20,13 +20,11 @@ Options:
|
|
|
20
20
|
--headless Disable browser auto-open, return auth URL instead
|
|
21
21
|
--redirect-uri=<uri> OAuth redirect URI (default: ephemeral loopback)
|
|
22
22
|
--tenant-id=<id> Microsoft tenant ID (overrides MS_TENANT_ID env var)
|
|
23
|
-
--dcr-
|
|
24
|
-
--dcr-verify-url=<url> External verification endpoint (required for external mode)
|
|
25
|
-
--dcr-store-uri=<uri> DCR client storage URI (required for self-hosted mode)
|
|
23
|
+
--dcr-store-uri=<uri> DCR client storage URI (default: .mcp-z/dcr.json)
|
|
26
24
|
--port=<port> Enable HTTP transport on specified port
|
|
27
25
|
--stdio Enable stdio transport (default if no port)
|
|
28
26
|
--log-level=<level> Logging level (default: info)
|
|
29
|
-
--resource-store-uri=<uri> Resource store URI for CSV file storage (default:
|
|
27
|
+
--resource-store-uri=<uri> Resource store URI for CSV file storage (default: .mcp-z/mcp-outlook/files beside the nearest .mcp.json, else ~/.mcp-z/mcp-outlook/files)
|
|
30
28
|
--base-url=<url> Base URL for HTTP file serving (default: http://localhost for HTTP transports)
|
|
31
29
|
|
|
32
30
|
Environment Variables:
|
|
@@ -35,8 +33,6 @@ Environment Variables:
|
|
|
35
33
|
MS_CLIENT_SECRET OAuth client secret (optional)
|
|
36
34
|
AUTH_MODE Default authentication mode (optional)
|
|
37
35
|
HEADLESS Disable browser auto-open (optional)
|
|
38
|
-
DCR_MODE DCR mode (optional, same format as --dcr-mode)
|
|
39
|
-
DCR_VERIFY_URL External verification URL (optional, same as --dcr-verify-url)
|
|
40
36
|
DCR_STORE_URI DCR storage URI (optional, same as --dcr-store-uri)
|
|
41
37
|
TOKEN_STORE_URI Token storage URI (optional)
|
|
42
38
|
PORT Default HTTP port (optional)
|
|
@@ -53,7 +49,7 @@ Configuration Files:
|
|
|
53
49
|
|
|
54
50
|
Storage Backends:
|
|
55
51
|
TOKEN_STORE_URI and DCR_STORE_URI accept any keyv-registry protocol.
|
|
56
|
-
file:// (the default) and memory:// work out of the box. Any other backend
|
|
52
|
+
file+shared:// (the default), file:// and memory:// work out of the box. Any other backend
|
|
57
53
|
needs its adapter installed alongside this server:
|
|
58
54
|
npm install -g @keyv/redis@6
|
|
59
55
|
TOKEN_STORE_URI=redis://localhost:6379 mcp-outlook
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["/Users/kevin/Dev/open-source/ai/mcp-z/mcp-outlook/src/setup/version-help.ts"],"sourcesContent":["import * as fs from 'fs';\nimport moduleRoot from 'module-root-sync';\nimport * as path from 'path';\nimport * as url from 'url';\nimport { parseArgs } from 'util';\n\n// Kept dependency-free (fs/path/url/module-root-sync only) so `--version`/`--help`\n// resolve nothing beyond Node startup: config.ts's parseConfig pulls in @mcp-z/oauth-microsoft\n// and @mcp-z/server, which this path must not touch.\nconst pkg = JSON.parse(fs.readFileSync(path.join(moduleRoot(url.fileURLToPath(import.meta.url)), 'package.json'), 'utf-8'));\n\nconst HELP_TEXT = `\nUsage: mcp-outlook [options]\n\nMCP server for Outlook/Microsoft email management with OAuth authentication.\n\nOptions:\n --version Show version number\n --help Show this help message\n --auth=<mode> Authentication mode (default: loopback-oauth)\n Modes: loopback-oauth, device-code, dcr\n --headless Disable browser auto-open, return auth URL instead\n --redirect-uri=<uri> OAuth redirect URI (default: ephemeral loopback)\n --tenant-id=<id> Microsoft tenant ID (overrides MS_TENANT_ID env var)\n --dcr-
|
|
1
|
+
{"version":3,"sources":["/Users/kevin/Dev/open-source/ai/mcp-z/mcp-outlook/src/setup/version-help.ts"],"sourcesContent":["import * as fs from 'fs';\nimport moduleRoot from 'module-root-sync';\nimport * as path from 'path';\nimport * as url from 'url';\nimport { parseArgs } from 'util';\n\n// Kept dependency-free (fs/path/url/module-root-sync only) so `--version`/`--help`\n// resolve nothing beyond Node startup: config.ts's parseConfig pulls in @mcp-z/oauth-microsoft\n// and @mcp-z/server, which this path must not touch.\nconst pkg = JSON.parse(fs.readFileSync(path.join(moduleRoot(url.fileURLToPath(import.meta.url)), 'package.json'), 'utf-8'));\n\nconst HELP_TEXT = `\nUsage: mcp-outlook [options]\n\nMCP server for Outlook/Microsoft email management with OAuth authentication.\n\nOptions:\n --version Show version number\n --help Show this help message\n --auth=<mode> Authentication mode (default: loopback-oauth)\n Modes: loopback-oauth, device-code, dcr\n --headless Disable browser auto-open, return auth URL instead\n --redirect-uri=<uri> OAuth redirect URI (default: ephemeral loopback)\n --tenant-id=<id> Microsoft tenant ID (overrides MS_TENANT_ID env var)\n --dcr-store-uri=<uri> DCR client storage URI (default: .mcp-z/dcr.json)\n --port=<port> Enable HTTP transport on specified port\n --stdio Enable stdio transport (default if no port)\n --log-level=<level> Logging level (default: info)\n --resource-store-uri=<uri> Resource store URI for CSV file storage (default: .mcp-z/mcp-outlook/files beside the nearest .mcp.json, else ~/.mcp-z/mcp-outlook/files)\n --base-url=<url> Base URL for HTTP file serving (default: http://localhost for HTTP transports)\n\nEnvironment Variables:\n MS_CLIENT_ID OAuth client ID (REQUIRED)\n MS_TENANT_ID Microsoft tenant ID (REQUIRED)\n MS_CLIENT_SECRET OAuth client secret (optional)\n AUTH_MODE Default authentication mode (optional)\n HEADLESS Disable browser auto-open (optional)\n DCR_STORE_URI DCR storage URI (optional, same as --dcr-store-uri)\n TOKEN_STORE_URI Token storage URI (optional)\n PORT Default HTTP port (optional)\n LOG_LEVEL Default logging level (optional)\n RESOURCE_STORE_URI Resource store URI (optional, file://)\n BASE_URL Base URL for HTTP file serving (optional)\n\nConfiguration Files:\n Variables may also be set in the first of these files that exists:\n 1. .mcp-z/mcp-outlook/.env beside the nearest .mcp.json (else ~/.mcp-z/mcp-outlook/.env)\n 2. ~/.config/mcp-z/mcp-outlook/.env (~ is your home directory, on every OS)\n Values already in the environment, including .mcp.json \"env\", take precedence.\n On macOS and Linux the file must be private (chmod 600), or the server will not start.\n\nStorage Backends:\n TOKEN_STORE_URI and DCR_STORE_URI accept any keyv-registry protocol.\n file+shared:// (the default), file:// and memory:// work out of the box. Any other backend\n needs its adapter installed alongside this server:\n npm install -g @keyv/redis@6\n TOKEN_STORE_URI=redis://localhost:6379 mcp-outlook\n\nOAuth Scopes:\n openid profile offline_access https://graph.microsoft.com/User.Read https://graph.microsoft.com/Mail.ReadWrite https://graph.microsoft.com/Mail.Send https://graph.microsoft.com/MailboxSettings.ReadWrite\n\nExamples:\n mcp-outlook # Use default settings\n mcp-outlook --auth=device-code # Use device code auth\n mcp-outlook --port=3000 # HTTP transport on port 3000\n mcp-outlook --tenant-id=xxx # Set tenant ID\n mcp-outlook --resource-store-uri=file:///tmp/emails # Custom resource store URI\n MS_CLIENT_ID=xxx mcp-outlook # Set client ID via env var\n`.trim();\n\n/** Package metadata read from package.json, resolved relative to this file. */\nexport function readPkg(): { name: string; version: string; repository?: string | { url?: string } } {\n return pkg;\n}\n\n/**\n * Handle --version/--help flags before config parsing.\n * These must work without requiring any configuration or heavy dependency.\n */\nexport function handleVersionHelp(args: string[]): { handled: boolean; output?: string } {\n const { values } = parseArgs({\n args,\n options: {\n version: { type: 'boolean', short: 'v' },\n help: { type: 'boolean', short: 'h' },\n },\n strict: false,\n allowPositionals: true,\n });\n\n if (values.version) return { handled: true, output: pkg.version };\n if (values.help) return { handled: true, output: HELP_TEXT };\n return { handled: false };\n}\n"],"names":["fs","moduleRoot","path","url","parseArgs","pkg","JSON","parse","readFileSync","join","fileURLToPath","HELP_TEXT","trim","readPkg","handleVersionHelp","args","values","options","version","type","short","help","strict","allowPositionals","handled","output"],"mappings":"AAAA,YAAYA,QAAQ,KAAK;AACzB,OAAOC,gBAAgB,mBAAmB;AAC1C,YAAYC,UAAU,OAAO;AAC7B,YAAYC,SAAS,MAAM;AAC3B,SAASC,SAAS,QAAQ,OAAO;AAEjC,mFAAmF;AACnF,+FAA+F;AAC/F,qDAAqD;AACrD,MAAMC,MAAMC,KAAKC,KAAK,CAACP,GAAGQ,YAAY,CAACN,KAAKO,IAAI,CAACR,WAAWE,IAAIO,aAAa,CAAC,YAAYP,GAAG,IAAI,iBAAiB;AAElH,MAAMQ,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAyDnB,CAAC,CAACC,IAAI;AAEN,6EAA6E,GAC7E,OAAO,SAASC;IACd,OAAOR;AACT;AAEA;;;CAGC,GACD,OAAO,SAASS,kBAAkBC,IAAc;IAC9C,MAAM,EAAEC,MAAM,EAAE,GAAGZ,UAAU;QAC3BW;QACAE,SAAS;YACPC,SAAS;gBAAEC,MAAM;gBAAWC,OAAO;YAAI;YACvCC,MAAM;gBAAEF,MAAM;gBAAWC,OAAO;YAAI;QACtC;QACAE,QAAQ;QACRC,kBAAkB;IACpB;IAEA,IAAIP,OAAOE,OAAO,EAAE,OAAO;QAAEM,SAAS;QAAMC,QAAQpB,IAAIa,OAAO;IAAC;IAChE,IAAIF,OAAOK,IAAI,EAAE,OAAO;QAAEG,SAAS;QAAMC,QAAQd;IAAU;IAC3D,OAAO;QAAEa,SAAS;IAAM;AAC1B"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mcp-z/mcp-outlook",
|
|
3
|
-
"version": "2.4.
|
|
3
|
+
"version": "2.4.2",
|
|
4
4
|
"description": "MCP server for Outlook integration with OAuth authentication, message search, and batch operations",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"outlook",
|
|
@@ -64,34 +64,40 @@
|
|
|
64
64
|
"prepublishOnly": "node scripts/require-dist-tag.cjs && tsds validate",
|
|
65
65
|
"test": "tsds test:node --no-timeouts",
|
|
66
66
|
"test:ci": "tsds test:node --no-timeouts",
|
|
67
|
+
"test:ci-setup": "node scripts/ci-tokens.ts upload",
|
|
67
68
|
"test:ci:engines": "nvu engines tsds test:node --no-timeouts",
|
|
68
69
|
"test:engines": "nvu engines tsds test:node --no-timeouts",
|
|
69
70
|
"test:setup": "node scripts/setup-test.ts",
|
|
70
71
|
"version": "tsds version"
|
|
71
72
|
},
|
|
72
73
|
"dependencies": {
|
|
74
|
+
"@keyv/serialize": "^1.1.1",
|
|
73
75
|
"@mcp-z/email": "^1.0.0",
|
|
74
76
|
"@mcp-z/oauth": "^2.2.0",
|
|
75
|
-
"@mcp-z/oauth-microsoft": "^2.4.
|
|
76
|
-
"@mcp-z/server": "^2.
|
|
77
|
+
"@mcp-z/oauth-microsoft": "^2.4.3",
|
|
78
|
+
"@mcp-z/server": "^2.4.0",
|
|
77
79
|
"@microsoft/microsoft-graph-client": "^3.0.0",
|
|
78
80
|
"@microsoft/microsoft-graph-types": "^2.0.0",
|
|
79
81
|
"cors": "^2.0.0",
|
|
80
82
|
"csv-stringify": "^6.0.0",
|
|
81
83
|
"express": "^5.0.0",
|
|
82
84
|
"keyv-file": "5.3.3",
|
|
83
|
-
"keyv-registry": "^3.
|
|
85
|
+
"keyv-registry": "^3.1.0",
|
|
84
86
|
"module-root-sync": "^2.0.0",
|
|
85
87
|
"pino": "^10.0.0",
|
|
88
|
+
"proper-lockfile": "^4.1.2",
|
|
89
|
+
"temp-suffix": "^1.0.12",
|
|
86
90
|
"zod": "^4.2.0"
|
|
87
91
|
},
|
|
88
92
|
"devDependencies": {
|
|
89
93
|
"@mcp-z/client": "^2.5.0",
|
|
94
|
+
"@modelcontextprotocol/client": "^2.4.0",
|
|
90
95
|
"@modelcontextprotocol/sdk": "^1.10.0",
|
|
91
96
|
"@types/cors": "^2.8.19",
|
|
92
97
|
"@types/express": "^5.0.6",
|
|
93
98
|
"@types/mocha": "^10.0.10",
|
|
94
99
|
"@types/node": "^22",
|
|
100
|
+
"cross-spawn-cb": "^3.3.1",
|
|
95
101
|
"fs-remove-compat": "^1.0.4",
|
|
96
102
|
"get-port": "5.1.1",
|
|
97
103
|
"keyv": "^6.1.0",
|