@ossy/platform 3.24.1 → 3.25.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/platform",
-  "version": "3.24.1",
+  "version": "3.25.0",
   "description": "Ossy application server runtime",
   "repository": {
     "type": "git",
@@ -49,18 +49,18 @@
     "@aws-sdk/util-format-url": "^3.972.17",
     "@modelcontextprotocol/sdk": "^1.12.1",
     "@ossy/config": "^3.0.9",
-    "@ossy/email": "^3.24.1",
+    "@ossy/email": "^3.25.0",
     "@ossy/event-store": "^3.24.1",
     "@ossy/locale": "^3.4.0",
     "@ossy/manifest": "^3.24.0",
     "@ossy/observability": "^3.24.1",
     "@ossy/policies": "^3.24.1",
-    "@ossy/router": "^3.0.9",
+    "@ossy/router": "^3.25.0",
     "@ossy/schema": "^3.24.0",
     "@ossy/sdk": "^3.24.0",
     "@ossy/tokens": "^3.24.1",
     "@ossy/users": "^3.24.1",
-    "@ossy/workspaces": "^3.24.1",
+    "@ossy/workspaces": "^3.25.0",
     "cookie-parser": "^1.4.7",
     "dotenv": ">=16.0.0 <18.0.0",
     "express": ">=5.0.0 <6.0.0",
@@ -81,5 +81,5 @@
     "Dockerfile",
     "docker-healthcheck.js"
   ],
-  "gitHead": "d0e7eda0397239d5e8a8cd5115d9c91959b4103f"
+  "gitHead": "00dd4b51a94de7e0399c9dfa59380a53e58c8523"
 }

package/src/runtime.js

@@ -187,7 +187,8 @@ export async function startRuntime ({ port } = {}) {
       const { language, messages, fallbackMessages } = resolveRequestLocale(pageRouter, requestUrl, buildDir, config)
       if (typeof pageEntry.redirect === 'string' && pageEntry.redirect.trim()) {
         const targetId = pageEntry.redirect.trim().replace(/^@/, '')
-        const targetPath = pageRouter.getPathname({ id: targetId, language })
+        const params = pageRouter.getParamsFromUrl(requestUrl)
+        const targetPath = pageRouter.getPathname({ id: targetId, language, params })
         if (targetPath) {
           const search = new URL(requestUrl, 'http://localhost').search || ''
           res.redirect(302, `${targetPath}${search}`)

package/src/server.js

@@ -530,7 +530,8 @@ export async function startServer (options = {}) {
         if (typeof pageEntry.redirect === 'string' && pageEntry.redirect.trim()) {
           const { language } = resolveRequestLocale(pageRouter, requestUrl, buildDir, config)
           const targetId = pageEntry.redirect.trim().replace(/^@/, '')
-          const targetPath = pageRouter.getPathname({ id: targetId, language })
+          const params = pageRouter.getParamsFromUrl(requestUrl)
+          const targetPath = pageRouter.getPathname({ id: targetId, language, params })
           if (targetPath) {
             const search = new URL(requestUrl, 'http://localhost').search || ''
             res.redirect(302, `${targetPath}${search}`)

package/src/ses/poll-inbound-mail.js

@@ -1,6 +1,7 @@
 import { DeleteMessageCommand, ReceiveMessageCommand, SQSClient } from '@aws-sdk/client-sqs'
 import { GetObjectCommand, S3Client } from '@aws-sdk/client-s3'
 import { fileSesReceipt, sesReceiptFromBody } from '@ossy/email/ses-inbound'
+import { canonicalWorkspaceId } from '@ossy/workspaces/server'
 import { createInProcessSdk } from '../tasks/in-process-sdk.js'
 import { inboundAwsClientConfig } from './inbound-aws-credentials.js'
 
@@ -47,9 +48,12 @@ export function startInboundMailPoller ({ queueUrl, bucket, log } = {}) {
   const file = (body) => fileSesReceipt(sesReceiptFromBody(body), {
     bucket,
     getObject: (location) => readObject(objects, location),
-    invoke: ({ mime, workspaceId }) => createInProcessSdk()
-      .forWorkspace(workspaceId)
-      .invoke(ReceiveInbound, { mime, workspaceId }),
+    invoke: async ({ mime, workspaceId }) => {
+      const canonical = await canonicalWorkspaceId(workspaceId)
+      return createInProcessSdk()
+        .forWorkspace(canonical)
+        .invoke(ReceiveInbound, { mime, workspaceId: canonical })
+    },
   })
 
   const run = (async () => {