Merge branch 'main' into feature/tinypen-upstream-pr-b

Author: cubap

.github/workflows/cd_dev.yaml

@@ -7,6 +7,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master
+      - name: Fetch all branches
+        run: git fetch --all
       - name: Merge with main
         uses: devmasx/merge-branch@master
         with:

routes/create.js

@@ -30,9 +30,12 @@ router.post('/', verifyJsonContentType, checkAccessToken, async (req, res, next)
     })
     // Send RERUM error responses to error-messenger.js
     if (errored) return next(result)
-    res.setHeader("Location", result["@id"] ?? result.id)
-    res.status(201)
-    res.json(result)
+    const location = result?.["@id"] ?? result?.id
+    const responseBody = { ...req.body, ...(result ?? {}) }
+    if (location) {
+      res.setHeader("Location", location)
+    }
+    res.status(201).json(responseBody)
   }
   catch (err) {
     next(err)

routes/delete.js

@@ -37,8 +37,7 @@ router.delete('/', verifyJsonContentType, checkAccessToken, async (req, res, nex
     })
     // Send RERUM error responses to error-messenger.js
     if (errored) return next(result)
-    res.status(204)
-    res.send(result)
+    res.sendStatus(204)
   }
   catch (err) {
     next(err)
@@ -67,8 +66,7 @@ router.delete('/:id', async (req, res, next) => {
     })
     // Send RERUM error responses to error-messenger.js
     if (errored) return next(result)
-    res.status(204)
-    res.send(result)
+    res.sendStatus(204)
   }
   catch (err) {
     next(err)

routes/overwrite.js

@@ -26,13 +26,13 @@ router.put('/', verifyJsonContentType, checkAccessToken, async (req, res, next)
     }
 
     // Pass through If-Overwritten-Version header if present
-    const ifOverwrittenVersion = req.headers.hasOwnProperty('if-overwritten-version') ? req.headers['if-overwritten-version'] : null
+    const ifOverwrittenVersion = Object.hasOwn(req.headers, 'if-overwritten-version') ? req.headers['if-overwritten-version'] : null
     if (ifOverwrittenVersion !== null) {
       overwriteOptions.headers['If-Overwritten-Version'] = ifOverwrittenVersion
     }
 
     // Check for __rerum.isOverwritten in body and use as If-Overwritten-Version header
-    const isOverwrittenValue = req.body?.__rerum?.hasOwnProperty("isOverwritten") ? req.body.__rerum.isOverwritten : null
+    const isOverwrittenValue = Object.hasOwn(req.body?.__rerum ?? {}, "isOverwritten") ? req.body.__rerum.isOverwritten : null
     if (isOverwrittenValue !== null) {
       overwriteOptions.headers['If-Overwritten-Version'] = isOverwrittenValue
     }
@@ -60,11 +60,11 @@ router.put('/', verifyJsonContentType, checkAccessToken, async (req, res, next)
     if (errored) return next(response)
     const result = response
     const location = result?.["@id"] ?? result?.id
+    const responseBody = { ...req.body, ...(result ?? {}) }
     if (location) {
       res.setHeader("Location", location)
     }
-    res.status(200)
-    res.json(result)
+    res.status(200).json(responseBody)
   }
   catch (err) {
     next(err)