fix: Append user params instead of overwrite to fix empty file bugs

Signed-off-by: Richie Bendall <richiebendall@gmail.com>

middleware/load-options.js

@@ -49,8 +49,6 @@ module.exports = (req, res, next) => {
     }
   );
 
-  console.log(res.locals.options);
-
   if (res.locals.options.sha) {
     res.setHeader(
       'X-note',

middleware/load-user.js

@@ -20,7 +20,7 @@ module.exports = async (req, res, next) => {
       path.join(__dirname, '..', 'users', `${id}.json`),
       'utf8'
     );
-    res.locals.user = JSON.parse(data);
+    res.locals.user = {...res.locals.user, ...JSON.parse(data)};
   } catch ({code, message}) {
     res.code(500).send(`An internal error occurred - open an issue on https://github.com/remy/mit-license with the following information: ${message}`)
     return;

routes/get.js

@@ -48,7 +48,7 @@ module.exports = (req, res) => {
     gravatar = `<img id="gravatar" alt="Profile image" src="https://www.gravatar.com/avatar/${md5(
       user.email.trim().toLowerCase()
     )}" />`;
-  } else if (user.copyright && typeof user.copyright[0] === 'object' && user.gravatar) {
+  } else if (typeof user.copyright[0] === 'object' && user.gravatar) {
     // Supports multi-user format
     gravatar = `<img id="gravatar" alt="Profile image" src="https://www.gravatar.com/avatar/${md5(
       user.copyright[0].email.trim().toLowerCase()

routes/post.js

@@ -105,6 +105,4 @@ module.exports = async (req, res) => {
   } catch(err) {
     res.status(500).send(`Unable to create new user - please send a pull request on https://github.com/remy/mit-license`)
   }
-
-  next();
 };

users/mit-license.json

@@ -0,0 +1,5 @@
+{
+    "//1": "Security holding user",
+    "//2": "This user is being locked incase of potential homepage hijack.",
+    "locked": true
+}