Merge pull request #322 from webkom/maintenance

Maintenance and Upgrade
webkom · Feb 4, 2020 · 7fb7eef · 7fb7eef
2 parents 5f42e15 + 4a372db
commit 7fb7eef
Show file tree

Hide file tree

Showing 11 changed files with 1,883 additions and 1,851 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -1,14 +1,14 @@
 pipeline:
   setup:
-    image: node:11
+    image: node:13
     when:
       event:
         - push
         - pull_request
     commands:
       - yarn
   integration-tests:
-    image: circleci/node:11-browsers
+    image: circleci/node:13-browsers
     when:
       event:
         - push
@@ -23,7 +23,7 @@ pipeline:
       - sudo su -c "chown -R circleci:circleci /root/"
       - MONGO_URL=mongodb://mongodb:27017/vote-integration-test REDIS_URL=redis HEADLESS=true yarn protractor
   lint:
-    image: node:11
+    image: node:13
     when:
       event:
         - push
@@ -32,7 +32,7 @@ pipeline:
     commands:
       - yarn lint
   test:
-    image: node:11
+    image: node:13
     when:
       event:
         - push
@@ -41,7 +41,7 @@ pipeline:
     commands:
       - MONGO_URL=mongodb://mongodb:27017/vote-test REDIS_URL=redis yarn mocha
   build:
-    image: node:11
+    image: node:13
     when:
       event:
         - push

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:11
+FROM node:13
 MAINTAINER Abakus Webkom <[email protected]>
 
 # Create app directory

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018-2019 Abakus Webkom
+Copyright (c) 2018-2020 Abakus Webkom
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/app.js b/app.js
@@ -22,26 +22,16 @@ app.set('views', `${__dirname}/app/views`);
 app.set('mongourl', env.MONGO_URL);
 
 mongoose.Promise = Bluebird;
-mongoose.connect(
-  app.get('mongourl'),
-  { useNewUrlParser: true }
-);
-mongoose.set('useCreateIndex', true);
+mongoose.connect(app.get('mongourl'), {
+  useCreateIndex: true,
+  useUnifiedTopology: true,
+  useNewUrlParser: true
+});
 
 raven.config(env.RAVEN_DSN).install();
 
 app.use(raven.requestHandler());
 
-const store = new MongoStore({
-  url: app.get('mongourl')
-  // TODO: re-enable this when
-  // https://github.com/jdesboeufs/connect-mongo/issues/277 is fixed:
-  // mongooseConnection: mongoose.connection
-});
-
-// TODO: This can also be removed when the above is fixed:
-mongoose.connection.on('disconnected', store.close.bind(store));
-
 if (['development', 'protractor'].includes(env.NODE_ENV)) {
   const webpack = require('webpack');
   const webpackMiddleware = require('webpack-dev-middleware');
@@ -71,7 +61,7 @@ app.use(
   session({
     cookie: { maxAge: 1000 * 3600 * 24 * 30 * 3 }, // Three months
     secret: env.COOKIE_SECRET || 'localsecret',
-    store,
+    store: new MongoStore({ mongooseConnection: mongoose.connection }), //re-use existing connection
     saveUninitialized: true,
     resave: false
   })

diff --git a/app/models/user.js b/app/models/user.js
@@ -1,6 +1,6 @@
 const _ = require('lodash');
 const Bluebird = require('bluebird');
-const bcrypt = require('bcrypt');
+const bcrypt = require('bcryptjs');
 const mongoose = require('mongoose');
 const errors = require('../errors');
 

diff --git a/bin/users b/bin/users
@@ -27,6 +27,12 @@ function validator(value) {
   return value;
 }
 
+const options = {
+  useCreateIndex: true,
+  useUnifiedTopology: true,
+  useNewUrlParser: true
+};
+
 program
   .version('1.0.0')
   .command('create-user <username> <cardKey>')
@@ -38,7 +44,7 @@ program
       'Usermode: \n [1] for User \n [2] for Moderator \n [3] for Admin \n Enter mode: ',
       { validator, retry: true },
       (modeErr, mode) => {
-        mongoose.connect(mongoURL, connectErr => {
+        mongoose.connect(mongoURL, options, connectErr => {
           if (connectErr) return done(connectErr);
 
           promptly.password('Enter password: ', (pwErr, password) => {

diff --git a/electron-app/package.json b/electron-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vote-client",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Admin client with support for card reader",
   "main": "main.js",
   "scripts": {
@@ -31,7 +31,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "card-scanner": "1.0.1"
+    "card-scanner": "1.0.2"
   },
   "devDependencies": {
     "electron": "4.0.1",

diff --git a/electron-app/rfid.js b/electron-app/rfid.js
@@ -55,10 +55,7 @@ const handleConnectButton = () => {
   return connectToDevice(devicePath);
 };
 const connectToDevice = devicePath =>
-  connect(
-    devicePath,
-    onData
-  )
+  connect(devicePath, onData)
     .then(() => {
       $('#overlay').classList.add('hidden');
     })