FS-InfMath/Jobboerse
27
0
Fork 1
Code Issues 1 Pull requests Projects Releases 17 Wiki Activity

Redesign page + Webhook notifications #43

Merged
ldr merged 16 commits from facelift into main 2023-12-25 21:23:53 +01:00
Conversation 7 Commits 16 Files changed 42 +4 -3
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 995840c104 - Show all commits

Keep progranm from crashing when webhook_url is not provided

Prev Next 
- Also require webhook_url to be a valid Url
Lukas Drescher 2023-12-25 18:58:00 +01:00
commit 995840c104

3
packages/jobboerse/src/server_config.rs
View file

@ -37,7 +37,8 @@ pub(crate) struct ProgramConfig {
pub(crate) login_provider: LoginProviderConfig,
#[serde(skip_serializing_if = "Option::is_none", default)]
pub(crate) email: Option<EmailConfig>,
pub(crate) webhook_url: Option<String>,
#[serde(default)]
ldr marked this conversation as resolved Outdated
ben commented 2023-12-25 13:24:30 +01:00
Outdated
Copy link

Add a #[serde(default)] attribute for the added field so that it will default to None if the field is absent, instead of failing to deserialize the config.

+    #[serde(default)]
     pub(crate) webhook_url: Option<String>,

Also if the webhook_url need to be a valid url url::Url might be better than String so that the validity is checked at deserialization time.

Add a `#[serde(default)]` attribute for the added field so that it will default to `None` if the field is absent, instead of failing to deserialize the config. ```diff + #[serde(default)] pub(crate) webhook_url: Option<String>, ``` Also if the `webhook_url` need to be a valid url `url::Url` might be better than `String` so that the validity is checked at deserialization time.
pub(crate) webhook_url: Option<Url>,
}
#[derive(Serialize, Deserialize, Debug)]

4
packages/jobboerse/src/webhook.rs
View file

@ -18,7 +18,7 @@ pub(crate) struct NewOfferWebhookData {
pub(crate) async fn send_new_offer_message(
hb: &Handlebars<'_>,
webhook_url: String,
webhook_url: Url,
data: &NewOfferWebhookData,
) -> Result<bool, RenderError> {
let message_text = hb.render(template::WEBHOOK_NEW_OFFER_MESSAGE, data)?;
@ -39,7 +39,7 @@ pub(crate) async fn send_new_offer_message(
let arc = Arc::new(tls_config);
let connector = Connector::new().rustls(arc);
let client = Client::builder().connector(connector).finish();
let request_result = client.post(webhook_url).send_json(&msg).await;
let request_result = client.post(webhook_url.as_str()).send_json(&msg).await;
let success = match request_result {
Ok(response) => {
debug!(