Merge pull request #3357 from rhafer/graph-getuser-err

Fix error handling in GetUsers
owncloud · Mar 22, 2022 · 0b96121 · 0b96121
2 parents 1265fd6 + 3c16713
commit 0b96121
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/changelog/unreleased/graph-getusers-err.md b/changelog/unreleased/graph-getusers-err.md
@@ -0,0 +1,6 @@
+Bugfix: Fix error handling in GraphAPI GetUsers call
+
+A missing return statement caused GetUsers to return misleading results when
+the identity backend returned an error.
+
+https://github.com/owncloud/ocis/pull/3357
diff --git a/graph/pkg/service/v0/users.go b/graph/pkg/service/v0/users.go
@@ -46,6 +46,7 @@ func (g Graph) GetUsers(w http.ResponseWriter, r *http.Request) {
 		} else {
 			errorcode.GeneralException.Render(w, r, http.StatusInternalServerError, err.Error())
 		}
+		return
 	}
 	render.Status(r, http.StatusOK)
 	render.JSON(w, r, &listResponse{Value: users})