Skip to content
This repository was archived by the owner on Dec 14, 2023. It is now read-only.

Commit 465981e

Browse files
committed
removed unused validateUserRequest function
1 parent 611c689 commit 465981e

File tree

1 file changed

+2
-88
lines changed

1 file changed

+2
-88
lines changed

users.js

Lines changed: 2 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -32,83 +32,10 @@ module.exports = function (options) {
3232
seneca.add({role: plugin, cmd: 'kpi_number_of_champions_and_mentors_registered'}, cmd_kpi_number_of_champions_and_mentors_registered);
3333
seneca.add({role: plugin, cmd: 'kpi_number_of_youth_females_registered'}, cmd_kpi_number_of_youth_females_registered);
3434

35-
function validateUserRequest (user, id, done) {
36-
if (!user) return done(new Error('user is undefined'));
37-
var isOwnAccount = (user.id === id);
38-
if (isOwnAccount) return done();
39-
var isCDFAdmin = _.contains(user.roles, 'cdf-admin');
40-
if (isCDFAdmin) return done();
41-
var allowedUserIds = [];
42-
43-
seneca.act({role: 'cd-dojos', cmd: 'load_usersdojos', query: {userId: id}}, function (err, usersDojos) {
44-
if (err) return done(err);
45-
46-
async.each(usersDojos, function (userDojo, cb) {
47-
async.parallel([
48-
loadDojoChampions,
49-
loadDojoAdmins,
50-
loadUsersParents
51-
], cb);
52-
53-
function loadDojoChampions (done) {
54-
seneca.act({role: 'cd-dojos', cmd: 'load_dojo_champion', id: userDojo.dojoId}, function (err, champions) {
55-
if (err) return done(err);
56-
_.each(champions, function (champion) {
57-
allowedUserIds.push(champion.id);
58-
});
59-
return done();
60-
});
61-
}
62-
63-
function loadDojoAdmins (done) {
64-
seneca.act({role: 'cd-dojos', cmd: 'load_usersdojos', query: {dojoId: userDojo.dojoId}}, function (err, usersDojos) {
65-
if (err) return done(err);
66-
_.each(usersDojos, function (userDojo) {
67-
var dojoAdminFound = _.find(userDojo.userPermissions, function (userPermission) {
68-
return userPermission.name === 'dojo-admin';
69-
});
70-
if (dojoAdminFound) allowedUserIds.push(userDojo.userId);
71-
});
72-
return done();
73-
});
74-
}
75-
76-
function loadUsersParents (done) {
77-
seneca.act({role: 'cd-profiles', cmd: 'list', query: {userId: id}}, function (err, profiles) {
78-
if (err) return done(err);
79-
var userProfile = profiles[0];
80-
_.each(userProfile.parents, function (parentUserId) {
81-
allowedUserIds.push(parentUserId);
82-
});
83-
return done();
84-
});
85-
}
86-
}, function (err) {
87-
if (err) return done(err);
88-
allowedUserIds = _.uniq(allowedUserIds);
89-
if (_.contains(allowedUserIds, user.id)) return done();
90-
return done(new Error('You do not have permission to load this data.'));
91-
});
92-
});
93-
}
94-
9535
function cmd_load (args, done) {
9636
var seneca = this;
9737
var id = args.id;
98-
var user = args.user;
99-
var userEntity = seneca.make(ENTITY_NS);
100-
101-
async.series([
102-
async.apply(validateUserRequest, user, id),
103-
loadUser
104-
], function (err, res) {
105-
if (err) return done(null, {ok: false, why: err.message});
106-
return done(null, res[1]);
107-
});
108-
109-
function loadUser (done) {
110-
userEntity.load$(id, done);
111-
}
38+
seneca.make(ENTITY_NS).load$(id, done);
11239
}
11340

11441
function cmd_list (args, done) {
@@ -315,20 +242,7 @@ module.exports = function (options) {
315242
function cmd_update (args, done) {
316243
var seneca = this;
317244
var user = args.user;
318-
var id = args.id;
319-
320-
async.series([
321-
async.apply(validateUserRequest, user, id),
322-
updateUser
323-
], function (err, res) {
324-
if (err) return done(null, {ok: false, why: err.message});
325-
return done(null, res[1]);
326-
});
327-
328-
function updateUser (done) {
329-
var userEntity = seneca.make(ENTITY_NS);
330-
userEntity.save$(user, done);
331-
}
245+
seneca.make(ENTITY_NS).save$(user, done);
332246
}
333247

334248
function cmd_get_init_user_types (args, done) {

0 commit comments

Comments
 (0)