Correct trace path for trigger with custom id (#51847)

This commit is contained in:
Erik Montnemery 2021-06-14 17:09:20 +02:00 committed by GitHub
parent a989677bef
commit 4c9f12b9c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 46 additions and 42 deletions

View file

@ -20,7 +20,7 @@ TRIGGER_SCHEMA = cv.TRIGGER_BASE_SCHEMA.extend(
)
async def _handle_webhook(job, trigger_id, hass, webhook_id, request):
async def _handle_webhook(job, trigger_data, hass, webhook_id, request):
"""Handle incoming webhook."""
result = {"platform": "webhook", "webhook_id": webhook_id}
@ -31,20 +31,20 @@ async def _handle_webhook(job, trigger_id, hass, webhook_id, request):
result["query"] = request.query
result["description"] = "webhook"
result["id"] = trigger_id
result.update(**trigger_data)
hass.async_run_hass_job(job, {"trigger": result})
async def async_attach_trigger(hass, config, action, automation_info):
"""Trigger based on incoming webhooks."""
trigger_id = automation_info.get("trigger_id") if automation_info else None
trigger_data = automation_info.get("trigger_data", {}) if automation_info else {}
webhook_id = config.get(CONF_WEBHOOK_ID)
job = HassJob(action)
hass.components.webhook.async_register(
automation_info["domain"],
automation_info["name"],
webhook_id,
partial(_handle_webhook, job, trigger_id),
partial(_handle_webhook, job, trigger_data),
)
@callback