Mirrors/sftpgo
1
0
Fork 0
mirror of https://github.com/drakkan/sftpgo.git synced 2025-12-07 06:40:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

REST API: remove merging of fields on updates

Browse Source 
we use PUT verb not PATCH. We keep merging only to allow to preserve
hidden/encrypted fields.

This is a backward incompatible change, but is necessary to avoid unexpected
issues.
You have to pass complete objects on updates.

Fixes #1088

Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
This commit is contained in:
Nicola Murino
2022-12-23 09:36:20 +01:00
parent e17975ed7d
commit 0841c7d7bd
12 changed files with 173 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/httpd/api_keys.go
View File

@@ -98,14 +98,17 @@ func updateAPIKey(w http.ResponseWriter, r *http.Request) {
return
}
err = render.DecodeJSON(r.Body, &apiKey)
var updatedAPIKey dataprovider.APIKey
err = render.DecodeJSON(r.Body, &updatedAPIKey)
if err != nil {
sendAPIResponse(w, r, err, "", http.StatusBadRequest)
return
}
apiKey.KeyID = keyID
if err := dataprovider.UpdateAPIKey(&apiKey, claims.Username, util.GetIPFromRemoteAddress(r.RemoteAddr), claims.Role); err != nil {
updatedAPIKey.KeyID = keyID
updatedAPIKey.Key = apiKey.Key
err = dataprovider.UpdateAPIKey(&updatedAPIKey, claims.Username, util.GetIPFromRemoteAddress(r.RemoteAddr), claims.Role)
if err != nil {
sendAPIResponse(w, r, err, "", getRespStatus(err))
return
}