Skip to content

Commit

Permalink
graph: Allow PATCH on user without 'mail' in body
Browse files Browse the repository at this point in the history
Skip the mail validator if 'mail' attribute is not present in the
request.
  • Loading branch information
rhafer committed Mar 23, 2022
1 parent a99f725 commit 517356f
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
6 changes: 6 additions & 0 deletions changelog/unreleased/graph-patch-mail.md
Original file line number Diff line number Diff line change
@@ -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 changes: 6 additions & 5 deletions graph/pkg/service/v0/users.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 517356f

Please sign in to comment.