jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-23 05:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable the use of non-encrypted token in Nuki (#104007)

Browse Source
This commit is contained in:
Pascal Reeb 2023-11-27 17:28:13 +01:00 committed by GitHub
parent 664aca2c68
commit 239d7c9d80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
homeassistant/components/nuki/__init__.py
View File

@ -39,7 +39,7 @@ from homeassistant.helpers.update_coordinator import (
UpdateFailed, UpdateFailed,
) )
from .const import DEFAULT_TIMEOUT, DOMAIN, ERROR_STATES from .const import CONF_ENCRYPT_TOKEN, DEFAULT_TIMEOUT, DOMAIN, ERROR_STATES
from .helpers import NukiWebhookException, parse_id from .helpers import NukiWebhookException, parse_id
_NukiDeviceT = TypeVar("_NukiDeviceT", bound=NukiDevice) _NukiDeviceT = TypeVar("_NukiDeviceT", bound=NukiDevice)
@ -188,7 +188,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
entry.data[CONF_HOST], entry.data[CONF_HOST],
entry.data[CONF_TOKEN], entry.data[CONF_TOKEN],
entry.data[CONF_PORT], entry.data[CONF_PORT],
True, entry.data.get(CONF_ENCRYPT_TOKEN, True),
DEFAULT_TIMEOUT, DEFAULT_TIMEOUT,
) )

24
homeassistant/components/nuki/config_flow.py
View File

@ -13,7 +13,7 @@ from homeassistant.components import dhcp
from homeassistant.const import CONF_HOST, CONF_PORT, CONF_TOKEN from homeassistant.const import CONF_HOST, CONF_PORT, CONF_TOKEN
from homeassistant.data_entry_flow import FlowResult from homeassistant.data_entry_flow import FlowResult
from .const import DEFAULT_PORT, DEFAULT_TIMEOUT, DOMAIN from .const import CONF_ENCRYPT_TOKEN, DEFAULT_PORT, DEFAULT_TIMEOUT, DOMAIN
from .helpers import CannotConnect, InvalidAuth, parse_id from .helpers import CannotConnect, InvalidAuth, parse_id
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -26,7 +26,12 @@ USER_SCHEMA = vol.Schema(
} }
) )
REAUTH_SCHEMA = vol.Schema({vol.Required(CONF_TOKEN): str}) REAUTH_SCHEMA = vol.Schema(
{
vol.Required(CONF_TOKEN): str,
vol.Optional(CONF_ENCRYPT_TOKEN, default=True): bool,
}
)
async def validate_input(hass, data): async def validate_input(hass, data):
@ -41,7 +46,7 @@ async def validate_input(hass, data):
data[CONF_HOST], data[CONF_HOST],
data[CONF_TOKEN], data[CONF_TOKEN],
data[CONF_PORT], data[CONF_PORT],
True, data.get(CONF_ENCRYPT_TOKEN, True),
DEFAULT_TIMEOUT, DEFAULT_TIMEOUT,
) )
@ -100,6 +105,7 @@ class NukiConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
CONF_HOST: self._data[CONF_HOST], CONF_HOST: self._data[CONF_HOST],
CONF_PORT: self._data[CONF_PORT], CONF_PORT: self._data[CONF_PORT],
CONF_TOKEN: user_input[CONF_TOKEN], CONF_TOKEN: user_input[CONF_TOKEN],
CONF_ENCRYPT_TOKEN: user_input[CONF_ENCRYPT_TOKEN],
} }
try: try:
@ -131,8 +137,15 @@ class NukiConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
async def async_step_validate(self, user_input=None): async def async_step_validate(self, user_input=None):
"""Handle init step of a flow.""" """Handle init step of a flow."""
data_schema = self.discovery_schema or USER_SCHEMA
errors = {} errors = {}
if user_input is not None: if user_input is not None:
data_schema = USER_SCHEMA.extend(
{
vol.Optional(CONF_ENCRYPT_TOKEN, default=True): bool,
}
)
try: try:
info = await validate_input(self.hass, user_input) info = await validate_input(self.hass, user_input)
except CannotConnect: except CannotConnect:
@ -149,7 +162,8 @@ class NukiConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
self._abort_if_unique_id_configured() self._abort_if_unique_id_configured()
return self.async_create_entry(title=bridge_id, data=user_input) return self.async_create_entry(title=bridge_id, data=user_input)
data_schema = self.discovery_schema or USER_SCHEMA
return self.async_show_form( return self.async_show_form(
step_id="user", data_schema=data_schema, errors=errors step_id="user",
data_schema=self.add_suggested_values_to_schema(data_schema, user_input),
errors=errors,
) )

3
homeassistant/components/nuki/const.py
View File

@ -12,3 +12,6 @@ DEFAULT_PORT = 8080
DEFAULT_TIMEOUT = 20 DEFAULT_TIMEOUT = 20
ERROR_STATES = (0, 254, 255) ERROR_STATES = (0, 254, 255)
# Encrypt token, instead of using a plaintext token
CONF_ENCRYPT_TOKEN = "encrypt_token"

6
homeassistant/components/nuki/strings.json
View File

@ -5,14 +5,16 @@
"data": { "data": {
"host": "[%key:common::config_flow::data::host%]", "host": "[%key:common::config_flow::data::host%]",
"port": "[%key:common::config_flow::data::port%]", "port": "[%key:common::config_flow::data::port%]",
"token": "[%key:common::config_flow::data::access_token%]" "token": "[%key:common::config_flow::data::access_token%]",
"encrypt_token": "Use an encrypted token for authentication."
} }
}, },
"reauth_confirm": { "reauth_confirm": {
"title": "[%key:common::config_flow::title::reauth%]", "title": "[%key:common::config_flow::title::reauth%]",
"description": "The Nuki integration needs to re-authenticate with your bridge.", "description": "The Nuki integration needs to re-authenticate with your bridge.",
"data": { "data": {
"token": "[%key:common::config_flow::data::access_token%]" "token": "[%key:common::config_flow::data::access_token%]",
"encrypt_token": "[%key:component::nuki::config::step::user::data::encrypt_token%]"
} }
} }
}, },