eliott/ocis
1
0
Fork 0
mirror of https://github.com/owncloud/ocis synced 2026-04-26 01:35:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(graph): log errors when deleting personal spaces

Browse Source 
Signed-off-by: Julian Koberg <jkoberg@MBP-Julian-Koberg.local>
This commit is contained in:
Julian Koberg
2025-02-19 16:29:31 +01:00
parent 9aa65c69db
commit f2b8891fcf
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/graph/pkg/service/v0/users.go
View File

@@ -660,7 +660,7 @@ func (g Graph) DeleteUser(w http.ResponseWriter, r *http.Request) {
// Deleting a space a two step process (1. disabling/trashing, 2. purging)
// Do the "disable/trash" step only if the space is not marked as trashed yet:
if _, ok := sp.Opaque.Map[_spaceStateTrashed]; !ok {
_, err := client.DeleteStorageSpace(r.Context(), &storageprovider.DeleteStorageSpaceRequest{
resp, err := client.DeleteStorageSpace(r.Context(), &storageprovider.DeleteStorageSpaceRequest{
Id: &storageprovider.StorageSpaceId{
OpaqueId: sp.Id.OpaqueId,
},
@@ -670,9 +670,17 @@ func (g Graph) DeleteUser(w http.ResponseWriter, r *http.Request) {
errorcode.GeneralException.Render(w, r, http.StatusInternalServerError, "could not disable homespace, aborting")
return
}
switch resp.GetStatus().GetCode() {
case cs3rpc.Code_CODE_OK:
// nothing to do
default:
logger.Error().Str("message", resp.GetStatus().GetMessage()).Interface("code", resp.GetStatus().GetCode()).Msg("could not disable home space: unexpected status code")
errorcode.GeneralException.Render(w, r, http.StatusInternalServerError, "could not disable homespace, aborting")
return
}
}
purgeFlag := utils.AppendPlainToOpaque(nil, "purge", "")
_, err := client.DeleteStorageSpace(r.Context(), &storageprovider.DeleteStorageSpaceRequest{
resp, err := client.DeleteStorageSpace(r.Context(), &storageprovider.DeleteStorageSpaceRequest{
Opaque: purgeFlag,
Id: &storageprovider.StorageSpaceId{
OpaqueId: sp.Id.OpaqueId,
@@ -684,6 +692,14 @@ func (g Graph) DeleteUser(w http.ResponseWriter, r *http.Request) {
errorcode.GeneralException.Render(w, r, http.StatusInternalServerError, "could not delete homespace, aborting")
return
}
switch resp.GetStatus().GetCode() {
case cs3rpc.Code_CODE_OK:
// nothing to do
default:
logger.Error().Str("message", resp.GetStatus().GetMessage()).Interface("code", resp.GetStatus().GetCode()).Msg("could not disable home space: unexpected status code")
errorcode.GeneralException.Render(w, r, http.StatusInternalServerError, "could not disable homespace, aborting")
return
}
break
}
}