Ported user delete route and added initial tests

This commit is contained in:
Keith Holliday
2016-03-20 14:08:08 -05:00
parent be9312deb0
commit 7f65707ee4
5 changed files with 226 additions and 36 deletions
+4 -34
View File
@@ -102,42 +102,11 @@ api.getGroups = {
let types = req.query.type.split(',');
let groupFields = basicGroupFields.concat('description memberCount balance');
let sort = '-memberCount';
let queries = [];
types.forEach(type => {
switch (type) {
case 'party':
queries.push(Group.getGroup({user, groupId: 'party', fields: groupFields}));
break;
case 'privateGuilds':
queries.push(Group.find({
type: 'guild',
privacy: 'private',
_id: {$in: user.guilds},
}).select(groupFields).sort(sort).exec());
break;
case 'publicGuilds':
queries.push(Group.find({
type: 'guild',
privacy: 'public',
}).select(groupFields).sort(sort).exec()); // TODO use lean?
break;
case 'tavern':
if (types.indexOf('publicGuilds') === -1) {
queries.push(Group.getGroup({user, groupId: 'habitrpg', fields: groupFields}));
}
break;
}
});
let results = await Group.getGroups({user, types, groupFields, sort});
// If no valid value for type was supplied, return an error
if (queries.length === 0) throw new BadRequest(res.t('groupTypesRequired'));
// TODO we would like not to return a single big array but Q doesn't support the funtionality https://github.com/kriskowal/q/issues/328
let results = _.reduce(await Q.all(queries), (previousValue, currentValue) => {
if (_.isEmpty(currentValue)) return previousValue; // don't add anything to the results if the query returned null or an empty array
return previousValue.concat(Array.isArray(currentValue) ? currentValue : [currentValue]); // otherwise concat the new results to the previousValue
}, []);
if (results.length === 0) throw new BadRequest(res.t('groupTypesRequired'));
res.respond(200, results);
},
@@ -170,7 +139,8 @@ api.getGroup = {
group = Group.toJSONCleanChat(group, user);
// TODO Instead of populate we make a find call manually because of https://github.com/Automattic/mongoose/issues/3833
group.leader = (await User.findById(group.leader).select(nameFields).exec()).toJSON({minimize: true});
let leader = await User.findById(group.leader).select(nameFields).exec();
if (leader) group.leader = leader.toJSON({minimize: true});
res.respond(200, group);
},
+46 -1
View File
@@ -7,10 +7,14 @@ import {
NotAuthorized,
} from '../../libs/api-v3/errors';
import * as Tasks from '../../models/task';
import { model as Group } from '../../models/group';
import {
basicFields as basicGroupFields,
model as Group,
} from '../../models/group';
import { model as User } from '../../models/user';
import Q from 'q';
import _ from 'lodash';
import * as firebase from '../../libs/api-v3/firebase';
let api = {};
@@ -41,6 +45,47 @@ api.getUser = {
},
};
/**
* @api {delete} /user DELETE an authenticated user's profile
* @apiVersion 3.0.0
* @apiName UserDelete
* @apiGroup User
*
* @apiSuccess {} object An empty object
*/
api.deleteUser = {
method: 'DELETE',
middlewares: [authWithHeaders(), cron],
url: '/user',
async handler (req, res) {
let user = res.locals.user;
let plan = user.purchased.plan;
if (plan && plan.customerId && !plan.dateTerminated) {
throw new NotAuthorized(res.t('cannotDeleteActiveAccount'));
}
let types = ['party', 'publicGuilds', 'privateGuilds'];
// @TODO: The group leave route doesn't work unless it has these fields. We should probably force the group to get these
let groupFields = basicGroupFields.concat(' leader memberCount');
let populateLeader = true;
let groupsUserIsMemberOf = await Group.getGroups({user, types, groupFields, populateLeader});
let groupLeavePromises = groupsUserIsMemberOf.map((group) => {
return group.leave(user, 'remove-all');
});
await Q.all(groupLeavePromises);
await user.remove();
res.respond(200, {});
firebase.deleteUser(user._id);
},
};
const partyMembersFields = 'profile.name stats achievements items.special';
/**