evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add more information to discovery API (#35624)

Browse source
This commit is contained in:
Franck Nijhof 2020-05-15 13:29:55 +02:00 • committed by GitHub
parent e74e0d1710
commit ddb5ed9dc8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

43
homeassistant/components/api/__init__.py
View file

@ -35,14 +35,18 @@ import homeassistant.core as ha
from homeassistant.exceptions import ServiceNotFound, TemplateError, Unauthorized from homeassistant.exceptions import ServiceNotFound, TemplateError, Unauthorized
from homeassistant.helpers import template from homeassistant.helpers import template
from homeassistant.helpers.json import JSONEncoder from homeassistant.helpers.json import JSONEncoder
from homeassistant.helpers.network import NoURLAvailableError, get_url
from homeassistant.helpers.service import async_get_all_descriptions from homeassistant.helpers.service import async_get_all_descriptions
from homeassistant.helpers.state import AsyncTrackStates from homeassistant.helpers.state import AsyncTrackStates
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
ATTR_BASE_URL = "base_url" ATTR_BASE_URL = "base_url"
ATTR_EXTERNAL_URL = "external_url"
ATTR_INTERNAL_URL = "internal_url"
ATTR_LOCATION_NAME = "location_name" ATTR_LOCATION_NAME = "location_name"
ATTR_REQUIRES_API_PASSWORD = "requires_api_password" ATTR_REQUIRES_API_PASSWORD = "requires_api_password"
ATTR_UUID = "uuid"
ATTR_VERSION = "version" ATTR_VERSION = "version"
DOMAIN = "api" DOMAIN = "api"
@ -173,19 +177,36 @@ class APIDiscoveryView(HomeAssistantView):
url = URL_API_DISCOVERY_INFO url = URL_API_DISCOVERY_INFO
name = "api:discovery" name = "api:discovery"
@ha.callback async def get(self, request):
def get(self, request):
"""Get discovery information.""" """Get discovery information."""
hass = request.app["hass"] hass = request.app["hass"]
return self.json( uuid = await hass.helpers.instance_id.async_get()
{
ATTR_BASE_URL: hass.config.api.base_url, data = {
ATTR_LOCATION_NAME: hass.config.location_name, ATTR_UUID: uuid,
# always needs authentication ATTR_BASE_URL: None,
ATTR_REQUIRES_API_PASSWORD: True, ATTR_EXTERNAL_URL: None,
ATTR_VERSION: __version__, ATTR_INTERNAL_URL: None,
} ATTR_LOCATION_NAME: hass.config.location_name,
) # always needs authentication
ATTR_REQUIRES_API_PASSWORD: True,
ATTR_VERSION: __version__,
}
try:
data["external_url"] = get_url(hass, allow_internal=False)
except NoURLAvailableError:
pass
try:
data["internal_url"] = get_url(hass, allow_external=False)
except NoURLAvailableError:
pass
# Set old base URL based on external or internal
data["base_url"] = data["external_url"] or data["internal_url"]
return self.json(data)
class APIStatesView(HomeAssistantView): class APIStatesView(HomeAssistantView):