snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-09-04 19:56:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve webhook settings

Browse Source
This commit is contained in:
Mubelotix
2025-08-05 10:48:39 +02:00
parent 8ef1a50086
commit 386cf83285
1 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
crates/meilisearch/src/routes/webhooks.rs
View File

@ -61,10 +61,9 @@ pub fn configure(cfg: &mut web::ServiceConfig) {
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
#[schema(rename_all = "camelCase")] #[schema(rename_all = "camelCase")]
pub(super) struct WebhookSettings { pub(super) struct WebhookSettings {
#[schema(value_type = Option<String>)]
#[deserr(default, error = DeserrJsonError<InvalidWebhooksUrl>)] #[deserr(default, error = DeserrJsonError<InvalidWebhooksUrl>)]
#[serde(default)] #[serde(default)]
url: Setting<String>, url: Option<String>,
#[schema(value_type = Option<BTreeMap<String, String>>, example = json!({"Authorization":"Bearer a-secret-token"}))] #[schema(value_type = Option<BTreeMap<String, String>>, example = json!({"Authorization":"Bearer a-secret-token"}))]
#[deserr(default, error = DeserrJsonError<InvalidWebhooksHeaders>)] #[deserr(default, error = DeserrJsonError<InvalidWebhooksHeaders>)]
#[serde(default)] #[serde(default)]
@ -237,19 +236,14 @@ impl ErrorCode for WebhooksError {
fn patch_webhook_inner( fn patch_webhook_inner(
uuid: &Uuid, uuid: &Uuid,
old_webhook: Option<Webhook>, old_webhook: Webhook,
new_webhook: WebhookSettings, new_webhook: WebhookSettings,
) -> Result<Webhook, WebhooksError> { ) -> Result<Webhook, WebhooksError> {
let (old_url, mut headers) = let Webhook { url: old_url, mut headers } = old_webhook;
old_webhook.map(|w| (Some(w.url), w.headers)).unwrap_or((None, BTreeMap::new()));
let url = match new_webhook.url { let url = new_webhook.url.unwrap_or(old_url);
Setting::Set(url) => url,
Setting::NotSet => old_url.ok_or_else(|| MissingUrl(uuid.to_owned()))?,
Setting::Reset => return Err(MissingUrl(uuid.to_owned())),
};
let headers = match new_webhook.headers { match new_webhook.headers {
Setting::Set(new_headers) => { Setting::Set(new_headers) => {
for (name, value) in new_headers { for (name, value) in new_headers {
match value { match value {
@ -263,10 +257,9 @@ fn patch_webhook_inner(
} }
} }
} }
headers
} }
Setting::NotSet => headers, Setting::Reset => headers.clear(),
Setting::Reset => BTreeMap::new(), Setting::NotSet => (),
}; };
if headers.len() > 200 { if headers.len() > 200 {
@ -376,7 +369,7 @@ async fn post_webhook(
} }
let webhook = Webhook { let webhook = Webhook {
url: webhook_settings.url.set().ok_or(MissingUrl(uuid))?, url: webhook_settings.url.ok_or(MissingUrl(uuid))?,
headers: webhook_settings headers: webhook_settings
.headers .headers
.set() .set()
@ -429,7 +422,7 @@ async fn patch_webhook(
debug!(parameters = ?(uuid, &webhook_settings), "Patch webhook"); debug!(parameters = ?(uuid, &webhook_settings), "Patch webhook");
let mut webhooks = index_scheduler.webhooks(); let mut webhooks = index_scheduler.webhooks();
let old_webhook = webhooks.webhooks.remove(&uuid); let old_webhook = webhooks.webhooks.remove(&uuid).ok_or(WebhookNotFound(uuid))?;
let webhook = patch_webhook_inner(&uuid, old_webhook, webhook_settings)?; let webhook = patch_webhook_inner(&uuid, old_webhook, webhook_settings)?;
check_changed(uuid, &webhook)?; check_changed(uuid, &webhook)?;