mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-04-10 18:38:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests for adding users to group in OCS

Browse Source
This commit is contained in:
Benedikt Kulmann
2020-10-22 12:44:44 +02:00
parent 1d66c22fc1
commit 0403264aef
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ocs/pkg/server/http/svc_test.go
View File

@@ -1576,7 +1576,6 @@ func TestAddUsersToGroupsNewUsers(t *testing.T) {
}
}
// Issue: https://github.com/owncloud/ocis/ocs/issues/55 Incorrect message when adding user to non existing group
func TestAddUsersToGroupInvalidGroup(t *testing.T) {
user := User{
Enabled: "true",
@@ -1629,7 +1628,7 @@ func TestAddUsersToGroupInvalidGroup(t *testing.T) {
assertResponseMeta(t, Meta{
"error",
998,
"The requested user could not be found",
"The requested group could not be found",
}, response.Ocs.Meta)
assert.Empty(t, response.Ocs.Data)
}

14
ocs/pkg/service/v0/groups.go
View File

@@ -64,7 +64,12 @@ func (o Ocs) AddToGroup(w http.ResponseWriter, r *http.Request) {
})
if err != nil {
render.Render(w, r, response.ErrRender(data.MetaServerError.StatusCode, err.Error()))
merr := merrors.FromError(err)
if merr.Code == http.StatusNotFound {
render.Render(w, r, response.ErrRender(data.MetaNotFound.StatusCode, "The requested group could not be found"))
} else {
render.Render(w, r, response.ErrRender(data.MetaServerError.StatusCode, err.Error()))
}
o.logger.Error().Err(err).Str("userid", userid).Str("groupid", groupid).Msg("could not add user to group")
return
}
@@ -95,7 +100,12 @@ func (o Ocs) RemoveFromGroup(w http.ResponseWriter, r *http.Request) {
})
if err != nil {
render.Render(w, r, response.ErrRender(data.MetaServerError.StatusCode, err.Error()))
merr := merrors.FromError(err)
if merr.Code == http.StatusNotFound {
render.Render(w, r, response.ErrRender(data.MetaNotFound.StatusCode, "The requested group could not be found"))
} else {
render.Render(w, r, response.ErrRender(data.MetaServerError.StatusCode, err.Error()))
}
o.logger.Error().Err(err).Str("userid", userid).Str("groupid", groupid).Msg("could not remove user from group")
return
}