From 80d1859452bc15bec3d03261dc6c41ea877a75b4 Mon Sep 17 00:00:00 2001 From: lede <52017225+xkmttc@users.noreply.github.com> Date: Fri, 30 Oct 2026 05:18:00 +0800 Subject: [PATCH] Fix push device unregistration endpoint (#7891) --- src/api/push.rs | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/api/push.rs b/src/api/push.rs index e87a0985..eee1873d 100644 --- a/src/api/push.rs +++ b/src/api/push.rs @@ -139,21 +139,25 @@ pub async fn unregister_push_device(push_id: Option<&PushId>) -> EmptyResult { if !CONFIG.push_enabled() || push_id.is_none() { return Ok(()); } - let auth_api_token = get_auth_api_token().await?; + let data = json!({ + "id": push_id.as_ref().unwrap(), + }); + let auth_api_token = get_auth_api_token().await?; let auth_header = format!("Bearer {auth_api_token}"); - match make_http_request( - Method::POST, - &format!("{}/push/delete/{}", CONFIG.push_relay_uri(), push_id.as_ref().unwrap()), - )? - .header(AUTHORIZATION, auth_header) - .send() - .await + if let Err(e) = make_http_request(Method::POST, &(CONFIG.push_relay_uri() + "/push/delete"))? + .header(CONTENT_TYPE, "application/json") + .header(ACCEPT, "application/json") + .header(AUTHORIZATION, auth_header) + .json(&data) + .send() + .await? + .error_for_status() { - Ok(r) => r, - Err(e) => err!(format!("An error occurred during device unregistration: {e}")), - }; + err!(format!("An error occurred during device unregistration: {e}")); + } + Ok(()) }