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

Add ombi password authentication option (#28742)

Browse Source 
* Add password authentication option

* Add vol.Exclusive for auth config params
This commit is contained in:
Tommy Larsson 2019-11-16 10:23:05 +01:00 committed by Fabian Affolter
parent d88ca0f5cb
commit 8a28d5fbee
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
homeassistant/components/ombi/__init__.py
View File

@ -7,6 +7,7 @@ import voluptuous as vol
from homeassistant.const import ( from homeassistant.const import (
CONF_API_KEY, CONF_API_KEY,
CONF_HOST, CONF_HOST,
CONF_PASSWORD,
CONF_PORT, CONF_PORT,
CONF_SSL, CONF_SSL,
CONF_USERNAME, CONF_USERNAME,
@ -57,13 +58,15 @@ CONFIG_SCHEMA = vol.Schema(
{ {
DOMAIN: vol.Schema( DOMAIN: vol.Schema(
{ {
vol.Required(CONF_API_KEY): cv.string,
vol.Required(CONF_HOST): cv.string, vol.Required(CONF_HOST): cv.string,
vol.Required(CONF_USERNAME): cv.string, vol.Required(CONF_USERNAME): cv.string,
vol.Exclusive(CONF_API_KEY, "auth"): cv.string,
vol.Exclusive(CONF_PASSWORD, "auth"): cv.string,
vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port, vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
vol.Optional(CONF_URLBASE, default=DEFAULT_URLBASE): urlbase, vol.Optional(CONF_URLBASE, default=DEFAULT_URLBASE): urlbase,
vol.Optional(CONF_SSL, default=DEFAULT_SSL): cv.boolean, vol.Optional(CONF_SSL, default=DEFAULT_SSL): cv.boolean,
} },
cv.has_at_least_one_key("auth"),
) )
}, },
extra=vol.ALLOW_EXTRA, extra=vol.ALLOW_EXTRA,
@ -77,12 +80,14 @@ def setup(hass, config):
ssl=config[DOMAIN][CONF_SSL], ssl=config[DOMAIN][CONF_SSL],
host=config[DOMAIN][CONF_HOST], host=config[DOMAIN][CONF_HOST],
port=config[DOMAIN][CONF_PORT], port=config[DOMAIN][CONF_PORT],
api_key=config[DOMAIN][CONF_API_KEY],
username=config[DOMAIN][CONF_USERNAME],
urlbase=config[DOMAIN][CONF_URLBASE], urlbase=config[DOMAIN][CONF_URLBASE],
username=config[DOMAIN][CONF_USERNAME],
password=config[DOMAIN].get(CONF_PASSWORD),
api_key=config[DOMAIN].get(CONF_API_KEY),
) )
try: try:
ombi.authenticate()
ombi.test_connection() ombi.test_connection()
except pyombi.OmbiError as err: except pyombi.OmbiError as err:
_LOGGER.warning("Unable to setup Ombi: %s", err) _LOGGER.warning("Unable to setup Ombi: %s", err)

2
homeassistant/components/ombi/manifest.json
View File

@ -4,5 +4,5 @@
"documentation": "https://www.home-assistant.io/integrations/ombi/", "documentation": "https://www.home-assistant.io/integrations/ombi/",
"dependencies": [], "dependencies": [],
"codeowners": ["@larssont"], "codeowners": ["@larssont"],
"requirements": ["pyombi==0.1.5"] "requirements": ["pyombi==0.1.10"]
} }

2
requirements_all.txt
View File

@ -1379,7 +1379,7 @@ pynzbgetapi==0.2.0
pyobihai==1.2.0 pyobihai==1.2.0
# homeassistant.components.ombi # homeassistant.components.ombi
pyombi==0.1.5 pyombi==0.1.10
# homeassistant.components.openuv # homeassistant.components.openuv
pyopenuv==1.0.9 pyopenuv==1.0.9