Merge branch 'main' into fix-iframely-csp

2026-09-12 05:48:57 +00:00 · 2024-04-18 08:39:09 -07:00
parent 119c22af11 f1440ca7ef
commit 0f7ac7ca08
1 changed files with 8 additions and 2 deletions
@@ -485,13 +485,19 @@ async function lookupSpaceInMultiIdMode(request: NextRequest, url: URL): Promise
    }

    const decoded = jwt.decode(apiToken) as ContentAPITokenPayload;
+    const siteLookupResult =
+        typeof decoded.site === 'string' &&
+        decoded.site &&
+        typeof decoded.organization === 'string' &&
+        decoded.organization
+            ? { site: decoded.site, organization: decoded.organization }
+            : {};

    return {
        space: spaceId,
        changeRequest: changeRequestId,
        revision: revisionId,
-        site: decoded.site,
-        organization: decoded.organization,
+        ...siteLookupResult,
        basePath: normalizePathname(basePathParts.join('/')),
        pathname: normalizePathname(pathSegments.join('/')),
        apiToken,