blackroad-os/backroad
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(dataservices): unify access methods and abstract away redundant code [EE-5628] (#9115)

Browse Source
This commit is contained in:
andres-portainer
2023-06-22 18:28:07 -03:00
committed by GitHub
parent 4c6bbe9a2f
commit 4cc96b4b30
171 changed files with 714 additions and 1590 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/http/handler/users/user_update.go
View File

@@ -87,7 +87,7 @@ func (handler *Handler) userUpdate(w http.ResponseWriter, r *http.Request) *http
return httperror.Forbidden("Permission denied to update user to administrator role", httperrors.ErrResourceAccessDenied)
}
user, err := handler.DataStore.User().User(portainer.UserID(userID))
user, err := handler.DataStore.User().Read(portainer.UserID(userID))
if handler.DataStore.IsErrObjectNotFound(err) {
return httperror.NotFound("Unable to find a user with the specified identifier inside the database", err)
} else if err != nil {
@@ -125,7 +125,7 @@ func (handler *Handler) userUpdate(w http.ResponseWriter, r *http.Request) *http
user.TokenIssueAt = time.Now().Unix()
}
err = handler.DataStore.User().UpdateUser(user.ID, user)
err = handler.DataStore.User().Update(user.ID, user)
if err != nil {
return httperror.InternalServerError("Unable to persist user changes inside the database", err)
}