Add new setting; Performance improvements

Small bug fixes

Author: simonwep

config/config.json

@@ -98,6 +98,9 @@
  "immediateDeletion": {
  "type": "boolean"
  },
+ "usePreferredColorScheme": {
+ "type": "boolean"
+ },
  "theme": {
  "type": "string",
  "enum": ["default", "dark"]

docker/Dockerfile

@@ -6,8 +6,8 @@ MAINTAINER Simon Reinisch <toports@gmx.de>
 WORKDIR /app
 
 # Upgrade
-RUN apt update && \
- apt upgrade -y
+RUN apt-get update && \
+ apt-get upgrade -y
 
 # Copy content into the container at /app
 COPY . /app

package.json

@@ -12,7 +12,7 @@
  "url": "git+https://github.com/ovanta/vue-cloudfront-api"
  },
  "scripts": {
- "dev": "nodemon ./src/app.js --ignore '/_storage'",
+ "dev": "nodemon ./src/app.js --ignore '/_storage' --watch src",
  "debug": "node %NODE_DEBUG_OPTION% ./src/app.js",
  "build:docker": "docker build -f docker/Dockerfile . -t vue-cloudfront-rest-api",
  "update:geoip-lite": "cd node_modules/geoip-lite && npm run-script updatedb",

src/api/endpoints/auth/login.js

@@ -32,7 +32,7 @@ module.exports = async req => {
  if (lastLoginAttemptMs < blockedLoginDuration) {
  throw {code: 404, text: `Try again in ${readableDuration(blockedLoginDuration - lastLoginAttemptMs)}`};
  } else {
- user.loginAttempts = 0;
+ user.set('loginAttempts', 0);
  }
  }
 

src/api/endpoints/data/static.js

@@ -2,7 +2,7 @@ const nodeModel = require('../../../models/node');
 const fs = require('fs');
 
 module.exports = async (req, res) => {
- const {_user, id} = req.query;
+ const {_user, id} = req.body;
 
  if (typeof id !== 'string') {
  throw {code: 103, text: 'Invalid node id'};

src/api/endpoints/data/upload/upload.js

@@ -56,7 +56,7 @@ module.exports = async req => {
  }
 
  // Create and push new node
- const newNode = await new nodeModel({
+ nodes.push(new nodeModel({
  owner: user.id,
  id: filename,
  parent: parent,
@@ -71,10 +71,8 @@ module.exports = async req => {
  console.warn(reason); // eslint-disable-line no-console
  fs.unlink(path, () => 0);
  return null;
- });
-
- newNode && nodes.push(newNode);
+ }));
  }
 
- return nodes;
+ return Promise.all(nodes);
 };

src/api/endpoints/user/logoutEverywhere.js

@@ -4,8 +4,7 @@ module.exports = async req => {
  const {_user} = req.body;
 
  // Clear apikeys
- _user.apikeys = [];
- _user.markModified('apikeys');
+ _user.set('apikeys', []);
 
  // Broadcast logout
  websocket.broadcast({

src/api/middleware/auth.js

@@ -1,7 +1,7 @@
 const userModel = require('../../models/user');
 
 module.exports = (req, res, next) => {
- const {apikey} = req.body;
+ const {apikey} = (req.body || req.query);
 
  if (typeof apikey !== 'string' || !apikey) {
  throw 'APIKey is invalid';
@@ -22,12 +22,19 @@ module.exports = (req, res, next) => {
 
  // Remove expired apikeys
  const now = Date.now();
- user.apikeys = user.apikeys.filter(
+ user.set('apikeys', user.apikeys.filter(
  ({expiry}) => expiry > now
- );
+ ));
 
  return user.save();
  }).then(user => {
+
+ // Merge query and body
+ req.body = {
+ ...req.body,
+ ...req.query
+ };
+
  req.body._user = user;
  next();
  });

src/api/tools/authViaApiKey.js

@@ -21,9 +21,9 @@ module.exports = async apikey => {
 
  // Remove expired apikeys
  const now = Date.now();
- user.apikeys = user.apikeys.filter(
+ user.set('apikeys', user.apikeys.filter(
  ({expiry}) => expiry > now
- );
+ ));
 
  return user.save();
  });

src/app.js

@@ -1,8 +1,8 @@
 const express = require('express');
 const server = require('http').createServer();
-const fs = require('fs');
 const cors = require('cors');
 const path = require('path');
+const fs = require('fs');
 
 // Resolve storage path and create global config variable
 const config = require('../config/config');