* [pdm-devel] [PATCH datacenter-manager/proxmox v2 0/7] fix #6914: add option to remove already existing token
@ 2025-12-10 16:37 Shan Shaji
2025-12-10 16:37 ` [pdm-devel] [PATCH datacenter-manager v2 1/6] server: pbs-client: add delete admin token method Shan Shaji
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: Shan Shaji @ 2025-12-10 16:37 UTC (permalink / raw)
To: pdm-devel
If a user removed a remote without deleting its associated token,
PDM would not allow re-adding the same remote unless the token
was changed. To fix this, support for optionally deleting the token
from the remote has been added.
This patch series adds support to delete the token using an optional
boolean flag in CLIs ie. on both admin and client. Additionaly, also
added a check box inside the UI that allow users to choose whether to
delete the token while removing the remote.
History
=======
patch: https://lore.proxmox.com/pdm-devel/DETUIY1JX929.1PHFNA7IHWJZ5@proxmox.com/T/#t
changes since v1:
- Locked the remote config inorder to avoid race condition. Thanks @Michael
- Included missing admin cli implementation. Thanks @Michael
- Addressed nit comments. Thanks @Shannon
proxmox-datacenter-manager:
Shan Shaji (6):
server: pbs-client: add delete admin token method
server: api: add support to optionally delete token from remote
pdm-client: accept `delete-token` argument for deleting api token
cli: client: add `delete-token` option to delete token from remote
fix: ui: add remove confirmation dialog with optional token deletion
cli: admin: add `delete-token` option to delete token from remote
cli/admin/src/remotes.rs | 20 ++++--
cli/client/src/remotes.rs | 11 ++-
lib/pdm-client/src/lib.rs | 11 ++-
server/src/api/remotes.rs | 46 ++++++++++++-
server/src/pbs_client.rs | 7 ++
ui/src/remotes/config.rs | 38 ++++++++---
ui/src/remotes/mod.rs | 2 +
ui/src/remotes/remove_remote.rs | 117 ++++++++++++++++++++++++++++++++
8 files changed, 231 insertions(+), 21 deletions(-)
create mode 100644 ui/src/remotes/remove_remote.rs
proxmox:
Shan Shaji (1):
pve-api-types: generate missing `delete_token` method
pve-api-types/generate.pl | 1 +
pve-api-types/src/generated/code.rs | 11 +++++++++++
2 files changed, 12 insertions(+)
Summary over all repositories:
10 files changed, 243 insertions(+), 21 deletions(-)
--
Generated by git-murpp 0.8.1
_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel
^ permalink raw reply [flat|nested] 8+ messages in thread
* [pdm-devel] [PATCH datacenter-manager v2 1/6] server: pbs-client: add delete admin token method
2025-12-10 16:37 [pdm-devel] [PATCH datacenter-manager/proxmox v2 0/7] fix #6914: add option to remove already existing token Shan Shaji
@ 2025-12-10 16:37 ` Shan Shaji
2025-12-10 16:37 ` [pdm-devel] [PATCH datacenter-manager v2 2/6] server: api: add support to optionally delete token from remote Shan Shaji
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Shan Shaji @ 2025-12-10 16:37 UTC (permalink / raw)
To: pdm-devel
Inorder to allow deleting the generated token of PBS from PDM, add
method inside the PbsClient to delete the admin token.
Signed-off-by: Shan Shaji <s.shaji@proxmox.com>
---
changes since v1:
- Revert the dropping of '/' from the comment.
- Remove unnecessary colon.
server/src/pbs_client.rs | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/server/src/pbs_client.rs b/server/src/pbs_client.rs
index f4f1f82..31befdd 100644
--- a/server/src/pbs_client.rs
+++ b/server/src/pbs_client.rs
@@ -260,6 +260,13 @@ impl PbsClient {
Ok(token)
}
+ /// Delete API-Token from the PBS remote.
+ pub async fn delete_admin_token(&self, userid: &Userid, tokenid: &str) -> Result<(), Error> {
+ let path = format!("/api2/extjs/access/users/{userid}/token/{tokenid}");
+ self.0.delete(&path).await?.nodata()?;
+ Ok(())
+ }
+
/// Return the status the Proxmox Backup Server instance
pub async fn node_status(&self) -> Result<pbs_api_types::NodeStatus, Error> {
let path = "/api2/extjs/nodes/localhost/status";
--
2.47.3
_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel
^ permalink raw reply [flat|nested] 8+ messages in thread
* [pdm-devel] [PATCH datacenter-manager v2 2/6] server: api: add support to optionally delete token from remote
2025-12-10 16:37 [pdm-devel] [PATCH datacenter-manager/proxmox v2 0/7] fix #6914: add option to remove already existing token Shan Shaji
2025-12-10 16:37 ` [pdm-devel] [PATCH datacenter-manager v2 1/6] server: pbs-client: add delete admin token method Shan Shaji
@ 2025-12-10 16:37 ` Shan Shaji
2025-12-10 16:37 ` [pdm-devel] [PATCH datacenter-manager v2 3/6] pdm-client: accept `delete-token` argument for deleting api token Shan Shaji
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Shan Shaji @ 2025-12-10 16:37 UTC (permalink / raw)
To: pdm-devel
Previously, when removing a remote, the token was still present in the
remote configuration. When users tried to add the remote again, they
received an error because a token with the same name already existed.
To support deleting the token from the remote, add an optional
parameter to the API endpoint.
Signed-off-by: Shan Shaji <s.shaji@proxmox.com>
---
changes since v1:
- nit: inlined the id argument using the format string.
- used `get` instead of `get_mut` inorder to access remote.
- removed unnecessary `&` operator use.
server/src/api/remotes.rs | 46 +++++++++++++++++++++++++++++++++++++--
1 file changed, 44 insertions(+), 2 deletions(-)
diff --git a/server/src/api/remotes.rs b/server/src/api/remotes.rs
index 298ad13..82b8469 100644
--- a/server/src/api/remotes.rs
+++ b/server/src/api/remotes.rs
@@ -27,6 +27,7 @@ use crate::api::remote_updates;
use crate::metric_collection;
use crate::{connection, pbs_client};
+use super::pbs;
use super::pve;
use super::rrd_common;
use super::rrd_common::DataPoint;
@@ -292,16 +293,57 @@ pub fn update_remote(
input: {
properties: {
id: { schema: REMOTE_ID_SCHEMA },
+ "delete-token": {
+ type: bool,
+ description: "Optional boolean value to delete the token from remote.",
+ optional: true,
+ }
},
},
access: {
permission: &Permission::Privilege(&["resource"], PRIV_RESOURCE_MODIFY, false),
},
)]
-/// List all the remotes this instance is managing.
-pub fn remove_remote(id: String) -> Result<(), Error> {
+/// Remove a remote that this instance is managing.
+pub async fn remove_remote(id: String, delete_token: Option<bool>) -> Result<(), Error> {
+ let _lock = pdm_config::remotes::lock_config()?;
let (mut remotes, _) = pdm_config::remotes::config()?;
+ if delete_token.unwrap_or(false) {
+ let remote = remotes
+ .get(&id)
+ .ok_or_else(|| http_err!(NOT_FOUND, "no such remote {id:?}"))?;
+
+ let user = remote.authid.user();
+
+ let short_delete_err = |err: proxmox_client::Error| {
+ format_err!("error deleting token: {}", err.source().unwrap_or(&err))
+ };
+
+ let token_name = remote
+ .authid
+ .tokenname()
+ .ok_or_else(|| format_err!("Unable to find the token for the remote {id:?}"))?;
+
+ // connect to remote and delete the already existing token.
+ match remote.ty {
+ RemoteType::Pve => {
+ let client = pve::connect_or_login(remote).await?;
+ client
+ .delete_token(user.as_str(), token_name.as_str())
+ .await
+ .map_err(short_delete_err)?
+ }
+ RemoteType::Pbs => {
+ let client = pbs::connect_or_login(remote).await?;
+ client
+ .delete_admin_token(user, token_name.as_str())
+ .await
+ .map_err(short_delete_err)?
+ }
+ };
+ }
+
if remotes.remove(&id).is_none() {
http_bail!(NOT_FOUND, "no such entry {id:?}");
}
--
2.47.3
_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel
^ permalink raw reply [flat|nested] 8+ messages in thread
* [pdm-devel] [PATCH datacenter-manager v2 3/6] pdm-client: accept `delete-token` argument for deleting api token
2025-12-10 16:37 [pdm-devel] [PATCH datacenter-manager/proxmox v2 0/7] fix #6914: add option to remove already existing token Shan Shaji
2025-12-10 16:37 ` [pdm-devel] [PATCH datacenter-manager v2 1/6] server: pbs-client: add delete admin token method Shan Shaji
2025-12-10 16:37 ` [pdm-devel] [PATCH datacenter-manager v2 2/6] server: api: add support to optionally delete token from remote Shan Shaji
@ 2025-12-10 16:37 ` Shan Shaji
2025-12-10 16:37 ` [pdm-devel] [PATCH datacenter-manager v2 4/6] cli: client: add `delete-token` option to delete token from remote Shan Shaji
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Shan Shaji @ 2025-12-10 16:37 UTC (permalink / raw)
To: pdm-devel
Signed-off-by: Shan Shaji <s.shaji@proxmox.com>
---
changes since v1:
- reformated using `rustfmt`.
- added doc comment.
lib/pdm-client/src/lib.rs | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/lib/pdm-client/src/lib.rs b/lib/pdm-client/src/lib.rs
index 01ee6f7..ef534cc 100644
--- a/lib/pdm-client/src/lib.rs
+++ b/lib/pdm-client/src/lib.rs
@@ -136,8 +136,15 @@ impl<T: HttpApiClient> PdmClient<T> {
Ok(())
}
- pub async fn delete_remote(&self, remote: &str) -> Result<(), Error> {
- let path = format!("/api2/extjs/remotes/remote/{remote}");
+ /// Deletes a remote, with optional support to also delete the associated token.
+ pub async fn delete_remote(
+ &self,
+ remote: &str,
+ delete_token: &Option<bool>,
+ ) -> Result<(), Error> {
+ let path = ApiPathBuilder::new(format!("/api2/extjs/remotes/remote/{remote}"))
+ .maybe_arg("delete-token", delete_token)
+ .build();
self.0.delete(&path).await?.nodata()?;
Ok(())
}
--
2.47.3
_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel
^ permalink raw reply [flat|nested] 8+ messages in thread
* [pdm-devel] [PATCH datacenter-manager v2 4/6] cli: client: add `delete-token` option to delete token from remote
2025-12-10 16:37 [pdm-devel] [PATCH datacenter-manager/proxmox v2 0/7] fix #6914: add option to remove already existing token Shan Shaji
` (2 preceding siblings ...)
2025-12-10 16:37 ` [pdm-devel] [PATCH datacenter-manager v2 3/6] pdm-client: accept `delete-token` argument for deleting api token Shan Shaji
@ 2025-12-10 16:37 ` Shan Shaji
2025-12-10 16:37 ` [pdm-devel] [PATCH datacenter-manager v2 5/6] fix: ui: add remove confirmation dialog with optional token deletion Shan Shaji
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Shan Shaji @ 2025-12-10 16:37 UTC (permalink / raw)
To: pdm-devel
Signed-off-by: Shan Shaji <s.shaji@proxmox.com>
---
cli/client/src/remotes.rs | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/cli/client/src/remotes.rs b/cli/client/src/remotes.rs
index 4145dac..0b4df3c 100644
--- a/cli/client/src/remotes.rs
+++ b/cli/client/src/remotes.rs
@@ -116,12 +116,17 @@ async fn update_remote(id: String, updater: RemoteUpdater) -> Result<(), Error>
input: {
properties: {
id: { schema: REMOTE_ID_SCHEMA },
+ "delete-token": {
+ type: bool,
+ optional: true,
+ description: "Remove the API-Token from remote."
+ }
}
}
)]
-/// Add a new remote.
-async fn delete_remote(id: String) -> Result<(), Error> {
- client()?.delete_remote(&id).await?;
+/// Delete a remote.
+async fn delete_remote(id: String, delete_token: Option<bool>) -> Result<(), Error> {
+ client()?.delete_remote(&id, &delete_token).await?;
Ok(())
}
--
2.47.3
_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel
^ permalink raw reply [flat|nested] 8+ messages in thread
* [pdm-devel] [PATCH datacenter-manager v2 5/6] fix: ui: add remove confirmation dialog with optional token deletion
2025-12-10 16:37 [pdm-devel] [PATCH datacenter-manager/proxmox v2 0/7] fix #6914: add option to remove already existing token Shan Shaji
` (3 preceding siblings ...)
2025-12-10 16:37 ` [pdm-devel] [PATCH datacenter-manager v2 4/6] cli: client: add `delete-token` option to delete token from remote Shan Shaji
@ 2025-12-10 16:37 ` Shan Shaji
2025-12-10 16:37 ` [pdm-devel] [PATCH datacenter-manager v2 6/6] cli: admin: add `delete-token` option to delete token from remote Shan Shaji
2025-12-10 16:37 ` [pdm-devel] [PATCH proxmox v2 1/1] pve-api-types: generate missing `delete_token` method Shan Shaji
6 siblings, 0 replies; 8+ messages in thread
From: Shan Shaji @ 2025-12-10 16:37 UTC (permalink / raw)
To: pdm-devel
Previously, removing a remote did not remove its token, which
prevented users from re-adding the same remote later with the same token
name. To fix this, add a new checkbox that lets users choose to also
delete the token when deleting the remote.
Signed-off-by: Shan Shaji <s.shaji@proxmox.com>
---
changes since v1:
- Updated commit message.
- Remove unnecesary comma.
- Removed uneccary `clone` of the state variable.
- added module level imports.
- use `on_activate` instead of `on_click`.
ui/src/remotes/config.rs | 38 ++++++++---
ui/src/remotes/mod.rs | 2 +
ui/src/remotes/remove_remote.rs | 117 ++++++++++++++++++++++++++++++++
3 files changed, 147 insertions(+), 10 deletions(-)
create mode 100644 ui/src/remotes/remove_remote.rs
diff --git a/ui/src/remotes/config.rs b/ui/src/remotes/config.rs
index d241159..42c49bc 100644
--- a/ui/src/remotes/config.rs
+++ b/ui/src/remotes/config.rs
@@ -7,6 +7,7 @@ use anyhow::Error;
use proxmox_schema::property_string::PropertyString;
use crate::remotes::edit_remote::EditRemote;
+use crate::remotes::remove_remote::RemoveRemote;
//use pwt::widget::form::{Field, FormContext, InputType};
use pdm_api_types::remotes::Remote;
@@ -17,7 +18,7 @@ use proxmox_yew_comp::percent_encoding::percent_encode_component;
//use proxmox_schema::api_types::{CERT_FINGERPRINT_SHA256_SCHEMA, DNS_NAME_OR_IP_SCHEMA};
-use serde_json::Value;
+use serde_json::{json, Value};
use yew::virtual_dom::{Key, VComp, VNode};
use pwt::prelude::*;
@@ -32,7 +33,7 @@ use pwt::widget::{
//use proxmox_yew_comp::EditWindow;
use proxmox_yew_comp::{
- ConfirmButton, LoadableComponent, LoadableComponentContext, LoadableComponentMaster,
+ LoadableComponent, LoadableComponentContext, LoadableComponentMaster,
LoadableComponentScopeExt, LoadableComponentState,
};
@@ -42,10 +43,13 @@ async fn load_remotes() -> Result<Vec<Remote>, Error> {
proxmox_yew_comp::http_get("/remotes/remote", None).await
}
-async fn delete_item(key: Key) -> Result<(), Error> {
+async fn delete_item(key: Key, delete_token: bool) -> Result<(), Error> {
let id = key.to_string();
+ let param = Some(json!({
+ "delete-token": delete_token,
+ }));
let url = format!("/remotes/remote/{}", percent_encode_component(&id));
- proxmox_yew_comp::http_delete(&url, None).await?;
+ proxmox_yew_comp::http_delete(&url, param).await?;
Ok(())
}
@@ -100,10 +104,11 @@ impl RemoteConfigPanel {
pub enum ViewState {
Add(RemoteType),
Edit,
+ Remove,
}
pub enum Msg {
- RemoveItem,
+ RemoveItem(bool),
}
pub struct PbsRemoteConfigPanel {
@@ -156,11 +161,11 @@ impl LoadableComponent for PbsRemoteConfigPanel {
fn update(&mut self, ctx: &LoadableComponentContext<Self>, msg: Self::Message) -> bool {
match msg {
- Msg::RemoveItem => {
+ Msg::RemoveItem(v) => {
if let Some(key) = self.selection.selected_key() {
let link = ctx.link().clone();
self.spawn(async move {
- if let Err(err) = delete_item(key).await {
+ if let Err(err) = delete_item(key, v).await {
link.show_error(tr!("Unable to delete item"), err, true);
}
link.send_reload();
@@ -205,10 +210,9 @@ impl LoadableComponent for PbsRemoteConfigPanel {
.onclick(link.change_view_callback(|_| Some(ViewState::Edit))),
)
.with_child(
- ConfirmButton::new(tr!("Remove"))
- .confirm_message(tr!("Are you sure you want to remove this remote?"))
+ Button::new(tr!("Remove"))
.disabled(disabled)
- .on_activate(link.callback(|_| Msg::RemoveItem)),
+ .on_activate(link.change_view_callback(|_| Some(ViewState::Remove))),
)
.with_flex_spacer()
.with_child({
@@ -243,6 +247,7 @@ impl LoadableComponent for PbsRemoteConfigPanel {
.selection
.selected_key()
.map(|key| self.create_edit_dialog(ctx, key)),
+ ViewState::Remove => Some(self.create_remove_remote_dialog(ctx)),
}
}
}
@@ -303,6 +308,19 @@ impl PbsRemoteConfigPanel {
.on_done(ctx.link().change_view_callback(|_| None))
.into()
}
+
+ fn create_remove_remote_dialog(&self, ctx: &LoadableComponentContext<Self>) -> Html {
+ let link = ctx.link().clone();
+ let close = link.change_view_callback(|_| None);
+
+ RemoveRemote::new()
+ .on_dismiss(close.clone())
+ .on_confirm(Callback::from(move |v| {
+ link.send_message(Msg::RemoveItem(v));
+ link.change_view(None);
+ }))
+ .into()
+ }
}
impl From<RemoteConfigPanel> for VNode {
diff --git a/ui/src/remotes/mod.rs b/ui/src/remotes/mod.rs
index 603077c..bfe9dc0 100644
--- a/ui/src/remotes/mod.rs
+++ b/ui/src/remotes/mod.rs
@@ -27,6 +27,8 @@ pub use tasks::RemoteTaskList;
mod updates;
pub use updates::UpdateTree;
+mod remove_remote;
+
mod firewall;
pub use firewall::FirewallTree;
diff --git a/ui/src/remotes/remove_remote.rs b/ui/src/remotes/remove_remote.rs
new file mode 100644
index 0000000..63b55ee
--- /dev/null
+++ b/ui/src/remotes/remove_remote.rs
@@ -0,0 +1,117 @@
+use std::rc::Rc;
+
+use yew::html::IntoEventCallback;
+use yew::prelude::*;
+use yew::virtual_dom::{VComp, VNode};
+
+use pwt::css::{AlignItems, FontColor, JustifyContent};
+use pwt::prelude::*;
+use pwt::widget::form::Checkbox;
+use pwt::widget::{Button, Column, Container, Dialog, Fa, Row};
+
+use pwt_macros::builder;
+
+#[derive(PartialEq, Properties)]
+#[builder]
+pub struct RemoveRemote {
+ /// A callback for an action that needs to be confirmed by the user.
+ #[prop_or_default]
+ #[builder_cb(IntoEventCallback, into_event_callback, bool)]
+ pub on_confirm: Option<Callback<bool>>,
+
+ /// A callback that will trigger if the user dismisses the dialog.
+ #[prop_or_default]
+ #[builder_cb(IntoEventCallback, into_event_callback, ())]
+ pub on_dismiss: Option<Callback<()>>,
+}
+
+impl RemoveRemote {
+ pub fn new() -> Self {
+ yew::props!(Self {})
+ }
+}
+
+pub enum Msg {
+ SelectCheckBox(bool),
+}
+
+pub struct PdmRemoveRemote {
+ delete_token: bool,
+}
+
+impl Component for PdmRemoveRemote {
+ type Message = Msg;
+
+ type Properties = RemoveRemote;
+
+ fn create(_ctx: &Context<Self>) -> Self {
+ Self {
+ delete_token: false,
+ }
+ }
+
+ fn update(&mut self, _ctx: &Context<Self>, msg: Self::Message) -> bool {
+ match msg {
+ Msg::SelectCheckBox(v) => {
+ self.delete_token = v;
+ true
+ }
+ }
+ }
+
+ fn view(&self, ctx: &Context<Self>) -> Html {
+ let props = ctx.props();
+ let delete_token = self.delete_token;
+
+ let on_confirm = props.on_confirm.clone();
+ let on_dismiss = props.on_dismiss.clone();
+
+ Dialog::new(tr!("Confirm"))
+ .on_close(on_dismiss.clone())
+ .min_height(100)
+ .with_child(
+ Column::new()
+ .padding(4)
+ .gap(2)
+ .with_child(
+ Row::new()
+ .gap(2)
+ .class(AlignItems::Center)
+ .with_child(Container::new().class("pwt-message-sign").with_child(
+ Fa::new("exclamation-triangle").class(FontColor::Error),
+ ))
+ .with_child(tr!("Are you sure you want to remove this remote?")),
+ )
+ .with_child(
+ Checkbox::new()
+ .default(false)
+ .box_label(tr!("Delete API token from remote"))
+ .checked(self.delete_token)
+ .on_change(ctx.link().callback(|v| Msg::SelectCheckBox(v))),
+ )
+ .with_child(
+ Row::new()
+ .gap(2)
+ .class(JustifyContent::Center)
+ .with_child(Button::new(tr!("Yes")).on_activate(move |_| {
+ if let Some(on_confirm) = &on_confirm {
+ on_confirm.emit(delete_token);
+ }
+ }))
+ .with_child(Button::new(tr!("No")).on_activate(move |_| {
+ if let Some(on_dismiss) = &on_dismiss {
+ on_dismiss.emit(());
+ }
+ })),
+ ),
+ )
+ .into()
+ }
+}
+
+impl From<RemoveRemote> for VNode {
+ fn from(val: RemoveRemote) -> Self {
+ let comp = VComp::new::<PdmRemoveRemote>(Rc::new(val), None);
+ VNode::from(comp)
+ }
+}
--
2.47.3
_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel
^ permalink raw reply [flat|nested] 8+ messages in thread
* [pdm-devel] [PATCH datacenter-manager v2 6/6] cli: admin: add `delete-token` option to delete token from remote
2025-12-10 16:37 [pdm-devel] [PATCH datacenter-manager/proxmox v2 0/7] fix #6914: add option to remove already existing token Shan Shaji
` (4 preceding siblings ...)
2025-12-10 16:37 ` [pdm-devel] [PATCH datacenter-manager v2 5/6] fix: ui: add remove confirmation dialog with optional token deletion Shan Shaji
@ 2025-12-10 16:37 ` Shan Shaji
2025-12-10 16:37 ` [pdm-devel] [PATCH proxmox v2 1/1] pve-api-types: generate missing `delete_token` method Shan Shaji
6 siblings, 0 replies; 8+ messages in thread
From: Shan Shaji @ 2025-12-10 16:37 UTC (permalink / raw)
To: pdm-devel
Inorder to allow deleting the remote API token from PDM, added optional
boolean flag.
Signed-off-by: Shan Shaji <s.shaji@proxmox.com>
---
**note**: This patch was not included in v1 and was never reviewed.
cli/admin/src/remotes.rs | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/cli/admin/src/remotes.rs b/cli/admin/src/remotes.rs
index d1a3ede..b28bdd5 100644
--- a/cli/admin/src/remotes.rs
+++ b/cli/admin/src/remotes.rs
@@ -217,16 +217,28 @@ fn update_remote(
input: {
properties: {
id: { schema: REMOTE_ID_SCHEMA },
+ "delete-token": {
+ type: bool,
+ optional: true,
+ description: "Remove the API-Token from remote."
+ }
}
}
)]
-/// Add a new remote.
-fn remove_remote(id: String, rpcenv: &mut dyn RpcEnvironment) -> Result<(), Error> {
- let param = json!({ "id": id });
+/// Remove a new remote.
+async fn remove_remote(
+ id: String,
+ delete_token: Option<bool>,
+ rpcenv: &mut dyn RpcEnvironment,
+) -> Result<(), Error> {
+ let mut param = json!({ "id": id });
+ if delete_token.is_some() {
+ param["delete-token"] = delete_token.into();
+ }
let info = &dc_api::remotes::API_METHOD_REMOVE_REMOTE;
match info.handler {
- ApiHandler::Sync(handler) => (handler)(param, info, rpcenv).map(drop),
+ ApiHandler::Async(handler) => (handler)(param, info, rpcenv).await.map(drop),
_ => unreachable!(),
}
}
--
2.47.3
_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel
^ permalink raw reply [flat|nested] 8+ messages in thread
* [pdm-devel] [PATCH proxmox v2 1/1] pve-api-types: generate missing `delete_token` method
2025-12-10 16:37 [pdm-devel] [PATCH datacenter-manager/proxmox v2 0/7] fix #6914: add option to remove already existing token Shan Shaji
` (5 preceding siblings ...)
2025-12-10 16:37 ` [pdm-devel] [PATCH datacenter-manager v2 6/6] cli: admin: add `delete-token` option to delete token from remote Shan Shaji
@ 2025-12-10 16:37 ` Shan Shaji
6 siblings, 0 replies; 8+ messages in thread
From: Shan Shaji @ 2025-12-10 16:37 UTC (permalink / raw)
To: pdm-devel
Removing a remote node from PDM and adding it again is prevented
by the already existing token. Inorder to allow deletion of token
from PVE generate the endpoint that is necessary to call from
PDM.
Signed-off-by: Shan Shaji <s.shaji@proxmox.com>
---
pve-api-types/generate.pl | 1 +
pve-api-types/src/generated/code.rs | 11 +++++++++++
2 files changed, 12 insertions(+)
diff --git a/pve-api-types/generate.pl b/pve-api-types/generate.pl
index 3cebe321..ee02d91b 100755
--- a/pve-api-types/generate.pl
+++ b/pve-api-types/generate.pl
@@ -359,6 +359,7 @@ Schema2Rust::derive('ListRealm' => 'Clone', 'PartialEq');
# api(GET => '/access/users/{userid}', 'get_user', 'return-name' => 'User');
api(POST => '/access/users/{userid}/token/{tokenid}', 'create_token', 'param-name' => 'CreateToken');
Schema2Rust::derive('CreateToken' => 'Default');
+api(DELETE => '/access/users/{userid}/token/{tokenid}', 'delete_token');
api(GET => '/nodes/{node}/apt/update', 'list_available_updates', 'return-name' => 'AptUpdateInfo');
api(POST => '/nodes/{node}/apt/update', 'update_apt_database', 'output-type' => 'PveUpid', 'param-name' => 'AptUpdateParams');
diff --git a/pve-api-types/src/generated/code.rs b/pve-api-types/src/generated/code.rs
index f364f9cd..3de2e554 100644
--- a/pve-api-types/src/generated/code.rs
+++ b/pve-api-types/src/generated/code.rs
@@ -450,6 +450,11 @@ pub trait PveClient {
Err(Error::Other("get_apt_repositories not implemented"))
}
+ /// Remove API token for a specific user.
+ async fn delete_token(&self, userid: &str, tokenid: &str) -> Result<(), Error> {
+ Err(Error::Other("delete_token not implemented"))
+ }
+
/// Get package changelogs.
async fn get_package_changelog(
&self,
@@ -1089,6 +1094,12 @@ where
Ok(self.0.get(url).await?.expect_json()?.data)
}
+ /// Remove API token for a specific user.
+ async fn delete_token(&self, userid: &str, tokenid: &str) -> Result<(), Error> {
+ let url = &format!("/api2/extjs/access/users/{userid}/token/{tokenid}");
+ self.0.delete(url).await?.nodata()
+ }
+
/// Get package changelogs.
async fn get_package_changelog(
&self,
--
2.47.3
_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2025-12-10 16:38 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-12-10 16:37 [pdm-devel] [PATCH datacenter-manager/proxmox v2 0/7] fix #6914: add option to remove already existing token Shan Shaji
2025-12-10 16:37 ` [pdm-devel] [PATCH datacenter-manager v2 1/6] server: pbs-client: add delete admin token method Shan Shaji
2025-12-10 16:37 ` [pdm-devel] [PATCH datacenter-manager v2 2/6] server: api: add support to optionally delete token from remote Shan Shaji
2025-12-10 16:37 ` [pdm-devel] [PATCH datacenter-manager v2 3/6] pdm-client: accept `delete-token` argument for deleting api token Shan Shaji
2025-12-10 16:37 ` [pdm-devel] [PATCH datacenter-manager v2 4/6] cli: client: add `delete-token` option to delete token from remote Shan Shaji
2025-12-10 16:37 ` [pdm-devel] [PATCH datacenter-manager v2 5/6] fix: ui: add remove confirmation dialog with optional token deletion Shan Shaji
2025-12-10 16:37 ` [pdm-devel] [PATCH datacenter-manager v2 6/6] cli: admin: add `delete-token` option to delete token from remote Shan Shaji
2025-12-10 16:37 ` [pdm-devel] [PATCH proxmox v2 1/1] pve-api-types: generate missing `delete_token` method Shan Shaji
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox