update code for sequelize upgrade

mnt
Lukas F. Hartmann 2023-09-21 20:38:52 +02:00 committed by minute
parent d5cd829834
commit 43577337aa
6 changed files with 12181 additions and 3074 deletions

View File

@ -61,7 +61,7 @@ module.exports = (req, res, next) => {
}
});
})
.error((err) => {
.catch((err) => {
console.error("Session resolve error", err);
next();
});

15126
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -11,47 +11,47 @@
"node": ">=10.0.0"
},
"dependencies": {
"archiver": "1.3.0",
"async": "2.3.0",
"archiver": "5.3.1",
"async": "3.2.4",
"bcryptjs": "2.4.3",
"body-parser": "^1.19.0",
"cheerio": "0.22.0",
"config": "1.25.1",
"cheerio": "1.0.0-rc.12",
"config": "3.3.9",
"cookie-parser": "~1.4.3",
"ejs": "3.1.5",
"ejs": "3.1.9",
"execSync": "latest",
"express": "^4.16.4",
"file-type": "^7.6.0",
"glob": "7.1.1",
"file-type": "^16.5.0",
"glob": "10.3.3",
"gm": "^1.23.1",
"helmet": "^3.5.0",
"i18n-2": "0.6.3",
"helmet": "^7.0.0",
"i18n-2": "0.7.3",
"log-timestamp": "latest",
"mock-aws-s3": "^4.0.2",
"moment": "^2.19.3",
"morgan": "^1.9.1",
"nodemailer": "^6.6.0",
"puppeteer": "8.0.0",
"read-chunk": "^2.1.0",
"puppeteer": "^18",
"read-chunk": "^3",
"request": "^2.88.0",
"sanitize-html": "^2.3.3",
"sequelize": "^4.37.6",
"serve-favicon": "~2.4.2",
"sequelize": "^6.33.0",
"serve-favicon": "~2.5.0",
"serve-static": "^1.13.1",
"slug": "^1.1.0",
"sqlite3": "^4.2.0",
"umzug": "^2.1.0",
"slug": "^8.2.2",
"sqlite3": "5.*",
"umzug": "^2",
"underscore": "^1.13.1",
"uuid": "^3.2.1",
"validator": "7.0.0",
"ws": "5.2.3"
"uuid": "^9.0.0",
"validator": "13.9.0",
"ws": "8.13.0"
},
"devDependencies": {
"gulp": "^4.0.2",
"gulp-clean-css": "^4.3.0",
"gulp-concat": "^2.6.1",
"gulp-sass": "^4.0.2",
"nodemon": "^2.0.6"
"gulp-sass": "^5",
"nodemon": "^3.0.1"
},
"main": "app.js",
"description": "",

View File

@ -21,7 +21,7 @@ router.post('/', function(req, res) {
var password = req.body["password"];
db.User.findOne({where: {email: email}})
.error(err => {
.catch(err => {
res.sendStatus(404);
})
.then(user => {
@ -41,7 +41,7 @@ router.post('/', function(req, res) {
};
db.Session.create(session)
.error(err => {
.catch(err => {
console.error("Error creating Session:",err);
res.sendStatus(500);
})

View File

@ -4,7 +4,7 @@ const os = require('os');
const db = require('../../models/db');
const Sequelize = require('sequelize');
const Op = Sequelize.Op;
const uuidv4 = require('uuid/v4');
const { v4: uuidv4 } = require('uuid');
var redis = require('../../helpers/redis');
var mailer = require('../../helpers/mailer');
@ -188,8 +188,6 @@ router.post('/', function(req, res, next) {
attrs.access_mode = "private";
db.Space.create(attrs).then(createdSpace => {
res.status(201).json(createdSpace);
// create initial admin membership
var membership = {
_id: uuidv4(),

View File

@ -2,7 +2,8 @@
var config = require('config');
const db = require('../../models/db');
const uuidv4 = require('uuid/v4');
const { v4: uuidv4 } = require('uuid');
const os = require('os');
var mailer = require('../../helpers/mailer');
@ -84,7 +85,7 @@ router.post('/', function(req, res) {
};
db.User.create(u)
.error(err => {
.catch(err => {
res.sendStatus(400);
})
.then(u => {
@ -95,7 +96,7 @@ router.post('/', function(req, res) {
creator_id: u._id
};
db.Space.create(homeFolder)
.error(err => {
.catch(err => {
res.sendStatus(400);
})
.then(homeFolder => {
@ -114,7 +115,7 @@ router.post('/', function(req, res) {
});
res.status(201).json({});
})
.error(err => {
.catch(err => {
res.status(400).json(err);
});
})