@ossy/app 0.13.3 → 0.14.0

package/cli/proxy-internal.js

@@ -1,3 +1,10 @@
+/** Node/Express can join duplicate workspace headers as `id, id` — API expects a single id. */
+function normalizeWorkspaceIdHeader (value) {
+    if (!value || value === 'undefined') return undefined
+    const first = String(value).split(',')[0]?.trim()
+    return first || undefined
+}
+
 export function ProxyInternal() {
     return (req, res, next) => {
 
@@ -48,18 +55,18 @@ export function ProxyInternal() {
 
         const domain = process.env.OSSY_API_URL || 'https://api.ossy.se'
         const url = `${domain}${req.originalUrl?.replace('/@ossy', '/api/v0')}`
-        const headers = { ...(req.headers || {}) } // Clone headers
-        const workspaceId = headers.workspaceId
-    
+        const forwardedHeaders = JSON.parse(JSON.stringify(req.headers))
+        const workspaceId = normalizeWorkspaceIdHeader(req.get('workspaceId'))
+
         if (workspaceId) {
-            headers['workspaceid'] = workspaceId
+            forwardedHeaders['workspaceid'] = workspaceId
         }
 
         console.log(`[@ossy/app][proxy] workspaceId ${workspaceId}`)
-    
+
         const request = {
             method: req.method,
-            headers: JSON.parse(JSON.stringify(req.headers))
+            headers: forwardedHeaders
         }
     
         if (!['GET', 'HEAD'].includes(req.method)) {
@@ -74,11 +81,28 @@ export function ProxyInternal() {
                 });
 
                 if (response.headers.get('content-type')?.includes('application/json')) {
-                    return response.json()
-                        .then(data => {
-                            res.status(response.status);
-                            res.json(data);
-                        });
+                    return response.text().then((text) => {
+                        const trimmed = text?.trim() ?? ''
+                        let data
+                        try {
+                            data = trimmed === '' ? null : JSON.parse(trimmed)
+                        } catch (e) {
+                            console.log(`[@ossy/app][proxy][error]`, e)
+                            res.removeHeader('content-length')
+                            const st = response.status
+                            if (st === 401 || st === 403 || st === 404) {
+                                res.status(st)
+                                res.json(null)
+                                return
+                            }
+                            res.status(502)
+                            res.json({ message: 'Upstream returned invalid JSON' })
+                            return
+                        }
+                        res.removeHeader('content-length')
+                        res.status(response.status)
+                        res.json(data)
+                    })
                 }
 
                 res.clearCookie('auth')

package/cli/server.js

@@ -84,8 +84,11 @@ const middleware = [
     const userSettings = JSON.parse(req.signedCookies?.['x-ossy-user-settings'] || '{}')
     req.userAppSettings = userSettings
 
-    if (userSettings.workspaceId && !req.headers.workspaceId) {
-      req.headers.workspaceId = userSettings.workspaceId
+    // Incoming headers live on lowercase keys (`workspaceid`). Do not use
+    // `req.headers.workspaceId` — it misses the client header and duplicates
+    // the id (Node then surfaces `id, id` from req.get('workspaceId')).
+    if (userSettings.workspaceId && !req.get('workspaceId')) {
+      req.headers['workspaceid'] = userSettings.workspaceId
     }
 
     // Check for auth cookie
@@ -123,6 +126,8 @@ app.all('*all', (req, res) => {
     isAuthenticated: req.isAuthenticated || false,
     workspaceId: userAppSettings.workspaceId || buildTimeConfig.workspaceId,
     apiUrl: buildTimeConfig.apiUrl,
+    /** Primary app shell sidebar: icon rail when true (persisted in `x-ossy-user-settings`). */
+    sidebarPrimaryCollapsed: userAppSettings.sidebarPrimaryCollapsed === true,
   }
 
   renderToString(App, appConfig)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/app",
-  "version": "0.13.3",
+  "version": "0.14.0",
   "description": "",
   "source": "./src/index.js",
   "main": "./src/index.js",
@@ -66,5 +66,5 @@
     "README.md",
     "tsconfig.json"
   ],
-  "gitHead": "f2d232939e2b9d06b49497c4a663f17558d9fa45"
+  "gitHead": "032e21b623b973a715d532580022f393b1f9d389"
 }