@ossy/platform 3.7.0 → 3.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/platform",
-  "version": "3.7.0",
+  "version": "3.7.1",
   "description": "Ossy application server runtime",
   "repository": {
     "type": "git",
@@ -54,7 +54,7 @@
     "@ossy/sdk": "^3.5.0",
     "@ossy/tokens": "^3.5.0",
     "@ossy/users": "^3.6.1",
-    "@ossy/workspaces": "^3.6.1",
+    "@ossy/workspaces": "^3.7.1",
     "cookie-parser": "^1.4.7",
     "dotenv": ">=16.0.0 <18.0.0",
     "express": ">=5.0.0 <6.0.0",
@@ -75,5 +75,5 @@
     "Dockerfile",
     "docker-healthcheck.js"
   ],
-  "gitHead": "622d97535abad08415963405ace2f5aaaecd7ca4"
+  "gitHead": "1ee220424da6b065034a7f52f52aa4a6ce7c88d5"
 }

package/src/server.js

@@ -495,6 +495,8 @@ export async function startServer (options = {}) {
         } = resolvePageLayoutRender(layoutsById, pageEntry)
         const { language, messages, fallbackMessages } = resolveRequestLocale(pageRouter, requestUrl, buildDir, config)
         let schemasForPage = cloneSerializable(manifest.schemas || [])
+        let ssrWorkspaceName
+        let ssrWorkspaceServices
         if (req.workspaceId && loadWorkspaceForEntitlements) {
           const workspaceTimer = createTimedOperation(`SSR loadWorkspace ${req.workspaceId}`, { log })
           try {
@@ -506,6 +508,8 @@ export async function startServer (options = {}) {
                 cloneSerializable(workspace.schemas),
               )
             }
+            ssrWorkspaceName = workspace?.name
+            ssrWorkspaceServices = workspace?.services
           } catch (err) {
             workspaceTimer.finish({
               pageId: pageRoute.id,
@@ -527,6 +531,9 @@ export async function startServer (options = {}) {
         const props = {
           ...config,
           ...(req.userAppSettings || {}),
+          ...(req.workspaceId ? { workspaceId: req.workspaceId } : {}),
+          ...(ssrWorkspaceName != null ? { workspaceName: ssrWorkspaceName } : {}),
+          ...(ssrWorkspaceServices != null ? { workspaceServices: cloneSerializable(ssrWorkspaceServices) } : {}),
           theme: req.userAppSettings?.theme || cloneSerializable(config?.theme),
           themes: cloneSerializable(config?.themes),
           schemas: schemasForPage,

package/src/storage/storage-keys.js

@@ -6,6 +6,24 @@
  */
 
 const KEY_PATTERN = /^[A-Za-z0-9_-]+(:[A-Za-z0-9_-]+)?$/
+const RESOURCE_ID_PATTERN = /^[A-Za-z0-9_-]+$/
+
+export function isStorageKey (key) {
+  return typeof key === 'string' && KEY_PATTERN.test(key)
+}
+
+/**
+ * Map a stored `content.Key` to a logical key for `/r/{id}` URLs.
+ * Legacy S3 paths (`media/{workspaceId}/{resourceId}/original.ext`) fall back
+ * to `resourceId` so folder list does not 500 after leftover File docs appear.
+ */
+export function coerceStorageKey (key, fallbackResourceId) {
+  if (isStorageKey(key)) return key
+  if (typeof fallbackResourceId === 'string' && RESOURCE_ID_PATTERN.test(fallbackResourceId)) {
+    return fallbackResourceId
+  }
+  return null
+}
 
 export function originalObjectKey (resourceId) {
   assertResourceId(resourceId)
@@ -31,7 +49,7 @@ export function assertStorageKey (key) {
 }
 
 function assertResourceId (resourceId) {
-  if (!resourceId || typeof resourceId !== 'string' || !/^[A-Za-z0-9_-]+$/.test(resourceId)) {
+  if (!resourceId || typeof resourceId !== 'string' || !RESOURCE_ID_PATTERN.test(resourceId)) {
     throw new Error(`[storage-keys] invalid resourceId: ${resourceId}`)
   }
 }

package/src/storage/storage-keys.spec.js

@@ -1,5 +1,5 @@
 import { describe, expect, it } from '@jest/globals'
-import { originalObjectKey, derivativeObjectKey, assertStorageKey } from './storage-keys.js'
+import { originalObjectKey, derivativeObjectKey, assertStorageKey, coerceStorageKey } from './storage-keys.js'
 
 describe('storage-keys', () => {
   it('originalObjectKey returns flat resourceId', () => {
@@ -13,4 +13,10 @@ describe('storage-keys', () => {
   it('rejects path-like keys', () => {
     expect(() => assertStorageKey('media/ws/file')).toThrow()
   })
+
+  it('coerces legacy media paths to the resource id', () => {
+    expect(coerceStorageKey('media/ws/abc123/original.pdf', 'abc123')).toBe('abc123')
+    expect(coerceStorageKey('abc123:galleryMedium', 'abc123')).toBe('abc123:galleryMedium')
+    expect(coerceStorageKey('media/ws/file', 'not valid')).toBe(null)
+  })
 })