cartodb4/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Follow Node.js callback pattern

Browse Source
This commit is contained in:
Daniel García Aubert 2020-04-27 10:23:11 +02:00
parent 809c267419
commit 6e4c8a6639
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/api/middlewares/user.js
View File

@ -8,11 +8,12 @@ module.exports = function user (metadataBackend) {
return function userMiddleware (req, res, next) { return function userMiddleware (req, res, next) {
res.locals.user = getUserNameFromRequest(req, cdbRequest); res.locals.user = getUserNameFromRequest(req, cdbRequest);
getUserId(metadataBackend, res.locals.user, function (userId) { metadataBackend.getUserId(res.locals.user, (err, userId) => {
if (userId) { if (err || !userId) {
res.locals.userId = userId; return next();
} }
return next();
res.locals.userId = userId;
}); });
}; };
}; };
@ -20,12 +21,3 @@ module.exports = function user (metadataBackend) {
function getUserNameFromRequest (req, cdbRequest) { function getUserNameFromRequest (req, cdbRequest) {
return cdbRequest.userByReq(req); return cdbRequest.userByReq(req);
} }
function getUserId (metadataBackend, userName, callback) {
metadataBackend.getUserId(userName, function (err, userId) {
if (err) {
return callback();
}
return callback(userId);
});
}