[refactor] remove username field and let instance_name be the only AP Actor

This commit is contained in:
les
2019-12-04 00:50:15 +01:00
parent e84d7f3bd1
commit 3116e776a0
23 changed files with 159 additions and 201 deletions

View File

@@ -1,6 +1,5 @@
const settingsController = require('./api/controller/settings')
const { user: User } = require('./api/models')
const { Op } = require('sequelize')
const acceptLanguage = require('accept-language')
const expressJwt = require('express-jwt')
const moment = require('moment-timezone')
@@ -22,7 +21,8 @@ const jwt = expressJwt({
})
module.exports = {
initMiddleware (req, res, next) {
async initMiddleware (req, res, next) {
await settingsController.load()
// initialize settings
req.settings = settingsController.settings
req.secretSettings = settingsController.secretSettings
@@ -44,7 +44,7 @@ module.exports = {
jwt(req, res, async () => {
if (!req.user) { return next() }
req.user = await User.findOne({
where: { id: { [Op.eq]: req.user.id }, is_active: true } })
where: { id: req.user.id, is_active: true } })
next()
})
}