sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-05-23 22:27:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5872 from HabitRPG/paglias/firebase

Browse source 
Firebase changes
This commit is contained in:
Blade Barringer 2015-09-02 08:35:47 -05:00
commit ceebb33daf
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
test/api/groups.coffee
View file

@ -151,7 +151,7 @@ describe "Guilds", ->
done()
context "removing users groups", ->
it "allows guild leaders to remove a member", (done) ->
it "allows guild leaders to remove a member (but not themselves)", (done) ->
guildToRemoveMember = undefined
members = undefined
userToRemove = undefined
@ -181,6 +181,11 @@ describe "Guilds", ->
.set("X-API-Key", userToRemove.apiToken)
.end (res) ->
cb()
(cb) ->
request.post(baseURL + "/groups/" + guildToRemoveMember._id + "/removeMember?uuid=" + guildToRemoveMember.leader)
.send().end (res) ->
expectCode res, 401
cb()
(cb) ->
request.post(baseURL + "/groups/" + guildToRemoveMember._id + "/removeMember?uuid=" + userToRemove._id)

4
website/src/controllers/groups.js
View file

@ -739,6 +739,10 @@ api.removeMember = function(req, res, next){
return res.json(401, {err: "Only group leader can remove a member!"});
}
if(user._id === uuid){
return res.json(401, {err: "You cannot remove yourself!"});
}
if(_.contains(group.members, uuid)){
var update = {$pull:{members:uuid}};
if(group.quest && group.quest.members){