mirror of
https://git.proxmox.com/git/proxmox-backup
synced 2025-04-28 20:44:53 +00:00
api: token: make comment deletable
Currently, the only way to delete a comment on a token is to set it to just spaces. Since we trim it in the endpoint, it gets deleted as a side effect. This allows the comment to be deleted properly. Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
This commit is contained in:
parent
320ea1cdb7
commit
3fdf8769f4
@ -515,6 +515,15 @@ pub fn generate_token(
|
||||
}))
|
||||
}
|
||||
|
||||
#[api()]
|
||||
#[derive(Serialize, Deserialize)]
|
||||
#[serde(rename_all = "kebab-case")]
|
||||
/// The set of properties that can be deleted from a token.
|
||||
pub enum DeletableTokenProperty {
|
||||
/// Delete the comment property.
|
||||
Comment,
|
||||
}
|
||||
|
||||
#[api(
|
||||
protected: true,
|
||||
input: {
|
||||
@ -537,6 +546,14 @@ pub fn generate_token(
|
||||
schema: EXPIRE_USER_SCHEMA,
|
||||
optional: true,
|
||||
},
|
||||
delete: {
|
||||
description: "List of properties to delete.",
|
||||
type: Array,
|
||||
optional: true,
|
||||
items: {
|
||||
type: DeletableTokenProperty,
|
||||
}
|
||||
},
|
||||
digest: {
|
||||
optional: true,
|
||||
schema: PROXMOX_CONFIG_DIGEST_SCHEMA,
|
||||
@ -557,6 +574,7 @@ pub fn update_token(
|
||||
comment: Option<String>,
|
||||
enable: Option<bool>,
|
||||
expire: Option<i64>,
|
||||
delete: Option<Vec<DeletableTokenProperty>>,
|
||||
digest: Option<String>,
|
||||
) -> Result<(), Error> {
|
||||
let _lock = pbs_config::user::lock_config()?;
|
||||
@ -573,6 +591,14 @@ pub fn update_token(
|
||||
|
||||
let mut data: ApiToken = config.lookup("token", &tokenid_string)?;
|
||||
|
||||
if let Some(delete) = delete {
|
||||
for delete_prop in delete {
|
||||
match delete_prop {
|
||||
DeletableTokenProperty::Comment => data.comment = None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if let Some(comment) = comment {
|
||||
let comment = comment.trim().to_string();
|
||||
if comment.is_empty() {
|
||||
|
@ -68,6 +68,7 @@ Ext.define('PBS.window.TokenEdit', {
|
||||
{
|
||||
xtype: 'proxmoxtextfield',
|
||||
name: 'comment',
|
||||
deleteEmpty: true,
|
||||
fieldLabel: gettext('Comment'),
|
||||
},
|
||||
],
|
||||
|
Loading…
Reference in New Issue
Block a user