Fix for issues

This commit is contained in:
Kasper Rynning-Tønnesen
2019-03-10 22:19:52 +01:00
parent 55a0b678d6
commit a8363ebbd2
4 changed files with 2462 additions and 1739 deletions

View File

@@ -88,9 +88,10 @@ gulp.task('callback', function () {
.pipe(gulp.dest('server/public/assets/dist'));
});
gulp.task('build', function() {
return gulp.run(['css', 'css-embed', 'js', 'embed', 'remotecontroller', 'callback', 'token']);
})
gulp.task('build', done => {
gulp.series('css', 'css-embed', 'js', 'embed', 'remotecontroller', 'callback', 'token')();
done();
});
gulp.task('remotecontroller', function () {
return gulp.src(['server/VERSION.js', 'server/config/api_key.js', 'server/public/assets/js/remotecontroller.js', 'server/public/assets/js/helpers.js'])

4147
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -20,41 +20,41 @@
"url": "https://github.com/zoff-music/zoff/issues"
},
"devDependencies": {
"gulp": "~3.9.0",
"gulp": "^4.0.0",
"gulp-concat": "^2.6.1",
"gulp-cssnano": "^2.1.3",
"gulp-uglify": "^3.0.1",
"gulp-uglify": "^3.0.2",
"gulp-util": "^3.0.8"
},
"homepage": "https://github.com/zoff-music/zoff#readme",
"dependencies": {
"bad-words": "^1.6.1",
"bad-words": "^1.6.5",
"bcrypt-nodejs": "0.0.3",
"body-parser": "^1.17.1",
"body-parser": "^1.18.3",
"color-thief-jimp": "^2.0.2",
"compression": "^1.7.3",
"cookie-parser": "^1.4.3",
"cors": "^2.8.4",
"express": "^4.16.3",
"express-handlebars": "^3.0.0",
"connect-mongo": "^2.0.3",
"cookie-parser": "^1.4.4",
"cors": "^2.8.5",
"express": "^4.16.4",
"express-handlebars": "^3.0.2",
"express-recaptcha": "^3.0.1",
"express-session": "^1.15.6",
"express-sessions": "^1.0.6",
"gulp-sourcemaps": "^2.6.4",
"gulp-sourcemaps": "^2.6.5",
"gulp-uglify-es": "^1.0.4",
"helmet": "^3.12.0",
"helmet": "^3.16.0",
"jimp": "^0.2.28",
"mongodb": "^2.2.35",
"mongojs": "^2.5.0",
"mongodb": "^2.2.36",
"mongojs": "^2.6.0",
"mongojs-paginate": "^1.2.0",
"mongoose": "^5.0.16",
"mongoose": "^5.4.18",
"mpromise": "^0.5.5",
"nodemailer": "^4.6.4",
"nodemailer": "^4.7.0",
"passport": "^0.4.0",
"passport-local": "^1.0.0",
"redis": "^2.8.0",
"request": "^2.88.0",
"socket.io": "^2.1.0",
"socket.io": "^2.2.0",
"socket.io-redis": "^5.2.0",
"sticky-session": "^1.1.2",
"uniqid": "5.0.3"

View File

@@ -20,6 +20,7 @@ var db = mongojs(mongo_db_cred.config);
var token_db = mongojs("tokens");
var bodyParser = require('body-parser');
var session = require('express-session');
var MongoStore = require('connect-mongo')(session);
var api = require(pathThumbnails + '/routing/admin/api.js');
var User = require(pathThumbnails + '/models/user.js');
@@ -40,14 +41,12 @@ app.use(session({
secret: mongo_db_cred.secret,
resave: true,
saveUninitialized: true,
store: new (require('express-sessions'))({
storage: 'mongodb',
instance: mongoose,
host: mongo_db_cred.host,
port: 27017,
collection: 'sessions',
expire: mongo_db_cred.expire
})
store: new MongoStore({
url: url,
useNewUrlParser: true,
collection: 'sessions',
ttl: mongo_db_cred.expire
})
})); // session secret
app.use(passport.initialize());
app.use(passport.session()); // persistent login sessions