@ossy/app 0.6.1 → 0.6.3

package/cli/proxy-internal.js

@@ -5,44 +5,44 @@ export function ProxyInternal() {
             return next()
         }
 
-        // if (req.originalUrl.startsWith('/@ossy/users/me/app-settings') && req.method === 'PATCH') {
+        if (req.originalUrl.startsWith('/@ossy/users/me/app-settings') && req.method === 'PATCH') {
         
-        //     if (!req.body) {
-        //         res.status(400)
-        //         res.json("Invalid request body")
-        //         return
-        //     }
+            if (!req.body) {
+                res.status(400)
+                res.json("Invalid request body")
+                return
+            }
     
-        //     const requestedSettings = req.body
+            const requestedSettings = req.body
     
     
-        //     const expiresMaxAge = 2147483647 // Max age for cookies in milliseconds
+            const expiresMaxAge = 2147483647 // Max age for cookies in milliseconds
     
-        //     const userSettings = JSON.parse(req.signedCookies?.['x-ossy-user-settings'] || '{}')
+            const userSettings = JSON.parse(req.signedCookies?.['x-ossy-user-settings'] || '{}')
             
-        //     const updatedSettings = {
-        //         ...userSettings,
-        //         ...requestedSettings
-        //     }
+            const updatedSettings = {
+                ...userSettings,
+                ...requestedSettings
+            }
     
-        //     res.cookie('x-ossy-user-settings', JSON.stringify(updatedSettings), {
-        //     httpOnly: true,
-        //     signed: true,
-        //     expires: new Date(Date.now() + expiresMaxAge)
-        //     })
+            res.cookie('x-ossy-user-settings', JSON.stringify(updatedSettings), {
+            httpOnly: true,
+            signed: true,
+            expires: new Date(Date.now() + expiresMaxAge)
+            })
     
-        //     res.status(201)
-        //     res.json("")
-        //     return
-        // }
+            res.status(201)
+            res.json("")
+            return
+        }
     
-        // if (req.originalUrl.startsWith('/@ossy/users/me/app-settings') && req.method === 'GET') {
-        //     LogService.Info({ message: `[UsersService][HandleUserAppSettings] METHOD ${req.method}` })
-        //     const userSettings = JSON.parse(req.signedCookies?.['x-ossy-user-settings'] || '{}')
-        //     res.status(200)
-        //     res.json(userSettings)
-        //     return
-        // }
+        if (req.originalUrl.startsWith('/@ossy/users/me/app-settings') && req.method === 'GET') {
+            LogService.Info({ message: `[UsersService][HandleUserAppSettings] METHOD ${req.method}` })
+            const userSettings = JSON.parse(req.signedCookies?.['x-ossy-user-settings'] || '{}')
+            res.status(200)
+            res.json(userSettings)
+            return
+        }
         
         console.log(`[@ossy/app][proxy] ${req.method} ${req.originalUrl}`)
 

package/cli/server.js

@@ -6,6 +6,7 @@ import morgan from 'morgan'
 import { Router } from '@ossy/router'
 import { prerenderToNodeStream } from 'react-dom/static'
 import { ProxyInternal } from './proxy-internal.js'
+import cookieParser from 'cookie-parser'
 
 import App from '%%@ossy/app/source-file%%'
 import ApiRoutes from '%%@ossy/api/source-file%%'
@@ -16,7 +17,6 @@ const app = express();
 const currentDir = path.dirname(url.fileURLToPath(import.meta.url))
 const ROOT_PATH = path.resolve(currentDir, 'public')
 
-
 if (Middleware !== undefined) {
   console.log(`[@ossy/app][server] ${Middleware?.length || 0} custom middleware loaded`)
 }
@@ -24,28 +24,11 @@ if (Middleware !== undefined) {
 const middleware = [
   morgan('tiny'),
   express.json({ strict: false }),
+  cookieParser(process.env.OSSY_COOKIE_SECRET || 'default_secret'),
   (req, res, next) => {
-    const domain = process.env.OSSY_API_URL || 'https://api.ossy.se'
-    const url = `${domain}/api/v0/users/me/app-settings`
-    const headers = { ...(req.headers || {}) } // Clone headers
-
-    const request = {
-      method: req.method,
-      headers: JSON.parse(JSON.stringify(headers))
-    }
-
-    fetch(url, request)
-      .then(response => response.json())
-      .then((userAppSettings) => {
-        req.userAppSettings = userAppSettings || {}
-        next()
-      })
-      .catch((error) => {
-        console.log(`[@ossy/app][server][error]`, error)
-        req.userAppSettings = {}
-        next()
-      })
-
+    const userSettings = JSON.parse(req.signedCookies?.['x-ossy-user-settings'] || '{}')
+    req.userAppSettings = userSettings
+    next()
   },
   ...(Middleware || []),
   express.static(ROOT_PATH),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/app",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "description": "",
   "source": "./src/index.js",
   "main": "./src/index.js",
@@ -58,5 +58,5 @@
     "/cli",
     "README.md"
   ],
-  "gitHead": "109a7e2881f55f5061eccb369ca834ab93ff32f5"
+  "gitHead": "dd003532612a1f93c33f3649985e3516d0b765b0"
 }