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

Validate test mode schema as well

Browse Source
This commit is contained in:
Rohan Kapoor 2019-01-13 12:12:04 -08:00
parent 0f92d061c4
commit b75356d532
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
homeassistant/components/locative/__init__.py
View File

@ -7,6 +7,7 @@ https://home-assistant.io/components/locative/
import logging import logging
import voluptuous as vol import voluptuous as vol
from typing import Dict
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
from homeassistant.components.device_tracker import \ from homeassistant.components.device_tracker import \
@ -28,13 +29,30 @@ TRACKER_UPDATE = '{}_tracker_update'.format(DOMAIN)
ATTR_DEVICE_ID = 'device' ATTR_DEVICE_ID = 'device'
ATTR_TRIGGER = 'trigger' ATTR_TRIGGER = 'trigger'
WEBHOOK_SCHEMA = vol.Schema({
vol.Required(ATTR_LATITUDE): cv.latitude, def _id(value: str) -> str:
vol.Required(ATTR_LONGITUDE): cv.longitude, """Coerce id by removing '-'."""
vol.Required(ATTR_DEVICE_ID): cv.string, return value.replace('-', '')
vol.Required(ATTR_TRIGGER): cv.string,
vol.Optional(ATTR_ID): cv.string,
}, extra=vol.ALLOW_EXTRA) def _validate_test_mode(obj: Dict) -> Dict:
"""Validate that id is provided outside of test mode."""
if ATTR_ID not in obj and obj[ATTR_TRIGGER] != 'test':
raise vol.Invalid('Location id not specified')
return obj
WEBHOOK_SCHEMA = vol.All(
dict,
vol.Schema({
vol.Required(ATTR_LATITUDE): cv.latitude,
vol.Required(ATTR_LONGITUDE): cv.longitude,
vol.Required(ATTR_DEVICE_ID): cv.string,
vol.Required(ATTR_TRIGGER): cv.string,
vol.Optional(ATTR_ID): vol.All(cv.string, _id)
}, extra=vol.ALLOW_EXTRA),
_validate_test_mode
)
async def async_setup(hass, hass_config): async def async_setup(hass, hass_config):
@ -52,12 +70,7 @@ async def handle_webhook(hass, webhook_id, request):
except vol.MultipleInvalid as e: except vol.MultipleInvalid as e:
return e.error_message, HTTP_UNPROCESSABLE_ENTITY return e.error_message, HTTP_UNPROCESSABLE_ENTITY
if ATTR_ID not in data and data[ATTR_TRIGGER] != 'test': device = data[ATTR_DEVICE_ID]
_LOGGER.error('Location id not specified.')
return ('Location id not specified.',
HTTP_UNPROCESSABLE_ENTITY)
device = data[ATTR_DEVICE_ID].replace('-', '')
location_name = data.get(ATTR_ID, data[ATTR_TRIGGER]).lower() location_name = data.get(ATTR_ID, data[ATTR_TRIGGER]).lower()
direction = data[ATTR_TRIGGER] direction = data[ATTR_TRIGGER]
gps_location = (data[ATTR_LATITUDE], data[ATTR_LONGITUDE]) gps_location = (data[ATTR_LATITUDE], data[ATTR_LONGITUDE])