@se-studio/contentful-cms 3.15.7 → 3.16.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +12 -0
- package/HOSTED.md +18 -0
- package/dist/commands/host-pack-publish.d.ts +23 -0
- package/dist/commands/host-pack-publish.d.ts.map +1 -0
- package/dist/commands/host-pack-publish.js +84 -0
- package/dist/commands/host-pack-publish.js.map +1 -0
- package/dist/commands/host.d.ts.map +1 -1
- package/dist/commands/host.js +2 -0
- package/dist/commands/host.js.map +1 -1
- package/dist/config/hosted.d.ts +14 -0
- package/dist/config/hosted.d.ts.map +1 -1
- package/dist/config/hosted.js +54 -0
- package/dist/config/hosted.js.map +1 -1
- package/dist/contentful/cma-user-agent.d.ts +1 -1
- package/dist/editor-pack/generate.d.ts +2 -0
- package/dist/editor-pack/generate.d.ts.map +1 -1
- package/dist/editor-pack/generate.js +1 -0
- package/dist/editor-pack/generate.js.map +1 -1
- package/dist/generated/version.d.ts +1 -1
- package/dist/generated/version.js +1 -1
- package/dist/hosted/index.d.ts +4 -2
- package/dist/hosted/index.d.ts.map +1 -1
- package/dist/hosted/index.js +4 -2
- package/dist/hosted/index.js.map +1 -1
- package/dist/hosted/next/context.d.ts +6 -1
- package/dist/hosted/next/context.d.ts.map +1 -1
- package/dist/hosted/next/context.js +18 -2
- package/dist/hosted/next/context.js.map +1 -1
- package/dist/hosted/next/editor-pack-path.d.ts +4 -0
- package/dist/hosted/next/editor-pack-path.d.ts.map +1 -1
- package/dist/hosted/next/editor-pack-path.js +16 -0
- package/dist/hosted/next/editor-pack-path.js.map +1 -1
- package/dist/hosted/next/routes/customer-index.d.ts.map +1 -1
- package/dist/hosted/next/routes/customer-index.js +20 -3
- package/dist/hosted/next/routes/customer-index.js.map +1 -1
- package/dist/hosted/next/routes/customer-resource.d.ts +1 -1
- package/dist/hosted/next/routes/customer-resource.d.ts.map +1 -1
- package/dist/hosted/next/routes/customer-resource.js +13 -3
- package/dist/hosted/next/routes/customer-resource.js.map +1 -1
- package/dist/hosted/next/routes/health.d.ts.map +1 -1
- package/dist/hosted/next/routes/health.js +77 -15
- package/dist/hosted/next/routes/health.js.map +1 -1
- package/dist/hosted/next/routes/link-contentful.js +1 -1
- package/dist/hosted/next/routes/link-contentful.js.map +1 -1
- package/dist/hosted/next/routes/mcp.d.ts +6 -1
- package/dist/hosted/next/routes/mcp.d.ts.map +1 -1
- package/dist/hosted/next/routes/mcp.js +50 -22
- package/dist/hosted/next/routes/mcp.js.map +1 -1
- package/dist/hosted/next/routes/oauth-authorization-server.d.ts +1 -1
- package/dist/hosted/next/routes/oauth-authorization-server.d.ts.map +1 -1
- package/dist/hosted/next/routes/oauth-authorization-server.js +2 -2
- package/dist/hosted/next/routes/oauth-authorization-server.js.map +1 -1
- package/dist/hosted/next/routes/oauth-authorize.js +1 -1
- package/dist/hosted/next/routes/oauth-authorize.js.map +1 -1
- package/dist/hosted/next/routes/oauth-protected-resource-path.d.ts +1 -1
- package/dist/hosted/next/routes/oauth-protected-resource-path.d.ts.map +1 -1
- package/dist/hosted/next/routes/oauth-protected-resource-path.js +2 -2
- package/dist/hosted/next/routes/oauth-protected-resource-path.js.map +1 -1
- package/dist/hosted/next/routes/oauth-protected-resource.d.ts +1 -1
- package/dist/hosted/next/routes/oauth-protected-resource.d.ts.map +1 -1
- package/dist/hosted/next/routes/oauth-protected-resource.js +2 -2
- package/dist/hosted/next/routes/oauth-protected-resource.js.map +1 -1
- package/dist/hosted/next/routes/oauth-register.js +1 -1
- package/dist/hosted/next/routes/oauth-register.js.map +1 -1
- package/dist/hosted/next/routes/oauth-token.js +1 -1
- package/dist/hosted/next/routes/oauth-token.js.map +1 -1
- package/dist/hosted/oauth/auth.d.ts +1 -1
- package/dist/hosted/oauth/auth.d.ts.map +1 -1
- package/dist/hosted/oauth/auth.js +3 -3
- package/dist/hosted/oauth/auth.js.map +1 -1
- package/dist/hosted/oauth/config.d.ts +14 -4
- package/dist/hosted/oauth/config.d.ts.map +1 -1
- package/dist/hosted/oauth/config.js +44 -8
- package/dist/hosted/oauth/config.js.map +1 -1
- package/dist/hosted/oauth/handlers.d.ts +5 -3
- package/dist/hosted/oauth/handlers.d.ts.map +1 -1
- package/dist/hosted/oauth/handlers.js +15 -10
- package/dist/hosted/oauth/handlers.js.map +1 -1
- package/dist/hosted/pack-fetch.d.ts +29 -0
- package/dist/hosted/pack-fetch.d.ts.map +1 -0
- package/dist/hosted/pack-fetch.js +180 -0
- package/dist/hosted/pack-fetch.js.map +1 -0
- package/dist/hosted/tenant-registry.d.ts +68 -0
- package/dist/hosted/tenant-registry.d.ts.map +1 -0
- package/dist/hosted/tenant-registry.js +167 -0
- package/dist/hosted/tenant-registry.js.map +1 -0
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editor-pack-path.js","sourceRoot":"","sources":["../../../src/hosted/next/editor-pack-path.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"editor-pack-path.js","sourceRoot":"","sources":["../../../src/hosted/next/editor-pack-path.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,uBAAuB,EAAE,8BAA8B,EAAE,MAAM,wBAAwB,CAAC;AACjG,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAE9D,MAAM,UAAU,uBAAuB;IACrC,OAAO,CACL,qBAAqB,CACnB,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,CAAC,CACpF,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,CAAC,CAC7C,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,qCAAqC,CAAC,OAAgB;IAC1E,IAAI,CAAC,uBAAuB,EAAE,EAAE,CAAC;QAC/B,OAAO,uBAAuB,EAAE,CAAC;IACnC,CAAC;IACD,MAAM,QAAQ,GAAG,8BAA8B,CAAC,OAAO,CAAC,CAAC;IACzD,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;IAChF,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,0BAA0B,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC/D,OAAO,IAAI,CAAC,QAAQ,CAAC;AACvB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"customer-index.d.ts","sourceRoot":"","sources":["../../../../src/hosted/next/routes/customer-index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"customer-index.d.ts","sourceRoot":"","sources":["../../../../src/hosted/next/routes/customer-index.ts"],"names":[],"mappings":"AAKA,wBAAsB,GAAG,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CA+B7D"}
|
|
@@ -1,9 +1,26 @@
|
|
|
1
1
|
import { buildCustomerPlaybookIndex } from '../../customer-playbooks.js';
|
|
2
|
-
import {
|
|
2
|
+
import { resolvePublicOrigin } from '../../oauth/config.js';
|
|
3
|
+
import { resolveHostedEditorPackPathForRequest } from '../editor-pack-path.js';
|
|
3
4
|
import { resolveRequestOrigin } from '../page-styles.js';
|
|
4
5
|
export async function GET(request) {
|
|
5
|
-
|
|
6
|
-
|
|
6
|
+
let origin;
|
|
7
|
+
try {
|
|
8
|
+
origin = resolvePublicOrigin(request);
|
|
9
|
+
}
|
|
10
|
+
catch {
|
|
11
|
+
origin = new URL(request.url).origin || (await resolveRequestOrigin());
|
|
12
|
+
}
|
|
13
|
+
let packPath;
|
|
14
|
+
try {
|
|
15
|
+
packPath = await resolveHostedEditorPackPathForRequest(request);
|
|
16
|
+
}
|
|
17
|
+
catch (err) {
|
|
18
|
+
return Response.json({
|
|
19
|
+
ok: false,
|
|
20
|
+
error: err instanceof Error ? err.message : 'Editor pack not found on this deployment.',
|
|
21
|
+
}, { status: 404 });
|
|
22
|
+
}
|
|
23
|
+
const index = buildCustomerPlaybookIndex(origin, packPath);
|
|
7
24
|
if (!index) {
|
|
8
25
|
return Response.json({ ok: false, error: 'Editor pack not found on this deployment.' }, { status: 404 });
|
|
9
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"customer-index.js","sourceRoot":"","sources":["../../../../src/hosted/next/routes/customer-index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"customer-index.js","sourceRoot":"","sources":["../../../../src/hosted/next/routes/customer-index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,qCAAqC,EAAE,MAAM,wBAAwB,CAAC;AAC/E,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAEzD,MAAM,CAAC,KAAK,UAAU,GAAG,CAAC,OAAgB;IACxC,IAAI,MAAc,CAAC;IACnB,IAAI,CAAC;QACH,MAAM,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,MAAM,oBAAoB,EAAE,CAAC,CAAC;IACzE,CAAC;IAED,IAAI,QAAgB,CAAC;IACrB,IAAI,CAAC;QACH,QAAQ,GAAG,MAAM,qCAAqC,CAAC,OAAO,CAAC,CAAC;IAClE,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,QAAQ,CAAC,IAAI,CAClB;YACE,EAAE,EAAE,KAAK;YACT,KAAK,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,2CAA2C;SACxF,EACD,EAAE,MAAM,EAAE,GAAG,EAAE,CAChB,CAAC;IACJ,CAAC;IAED,MAAM,KAAK,GAAG,0BAA0B,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAE3D,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,QAAQ,CAAC,IAAI,CAClB,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,2CAA2C,EAAE,EACjE,EAAE,MAAM,EAAE,GAAG,EAAE,CAChB,CAAC;IACJ,CAAC;IAED,OAAO,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC;AAC/C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"customer-resource.d.ts","sourceRoot":"","sources":["../../../../src/hosted/next/routes/customer-resource.ts"],"names":[],"mappings":"AAGA,KAAK,sBAAsB,GAAG;IAC5B,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,wBAAsB,GAAG,CACvB,
|
|
1
|
+
{"version":3,"file":"customer-resource.d.ts","sourceRoot":"","sources":["../../../../src/hosted/next/routes/customer-resource.ts"],"names":[],"mappings":"AAGA,KAAK,sBAAsB,GAAG;IAC5B,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,wBAAsB,GAAG,CACvB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE;IAAE,MAAM,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAA;CAAE,GACnD,OAAO,CAAC,QAAQ,CAAC,CAoCnB"}
|
|
@@ -1,8 +1,18 @@
|
|
|
1
1
|
import { readCustomerPlaybook } from '../../customer-playbooks.js';
|
|
2
|
-
import {
|
|
3
|
-
export async function GET(
|
|
2
|
+
import { resolveHostedEditorPackPathForRequest } from '../editor-pack-path.js';
|
|
3
|
+
export async function GET(request, context) {
|
|
4
4
|
const { resource } = await context.params;
|
|
5
|
-
|
|
5
|
+
let packPath;
|
|
6
|
+
try {
|
|
7
|
+
packPath = await resolveHostedEditorPackPathForRequest(request);
|
|
8
|
+
}
|
|
9
|
+
catch (err) {
|
|
10
|
+
return Response.json({
|
|
11
|
+
ok: false,
|
|
12
|
+
error: err instanceof Error ? err.message : `Unknown customer playbook: ${resource}`,
|
|
13
|
+
}, { status: 404 });
|
|
14
|
+
}
|
|
15
|
+
const playbook = readCustomerPlaybook(resource, packPath);
|
|
6
16
|
if (!playbook) {
|
|
7
17
|
return Response.json({ ok: false, error: `Unknown customer playbook: ${resource}` }, { status: 404 });
|
|
8
18
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"customer-resource.js","sourceRoot":"","sources":["../../../../src/hosted/next/routes/customer-resource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"customer-resource.js","sourceRoot":"","sources":["../../../../src/hosted/next/routes/customer-resource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,qCAAqC,EAAE,MAAM,wBAAwB,CAAC;AAM/E,MAAM,CAAC,KAAK,UAAU,GAAG,CACvB,OAAgB,EAChB,OAAoD;IAEpD,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC;IAE1C,IAAI,QAAgB,CAAC;IACrB,IAAI,CAAC;QACH,QAAQ,GAAG,MAAM,qCAAqC,CAAC,OAAO,CAAC,CAAC;IAClE,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,QAAQ,CAAC,IAAI,CAClB;YACE,EAAE,EAAE,KAAK;YACT,KAAK,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,8BAA8B,QAAQ,EAAE;SACrF,EACD,EAAE,MAAM,EAAE,GAAG,EAAE,CAChB,CAAC;IACJ,CAAC;IAED,MAAM,QAAQ,GAAG,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAE1D,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,QAAQ,CAAC,IAAI,CAClB,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,8BAA8B,QAAQ,EAAE,EAAE,EAC9D,EAAE,MAAM,EAAE,GAAG,EAAE,CAChB,CAAC;IACJ,CAAC;IAED,MAAM,OAAO,GAA2B;QACtC,cAAc,EAAE,QAAQ,CAAC,QAAQ;QACjC,eAAe,EAAE,qBAAqB;QACtC,qBAAqB,EAAE,QAAQ,CAAC,GAAG;KACpC,CAAC;IAEF,IAAI,QAAQ,CAAC,QAAQ,KAAK,kBAAkB,EAAE,CAAC;QAC7C,OAAO,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;IAC/D,CAAC;IAED,OAAO,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;AAC/D,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"health.d.ts","sourceRoot":"","sources":["../../../../src/hosted/next/routes/health.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"health.d.ts","sourceRoot":"","sources":["../../../../src/hosted/next/routes/health.ts"],"names":[],"mappings":"AAqCA,wBAAsB,GAAG,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAyJ7D"}
|
|
@@ -1,16 +1,58 @@
|
|
|
1
1
|
import { loadEditorPackManifest } from '../../../editor-pack/load.js';
|
|
2
2
|
import { mediaPipelineHealthCheck, stagedUploadHealthCheck, } from '../../../media-pipeline/config.js';
|
|
3
3
|
import { buildCustomerPlaybookIndex } from '../../customer-playbooks.js';
|
|
4
|
-
import { GETTING_STARTED_INFO, getMcpResourceUrl, getVersionInfo, handleOAuthHealthCheck, loadHostedDeploymentFromEnv, } from '../../index.js';
|
|
4
|
+
import { GETTING_STARTED_INFO, getMcpResourceUrl, getVersionInfo, handleOAuthHealthCheck, isMultiTenantHostedMode, loadHostedDeploymentForRequest, loadHostedDeploymentFromEnv, readCachedPackSource, resolveEditorPackForTenant, resolvePublicOrigin, } from '../../index.js';
|
|
5
5
|
import { getHostedEditorPackPath } from '../editor-pack-path.js';
|
|
6
6
|
import { upstashRedis } from '../redis.js';
|
|
7
7
|
export async function GET(request) {
|
|
8
|
-
const
|
|
8
|
+
const multiTenant = isMultiTenantHostedMode();
|
|
9
|
+
let deployment = multiTenant
|
|
10
|
+
? null
|
|
11
|
+
: (() => {
|
|
12
|
+
try {
|
|
13
|
+
return loadHostedDeploymentFromEnv();
|
|
14
|
+
}
|
|
15
|
+
catch {
|
|
16
|
+
return null;
|
|
17
|
+
}
|
|
18
|
+
})();
|
|
19
|
+
let tenantMeta = {};
|
|
20
|
+
let tenantResolveError;
|
|
21
|
+
let editorPackPath = getHostedEditorPackPath();
|
|
22
|
+
let packSource = 'local';
|
|
23
|
+
if (multiTenant) {
|
|
24
|
+
try {
|
|
25
|
+
const resolved = loadHostedDeploymentForRequest(request);
|
|
26
|
+
deployment = resolved.deployment;
|
|
27
|
+
tenantMeta = {
|
|
28
|
+
hostname: resolved.tenant?.hostname,
|
|
29
|
+
packTag: resolved.tenant?.packTag,
|
|
30
|
+
packRepo: resolved.tenant?.packRepo,
|
|
31
|
+
publicOrigin: resolved.publicOrigin,
|
|
32
|
+
};
|
|
33
|
+
if (resolved.tenant) {
|
|
34
|
+
const pack = await resolveEditorPackForTenant(resolved.tenant);
|
|
35
|
+
editorPackPath = pack.packPath;
|
|
36
|
+
packSource = pack.source;
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
catch (err) {
|
|
40
|
+
deployment = null;
|
|
41
|
+
tenantResolveError = err instanceof Error ? err.message : String(err);
|
|
42
|
+
}
|
|
43
|
+
}
|
|
9
44
|
const checks = {
|
|
10
|
-
config:
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
45
|
+
config: multiTenant
|
|
46
|
+
? {
|
|
47
|
+
ok: deployment !== null,
|
|
48
|
+
detail: deployment
|
|
49
|
+
? `multi-tenant hostname=${tenantMeta.hostname ?? '?'} spaceId=${deployment.spaceId}`
|
|
50
|
+
: `tenant resolve failed: ${tenantResolveError ?? 'unknown'}`,
|
|
51
|
+
}
|
|
52
|
+
: {
|
|
53
|
+
ok: Boolean(process.env['CONTENTFUL_SPACE_ID']),
|
|
54
|
+
detail: process.env['CONTENTFUL_SPACE_ID'] ? 'CONTENTFUL_SPACE_ID is set' : 'Missing',
|
|
55
|
+
},
|
|
14
56
|
redis: { ok: false, detail: 'Not checked' },
|
|
15
57
|
oauth: { ok: false, detail: 'Not checked' },
|
|
16
58
|
editorPack: { ok: false, detail: 'Not checked', path: '' },
|
|
@@ -18,8 +60,7 @@ export async function GET(request) {
|
|
|
18
60
|
mediaPipeline: mediaPipelineHealthCheck(),
|
|
19
61
|
};
|
|
20
62
|
try {
|
|
21
|
-
|
|
22
|
-
const probeSpace = deployment.spaceId?.trim() || process.env['CONTENTFUL_SPACE_ID']?.trim() || 'unknown';
|
|
63
|
+
const probeSpace = deployment?.spaceId?.trim() || process.env['CONTENTFUL_SPACE_ID']?.trim() || 'unknown';
|
|
23
64
|
const probeKey = `cms-edit:health-probe:${probeSpace}`;
|
|
24
65
|
await upstashRedis.set(probeKey, 'ok', { ex: 30 });
|
|
25
66
|
const value = await upstashRedis.get(probeKey);
|
|
@@ -34,33 +75,45 @@ export async function GET(request) {
|
|
|
34
75
|
detail: err instanceof Error ? err.message : String(err),
|
|
35
76
|
};
|
|
36
77
|
}
|
|
37
|
-
checks.oauth = await handleOAuthHealthCheck();
|
|
38
|
-
const editorPackPath = getHostedEditorPackPath();
|
|
78
|
+
checks.oauth = await handleOAuthHealthCheck(request);
|
|
39
79
|
const editorPackManifest = loadEditorPackManifest(editorPackPath);
|
|
80
|
+
const cachedSource = readCachedPackSource(editorPackPath);
|
|
40
81
|
checks.editorPack = {
|
|
41
82
|
ok: editorPackManifest !== null,
|
|
42
83
|
path: editorPackPath,
|
|
84
|
+
source: packSource,
|
|
85
|
+
...(tenantMeta.packTag ? { packTag: tenantMeta.packTag } : {}),
|
|
86
|
+
...(tenantMeta.packRepo ? { packRepo: tenantMeta.packRepo } : {}),
|
|
43
87
|
detail: editorPackManifest !== null
|
|
44
|
-
? `manifest.json OK (${editorPackManifest.resources.length} resources
|
|
88
|
+
? `manifest.json OK (${editorPackManifest.resources.length} resources` +
|
|
89
|
+
`${editorPackManifest.spaceId ? `, spaceId=${editorPackManifest.spaceId}` : ''})` +
|
|
90
|
+
(cachedSource ? `; cached ${JSON.stringify(cachedSource)}` : '')
|
|
45
91
|
: `manifest.json missing at ${editorPackPath}`,
|
|
46
92
|
};
|
|
47
93
|
const ok = checks.config.ok && checks.redis.ok && checks.oauth.ok;
|
|
48
|
-
|
|
94
|
+
let origin;
|
|
95
|
+
try {
|
|
96
|
+
origin = resolvePublicOrigin(request);
|
|
97
|
+
}
|
|
98
|
+
catch {
|
|
99
|
+
origin = new URL(request.url).origin;
|
|
100
|
+
}
|
|
49
101
|
checks.stagedUpload = await stagedUploadHealthCheck({ origin });
|
|
50
102
|
const landingPageUrl = `${origin}/cms-edit`;
|
|
51
103
|
const playbooksUrl = `${origin}/cms-edit/playbooks`;
|
|
52
104
|
const customerApiUrl = `${origin}/api/customer`;
|
|
53
105
|
let mcpUrl = `${origin}/api/mcp`;
|
|
54
106
|
try {
|
|
55
|
-
mcpUrl = getMcpResourceUrl();
|
|
107
|
+
mcpUrl = getMcpResourceUrl(request);
|
|
56
108
|
}
|
|
57
109
|
catch {
|
|
58
110
|
// CMS_EDIT_PUBLIC_ORIGIN may be unset during partial local setup
|
|
59
111
|
}
|
|
60
|
-
const customerPlaybooks = buildCustomerPlaybookIndex(origin,
|
|
112
|
+
const customerPlaybooks = buildCustomerPlaybookIndex(origin, editorPackPath);
|
|
61
113
|
return Response.json({
|
|
62
114
|
ok,
|
|
63
115
|
cmsEdit: getVersionInfo(),
|
|
116
|
+
multiTenant,
|
|
64
117
|
gettingStarted: {
|
|
65
118
|
...GETTING_STARTED_INFO,
|
|
66
119
|
landingPageUrl,
|
|
@@ -79,7 +132,16 @@ export async function GET(request) {
|
|
|
79
132
|
}
|
|
80
133
|
: null,
|
|
81
134
|
},
|
|
82
|
-
deployment:
|
|
135
|
+
deployment: deployment
|
|
136
|
+
? {
|
|
137
|
+
projectKey: deployment.projectKey,
|
|
138
|
+
spaceId: deployment.spaceId,
|
|
139
|
+
...(tenantMeta.hostname ? { hostname: tenantMeta.hostname } : {}),
|
|
140
|
+
...(tenantMeta.packTag ? { packTag: tenantMeta.packTag } : {}),
|
|
141
|
+
...(tenantMeta.packRepo ? { packRepo: tenantMeta.packRepo } : {}),
|
|
142
|
+
...(tenantMeta.publicOrigin ? { publicOrigin: tenantMeta.publicOrigin } : {}),
|
|
143
|
+
}
|
|
144
|
+
: null,
|
|
83
145
|
checks,
|
|
84
146
|
}, { status: ok ? 200 : 503 });
|
|
85
147
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"health.js","sourceRoot":"","sources":["../../../../src/hosted/next/routes/health.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EACL,wBAAwB,EACxB,uBAAuB,GACxB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EACL,oBAAoB,EACpB,iBAAiB,EACjB,cAAc,EACd,sBAAsB,EACtB,2BAA2B,
|
|
1
|
+
{"version":3,"file":"health.js","sourceRoot":"","sources":["../../../../src/hosted/next/routes/health.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EACL,wBAAwB,EACxB,uBAAuB,GACxB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EACL,oBAAoB,EACpB,iBAAiB,EACjB,cAAc,EACd,sBAAsB,EACtB,uBAAuB,EACvB,8BAA8B,EAC9B,2BAA2B,EAC3B,oBAAoB,EACpB,0BAA0B,EAC1B,mBAAmB,GACpB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAkB3C,MAAM,CAAC,KAAK,UAAU,GAAG,CAAC,OAAgB;IACxC,MAAM,WAAW,GAAG,uBAAuB,EAAE,CAAC;IAC9C,IAAI,UAAU,GAAG,WAAW;QAC1B,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,CAAC,GAAG,EAAE;YACJ,IAAI,CAAC;gBACH,OAAO,2BAA2B,EAAE,CAAC;YACvC,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC,CAAC,EAAE,CAAC;IACT,IAAI,UAAU,GAKV,EAAE,CAAC;IACP,IAAI,kBAAsC,CAAC;IAC3C,IAAI,cAAc,GAAG,uBAAuB,EAAE,CAAC;IAC/C,IAAI,UAAU,GAAuB,OAAO,CAAC;IAE7C,IAAI,WAAW,EAAE,CAAC;QAChB,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,8BAA8B,CAAC,OAAO,CAAC,CAAC;YACzD,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;YACjC,UAAU,GAAG;gBACX,QAAQ,EAAE,QAAQ,CAAC,MAAM,EAAE,QAAQ;gBACnC,OAAO,EAAE,QAAQ,CAAC,MAAM,EAAE,OAAO;gBACjC,QAAQ,EAAE,QAAQ,CAAC,MAAM,EAAE,QAAQ;gBACnC,YAAY,EAAE,QAAQ,CAAC,YAAY;aACpC,CAAC;YACF,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;gBACpB,MAAM,IAAI,GAAG,MAAM,0BAA0B,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBAC/D,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC;gBAC/B,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC;YAC3B,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,UAAU,GAAG,IAAI,CAAC;YAClB,kBAAkB,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACxE,CAAC;IACH,CAAC;IAED,MAAM,MAAM,GAAiB;QAC3B,MAAM,EAAE,WAAW;YACjB,CAAC,CAAC;gBACE,EAAE,EAAE,UAAU,KAAK,IAAI;gBACvB,MAAM,EAAE,UAAU;oBAChB,CAAC,CAAC,yBAAyB,UAAU,CAAC,QAAQ,IAAI,GAAG,YAAY,UAAU,CAAC,OAAO,EAAE;oBACrF,CAAC,CAAC,0BAA0B,kBAAkB,IAAI,SAAS,EAAE;aAChE;YACH,CAAC,CAAC;gBACE,EAAE,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;gBAC/C,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,4BAA4B,CAAC,CAAC,CAAC,SAAS;aACtF;QACL,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE;QAC3C,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE;QAC3C,UAAU,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,IAAI,EAAE,EAAE,EAAE;QAC1D,YAAY,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE;QAClD,aAAa,EAAE,wBAAwB,EAAE;KAC1C,CAAC;IAEF,IAAI,CAAC;QACH,MAAM,UAAU,GACd,UAAU,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,EAAE,IAAI,EAAE,IAAI,SAAS,CAAC;QACzF,MAAM,QAAQ,GAAG,yBAAyB,UAAU,EAAE,CAAC;QACvD,MAAM,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QACnD,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,GAAG,CAAS,QAAQ,CAAC,CAAC;QACvD,MAAM,CAAC,KAAK,GAAG;YACb,EAAE,EAAE,KAAK,KAAK,IAAI;YAClB,MAAM,EAAE,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,oBAAoB;SACtE,CAAC;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,CAAC,KAAK,GAAG;YACb,EAAE,EAAE,KAAK;YACT,MAAM,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;SACzD,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,KAAK,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,CAAC;IAErD,MAAM,kBAAkB,GAAG,sBAAsB,CAAC,cAAc,CAAC,CAAC;IAClE,MAAM,YAAY,GAAG,oBAAoB,CAAC,cAAc,CAAC,CAAC;IAC1D,MAAM,CAAC,UAAU,GAAG;QAClB,EAAE,EAAE,kBAAkB,KAAK,IAAI;QAC/B,IAAI,EAAE,cAAc;QACpB,MAAM,EAAE,UAAU;QAClB,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9D,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACjE,MAAM,EACJ,kBAAkB,KAAK,IAAI;YACzB,CAAC,CAAC,qBAAqB,kBAAkB,CAAC,SAAS,CAAC,MAAM,YAAY;gBACpE,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,kBAAkB,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG;gBACjF,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAClE,CAAC,CAAC,4BAA4B,cAAc,EAAE;KACnD,CAAC;IAEF,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;IAClE,IAAI,MAAc,CAAC;IACnB,IAAI,CAAC;QACH,MAAM,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;IACvC,CAAC;IACD,MAAM,CAAC,YAAY,GAAG,MAAM,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAChE,MAAM,cAAc,GAAG,GAAG,MAAM,WAAW,CAAC;IAC5C,MAAM,YAAY,GAAG,GAAG,MAAM,qBAAqB,CAAC;IACpD,MAAM,cAAc,GAAG,GAAG,MAAM,eAAe,CAAC;IAChD,IAAI,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC;IACjC,IAAI,CAAC;QACH,MAAM,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;IAAC,MAAM,CAAC;QACP,iEAAiE;IACnE,CAAC;IAED,MAAM,iBAAiB,GAAG,0BAA0B,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAE7E,OAAO,QAAQ,CAAC,IAAI,CAClB;QACE,EAAE;QACF,OAAO,EAAE,cAAc,EAAE;QACzB,WAAW;QACX,cAAc,EAAE;YACd,GAAG,oBAAoB;YACvB,cAAc;YACd,iBAAiB,EAAE,MAAM;YACzB,YAAY;YACZ,cAAc;YACd,YAAY,EAAE,mBAAmB;YACjC,iBAAiB,EAAE,iBAAiB;gBAClC,CAAC,CAAC;oBACE,UAAU,EAAE,iBAAiB,CAAC,UAAU;oBACxC,WAAW,EAAE,iBAAiB,CAAC,WAAW;oBAC1C,SAAS,EAAE,iBAAiB,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;wBACxD,IAAI,EAAE,QAAQ,CAAC,IAAI;wBACnB,MAAM,EAAE,QAAQ,CAAC,MAAM;qBACxB,CAAC,CAAC;iBACJ;gBACH,CAAC,CAAC,IAAI;SACT;QACD,UAAU,EAAE,UAAU;YACpB,CAAC,CAAC;gBACE,UAAU,EAAE,UAAU,CAAC,UAAU;gBACjC,OAAO,EAAE,UAAU,CAAC,OAAO;gBAC3B,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACjE,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC9D,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACjE,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,UAAU,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAC9E;YACH,CAAC,CAAC,IAAI;QACR,MAAM;KACP,EACD,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAC3B,CAAC;AACJ,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { handleLinkContentfulPost } from '../../index.js';
|
|
2
2
|
import { createOAuthHandlerContext } from '../context.js';
|
|
3
3
|
export async function POST(request) {
|
|
4
|
-
return handleLinkContentfulPost(request, createOAuthHandlerContext());
|
|
4
|
+
return handleLinkContentfulPost(request, createOAuthHandlerContext(request));
|
|
5
5
|
}
|
|
6
6
|
//# sourceMappingURL=link-contentful.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"link-contentful.js","sourceRoot":"","sources":["../../../../src/hosted/next/routes/link-contentful.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAE1D,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,OAAgB;IACzC,OAAO,wBAAwB,CAAC,OAAO,EAAE,yBAAyB,
|
|
1
|
+
{"version":3,"file":"link-contentful.js","sourceRoot":"","sources":["../../../../src/hosted/next/routes/link-contentful.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAE1D,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,OAAgB;IACzC,OAAO,wBAAwB,CAAC,OAAO,EAAE,yBAAyB,CAAC,OAAO,CAAC,CAAC,CAAC;AAC/E,CAAC"}
|
|
@@ -1,4 +1,9 @@
|
|
|
1
|
-
|
|
1
|
+
/**
|
|
2
|
+
* Streamable HTTP clients may open a long-lived GET SSE stream. This host is
|
|
3
|
+
* stateless and never writes to it, so GET held Fluid memory until the 300s
|
|
4
|
+
* timeout (#267). Refuse GET; clients fall back to POST/JSON.
|
|
5
|
+
*/
|
|
6
|
+
export declare function GET(_request: Request): Promise<Response>;
|
|
2
7
|
export declare function POST(request: Request): Promise<Response>;
|
|
3
8
|
export declare function DELETE(request: Request): Promise<Response>;
|
|
4
9
|
export declare function OPTIONS(): Promise<Response>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp.d.ts","sourceRoot":"","sources":["../../../../src/hosted/next/routes/mcp.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mcp.d.ts","sourceRoot":"","sources":["../../../../src/hosted/next/routes/mcp.ts"],"names":[],"mappings":"AAkDA;;;;GAIG;AACH,wBAAsB,GAAG,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAO9D;AAED,wBAAsB,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAE9D;AAED,wBAAsB,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAEhE;AAED,wBAAsB,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,CAEjD"}
|
|
@@ -1,16 +1,17 @@
|
|
|
1
1
|
import { readFileSync } from 'node:fs';
|
|
2
2
|
import path from 'node:path';
|
|
3
|
+
import { isMultiTenantHostedMode, loadHostedDeploymentForRequest, loadHostedDeploymentFromEnv, } from '../../../config/hosted.js';
|
|
3
4
|
import { MediaPipelineJobStore } from '../../../media-pipeline/job-store.js';
|
|
4
5
|
import { isAllowedExtraRoot } from '../../../publish/classify.js';
|
|
5
6
|
import { redisPlanStore } from '../../../publish/store.js';
|
|
6
7
|
import { StagedUploadStore } from '../../../staged-upload/store.js';
|
|
7
|
-
import { buildHostedConfig, handleHostedMcpRequest, isMcpUnauthorizedError, isTransientContentfulFailure, isUnusableContentfulCacheReason,
|
|
8
|
+
import { buildHostedConfig, handleHostedMcpRequest, isMcpUnauthorizedError, isTransientContentfulFailure, isUnusableContentfulCacheReason, oauthLogAuthFailure, oauthLogMcpHandlerError, patValidationFailureReason, RedisIndexCacheStore, RedisSessionStore, resolveContentfulTokenFromRequest, resolveEditorPackForTenant, resolvePatForDeployment, runWithContentfulRequestStats, unauthorizedMcpResponse, } from '../../index.js';
|
|
8
9
|
import { corsPreflight, withCors } from '../../oauth/cors.js';
|
|
9
10
|
import { createOAuthHandlerContext } from '../context.js';
|
|
10
11
|
import { getHostedEditorPackPath } from '../editor-pack-path.js';
|
|
11
12
|
import { createRedisClient } from '../redis.js';
|
|
12
13
|
const redisClient = createRedisClient();
|
|
13
|
-
const
|
|
14
|
+
const localEditorPackPath = getHostedEditorPackPath();
|
|
14
15
|
function readExtraRootContentTypes(packPath) {
|
|
15
16
|
try {
|
|
16
17
|
const raw = readFileSync(path.join(packPath, 'publish.json'), 'utf8');
|
|
@@ -23,8 +24,16 @@ function readExtraRootContentTypes(packPath) {
|
|
|
23
24
|
return [];
|
|
24
25
|
}
|
|
25
26
|
}
|
|
26
|
-
|
|
27
|
-
|
|
27
|
+
/**
|
|
28
|
+
* Streamable HTTP clients may open a long-lived GET SSE stream. This host is
|
|
29
|
+
* stateless and never writes to it, so GET held Fluid memory until the 300s
|
|
30
|
+
* timeout (#267). Refuse GET; clients fall back to POST/JSON.
|
|
31
|
+
*/
|
|
32
|
+
export async function GET(_request) {
|
|
33
|
+
return withCors(new Response(null, {
|
|
34
|
+
status: 405,
|
|
35
|
+
headers: { Allow: 'POST' },
|
|
36
|
+
}));
|
|
28
37
|
}
|
|
29
38
|
export async function POST(request) {
|
|
30
39
|
return handleMcp(request);
|
|
@@ -39,12 +48,34 @@ async function handleMcp(request) {
|
|
|
39
48
|
const response = await runWithContentfulRequestStats(() => handleMcpInner(request));
|
|
40
49
|
return withCors(response);
|
|
41
50
|
}
|
|
51
|
+
async function resolveDeployment(request) {
|
|
52
|
+
if (isMultiTenantHostedMode()) {
|
|
53
|
+
const resolved = loadHostedDeploymentForRequest(request);
|
|
54
|
+
if (!resolved.tenant) {
|
|
55
|
+
throw new Error('Multi-tenant mode resolved no tenant.');
|
|
56
|
+
}
|
|
57
|
+
const pack = await resolveEditorPackForTenant(resolved.tenant);
|
|
58
|
+
return {
|
|
59
|
+
deployment: resolved.deployment,
|
|
60
|
+
displayName: resolved.tenant.displayName,
|
|
61
|
+
editorPackPath: pack.packPath,
|
|
62
|
+
};
|
|
63
|
+
}
|
|
64
|
+
return {
|
|
65
|
+
deployment: loadHostedDeploymentFromEnv(),
|
|
66
|
+
displayName: process.env['CMS_EDIT_DISPLAY_NAME'],
|
|
67
|
+
editorPackPath: localEditorPackPath,
|
|
68
|
+
};
|
|
69
|
+
}
|
|
42
70
|
async function handleMcpInner(request) {
|
|
43
|
-
const oauthCtx = createOAuthHandlerContext();
|
|
71
|
+
const oauthCtx = createOAuthHandlerContext(request);
|
|
44
72
|
let user;
|
|
45
73
|
let mcpSub;
|
|
74
|
+
let deployment;
|
|
75
|
+
let editorPackPath;
|
|
76
|
+
let displayName;
|
|
46
77
|
try {
|
|
47
|
-
|
|
78
|
+
({ deployment, editorPackPath, displayName } = await resolveDeployment(request));
|
|
48
79
|
const { sub, contentfulToken } = await resolveContentfulTokenFromRequest(request, oauthCtx.store, deployment.spaceId);
|
|
49
80
|
mcpSub = sub;
|
|
50
81
|
try {
|
|
@@ -60,7 +91,7 @@ async function handleMcpInner(request) {
|
|
|
60
91
|
projectKey: deployment.projectKey,
|
|
61
92
|
message,
|
|
62
93
|
});
|
|
63
|
-
return unauthorizedMcpResponse('invalid_contentful_token');
|
|
94
|
+
return unauthorizedMcpResponse('invalid_contentful_token', request);
|
|
64
95
|
}
|
|
65
96
|
if (isTransientContentfulFailure(reason)) {
|
|
66
97
|
oauthLogAuthFailure('mcp', reason, {
|
|
@@ -77,15 +108,18 @@ async function handleMcpInner(request) {
|
|
|
77
108
|
catch (err) {
|
|
78
109
|
let deploymentMeta = {};
|
|
79
110
|
try {
|
|
80
|
-
const
|
|
81
|
-
deploymentMeta = {
|
|
111
|
+
const resolved = await resolveDeployment(request);
|
|
112
|
+
deploymentMeta = {
|
|
113
|
+
spaceId: resolved.deployment.spaceId,
|
|
114
|
+
projectKey: resolved.deployment.projectKey,
|
|
115
|
+
};
|
|
82
116
|
}
|
|
83
117
|
catch {
|
|
84
|
-
// env not configured — still log auth failure without deployment context
|
|
118
|
+
// env/registry not configured — still log auth failure without deployment context
|
|
85
119
|
}
|
|
86
120
|
if (isMcpUnauthorizedError(err)) {
|
|
87
121
|
oauthLogAuthFailure('mcp', err.reason, deploymentMeta);
|
|
88
|
-
return unauthorizedMcpResponse(err.reason);
|
|
122
|
+
return unauthorizedMcpResponse(err.reason, request);
|
|
89
123
|
}
|
|
90
124
|
const message = err instanceof Error ? err.message : String(err);
|
|
91
125
|
oauthLogAuthFailure('mcp', patValidationFailureReason(message), {
|
|
@@ -95,7 +129,6 @@ async function handleMcpInner(request) {
|
|
|
95
129
|
return Response.json({ error: message }, { status: 401 });
|
|
96
130
|
}
|
|
97
131
|
try {
|
|
98
|
-
const deployment = loadHostedDeploymentFromEnv();
|
|
99
132
|
const runtimeContext = {
|
|
100
133
|
config: buildHostedConfig(deployment, user.token),
|
|
101
134
|
sessionStore: new RedisSessionStore(redisClient),
|
|
@@ -116,7 +149,7 @@ async function handleMcpInner(request) {
|
|
|
116
149
|
resolveContext: async () => runtimeContext,
|
|
117
150
|
getMcpInfo: () => ({
|
|
118
151
|
projectKey: deployment.projectKey,
|
|
119
|
-
displayName
|
|
152
|
+
displayName,
|
|
120
153
|
spaceId: deployment.spaceId,
|
|
121
154
|
}),
|
|
122
155
|
editorPackPath,
|
|
@@ -124,15 +157,10 @@ async function handleMcpInner(request) {
|
|
|
124
157
|
}
|
|
125
158
|
catch (err) {
|
|
126
159
|
const message = err instanceof Error ? err.message : String(err);
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
}
|
|
132
|
-
catch {
|
|
133
|
-
// env not configured — still log handler failure without deployment context
|
|
134
|
-
}
|
|
135
|
-
oauthLogMcpHandlerError(message, deploymentMeta);
|
|
160
|
+
oauthLogMcpHandlerError(message, {
|
|
161
|
+
spaceId: deployment.spaceId,
|
|
162
|
+
projectKey: deployment.projectKey,
|
|
163
|
+
});
|
|
136
164
|
return Response.json({ error: message }, { status: 500 });
|
|
137
165
|
}
|
|
138
166
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../../../../src/hosted/next/routes/mcp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EACL,iBAAiB,EACjB,sBAAsB,EACtB,sBAAsB,EACtB,4BAA4B,EAC5B,+BAA+B,EAC/B,
|
|
1
|
+
{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../../../../src/hosted/next/routes/mcp.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-authorization-server.d.ts","sourceRoot":"","sources":["../../../../src/hosted/next/routes/oauth-authorization-server.ts"],"names":[],"mappings":"AAGA,wBAAsB,GAAG,
|
|
1
|
+
{"version":3,"file":"oauth-authorization-server.d.ts","sourceRoot":"","sources":["../../../../src/hosted/next/routes/oauth-authorization-server.ts"],"names":[],"mappings":"AAGA,wBAAsB,GAAG,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAE7D;AAED,wBAAsB,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,CAEjD"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { handleOAuthAuthorizationServerMetadataGet } from '../../index.js';
|
|
2
2
|
import { corsPreflight, withCors } from '../../oauth/cors.js';
|
|
3
|
-
export async function GET() {
|
|
4
|
-
return withCors(handleOAuthAuthorizationServerMetadataGet());
|
|
3
|
+
export async function GET(request) {
|
|
4
|
+
return withCors(handleOAuthAuthorizationServerMetadataGet(request));
|
|
5
5
|
}
|
|
6
6
|
export async function OPTIONS() {
|
|
7
7
|
return corsPreflight();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-authorization-server.js","sourceRoot":"","sources":["../../../../src/hosted/next/routes/oauth-authorization-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yCAAyC,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE9D,MAAM,CAAC,KAAK,UAAU,GAAG;
|
|
1
|
+
{"version":3,"file":"oauth-authorization-server.js","sourceRoot":"","sources":["../../../../src/hosted/next/routes/oauth-authorization-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yCAAyC,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE9D,MAAM,CAAC,KAAK,UAAU,GAAG,CAAC,OAAgB;IACxC,OAAO,QAAQ,CAAC,yCAAyC,CAAC,OAAO,CAAC,CAAC,CAAC;AACtE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,OAAO;IAC3B,OAAO,aAAa,EAAE,CAAC;AACzB,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { handleOAuthAuthorizeGet } from '../../index.js';
|
|
2
2
|
import { createOAuthHandlerContext } from '../context.js';
|
|
3
3
|
export async function GET(request) {
|
|
4
|
-
return handleOAuthAuthorizeGet(request, createOAuthHandlerContext());
|
|
4
|
+
return handleOAuthAuthorizeGet(request, createOAuthHandlerContext(request));
|
|
5
5
|
}
|
|
6
6
|
//# sourceMappingURL=oauth-authorize.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-authorize.js","sourceRoot":"","sources":["../../../../src/hosted/next/routes/oauth-authorize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAE1D,MAAM,CAAC,KAAK,UAAU,GAAG,CAAC,OAAgB;IACxC,OAAO,uBAAuB,CAAC,OAAO,EAAE,yBAAyB,
|
|
1
|
+
{"version":3,"file":"oauth-authorize.js","sourceRoot":"","sources":["../../../../src/hosted/next/routes/oauth-authorize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAE1D,MAAM,CAAC,KAAK,UAAU,GAAG,CAAC,OAAgB;IACxC,OAAO,uBAAuB,CAAC,OAAO,EAAE,yBAAyB,CAAC,OAAO,CAAC,CAAC,CAAC;AAC9E,CAAC"}
|
|
@@ -5,7 +5,7 @@ type PathParams = {
|
|
|
5
5
|
* RFC 9728 path-aware metadata:
|
|
6
6
|
* `/.well-known/oauth-protected-resource/api/mcp`
|
|
7
7
|
*/
|
|
8
|
-
export declare function GET(
|
|
8
|
+
export declare function GET(request: Request, context: {
|
|
9
9
|
params: Promise<PathParams>;
|
|
10
10
|
}): Promise<Response>;
|
|
11
11
|
export declare function OPTIONS(): Promise<Response>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-protected-resource-path.d.ts","sourceRoot":"","sources":["../../../../src/hosted/next/routes/oauth-protected-resource-path.ts"],"names":[],"mappings":"AAMA,KAAK,UAAU,GAAG;IAAE,IAAI,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAErC;;;GAGG;AACH,wBAAsB,GAAG,CACvB,
|
|
1
|
+
{"version":3,"file":"oauth-protected-resource-path.d.ts","sourceRoot":"","sources":["../../../../src/hosted/next/routes/oauth-protected-resource-path.ts"],"names":[],"mappings":"AAMA,KAAK,UAAU,GAAG;IAAE,IAAI,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAErC;;;GAGG;AACH,wBAAsB,GAAG,CACvB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE;IAAE,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,CAAA;CAAE,GACvC,OAAO,CAAC,QAAQ,CAAC,CAMnB;AAED,wBAAsB,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,CAEjD"}
|
|
@@ -4,12 +4,12 @@ import { corsPreflight, withCors } from '../../oauth/cors.js';
|
|
|
4
4
|
* RFC 9728 path-aware metadata:
|
|
5
5
|
* `/.well-known/oauth-protected-resource/api/mcp`
|
|
6
6
|
*/
|
|
7
|
-
export async function GET(
|
|
7
|
+
export async function GET(request, context) {
|
|
8
8
|
const { path } = await context.params;
|
|
9
9
|
if (!isMcpProtectedResourcePath(path)) {
|
|
10
10
|
return withCors(new Response('Not found', { status: 404 }));
|
|
11
11
|
}
|
|
12
|
-
return withCors(handleOAuthProtectedResourceMetadataGet());
|
|
12
|
+
return withCors(handleOAuthProtectedResourceMetadataGet(request));
|
|
13
13
|
}
|
|
14
14
|
export async function OPTIONS() {
|
|
15
15
|
return corsPreflight();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-protected-resource-path.js","sourceRoot":"","sources":["../../../../src/hosted/next/routes/oauth-protected-resource-path.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uCAAuC,EACvC,0BAA0B,GAC3B,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAI9D;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,GAAG,CACvB,
|
|
1
|
+
{"version":3,"file":"oauth-protected-resource-path.js","sourceRoot":"","sources":["../../../../src/hosted/next/routes/oauth-protected-resource-path.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uCAAuC,EACvC,0BAA0B,GAC3B,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAI9D;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,GAAG,CACvB,OAAgB,EAChB,OAAwC;IAExC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC;IACtC,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,EAAE,CAAC;QACtC,OAAO,QAAQ,CAAC,IAAI,QAAQ,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;IAC9D,CAAC;IACD,OAAO,QAAQ,CAAC,uCAAuC,CAAC,OAAO,CAAC,CAAC,CAAC;AACpE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,OAAO;IAC3B,OAAO,aAAa,EAAE,CAAC;AACzB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-protected-resource.d.ts","sourceRoot":"","sources":["../../../../src/hosted/next/routes/oauth-protected-resource.ts"],"names":[],"mappings":"AAGA,wBAAsB,GAAG,
|
|
1
|
+
{"version":3,"file":"oauth-protected-resource.d.ts","sourceRoot":"","sources":["../../../../src/hosted/next/routes/oauth-protected-resource.ts"],"names":[],"mappings":"AAGA,wBAAsB,GAAG,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAE7D;AAED,wBAAsB,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,CAEjD"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { handleOAuthProtectedResourceMetadataGet } from '../../index.js';
|
|
2
2
|
import { corsPreflight, withCors } from '../../oauth/cors.js';
|
|
3
|
-
export async function GET() {
|
|
4
|
-
return withCors(handleOAuthProtectedResourceMetadataGet());
|
|
3
|
+
export async function GET(request) {
|
|
4
|
+
return withCors(handleOAuthProtectedResourceMetadataGet(request));
|
|
5
5
|
}
|
|
6
6
|
export async function OPTIONS() {
|
|
7
7
|
return corsPreflight();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-protected-resource.js","sourceRoot":"","sources":["../../../../src/hosted/next/routes/oauth-protected-resource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uCAAuC,EAAE,MAAM,gBAAgB,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE9D,MAAM,CAAC,KAAK,UAAU,GAAG;
|
|
1
|
+
{"version":3,"file":"oauth-protected-resource.js","sourceRoot":"","sources":["../../../../src/hosted/next/routes/oauth-protected-resource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uCAAuC,EAAE,MAAM,gBAAgB,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE9D,MAAM,CAAC,KAAK,UAAU,GAAG,CAAC,OAAgB;IACxC,OAAO,QAAQ,CAAC,uCAAuC,CAAC,OAAO,CAAC,CAAC,CAAC;AACpE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,OAAO;IAC3B,OAAO,aAAa,EAAE,CAAC;AACzB,CAAC"}
|
|
@@ -2,7 +2,7 @@ import { handleOAuthRegisterPost } from '../../index.js';
|
|
|
2
2
|
import { corsPreflight, withCors } from '../../oauth/cors.js';
|
|
3
3
|
import { createOAuthHandlerContext } from '../context.js';
|
|
4
4
|
export async function POST(request) {
|
|
5
|
-
return withCors(await handleOAuthRegisterPost(request, createOAuthHandlerContext()));
|
|
5
|
+
return withCors(await handleOAuthRegisterPost(request, createOAuthHandlerContext(request)));
|
|
6
6
|
}
|
|
7
7
|
export async function OPTIONS() {
|
|
8
8
|
return corsPreflight();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-register.js","sourceRoot":"","sources":["../../../../src/hosted/next/routes/oauth-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAE1D,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,OAAgB;IACzC,OAAO,QAAQ,CAAC,MAAM,uBAAuB,CAAC,OAAO,EAAE,yBAAyB,
|
|
1
|
+
{"version":3,"file":"oauth-register.js","sourceRoot":"","sources":["../../../../src/hosted/next/routes/oauth-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAE1D,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,OAAgB;IACzC,OAAO,QAAQ,CAAC,MAAM,uBAAuB,CAAC,OAAO,EAAE,yBAAyB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AAC9F,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,OAAO;IAC3B,OAAO,aAAa,EAAE,CAAC;AACzB,CAAC"}
|