jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

make user.remove and user.update add eventlog

Browse Source
This commit is contained in:
Girish Ramakrishnan
2016-05-01 20:09:31 -07:00
parent 37bdd2672b
commit 1f31fe6f8f
5 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/routes/user.js
View File

@@ -13,7 +13,6 @@ exports = module.exports = {
};
var assert = require('assert'),
eventlog = require('../eventlog.js'),
generatePassword = require('../password.js').generate,
groups = require('../groups.js'),
HttpError = require('connect-lastmile').HttpError,
@@ -77,15 +76,13 @@ function update(req, res, next) {
if (error && error.reason === UserError.NOT_FOUND) return next(new HttpError(404, 'No such user'));
if (error) return next(new HttpError(500, error));
user.update(req.params.userId, result.username, req.body.email || result.email, req.body.displayName || result.displayName, function (error) {
user.update(req.params.userId, result.username, req.body.email || result.email, req.body.displayName || result.displayName, auditSource(req), function (error) {
if (error && error.reason === UserError.BAD_USERNAME) return next(new HttpError(400, error.message));
if (error && error.reason === UserError.BAD_EMAIL) return next(new HttpError(400, error.message));
if (error && error.reason === UserError.ALREADY_EXISTS) return next(new HttpError(409, 'Already exists'));
if (error && error.reason === UserError.NOT_FOUND) return next(new HttpError(404, 'User not found'));
if (error) return next(new HttpError(500, error));
eventlog.add(eventlog.ACTION_USER_UPDATE, req, { id: req.params.userId, username: result.username });
next(new HttpSuccess(204));
});
});
@@ -136,12 +133,10 @@ function remove(req, res, next) {
if (error && error.reason === UserError.NOT_FOUND) return next(new HttpError(404, 'No such user'));
if (error) return next(new HttpError(500, error));
user.remove(userObject, function (error) {
user.remove(userObject, auditSource(req), function (error) {
if (error && error.reason === UserError.NOT_FOUND) return next(new HttpError(404, 'No such user'));
if (error) return next(new HttpError(500, error));
eventlog.add(eventlog.ACTION_USER_REMOVE, req, { id: req.params.userId, username: userObject.username });
next(new HttpSuccess(204));
});
});