mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-05 11:51:16 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3376 from rhafer/graph-user-patch

Browse Source 
graph: Allow PATCH on user without 'mail' in body
This commit is contained in:
Ralf Haferkamp
2022-03-29 10:11:19 +02:00
committed by GitHub
parent c34503ef53 517356f176
commit ec0b3b10af
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
changelog/unreleased/graph-patch-mail.md Normal file
View File

@@ -0,0 +1,6 @@
Bugfix: Fix request validation on GraphAPI User updates
Fix PATCH on graph/v1.0/users when no 'mail' attribute
is present in the request body
https://github.com/owncloud/ocis/issues/3167

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

@@ -180,11 +180,12 @@ func (g Graph) PatchUser(w http.ResponseWriter, r *http.Request) {
return
}
mail := changes.GetMail()
if !isValidEmail(mail) {
errorcode.InvalidRequest.Render(w, r, http.StatusBadRequest,
fmt.Sprintf("'%s' is not a valid email address", mail))
return
if mail, ok := changes.GetMailOk(); ok {
if !isValidEmail(*mail) {
errorcode.InvalidRequest.Render(w, r, http.StatusBadRequest,
fmt.Sprintf("'%s' is not a valid email address", *mail))
return
}
}
u, err := g.identityBackend.UpdateUser(r.Context(), nameOrID, *changes)