feat: load user object in auth middleware chain
This commit is contained in:
parent
393fc3dbb2
commit
29269dcfcd
1
app.js
1
app.js
|
@ -14,6 +14,7 @@ const app = express();
|
|||
|
||||
app.use(cors());
|
||||
app.use(auth.getUserIdMiddleware);
|
||||
app.use(auth.loadUserMiddleware);
|
||||
|
||||
// Normal express config defaults
|
||||
app.use(require('morgan')('dev'));
|
||||
|
|
|
@ -130,3 +130,5 @@ UserSchema.methods.isFollowing = function (id) {
|
|||
};
|
||||
|
||||
mongoose.model('User', UserSchema);
|
||||
|
||||
module.exports = mongoose.model('User')
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
const jwt = require('express-jwt');
|
||||
const secret = require('../config').secret;
|
||||
const User = require('../models/User');
|
||||
|
||||
function getTokenFromHeader(req) {
|
||||
const authorization = req.headers.authorization;
|
||||
|
@ -20,7 +21,7 @@ const jwtOptional = jwt({
|
|||
algorithms: ['HS256'],
|
||||
});
|
||||
|
||||
function getUserIdMiddleware(req, res, next) {
|
||||
async function getUserIdMiddleware(req, res, next) {
|
||||
try {
|
||||
const authorization = req.headers.authorization;
|
||||
const [tokenType, token] = (authorization && authorization.split(' ')) || [];
|
||||
|
@ -30,6 +31,13 @@ function getUserIdMiddleware(req, res, next) {
|
|||
} else if (tokenType === 'OBSUserId') {
|
||||
req.payload = { id: token.trim() };
|
||||
next();
|
||||
} else if (!authorization && req.body && req.body.id && req.body.id.length === 24) {
|
||||
const user = await User.findById(req.body.id);
|
||||
if (user) {
|
||||
req.payload = { id: user.id };
|
||||
req.user = user;
|
||||
}
|
||||
next();
|
||||
} else {
|
||||
req.payload = null;
|
||||
next();
|
||||
|
@ -39,6 +47,22 @@ function getUserIdMiddleware(req, res, next) {
|
|||
}
|
||||
}
|
||||
|
||||
async function loadUserMiddleware(req, res, next) {
|
||||
try {
|
||||
if (req.payload && req.payload.id) {
|
||||
req.user = await User.findById(req.payload.id);
|
||||
|
||||
if (!req.user) {
|
||||
return res.sendStatus(401);
|
||||
}
|
||||
}
|
||||
|
||||
next();
|
||||
} catch (err) {
|
||||
next(err);
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
required(req, res, next) {
|
||||
if (!req.payload) {
|
||||
|
@ -51,4 +75,5 @@ module.exports = {
|
|||
return next();
|
||||
},
|
||||
getUserIdMiddleware,
|
||||
loadUserMiddleware,
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue