-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Deprecate verify_domain_control service helper #2688
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
epenet
wants to merge
6
commits into
master
Choose a base branch
from
epenet-patch-1
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
f03dc5b
Deprecate verify_domain_control service helper
epenet cfd99af
Tweak
epenet dbc3b12
Apply suggestions from code review
epenet e238903
Update 2025-06-03-deprecate-verify-domain-control.md
epenet ba727f2
Update 2025-06-03-deprecate-verify-domain-control.md
epenet a108d3d
Update blog/2025-06-03-deprecate-verify-domain-control.md
frenck File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
--- | ||
author: epenet | ||
authorURL: https://github.com/epenet | ||
title: "Deprecate verify_domain_control service helper" | ||
--- | ||
|
||
### Summary of changes | ||
|
||
The `homeassistant.helpers.service.verify_domain_control` service helper is deprecated, | ||
and has been replaced with `verify_domain_entity_control`. | ||
|
||
Since release `2025.1` (via core PR [#133062](https://github.com/home-assistant/core/pull/133062)), | ||
frenck marked this conversation as resolved.
Show resolved
Hide resolved
|
||
a reference to `HomeAssistant` is available as a property of the `ServiceCall` object, | ||
and it became redundant to pass the `hass` object to `verify_domain_control`. | ||
|
||
To update your integration: | ||
1. Replace the decorator (as shown in the first example below). | ||
2. Move the nested functions to be module-level (Optional - as shown in the second example below). | ||
3. Test the changes. | ||
|
||
The old `verify_domain_control` decorator will be removed in Home Assistant 2026.7. | ||
|
||
|
||
### Examples | ||
|
||
The minimum change is to adjust the decorator | ||
|
||
```python | ||
# Old | ||
# def register_services(hass: HomeAssistant) -> None: | ||
# @verify_domain_control(hass, DOMAIN) | ||
# async def do_action(call: ServiceCall) -> None: | ||
# entries = hass.config_entries.async_entries(DOMAIN) | ||
# ... | ||
# hass.services.async_register(...) | ||
|
||
# New | ||
def register_services(hass: HomeAssistant) -> None: | ||
@verify_domain_entity_control(DOMAIN) | ||
async def do_action(call: ServiceCall) -> None: | ||
entries = hass.config_entries.async_entries(DOMAIN) | ||
... | ||
|
||
hass.services.async_register(...) | ||
``` | ||
|
||
Move the service functions to module-level functions to reduce code complexity. | ||
|
||
```python | ||
# Old | ||
# def register_services(hass: HomeAssistant) -> None: | ||
# @verify_domain_control(hass, DOMAIN) | ||
# async def do_action(call: ServiceCall) -> None: | ||
# entries = hass.config_entries.async_entries(DOMAIN) | ||
# ... | ||
# hass.services.async_register(...) | ||
|
||
# New | ||
@verify_domain_entity_control(DOMAIN) | ||
async def do_action(call: ServiceCall) -> None: | ||
entries = call.hass.config_entries.async_entries(DOMAIN) | ||
... | ||
|
||
def register_services(hass: HomeAssistant) -> None: | ||
hass.services.async_register(...) | ||
``` |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.