changes during review and testing

Author: thehabes

app.js

@@ -39,7 +39,8 @@ if(process.env.OPEN_API_CORS !== "false") {
         'X-HTTP-Method-Override',
         'Origin',
         'Referrer',
-        'User-Agent'
+        'User-Agent',
+        'If-Overwritten-Version'
       ],
       "exposedHeaders" : "*",
       "origin" : "*",

routes/__tests__/overwrite.test.js

@@ -1,6 +1,5 @@
 
 import { jest } from "@jest/globals"
-process.env.RERUM_ID_PATTERN = "https://devstore.rerum.io/v1/id/"
 import express from "express"
 import request from "supertest"
 import overwriteRoute from "../overwrite.js"

routes/overwrite.js

@@ -1,8 +1,10 @@
 import express from "express"
+import checkAccessToken from "../tokens.js"
 const router = express.Router()
+import rerumPropertiesWasher from "../preprocessor.js"
 
 /* PUT an overwrite to the thing. */
-router.put('/', async (req, res, next) => {
+router.put('/', checkAccessToken, rerumPropertiesWasher, async (req, res, next) => {
 
   try {
 
@@ -16,22 +18,21 @@ router.put('/', async (req, res, next) => {
       method: 'PUT',
       body: JSON.stringify(overwriteBody),
       headers: {
-        'user-agent': 'TinyPen',
-        'Origin': process.env.ORIGIN,
+        'user-agent': 'Tiny-Things/1.0',
         'Authorization': `Bearer ${process.env.ACCESS_TOKEN}`,
         'Content-Type' : "application/json;charset=utf-8"
       }
     }
 
     // Pass through If-Overwritten-Version header if present
-    const ifOverwrittenVersion = req.headers['if-overwritten-version']
-    if (ifOverwrittenVersion) {
+    const ifOverwrittenVersion = req.headers.hasOwnProperty('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?.isOverwritten
-    if (isOverwrittenValue) {
+    const isOverwrittenValue = req.body?.__rerum?.hasOwnProperty("isOverwritten") ? req.body.__rerum.isOverwritten : null
+    if (isOverwrittenValue !== null) {
       overwriteOptions.headers['If-Overwritten-Version'] = isOverwrittenValue
     }
 
@@ -63,4 +64,8 @@ router.put('/', async (req, res, next) => {
   }
 })
 
+router.all('/', (req, res, next) => {
+  res.status(405).send("Method Not Allowed")
+})
+
 export default router