Rename to getGroups
This commit is contained in:
+3
-3
@@ -19,7 +19,7 @@ exports = module.exports = {
|
||||
getMembership: getMembership,
|
||||
setMembership: setMembership,
|
||||
|
||||
getRoles: getRoles,
|
||||
getGroups: getGroups,
|
||||
|
||||
_clear: clear
|
||||
};
|
||||
@@ -284,7 +284,7 @@ function isMember(groupId, userId, callback) {
|
||||
});
|
||||
}
|
||||
|
||||
function getRoles(userId, callback) {
|
||||
function getGroups(userId, callback) {
|
||||
assert.strictEqual(typeof userId, 'string');
|
||||
assert.strictEqual(typeof callback, 'function');
|
||||
|
||||
@@ -295,6 +295,6 @@ function getRoles(userId, callback) {
|
||||
|
||||
results.forEach(postProcess);
|
||||
|
||||
callback(null, _.uniq(_.flatten(results.map(function (r) { return r.roles; }))));
|
||||
callback(null, results);
|
||||
});
|
||||
}
|
||||
|
||||
+4
-4
@@ -19,7 +19,7 @@ exports = module.exports = {
|
||||
removeMember: removeMember,
|
||||
isMember: isMember,
|
||||
|
||||
getRoles: getRoles,
|
||||
getGroups: getGroups,
|
||||
|
||||
setMembership: setMembership,
|
||||
getMembership: getMembership
|
||||
@@ -270,14 +270,14 @@ function update(groupId, data, callback) {
|
||||
});
|
||||
}
|
||||
|
||||
function getRoles(userId, callback) {
|
||||
function getGroups(userId, callback) {
|
||||
assert.strictEqual(typeof userId, 'string');
|
||||
assert.strictEqual(typeof callback, 'function');
|
||||
|
||||
groupdb.getRoles(userId, function (error, roles) {
|
||||
groupdb.getGroups(userId, function (error, results) {
|
||||
if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new GroupsError(GroupsError.NOT_FOUND));
|
||||
if (error) return callback(new GroupsError(GroupsError.INTERNAL_ERROR, error));
|
||||
|
||||
callback(null, roles);
|
||||
callback(null, results);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -414,9 +414,9 @@ describe('Roles', function () {
|
||||
});
|
||||
|
||||
it('can get roles of a user', function (done) {
|
||||
groups.getRoles(USER_0.id, function (error, roles) {
|
||||
expect(roles.length).to.be(1);
|
||||
expect(roles[0]).to.be('owner');
|
||||
groups.getGroups(USER_0.id, function (error, results) {
|
||||
expect(results.length).to.be(1);
|
||||
expect(results[0].roles).to.eql([ 'owner' ]);
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user