mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-06 04:09:40 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2837 from owncloud/update-reva-a042373b390

Browse Source 
[full-ci] update reva, ignoring docker-arm
This commit is contained in:
Jörn Friedrich Dreyer
2021-12-07 13:17:12 +01:00
committed by GitHub
parent 8c43c647f0 c338d32222
commit ffe75747d3
24 changed files with 356 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
graph/pkg/service/v0/groups.go
View File

@@ -3,6 +3,7 @@ package svc
import (
"errors"
"net/http"
"net/url"
"github.com/owncloud/ocis/graph/pkg/service/v0/errorcode"
@@ -30,6 +31,11 @@ func (g Graph) GetGroups(w http.ResponseWriter, r *http.Request) {
// GetGroup implements the Service interface.
func (g Graph) GetGroup(w http.ResponseWriter, r *http.Request) {
groupID := chi.URLParam(r, "groupID")
groupID, err := url.PathUnescape(groupID)
if err != nil {
errorcode.InvalidRequest.Render(w, r, http.StatusBadRequest, "unescaping group id failed")
}
if groupID == "" {
errorcode.InvalidRequest.Render(w, r, http.StatusBadRequest, "missing group id")
return

6
graph/pkg/service/v0/users.go
View File

@@ -3,6 +3,7 @@ package svc
import (
"errors"
"net/http"
"net/url"
revactx "github.com/cs3org/reva/pkg/ctx"
"github.com/go-chi/chi/v5"
@@ -49,6 +50,11 @@ func (g Graph) GetUsers(w http.ResponseWriter, r *http.Request) {
// GetUser implements the Service interface.
func (g Graph) GetUser(w http.ResponseWriter, r *http.Request) {
userID := chi.URLParam(r, "userID")
userID, err := url.PathUnescape(userID)
if err != nil {
errorcode.InvalidRequest.Render(w, r, http.StatusBadRequest, "unescaping user id failed")
}
if userID == "" {
errorcode.InvalidRequest.Render(w, r, http.StatusBadRequest, "missing user id")
return