mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-03-03 11:28:38 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: use error detail as message instead of whole error object (#6911)

Browse Source 
* fix: instead of whole erro object, only send error detail as message

* remove passing test from expected failure
This commit is contained in:
Sawjan Gurung
2023-07-28 17:00:55 +05:45
committed by GitHub
parent ebff0114d4
commit ec4f56d0b9
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
changelog/unreleased/fix-error-message-on-400-code-thumbnail.md Normal file
View File

@@ -0,0 +1,6 @@
Bugfix: Fix error message on 400 response for thumbnail requests
Fix the error message when the thumbnail request returns a '400 Bad Request' response.
https://github.com/owncloud/ocis/issues/2064
https://github.com/owncloud/ocis/pull/6911

8
services/webdav/pkg/service/v0/service.go
View File

@@ -260,7 +260,7 @@ func (g Webdav) SpacesThumbnail(w http.ResponseWriter, r *http.Request) {
renderError(w, r, errTooEarly(err.Error()))
return
case http.StatusBadRequest:
renderError(w, r, errBadRequest(err.Error()))
renderError(w, r, errBadRequest(e.Detail))
default:
renderError(w, r, errInternalError(err.Error()))
}
@@ -348,7 +348,7 @@ func (g Webdav) Thumbnail(w http.ResponseWriter, r *http.Request) {
renderError(w, r, errNotFound(notFoundMsg(tr.Filename)))
return
case http.StatusBadRequest:
renderError(w, r, errBadRequest(err.Error()))
renderError(w, r, errBadRequest(e.Detail))
default:
renderError(w, r, errInternalError(err.Error()))
}
@@ -389,7 +389,7 @@ func (g Webdav) PublicThumbnail(w http.ResponseWriter, r *http.Request) {
renderError(w, r, errNotFound(notFoundMsg(tr.Filename)))
return
case http.StatusBadRequest:
renderError(w, r, errBadRequest(err.Error()))
renderError(w, r, errBadRequest(e.Detail))
default:
renderError(w, r, errInternalError(err.Error()))
}
@@ -430,7 +430,7 @@ func (g Webdav) PublicThumbnailHead(w http.ResponseWriter, r *http.Request) {
renderError(w, r, errNotFound(notFoundMsg(tr.Filename)))
return
case http.StatusBadRequest:
renderError(w, r, errBadRequest(err.Error()))
renderError(w, r, errBadRequest(e.Detail))
default:
renderError(w, r, errInternalError(err.Error()))
}

4
tests/acceptance/expected-failures-API-on-OCIS-storage.md
View File

@@ -212,10 +212,6 @@ cannot share a folder with create permission
- [coreApiWebdavPreviews/previews.feature:98](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavPreviews/previews.feature#L98)
#### [different error message detail for previews of folder](https://github.com/owncloud/ocis/issues/2064)
- [coreApiWebdavPreviews/previews.feature:107](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavPreviews/previews.feature#L107)
#### [copying a folder within a public link folder to folder with same name as an already existing file overwrites the parent file](https://github.com/owncloud/ocis/issues/1232)
- [coreApiSharePublicLink2/copyFromPublicLink.feature:66](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharePublicLink2/copyFromPublicLink.feature#L66)