removed some methods

helpers.getBaseUser
exposeUid, exposeGroupName
This commit is contained in:
barisusakli
2016-09-14 14:33:39 +03:00
parent 001eb3454c
commit aefba6e2b1
11 changed files with 78 additions and 140 deletions

View File

@@ -1,7 +1,6 @@
'use strict';
var async = require('async');
var _ = require('underscore');
var user = require('../../user');
var helpers = require('../helpers');
@@ -9,33 +8,33 @@ var accountHelpers = require('./helpers');
var infoController = {};
infoController.get = function(req, res, next) {
accountHelpers.getBaseUser(req.params.userslug, req.uid, function(err, userData) {
infoController.get = function(req, res, callback) {
var userData;
async.waterfall([
function(next) {
accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid, next);
},
function(_userData, next) {
userData = _userData;
if (!userData) {
return callback();
}
async.parallel({
history: async.apply(user.getModerationHistory, userData.uid),
sessions: async.apply(user.auth.getSessions, userData.uid, req.sessionID)
}, next);
}
], function(err, data) {
if (err) {
return next(err);
return callback(err);
}
async.parallel({
ips: async.apply(user.getIPs, res.locals.uid, 4),
history: async.apply(user.getModerationHistory, res.locals.uid),
fields: async.apply(user.getUserFields, res.locals.uid, ['banned']),
sessions: async.apply(user.auth.getSessions, userData.uid, req.sessionID)
}, function(err, data) {
if (err) {
return next(err);
}
userData.history = data.history;
userData.sessions = data.sessions;
userData.title = '[[pages:account/info]]';
userData.breadcrumbs = helpers.buildBreadcrumbs([{text: userData.username, url: '/user/' + userData.userslug}, {text: '[[user:account_info]]'}]);
userData = _.extend(userData, {
ips: data.ips,
history: data.history
}, data.fields);
userData.sessions = data.sessions;
userData.title = '[[pages:account/info]]';
userData.breadcrumbs = helpers.buildBreadcrumbs([{text: userData.username, url: '/user/' + userData.userslug}, {text: '[[user:account_info]]'}]);
res.render('account/info', userData);
});
res.render('account/info', userData);
});
};