Added reauth flow, much better error handling on setup

### Feature * Now supports reauthentication if credentials have expired/no longer work * Better error handling when configuring integration, will notify user of incorrect credentials ### Fix * Removed Owlet specific constants, now using homeassistant generic constants * On initialisation the integration would crash when trying to update the auth token, the integration would then have to be deleted and setup again
2023-05-12 16:58:50 +01:00
26 changed files with 208 additions and 4418 deletions
--- a/.github/workflows/cron.yml
+++ b/.github/workflows/cron.yml
@@ -1,25 +0,0 @@
-name: Validate with hassfest
-
-on:
-  push:
-  pull_request:
-  schedule:
-    - cron:  '0 0 * * *'
-
-jobs:
-  hassfest:
-    name: "Hassfest validation"
-    runs-on: "ubuntu-latest"
-    steps:
-        - uses: "actions/checkout@v3"
-        - uses: "home-assistant/actions/hassfest@master"
-  hacs:
-    name: "HACS Action"
-    runs-on: "ubuntu-latest"
-    steps:
-      - name: "HACS Action"
-        uses: "hacs/action@main"
-        with:
-            category: "integration"
-        
-        
--- a/.gitignore
+++ b/.gitignore
@@ -151,5 +151,4 @@ cython_debug/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/

-/custom_components/owlet.zip
-custom_components/owlet/owlet.zip
+/custom_components/owlet.zip
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,52 +1,6 @@
 # Changelog

 <!--next-version-placeholder-->
-## 2023.7.2 (2023-07-04)
-### Fix
-* Bumping pyowletapi version to 2023.7.2 ([`c45959b`](https://github.com/ryanbdclark/owlet/commit/c45959b123a6e5f77747475f11d3d3ab67859756))
-
-## 2023.7.1 (2023-07-03)
-### Fix
-*  Bumping pyowletapi to 2023.7.1 ([`c693fef`](https://github.com/ryanbdclark/owlet/commit/c693fefbf3dba8f35802b87d064401dadbb211b5))
-  
-## 2023.05.7 (2023-05-30)
-### Fix
-* Fixed issue with binary sensors not loading, caused by change to way the coordinators are stored ([`8d17317`](https://github.com/ryanbdclark/owlet/commit/8d173174e286b0451cbb2c0d4ae3087028d1ea23))
-
-## 2023.05.6 (2023-05-30)
-### Fix
-* In light of submitting this as a pull request to the core of HA there have been some refactoring changes to comply with HA's style requirements
-* Sensor names now moved to strings file to allow for translations
-* Coordinator now properly handles multiple devices
-* Spelling of signal strength sensor corrected
-
-### Feature
-* Tests added
-
-## 2023.05.5 (2023-05-19)
-#### Fix
-* Owlet refresh token becomes invalid after 24 hours. Meant that after 1 day the integration would stop working. Moved to pyowletapi v2023.5.28 which uses different refresh token, should no longer need reconfiguring after 24 hours ([`dc58b19`](https://github.com/ryanbdclark/owlet/commit/0141f7d01a9ac9b3e1dcc74cabb896e19bd4a821))
-
-## 2023.05.4 (2023-05-17)
-#### Fix
-* Bumping to pyowletapi 2023.5.25
-
-## 2023.05.3 (2023-05-17)
-#### Fix
-* Bumping to pyowletapi 2023.5.24
-* Reauthing now no longer re adds users' password to config entry
-
-## 2023.05.2 (2023-05-16)
-#### Feature
-* Integration now makes use of refresh token from pyowletapi to reauthenticate, user password in no longer stored by integration ([`dc710a1`](https://github.com/ryanbdclark/owlet/commit/dc710a1783a4cad9d6cf355240fe12ac779a87ef))
-* New sensors create for baby sleep state ([`9b3392b`](https://github.com/ryanbdclark/owlet/commit/9b3392bdbcd82015ed31d3a50a517e4e22905684))
- 
-## 2023.05.1 (2023-05-15)
-#### Feature
-* Changed versioning to date based
-### Fix
-* Bumping to pyowletapi 2023.5.21 to fix issue with unawaited authentication call, should resolve issue with refreshing authentication ([`228d54b`](https://github.com/ryanbdclark/owlet/commit/228d54b6414e0b9171064254246d1f36c3af8f5b))
-

 ## v1.5.0 (2023-05-12)
 ### Feature
@@ -55,4 +9,4 @@

 ### Fix
 * Removed Owlet specific constants, now using homeassistant generic constants
-* On initialisation the integration would crash when trying to update the auth token, the integration would then have to be deleted and setup again
+* On initialisation the integration would crash when trying to update the auth token, the integration would then have to be deleted and setup again
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 # Owlet Custom Integration

 [![GitHub Release][releases-shield]][releases]
+![GitHub all releases][download-all]
+![GitHub release (latest by RyanClark123)][download-latest]
 [![GitHub Activity][commits-shield]][commits]

 [![License][license-shield]][license]
@@ -14,7 +16,7 @@ If you have a smart sock 2 and would like to contribute then please do so.

 ## Installation

-1. Use [HACS](https://hacs.xyz/docs/setup/download), in `HACS > Integrations > Explore & Add Repositories` search for "Owlet". After adding this `https://github.com/ryanbdclark/owlet` as a custom repository.
+1. Use [HACS](https://hacs.xyz/docs/setup/download), in `HACS > Integrations > Explore & Add Repositories` search for "Owlet". After adding this `https://github.com/RyanClark123/owlet` as a custom repository.
 2. Restart Home Assistant.
 3. [![Add Integration][add-integration-badge]][add-integration] or in the HA UI go to "Settings" -> "Devices & Services" then click "+" and search for "Owlet Smart Sock".

@@ -32,19 +34,21 @@ This integration provides the following entities:

 ## Options

- Seconds between polling - Number of seconds between each call for data from the owlet cloud service, default is 5 seconds.
+- Seconds between polling - Number of seconds between each call for data from the owlet cloud service, default is 10 seconds.

 ---

-[commits-shield]: https://img.shields.io/github/commit-activity/w/ryanbdclark/owlet?style=for-the-badge
-[commits]: https://github.com/ryanbdclark/owlet/commits/main
+[commits-shield]: https://img.shields.io/github/commit-activity/w/RyanClark123/owlet?style=for-the-badge
+[commits]: https://github.com/RyanClark123/owlet/commits/main
 [hacs]: https://github.com/hacs/integration
 [hacsbadge]: https://img.shields.io/badge/HACS-Custom-orange.svg?style=for-the-badge
 [license]: LICENSE
-[license-shield]: https://img.shields.io/github/license/ryanbdclark/owlet.svg?style=for-the-badge
-[maintenance-shield]: https://img.shields.io/badge/maintainer-Ryan%20Clark%20%40ryanbdclark-blue.svg?style=for-the-badge
-[releases-shield]: https://img.shields.io/github/release/ryanbdclark/owlet.svg?style=for-the-badge
-[releases]: https://github.com/ryanbdclark/owlet/releases
-[user_profile]: https://github.com/ryanbdclark
+[license-shield]: https://img.shields.io/github/license/RyanClark123/owlet.svg?style=for-the-badge
+[maintenance-shield]: https://img.shields.io/badge/maintainer-Ryan%20Clark%20%40RyanClark123-blue.svg?style=for-the-badge
+[releases-shield]: https://img.shields.io/github/release/RyanClark123/owlet.svg?style=for-the-badge
+[releases]: https://github.com/RyanClark123/owlet/releases
+[user_profile]: https://github.com/RyanClark123
+[download-all]: https://img.shields.io/github/downloads/RyanClark123/Owlet/total?style=for-the-badge
+[download-latest]: https://img.shields.io/github/downloads/RyanClark123/Owlet/latest/total?style=for-the-badge
 [add-integration]: https://my.home-assistant.io/redirect/config_flow_start?domain=owlet
 [add-integration-badge]: https://my.home-assistant.io/badges/config_flow_start.svg
--- a/custom_components/owlet/init.py
+++ b/custom_components/owlet/init.py
@@ -1,32 +1,28 @@
 """The Owlet Smart Sock integration."""
 from __future__ import annotations

-import asyncio
 import logging

 from pyowletapi.api import OwletAPI
-from pyowletapi.exceptions import (
-    OwletAuthenticationError,
-    OwletConnectionError,
-    OwletDevicesError,
-    OwletEmailError,
-    OwletPasswordError,
-)
 from pyowletapi.sock import Sock
+from pyowletapi.exceptions import OwletConnectionError

-from homeassistant.config_entries import ConfigEntry
+from homeassistant.config_entries import ConfigEntry, ConfigEntryAuthFailed
 from homeassistant.const import (
-    CONF_API_TOKEN,
-    CONF_REGION,
-    CONF_SCAN_INTERVAL,
-    CONF_USERNAME,
    Platform,
+    CONF_REGION,
+    CONF_USERNAME,
+    CONF_PASSWORD,
+    CONF_SCAN_INTERVAL,
+    CONF_API_TOKEN,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-
-from .const import CONF_OWLET_EXPIRY, CONF_OWLET_REFRESH, DOMAIN, SUPPORTED_VERSIONS
+from .const import (
+    DOMAIN,
+    CONF_OWLET_EXPIRY,
+    SUPPORTED_VERSIONS,
+)
 from .coordinator import OwletCoordinator

 PLATFORMS: list[Platform] = [Platform.BINARY_SENSOR, Platform.SENSOR]
@@ -39,58 +35,39 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
    hass.data.setdefault(DOMAIN, {})

    owlet_api = OwletAPI(
-        region=entry.data[CONF_REGION],
-        token=entry.data[CONF_API_TOKEN],
-        expiry=entry.data[CONF_OWLET_EXPIRY],
-        refresh=entry.data[CONF_OWLET_REFRESH],
-        session=async_get_clientsession(hass),
+        entry.data[CONF_REGION],
+        entry.data[CONF_USERNAME],
+        entry.data[CONF_PASSWORD],
+        entry.data[CONF_API_TOKEN],
+        entry.data[CONF_OWLET_EXPIRY],
+        async_get_clientsession(hass),
    )

    try:
-        if token := await owlet_api.authenticate():
+        token = await owlet_api.authenticate()
+
+        if token:
            hass.config_entries.async_update_entry(entry, data={**entry.data, **token})

-        devices = await owlet_api.get_devices(SUPPORTED_VERSIONS)
+        socks = {
+            device["device"]["dsn"]: Sock(owlet_api, device["device"])
+            for device in await owlet_api.get_devices(SUPPORTED_VERSIONS)
+        }

-    except (OwletAuthenticationError, OwletEmailError, OwletPasswordError) as err:
+    except OwletConnectionError as err:
        _LOGGER.error("Credentials no longer valid, please setup owlet again")
        raise ConfigEntryAuthFailed(
            f"Credentials expired for {entry.data[CONF_USERNAME]}"
        ) from err

-    except OwletConnectionError as err:
-        raise ConfigEntryNotReady(
-            f"Error connecting to {entry.data[CONF_USERNAME]}"
-        ) from err
+    coordinators = [
+        OwletCoordinator(hass, sock, entry.options.get(CONF_SCAN_INTERVAL))
+        for sock in socks.values()
+    ]

-    except OwletDevicesError:
-        _LOGGER.error("No owlet devices found to set up")
-        return False
-
-    if devices["tokens"]:
-        hass.config_entries.async_update_entry(
-            entry, data={**entry.data, **devices["tokens"]}
-        )
-
-    socks = {
-        device["device"]["dsn"]: Sock(owlet_api, device["device"])
-        for device in devices["response"]
-    }
-
-    scan_interval = entry.options.get(CONF_SCAN_INTERVAL)
-    coordinators = {
-        serial: OwletCoordinator(hass, sock, scan_interval)
-        for (serial, sock) in socks.items()
-    }
-
-    await asyncio.gather(
-        *(
-            coordinator.async_config_entry_first_refresh()
-            for coordinator in list(coordinators.values())
-        )
-    )
-
-    hass.data[DOMAIN][entry.entry_id] = coordinators
+    for coordinator in coordinators:
+        await coordinator.async_config_entry_first_refresh()
+        hass.data[DOMAIN][entry.entry_id] = coordinator

    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)

--- a/custom_components/owlet/binary_sensor.py
+++ b/custom_components/owlet/binary_sensor.py
@@ -34,64 +34,58 @@ class OwletBinarySensorEntityDescription(
 SENSORS: tuple[OwletBinarySensorEntityDescription, ...] = (
    OwletBinarySensorEntityDescription(
        key="charging",
-        translation_key="charging",
+        name="Charging",
        device_class=BinarySensorDeviceClass.BATTERY_CHARGING,
        element="charging",
    ),
    OwletBinarySensorEntityDescription(
        key="highhr",
-        translation_key="high_hr_alrt",
+        name="High heart rate alert",
        device_class=BinarySensorDeviceClass.SOUND,
        element="high_heart_rate_alert",
    ),
    OwletBinarySensorEntityDescription(
        key="lowhr",
-        translation_key="low_hr_alrt",
+        name="Low Heart Rate Alert",
        device_class=BinarySensorDeviceClass.SOUND,
        element="low_heart_rate_alert",
    ),
    OwletBinarySensorEntityDescription(
        key="higho2",
-        translation_key="high_ox_alrt",
+        name="High oxygen alert",
        device_class=BinarySensorDeviceClass.SOUND,
        element="high_oxygen_alert",
    ),
    OwletBinarySensorEntityDescription(
        key="lowo2",
-        translation_key="low_ox_alrt",
+        name="Low oxygen alert",
        device_class=BinarySensorDeviceClass.SOUND,
        element="low_oxygen_alert",
    ),
    OwletBinarySensorEntityDescription(
        key="lowbattery",
-        translation_key="low_batt_alrt",
+        name="Low Battery alert",
        device_class=BinarySensorDeviceClass.SOUND,
        element="low_battery_alert",
    ),
    OwletBinarySensorEntityDescription(
        key="lostpower",
-        translation_key="lost_pwr_alrt",
+        name="Lost power alert",
        device_class=BinarySensorDeviceClass.SOUND,
        element="lost_power_alert",
    ),
    OwletBinarySensorEntityDescription(
        key="sockdisconnected",
-        translation_key="sock_discon_alrt",
+        name="Sock disconnected alert",
        device_class=BinarySensorDeviceClass.SOUND,
        element="sock_disconnected",
    ),
    OwletBinarySensorEntityDescription(
        key="sock_off",
-        translation_key="sock_off",
+        name="Sock off",
        device_class=BinarySensorDeviceClass.POWER,
        element="sock_off",
    ),
-    OwletBinarySensorEntityDescription(
-        key="awake",
-        translation_key="awake",
-        element="sleep_state",
-        icon="mdi:sleep",
-    ),
 )


@@ -102,13 +96,11 @@ async def async_setup_entry(
 ) -> None:
    """Set up the owlet sensors from config entry."""

-    coordinators: OwletCoordinator = hass.data[DOMAIN][config_entry.entry_id].values()
+    coordinator: OwletCoordinator = hass.data[DOMAIN][config_entry.entry_id]

-    async_add_entities(
-        OwletBinarySensor(coordinator, sensor)
-        for coordinator in coordinators
-        for sensor in SENSORS
-    )
+    entities = [OwletBinarySensor(coordinator, sensor) for sensor in SENSORS]
+
+    async_add_entities(entities)


 class OwletBinarySensor(OwletBaseEntity, BinarySensorEntity):
@@ -122,19 +114,9 @@ class OwletBinarySensor(OwletBaseEntity, BinarySensorEntity):
        """Initialize the binary sensor."""
        super().__init__(coordinator)
        self.entity_description = sensor_description
-        self._attr_unique_id = f"{self.sock.serial}-{self.entity_description.translation_key}"
+        self._attr_unique_id = f"{self.sock.serial}-{self.entity_description.name}"

    @property
    def is_on(self) -> bool:
        """Return true if the binary sensor is on."""
-        state = self.sock.properties[self.entity_description.element]
-
-        if self.entity_description.element == "sleep_state":
-            if self.sock.properties["charging"]:
-                return None
-            if state in [8, 15]:
-                state = False
-            else:
-                state = True
-
-        return state
+        return self.sock.properties[self.entity_description.element]
--- a/custom_components/owlet/config_flow.py
+++ b/custom_components/owlet/config_flow.py
@@ -1,34 +1,38 @@
 """Config flow for Owlet Smart Sock integration."""
 from __future__ import annotations

-from collections.abc import Mapping
 import logging
 from typing import Any

 from pyowletapi.api import OwletAPI
+from pyowletapi.sock import Sock
 from pyowletapi.exceptions import (
-    OwletCredentialsError,
    OwletDevicesError,
    OwletEmailError,
    OwletPasswordError,
 )
-from pyowletapi.sock import Sock
+
 import voluptuous as vol

 from homeassistant import config_entries, exceptions
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import (
-    CONF_API_TOKEN,
-    CONF_PASSWORD,
-    CONF_REGION,
-    CONF_SCAN_INTERVAL,
-    CONF_USERNAME,
-)
-from homeassistant.core import callback
 from homeassistant.data_entry_flow import FlowResult
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.core import callback
+from homeassistant.const import (
+    CONF_REGION,
+    CONF_USERNAME,
+    CONF_PASSWORD,
+    CONF_SCAN_INTERVAL,
+    CONF_API_TOKEN,
+)

-from .const import CONF_OWLET_EXPIRY, CONF_OWLET_REFRESH, DOMAIN, POLLING_INTERVAL
+from .const import (
+    DOMAIN,
+    CONF_OWLET_EXPIRY,
+    POLLING_INTERVAL,
+    SUPPORTED_VERSIONS,
+)

 _LOGGER = logging.getLogger(__name__)

@@ -47,7 +51,6 @@ class OwletConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
    VERSION = 1

    def __init__(self) -> None:
-        """Initialise config flow."""
        self._entry: ConfigEntry
        self._region: str
        self._username: str
@@ -66,9 +69,9 @@ class OwletConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
            self._password = user_input[CONF_PASSWORD]

            owlet_api = OwletAPI(
-                region=self._region,
-                user=self._username,
-                password=self._password,
+                self._region,
+                self._username,
+                self._password,
                session=async_get_clientsession(self.hass),
            )

@@ -77,31 +80,29 @@ class OwletConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):

            try:
                token = await owlet_api.authenticate()
-                await owlet_api.validate_authentication()
+                try:
+                    await owlet_api.get_devices(SUPPORTED_VERSIONS)
+                    return self.async_create_entry(
+                        title=self._username,
+                        data={
+                            CONF_REGION: self._region,
+                            CONF_USERNAME: self._username,
+                            CONF_PASSWORD: self._password,
+                            CONF_API_TOKEN: token[CONF_API_TOKEN],
+                            CONF_OWLET_EXPIRY: token[CONF_OWLET_EXPIRY],
+                        },
+                        options={CONF_SCAN_INTERVAL: POLLING_INTERVAL},
+                    )
+                except OwletDevicesError:
+                    errors["base"] = "no_devices"

-            except OwletDevicesError:
-                errors["base"] = "no_devices"
            except OwletEmailError:
                errors["base"] = "invalid_email"
            except OwletPasswordError:
                errors["base"] = "invalid_password"
-            except OwletCredentialsError:
-                errors["base"] = "invalid_credentials"
            except Exception:  # pylint: disable=broad-except
                _LOGGER.exception("Unexpected exception")
                errors["base"] = "unknown"
-            else:
-                return self.async_create_entry(
-                    title=self._username,
-                    data={
-                        CONF_REGION: self._region,
-                        CONF_USERNAME: self._username,
-                        CONF_API_TOKEN: token[CONF_API_TOKEN],
-                        CONF_OWLET_EXPIRY: token[CONF_OWLET_EXPIRY],
-                        CONF_OWLET_REFRESH: token[CONF_OWLET_REFRESH],
-                    },
-                    options={CONF_SCAN_INTERVAL: POLLING_INTERVAL},
-                )

        return self.async_show_form(
            step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
@@ -109,21 +110,19 @@ class OwletConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):

    @staticmethod
    @callback
-    def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlowHandler:
+    def async_get_options_flow(config_entry):
        """Get the options flow for this handler."""
        return OptionsFlowHandler(config_entry)

-    async def async_step_reauth(self, user_input: Mapping[str, Any]) -> FlowResult:
-        """Handle reauth."""
+    async def async_step_reauth(self, user_input=None):
+        """Handle reauth"""
        self.reauth_entry = self.hass.config_entries.async_get_entry(
            self.context["entry_id"]
        )
        return await self.async_step_reauth_confirm()

-    async def async_step_reauth_confirm(
-        self, user_input: dict[str, Any] | None = None
-    ) -> FlowResult:
-        """Dialog that informs the user that reauth is required."""
+    async def async_step_reauth_confirm(self, user_input=None):
+        """Dialog that informs the user that reauth is required"""
        assert self.reauth_entry is not None
        errors: dict[str, str] = {}

@@ -138,18 +137,22 @@ class OwletConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
            try:
                token = await owlet_api.authenticate()
                if token:
-                    self.hass.config_entries.async_update_entry(
-                        self.reauth_entry, data={**entry_data, **token}
-                    )
+                    user_input[CONF_API_TOKEN] = token[CONF_API_TOKEN]
+                    user_input[CONF_OWLET_EXPIRY] = token[CONF_OWLET_EXPIRY]
+                self.hass.config_entries.async_update_entry(
+                    self.reauth_entry, data={**entry_data, **user_input}
+                )

                await self.hass.config_entries.async_reload(self.reauth_entry.entry_id)

                return self.async_abort(reason="reauth_successful")

+            except OwletEmailError:
+                errors["base"] = "invalid_email"
            except OwletPasswordError:
                errors["base"] = "invalid_password"
            except Exception:  # pylint: disable=broad-except
-                _LOGGER.exception("Error reauthenticating")
+                _LOGGER.exception("error reauthing")

        return self.async_show_form(
            step_id="reauth_confirm",
@@ -159,16 +162,14 @@ class OwletConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):


 class OptionsFlowHandler(config_entries.OptionsFlow):
-    """Handle a options flow for owlet."""
+    """Handle a options flow for owlet"""

-    def __init__(self, config_entry: ConfigEntry) -> None:
-        """Initialise options flow."""
+    def __init__(self, config_entry: config_entries.ConfigEntry) -> None:
+        """Initialise options flow"""
        self.config_entry = config_entry

-    async def async_step_init(
-        self, user_input: dict[str, Any] | None = None
-    ) -> FlowResult:
-        """Handle options flow."""
+    async def async_step_init(self, user_input=None):
+        """Handle options flow"""
        if user_input is not None:
            return self.async_create_entry(title="", data=user_input)

@@ -185,4 +186,4 @@ class OptionsFlowHandler(config_entries.OptionsFlow):


 class InvalidAuth(exceptions.HomeAssistantError):
-    """Error to indicate there is invalid auth."""
+    """Error to indiciate there is invalud auth"""
--- a/custom_components/owlet/const.py
+++ b/custom_components/owlet/const.py
@@ -3,9 +3,7 @@
 DOMAIN = "owlet"

 CONF_OWLET_EXPIRY = "expiry"
-CONF_OWLET_REFRESH = "refresh"

 SUPPORTED_VERSIONS = [3]
-POLLING_INTERVAL = 5
+POLLING_INTERVAL = 10
 MANUFACTURER = "Owlet Baby Care"
-SLEEP_STATES = {0: "unknown", 1: "awake", 8: "light_sleep", 15: "deep_sleep"}
--- a/custom_components/owlet/coordinator.py
+++ b/custom_components/owlet/coordinator.py
@@ -1,24 +1,20 @@
-"""Owlet integration coordinator class."""
+"""Owlet integration."""
 from __future__ import annotations

 from datetime import timedelta
 import logging

-from pyowletapi.exceptions import (
-    OwletAuthenticationError,
-    OwletConnectionError,
-    OwletError,
-)
 from pyowletapi.sock import Sock
+from pyowletapi.exceptions import OwletError

-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_EMAIL
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed

-from .const import DOMAIN, MANUFACTURER
+from .const import (
+    DOMAIN,
+    MANUFACTURER,
+)

 _LOGGER = logging.getLogger(__name__)

@@ -26,7 +22,7 @@ _LOGGER = logging.getLogger(__name__)
 class OwletCoordinator(DataUpdateCoordinator):
    """Coordinator is responsible for querying the device at a specified route."""

-    def __init__(self, hass: HomeAssistant, sock: Sock, interval) -> None:
+    def __init__(self, hass: HomeAssistant, sock: Sock, interval: int) -> None:
        """Initialise a custom coordinator."""
        super().__init__(
            hass,
@@ -35,29 +31,23 @@ class OwletCoordinator(DataUpdateCoordinator):
            update_interval=timedelta(seconds=interval),
        )
        assert self.config_entry is not None
-        self.config_entry: ConfigEntry
+        self._device_unique_id = sock.serial
+        self._model = sock.model
+        self._sw_version = sock.sw_version
+        self._hw_version = sock.version
        self.sock = sock
        self.device_info = DeviceInfo(
-            identifiers={(DOMAIN, sock.serial)},
+            identifiers={(DOMAIN, self._device_unique_id)},
            name="Owlet Baby Care Sock",
            manufacturer=MANUFACTURER,
-            model=sock.model,
-            sw_version=sock.sw_version,
-            hw_version=sock.version,
+            model=self._model,
+            sw_version=self._sw_version,
+            hw_version=self._hw_version,
        )

    async def _async_update_data(self) -> None:
        """Fetch the data from the device."""
        try:
-            properties = await self.sock.update_properties()
-            if properties["tokens"]:
-                self.hass.config_entries.async_update_entry(
-                    self.config_entry,
-                    data={**self.config_entry.data, **properties["tokens"]},
-                )
-        except OwletAuthenticationError as err:
-            raise ConfigEntryAuthFailed(
-                f"Authentication failed for {self.config_entry.data[CONF_EMAIL]}"
-            ) from err
-        except (OwletError, OwletConnectionError) as err:
+            await self.sock.update_properties()
+        except OwletError as err:
            raise UpdateFailed(err) from err
--- a/custom_components/owlet/manifest.json
+++ b/custom_components/owlet/manifest.json
@@ -1,11 +1,16 @@
 {
  "domain": "owlet",
  "name": "Owlet Smart Sock",
-  "codeowners": ["@ryanbdclark"],
+  "codeowners": [
+    "@RyanClark123"
+  ],
  "config_flow": true,
+  "dependencies": [],
  "documentation": "https://www.home-assistant.io/integrations/owlet",
+  "homekit": {},
  "iot_class": "cloud_polling",
-  "issue_tracker": "https://github.com/ryanbdclark/owlet/issues",
-  "requirements": ["pyowletapi==2023.7.2"],
-  "version":"2023.7.2"
+  "requirements": [
+    "pyowletapi==2023.5.20"
+  ],
+  "version":"1.5.0"
 }
--- a/custom_components/owlet/sensor.py
+++ b/custom_components/owlet/sensor.py
@@ -1,6 +1,5 @@
-"""Support for Owlet sensors."""
+"""Support for Android IP Webcam binary sensors."""
 from __future__ import annotations
-
 from dataclasses import dataclass

 from homeassistant.components.sensor import (
@@ -10,24 +9,23 @@ from homeassistant.components.sensor import (
    SensorStateClass,
 )
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.const import (
    PERCENTAGE,
    SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
-    UnitOfTemperature,
    UnitOfTime,
+    UnitOfTemperature,
 )
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import StateType

-from .const import DOMAIN, SLEEP_STATES
+from .const import DOMAIN
 from .coordinator import OwletCoordinator
 from .entity import OwletBaseEntity


@dataclass
 class OwletSensorEntityDescriptionMixin:
-    """Owlet sensor description mix in."""
+    """Owlet sensor description mix in"""

    element: str

@@ -42,7 +40,7 @@ class OwletSensorEntityDescription(
 SENSORS: tuple[OwletSensorEntityDescription, ...] = (
    OwletSensorEntityDescription(
        key="batterypercentage",
-        translation_key="batterypercent",
+        name="Battery",
        native_unit_of_measurement=PERCENTAGE,
        device_class=SensorDeviceClass.BATTERY,
        state_class=SensorStateClass.MEASUREMENT,
@@ -50,7 +48,7 @@ SENSORS: tuple[OwletSensorEntityDescription, ...] = (
    ),
    OwletSensorEntityDescription(
        key="oxygensaturation",
-        translation_key="o2saturation",
+        name="O2 Saturation",
        native_unit_of_measurement=PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
        element="oxygen_saturation",
@@ -58,7 +56,7 @@ SENSORS: tuple[OwletSensorEntityDescription, ...] = (
    ),
    OwletSensorEntityDescription(
        key="oxygensaturation10a",
-        translation_key="o2saturation10a",
+        name="O2 Saturation 10 Minute Average",
        native_unit_of_measurement=PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
        element="oxygen_10_av",
@@ -66,7 +64,7 @@ SENSORS: tuple[OwletSensorEntityDescription, ...] = (
    ),
    OwletSensorEntityDescription(
        key="heartrate",
-        translation_key="heartrate",
+        name="Heart rate",
        native_unit_of_measurement="bpm",
        state_class=SensorStateClass.MEASUREMENT,
        element="heart_rate",
@@ -74,7 +72,7 @@ SENSORS: tuple[OwletSensorEntityDescription, ...] = (
    ),
    OwletSensorEntityDescription(
        key="batteryminutes",
-        translation_key="batterymin",
+        name="Battery Remaining",
        native_unit_of_measurement=UnitOfTime.MINUTES,
        device_class=SensorDeviceClass.DURATION,
        state_class=SensorStateClass.MEASUREMENT,
@@ -82,7 +80,7 @@ SENSORS: tuple[OwletSensorEntityDescription, ...] = (
    ),
    OwletSensorEntityDescription(
        key="signalstrength",
-        translation_key="signalstrength",
+        name="Singal Strength",
        native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
        device_class=SensorDeviceClass.SIGNAL_STRENGTH,
        state_class=SensorStateClass.MEASUREMENT,
@@ -90,7 +88,7 @@ SENSORS: tuple[OwletSensorEntityDescription, ...] = (
    ),
    OwletSensorEntityDescription(
        key="skintemp",
-        translation_key="skintemp",
+        name="Skin Temperature",
        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
        device_class=SensorDeviceClass.TEMPERATURE,
        state_class=SensorStateClass.MEASUREMENT,
@@ -106,19 +104,11 @@ async def async_setup_entry(
 ) -> None:
    """Set up the owlet sensors from config entry."""

-    coordinators: list[OwletCoordinator] = list(
-        hass.data[DOMAIN][config_entry.entry_id].values()
-    )
+    coordinator: OwletCoordinator = hass.data[DOMAIN][config_entry.entry_id]

-    async_add_entities(
-        OwletSensor(coordinator, sensor)
-        for coordinator in coordinators
-        for sensor in SENSORS
-    )
+    entities = [OwletSensor(coordinator, sensor) for sensor in SENSORS]

-    async_add_entities(
-        OwletSleepStateSensor(coordinator) for coordinator in coordinators
-    )
+    async_add_entities(entities)


 class OwletSensor(OwletBaseEntity, SensorEntity):
@@ -131,14 +121,12 @@ class OwletSensor(OwletBaseEntity, SensorEntity):
    ) -> None:
        """Initialize the sensor."""
        super().__init__(coordinator)
-        self.entity_description: OwletSensorEntityDescription = sensor_description
-        self._attr_unique_id = (
-            f"{self.sock.serial}-{self.entity_description.translation_key}"
-        )
+        self.entity_description = sensor_description
+        self._attr_unique_id = f"{self.sock.serial}-{self.entity_description.name}"

    @property
-    def native_value(self) -> StateType:
-        """Return sensor value."""
+    def native_value(self):
+        """Return sensor value"""

        if (
            self.entity_description.element
@@ -153,34 +141,4 @@ class OwletSensor(OwletBaseEntity, SensorEntity):
        ):
            return None

-        properties = self.sock.properties
-
-        return properties[self.entity_description.element]
-
-
-class OwletSleepStateSensor(OwletBaseEntity, SensorEntity):
-    """Representation of an Owlet sleep state sensor."""
-
-    def __init__(
-        self,
-        coordinator: OwletCoordinator,
-    ) -> None:
-        """Initialize the sensor."""
-        super().__init__(coordinator)
-        self._attr_unique_id = f"{self.sock.serial}-sleepstate"
-        self._attr_icon = "mdi:sleep"
-        self._attr_device_class = SensorDeviceClass.ENUM
-        self._attr_translation_key = "sleepstate"
-
-    @property
-    def native_value(self) -> str:
-        """Return sensor value."""
-        if self.sock.properties["charging"]:
-            return "unknown"
-
-        return SLEEP_STATES[self.sock.properties["sleep_state"]]
-
-    @property
-    def options(self) -> list[str]:
-        """Set options for sleep state."""
-        return list(SLEEP_STATES.values())
+        return self.sock.properties[self.entity_description.element]
--- a/custom_components/owlet/strings.json
+++ b/custom_components/owlet/strings.json
@@ -1,17 +1,17 @@
 {
  "config": {
    "step": {
-      "user": {
+      "user":{
        "title": "Enter login details",
-        "data": {
+        "data":{
          "region": "Region",
          "username": "Email",
          "password": "Password"
        }
      },
-      "reauth_confirm": {
+      "reauth_confirm":{
        "title": "Reauthentiaction required for Owlet",
-        "data": {
+        "data":{
          "password": "Password"
        }
      }
@@ -20,88 +20,20 @@
      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
      "invalid_email": "Entered email address is incorrect",
      "invalid_password": "Entered password is incorrect",
-      "invalid_credentials": "Entered credentials are incorrect",
-      "unknown": "Unknown error occured"
+      "unknown": "[%key:common::config_flow::error::unknown%]"
    },
    "abort": {
-      "already_configured": "Device already configured",
-      "reauth_successful": "Reauthentication successful"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
    }
  },
  "options": {
    "step": {
-      "init": {
-        "title": "Configure options for Owlet",
-        "data": {
+      "init":{
+        "title":"Configure options for Owlet",
+        "data":{
          "pollinterval": "Polling interval in seconds, min 10"
        }
      }
    }
-  },
-  "entity": {
-    "binary_sensor":{
-      "charging": {
-        "name": "Charging"
-      },
-      "high_hr_alrt":{
-        "name": "High Heart Rate Alert"
-      },
-      "low_hr_alrt":{
-        "name":"Low Heart Rate Alert"
-      },
-      "high_ox_alrt":{
-        "name":"High Oxygen Alert"
-      },
-      "low_ox_alrt":{
-        "name":"Low Oxygen Alert"
-      },
-      "low_batt_alrt":{
-        "name": "Low Battery Alert"
-      },
-      "lost_pwr_alrt":{
-        "name": "Lost Power Alert"
-      },
-      "sock_discon_alrt":{
-        "name": "Sock Diconnected Alert"
-      },
-      "sock_off":{
-        "name":"Sock Off"
-      },
-      "awake":{
-        "name":"Awake"
-      }
-    },
-    "sensor": {
-      "batterypercent": {
-        "name": "Battery Percentage"
-      },
-      "o2saturation": {
-        "name": "O2 Saturation"
-      },
-      "o2saturation10a": {
-        "name": "O2 Saturation 10 Minute Average"
-      },
-      "heartrate": {
-        "name": "Heart Rate"
-      },
-      "batterymin": {
-        "name": "Battery Remaining"
-      },
-      "signalstrength": {
-        "name": "Signal Strength"
-      },
-      "skintemp": {
-        "name": "Skin Temperature"
-      },
-      "sleepstate": {
-        "name": "Sleep State",
-        "state": {
-          "unknown": "Unknown",
-          "awake": "Awake",
-          "light_sleep": "Light Sleep",
-          "deep_sleep": "Deep Sleep"
-        }
-      }
-    }
  }
-}
+}
--- a/custom_components/owlet/translations/en.json
+++ b/custom_components/owlet/translations/en.json
@@ -1,17 +1,17 @@
 {
  "config": {
    "step": {
-      "user": {
+      "user":{
        "title": "Enter login details",
-        "data": {
+        "data":{
          "region": "Region",
          "username": "Email",
          "password": "Password"
        }
      },
-      "reauth_confirm": {
+      "reauth_confirm":{
        "title": "Reauthentiaction required for Owlet",
-        "data": {
+        "data":{
          "password": "Password"
        }
      }
@@ -20,88 +20,20 @@
      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
      "invalid_email": "Entered email address is incorrect",
      "invalid_password": "Entered password is incorrect",
-      "invalid_credentials": "Entered credentials are incorrect",
-      "unknown": "Unknown error occured"
+      "unknown": "[%key:common::config_flow::error::unknown%]"
    },
    "abort": {
-      "already_configured": "Device already configured",
-      "reauth_successful": "Reauthentication successful"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
    }
  },
  "options": {
    "step": {
-      "init": {
-        "title": "Configure options for Owlet",
-        "data": {
+      "init":{
+        "title":"Configure options for Owlet",
+        "data":{
          "pollinterval": "Polling interval in seconds, min 10"
        }
      }
    }
-  },
-  "entity": {
-    "binary_sensor":{
-      "charging": {
-        "name": "Charging"
-      },
-      "high_hr_alrt":{
-        "name": "High Heart Rate Alert"
-      },
-      "low_hr_alrt":{
-        "name":"Low Heart Rate Alert"
-      },
-      "high_ox_alrt":{
-        "name":"High Oxygen Alert"
-      },
-      "low_ox_alrt":{
-        "name":"Low Oxygen Alert"
-      },
-      "low_batt_alrt":{
-        "name": "Low Battery Alert"
-      },
-      "lost_pwr_alrt":{
-        "name": "Lost Power Alert"
-      },
-      "sock_discon_alrt":{
-        "name": "Sock Diconnected Alert"
-      },
-      "sock_off":{
-        "name":"Sock Off"
-      },
-      "awake":{
-        "name":"Awake"
-      }
-    },
-    "sensor": {
-      "batterypercent": {
-        "name": "Battery Percentage"
-      },
-      "o2saturation": {
-        "name": "O2 Saturation"
-      },
-      "o2saturation10a": {
-        "name": "O2 Saturation 10 Minute Average"
-      },
-      "heartrate": {
-        "name": "Heart Rate"
-      },
-      "batterymin": {
-        "name": "Battery Remaining"
-      },
-      "signalstrength": {
-        "name": "Signal Strength"
-      },
-      "skintemp": {
-        "name": "Skin Temperature"
-      },
-      "sleepstate": {
-        "name": "Sleep State",
-        "state": {
-          "unknown": "Unknown",
-          "awake": "Awake",
-          "light_sleep": "Light Sleep",
-          "deep_sleep": "Deep Sleep"
-        }
-      }
-    }
  }
-}
+}
--- a/custom_components/owlet/translations/uk.json
+++ b/custom_components/owlet/translations/uk.json
@@ -1,17 +1,17 @@
 {
  "config": {
    "step": {
-      "user": {
+      "user":{
        "title": "Enter login details",
-        "data": {
+        "data":{
          "region": "Region",
          "username": "Email",
          "password": "Password"
        }
      },
-      "reauth_confirm": {
+      "reauth_confirm":{
        "title": "Reauthentiaction required for Owlet",
-        "data": {
+        "data":{
          "password": "Password"
        }
      }
@@ -20,88 +20,20 @@
      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
      "invalid_email": "Entered email address is incorrect",
      "invalid_password": "Entered password is incorrect",
-      "invalid_credentials": "Entered credentials are incorrect",
-      "unknown": "Unknown error occured"
+      "unknown": "[%key:common::config_flow::error::unknown%]"
    },
    "abort": {
-      "already_configured": "Device already configured",
-      "reauth_successful": "Reauthentication successful"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
    }
  },
  "options": {
    "step": {
-      "init": {
-        "title": "Configure options for Owlet",
-        "data": {
+      "init":{
+        "title":"Configure options for Owlet",
+        "data":{
          "pollinterval": "Polling interval in seconds, min 10"
        }
      }
    }
-  },
-  "entity": {
-    "binary_sensor":{
-      "charging": {
-        "name": "Charging"
-      },
-      "high_hr_alrt":{
-        "name": "High Heart Rate Alert"
-      },
-      "low_hr_alrt":{
-        "name":"Low Heart Rate Alert"
-      },
-      "high_ox_alrt":{
-        "name":"High Oxygen Alert"
-      },
-      "low_ox_alrt":{
-        "name":"Low Oxygen Alert"
-      },
-      "low_batt_alrt":{
-        "name": "Low Battery Alert"
-      },
-      "lost_pwr_alrt":{
-        "name": "Lost Power Alert"
-      },
-      "sock_discon_alrt":{
-        "name": "Sock Diconnected Alert"
-      },
-      "sock_off":{
-        "name":"Sock Off"
-      },
-      "awake":{
-        "name":"Awake"
-      }
-    },
-    "sensor": {
-      "batterypercent": {
-        "name": "Battery Percentage"
-      },
-      "o2saturation": {
-        "name": "O2 Saturation"
-      },
-      "o2saturation10a": {
-        "name": "O2 Saturation 10 Minute Average"
-      },
-      "heartrate": {
-        "name": "Heart Rate"
-      },
-      "batterymin": {
-        "name": "Battery Remaining"
-      },
-      "signalstrength": {
-        "name": "Signal Strength"
-      },
-      "skintemp": {
-        "name": "Skin Temperature"
-      },
-      "sleepstate": {
-        "name": "Sleep State",
-        "state": {
-          "unknown": "Unknown",
-          "awake": "Awake",
-          "light_sleep": "Light Sleep",
-          "deep_sleep": "Deep Sleep"
-        }
-      }
-    }
  }
-}
+}
--- a/info.md
+++ b/info.md
@@ -1,6 +1,8 @@
 # Owlet Custom Integration

 [![GitHub Release][releases-shield]][releases]
+![GitHub all releases][download-all]
+![GitHub release (latest by RyanClark123)][download-latest]
 [![GitHub Activity][commits-shield]][commits]

 [![License][license-shield]][license]
@@ -19,19 +21,23 @@ If you have a smart sock 2 and would like to contribute then please do so.
 3. Hard refresh browser cache.
 4. [![Add Integration][add-integration-badge]][add-integration] or in the HA UI go to "Configuration" -> "Integrations" click "+" and search for "Owlet Smart Sock".

+{% endif %}
+
 <!---->

 ---

-[commits-shield]: https://img.shields.io/github/commit-activity/w/ryanbdclark/owlet?style=for-the-badge
-[commits]: https://github.com/ryanbdclark/owlet/commits/main
+[commits-shield]: https://img.shields.io/github/commit-activity/w/RyanClark123/owlet?style=for-the-badge
+[commits]: https://github.com/RyanClark123/owlet/commits/main
 [hacs]: https://github.com/hacs/integration
 [hacsbadge]: https://img.shields.io/badge/HACS-Custom-orange.svg?style=for-the-badge
 [license]: LICENSE
-[license-shield]: https://img.shields.io/github/license/ryanbdclark/owlet.svg?style=for-the-badge
-[maintenance-shield]: https://img.shields.io/badge/maintainer-Ryan%20Clark%20%40ryanbdclark-blue.svg?style=for-the-badge
-[releases-shield]: https://img.shields.io/github/release/ryanbdclark/owlet.svg?style=for-the-badge
-[releases]: https://github.com/ryanbdclark/owlet/releases
-[user_profile]: https://github.com/ryanbdclark
+[license-shield]: https://img.shields.io/github/license/RyanClark123/owlet.svg?style=for-the-badge
+[maintenance-shield]: https://img.shields.io/badge/maintainer-Ryan%20Clark%20%40RyanClark123-blue.svg?style=for-the-badge
+[releases-shield]: https://img.shields.io/github/release/RyanClark123/owlet.svg?style=for-the-badge
+[releases]: https://github.com/RyanClark123/owlet/releases
+[user_profile]: https://github.com/RyanClark123
+[download-all]: https://img.shields.io/github/downloads/RyanClark123/Owlet/total?style=for-the-badge
+[download-latest]: https://img.shields.io/github/downloads/RyanClark123/Owlet/latest/total?style=for-the-badge
 [add-integration]: https://my.home-assistant.io/redirect/config_flow_start?domain=owlet
 [add-integration-badge]: https://my.home-assistant.io/badges/config_flow_start.svg
--- a/tests/init.py
+++ b/tests/init.py
@@ -1,60 +0,0 @@
-"""Tests for the Owlet integration."""
-from __future__ import annotations
-
-import json
-from unittest.mock import patch
-
-from homeassistant.components.owlet.const import (
-    CONF_OWLET_EXPIRY,
-    CONF_OWLET_REFRESH,
-    DOMAIN,
-    POLLING_INTERVAL,
-)
-from homeassistant.const import (
-    CONF_API_TOKEN,
-    CONF_REGION,
-    CONF_SCAN_INTERVAL,
-    CONF_USERNAME,
-)
-from homeassistant.core import HomeAssistant
-
-from tests.common import MockConfigEntry, load_fixture
-
-
-async def async_init_integration(
-    hass: HomeAssistant,
-    skip_setup: bool = False,
-    properties_fixture: str = "update_properties_charging.json",
-    devices_fixture: str = "get_devices.json",
-) -> MockConfigEntry:
-    """Set up integration entry."""
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        title="sample@gmail.com",
-        unique_id="sample@gmail.com",
-        data={
-            CONF_REGION: "europe",
-            CONF_USERNAME: "sample@gmail.com",
-            CONF_API_TOKEN: "api_token",
-            CONF_OWLET_EXPIRY: 100,
-            CONF_OWLET_REFRESH: "refresh_token",
-        },
-        options={CONF_SCAN_INTERVAL: POLLING_INTERVAL},
-    )
-
-    entry.add_to_hass(hass)
-
-    if not skip_setup:
-        with patch(
-            "homeassistant.components.owlet.OwletAPI.get_properties",
-            return_value=json.loads(load_fixture(properties_fixture, "owlet")),
-        ), patch(
-            "homeassistant.components.owlet.OwletAPI.authenticate", return_value=None
-        ), patch(
-            "homeassistant.components.owlet.OwletAPI.get_devices",
-            return_value=json.loads(load_fixture(devices_fixture, "owlet")),
-        ):
-            await hass.config_entries.async_setup(entry.entry_id)
-            await hass.async_block_till_done()
-
-    return entry
--- a/tests/const.py
+++ b/tests/const.py
@@ -1,14 +0,0 @@
-"""Constants used for Owlet tests."""
-
-AUTH_RETURN = {
-    "api_token": "api_token",
-    "expiry": 100,
-    "refresh": "refresh_token",
-}
-
-
-CONF_INPUT = {
-    "region": "europe",
-    "username": "sample@gmail.com",
-    "password": "sample",
-}
--- a/tests/fixtures/get_devices.json
+++ b/tests/fixtures/get_devices.json
@@ -1,32 +0,0 @@
-{
-  "response": [
-    {
-      "device": {
-        "product_name": "Owlet Baby Monitors",
-        "model": "AY001MTL1",
-        "dsn": "SERIAL_NUMBER",
-        "oem_model": "SS3-OBL-EU",
-        "sw_version": "bc 2.9.7-beta 05/01/19 16:15:18 ID beb2858",
-        "template_id": 48775,
-        "mac": "MAC",
-        "unique_hardware_id": "None",
-        "hwsig": "123-123-123",
-        "lan_ip": "192.0.0.1",
-        "connected_at": "2023-05-23T01:21:29Z",
-        "key": 123456,
-        "lan_enabled": false,
-        "connection_priority": [],
-        "has_properties": true,
-        "product_class": "None",
-        "connection_status": "Online",
-        "lat": "0.0",
-        "lng": "0.0",
-        "locality": "QW12",
-        "device_type": "Wifi",
-        "dealer": "None",
-        "manuf_model": "LBEE5PA1LD-222"
-      }
-    }
-  ],
-  "tokens": ""
-}
--- a/tests/fixtures/get_devices_with_tokens.json
+++ b/tests/fixtures/get_devices_with_tokens.json
@@ -1,36 +0,0 @@
-{
-  "response": [
-    {
-      "device": {
-        "product_name": "Owlet Baby Monitors",
-        "model": "AY001MTL1",
-        "dsn": "SERIAL_NUMBER",
-        "oem_model": "SS3-OBL-EU",
-        "sw_version": "bc 2.9.7-beta 05/01/19 16:15:18 ID beb2858",
-        "template_id": 48775,
-        "mac": "MAC",
-        "unique_hardware_id": "None",
-        "hwsig": "123-123-123",
-        "lan_ip": "192.0.0.1",
-        "connected_at": "2023-05-23T01:21:29Z",
-        "key": 123456,
-        "lan_enabled": false,
-        "connection_priority": [],
-        "has_properties": true,
-        "product_class": "None",
-        "connection_status": "Online",
-        "lat": "0.0",
-        "lng": "0.0",
-        "locality": "QW12",
-        "device_type": "Wifi",
-        "dealer": "None",
-        "manuf_model": "LBEE5PA1LD-222"
-      }
-    }
-  ],
-  "tokens": {
-    "api_token": "new_api_token",
-    "expiry": 200,
-    "refresh": "new_refresh_token"
-  }
-}
--- a/tests/fixtures/update_properties_asleep.json
+++ b/tests/fixtures/update_properties_asleep.json
--- a/tests/fixtures/update_properties_awake.json
+++ b/tests/fixtures/update_properties_awake.json
--- a/tests/fixtures/update_properties_charging.json
+++ b/tests/fixtures/update_properties_charging.json
--- a/tests/test_config_flow.py
+++ b/tests/test_config_flow.py
@@ -1,237 +0,0 @@
-"""Test Owlet config flow."""
-from __future__ import annotations
-
-from unittest.mock import patch
-
-from pyowletapi.exceptions import (
-    OwletCredentialsError,
-    OwletDevicesError,
-    OwletEmailError,
-    OwletPasswordError,
-)
-
-from homeassistant import config_entries
-from homeassistant.components.owlet.const import DOMAIN, POLLING_INTERVAL
-from homeassistant.config_entries import SOURCE_REAUTH, SOURCE_USER
-from homeassistant.const import CONF_PASSWORD, CONF_SCAN_INTERVAL
-from homeassistant.core import HomeAssistant
-from homeassistant.data_entry_flow import FlowResultType
-
-from . import async_init_integration
-from .const import AUTH_RETURN, CONF_INPUT
-
-
-async def test_form(hass: HomeAssistant) -> None:
-    """Test that the form is served with no input."""
-    # await async_init_integration(hass)
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": SOURCE_USER}
-    )
-
-    assert result["type"] == FlowResultType.FORM
-    assert result["step_id"] == "user"
-
-    with patch(
-        "homeassistant.components.owlet.config_flow.OwletAPI.authenticate",
-        return_value=AUTH_RETURN,
-    ), patch(
-        "homeassistant.components.owlet.config_flow.OwletAPI.validate_authentication"
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            user_input=CONF_INPUT,
-        )
-        await hass.async_block_till_done()
-
-        assert result["type"] == FlowResultType.CREATE_ENTRY
-        assert result["title"] == "sample@gmail.com"
-        assert result["data"] == {
-            "region": "europe",
-            "username": "sample@gmail.com",
-            "api_token": "api_token",
-            "expiry": 100,
-            "refresh": "refresh_token",
-        }
-        assert result["options"] == {"scan_interval": POLLING_INTERVAL}
-
-
-async def test_flow_wrong_password(hass: HomeAssistant) -> None:
-    """Test incorrect login throwing error."""
-    with patch(
-        "homeassistant.components.owlet.config_flow.OwletAPI.authenticate",
-        side_effect=OwletPasswordError(),
-    ):
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN,
-            context={"source": config_entries.SOURCE_USER},
-        )
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            user_input=CONF_INPUT,
-        )
-        assert result["type"] == FlowResultType.FORM
-        assert result["errors"] == {"base": "invalid_password"}
-
-
-async def test_flow_wrong_email(hass: HomeAssistant) -> None:
-    """Test incorrect login throwing error."""
-    with patch(
-        "homeassistant.components.owlet.config_flow.OwletAPI.authenticate",
-        side_effect=OwletEmailError(),
-    ):
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN,
-            context={"source": config_entries.SOURCE_USER},
-        )
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            user_input=CONF_INPUT,
-        )
-        assert result["type"] == FlowResultType.FORM
-        assert result["errors"] == {"base": "invalid_email"}
-
-
-async def test_flow_credentials_error(hass: HomeAssistant) -> None:
-    """Test incorrect login throwing error."""
-    with patch(
-        "homeassistant.components.owlet.config_flow.OwletAPI.authenticate",
-        side_effect=OwletCredentialsError(),
-    ):
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN,
-            context={"source": config_entries.SOURCE_USER},
-        )
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            user_input=CONF_INPUT,
-        )
-        assert result["type"] == FlowResultType.FORM
-        assert result["errors"] == {"base": "invalid_credentials"}
-
-
-async def test_flow_unknown_error(hass: HomeAssistant) -> None:
-    """Test unknown error throwing error."""
-    with patch(
-        "homeassistant.components.owlet.config_flow.OwletAPI.authenticate",
-        side_effect=Exception(),
-    ):
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN,
-            context={"source": config_entries.SOURCE_USER},
-        )
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            user_input=CONF_INPUT,
-        )
-        assert result["type"] == FlowResultType.FORM
-        assert result["errors"] == {"base": "unknown"}
-
-
-async def test_flow_no_devices(hass: HomeAssistant) -> None:
-    """Test unknown error throwing error."""
-    with patch(
-        "homeassistant.components.owlet.config_flow.OwletAPI.authenticate"
-    ), patch(
-        "homeassistant.components.owlet.config_flow.OwletAPI.validate_authentication",
-        side_effect=OwletDevicesError(),
-    ):
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN,
-            context={"source": config_entries.SOURCE_USER},
-        )
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            user_input=CONF_INPUT,
-        )
-        assert result["type"] == FlowResultType.FORM
-        assert result["errors"] == {"base": "no_devices"}
-
-
-async def test_reauth_success(hass: HomeAssistant) -> None:
-    """Test reauth form."""
-
-    entry = await async_init_integration(hass, skip_setup=True)
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": SOURCE_REAUTH, "entry_id": entry.entry_id}
-    )
-
-    assert result["type"] == FlowResultType.FORM
-    assert result["step_id"] == "reauth_confirm"
-
-    with patch(
-        "homeassistant.components.owlet.config_flow.OwletAPI.authenticate",
-        return_value=AUTH_RETURN,
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            user_input={CONF_PASSWORD: "sample"},
-        )
-        await hass.async_block_till_done()
-
-        assert result["type"] == FlowResultType.ABORT
-        assert result["reason"] == "reauth_successful"
-
-        await hass.config_entries.async_unload(entry.entry_id)
-
-
-async def test_reauth_invalid_password(hass: HomeAssistant) -> None:
-    """Test reauth with invalid password errir."""
-    entry = await async_init_integration(hass, skip_setup=True)
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": SOURCE_REAUTH, "entry_id": entry.entry_id}
-    )
-
-    with patch(
-        "homeassistant.components.owlet.config_flow.OwletAPI.authenticate",
-        side_effect=OwletPasswordError(),
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"], user_input={CONF_PASSWORD: "sample"}
-        )
-
-        assert result["type"] == FlowResultType.FORM
-        assert result["step_id"] == "reauth_confirm"
-        assert result["errors"] == {"base": "invalid_password"}
-
-
-async def test_reauth_unknown_error(hass: HomeAssistant) -> None:
-    """Test reauthing with an unknown error."""
-
-    entry = await async_init_integration(hass, skip_setup=True)
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": SOURCE_REAUTH, "entry_id": entry.entry_id}
-    )
-
-    with patch(
-        "homeassistant.components.owlet.config_flow.OwletAPI.authenticate",
-        side_effect=Exception(),
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"], user_input={CONF_PASSWORD: "sample"}
-        )
-
-        assert result["type"] == FlowResultType.FORM
-        assert result["step_id"] == "reauth_confirm"
-
-
-async def test_options_flow(hass: HomeAssistant) -> None:
-    """Test that the form is served with no input."""
-    entry = await async_init_integration(hass, skip_setup=True)
-
-    result = await hass.config_entries.options.async_init(entry.entry_id)
-
-    assert result["type"] == FlowResultType.FORM
-    assert result["step_id"] == "init"
-
-    result = await hass.config_entries.options.async_configure(
-        result["flow_id"],
-        user_input={CONF_SCAN_INTERVAL: 10},
-    )
-    await hass.async_block_till_done()
-
-    assert result["type"] == FlowResultType.CREATE_ENTRY
-    assert result["title"] == ""
-    assert result["data"] == {CONF_SCAN_INTERVAL: 10}
--- a/tests/test_coordinator.py
+++ b/tests/test_coordinator.py
@@ -1,74 +0,0 @@
-"""Test owlet coordinator."""
-from __future__ import annotations
-
-import json
-from unittest.mock import patch
-
-from pyowletapi.exceptions import OwletAuthenticationError, OwletConnectionError
-
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant
-
-from . import async_init_integration
-
-from tests.common import load_fixture
-
-PLATFORMS: list[Platform] = [Platform.BINARY_SENSOR, Platform.SENSOR]
-
-
-async def test_coordinator_auth_error(hass: HomeAssistant) -> None:
-    """Test coordinator setup authentication error."""
-    entry = await async_init_integration(hass, skip_setup=True)
-
-    with patch(
-        "homeassistant.components.owlet.Sock.update_properties",
-        side_effect=OwletAuthenticationError(),
-    ), patch(
-        "homeassistant.components.owlet.OwletAPI.authenticate", return_value=None
-    ), patch(
-        "homeassistant.components.owlet.OwletAPI.get_devices",
-        return_value=json.loads(load_fixture("get_devices.json", "owlet")),
-    ):
-        await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
-
-        assert entry.state == ConfigEntryState.SETUP_RETRY
-
-
-async def test_coordinator_connection_error(hass: HomeAssistant) -> None:
-    """Test coordinator setup connection error error."""
-    entry = await async_init_integration(hass, skip_setup=True)
-
-    with patch(
-        "homeassistant.components.owlet.Sock.update_properties",
-        side_effect=OwletConnectionError(),
-    ), patch(
-        "homeassistant.components.owlet.OwletAPI.authenticate", return_value=None
-    ), patch(
-        "homeassistant.components.owlet.OwletAPI.get_devices",
-        return_value=json.loads(load_fixture("get_devices.json", "owlet")),
-    ):
-        await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
-
-        assert entry.state == ConfigEntryState.SETUP_RETRY
-
-
-async def test_coordinator_error(hass: HomeAssistant) -> None:
-    """Test coordinator setup generic error."""
-    entry = await async_init_integration(hass, skip_setup=True)
-
-    with patch(
-        "homeassistant.components.owlet.Sock.update_properties",
-        side_effect=Exception(),
-    ), patch(
-        "homeassistant.components.owlet.OwletAPI.authenticate", return_value=None
-    ), patch(
-        "homeassistant.components.owlet.OwletAPI.get_devices",
-        return_value=json.loads(load_fixture("get_devices.json", "owlet")),
-    ):
-        await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
-
-        assert entry.state == ConfigEntryState.SETUP_RETRY
--- a/tests/test_init.py
+++ b/tests/test_init.py
@@ -1,136 +0,0 @@
-"""Test Owlet init."""
-from __future__ import annotations
-
-from unittest.mock import patch
-
-from pyowletapi.exceptions import (
-    OwletAuthenticationError,
-    OwletConnectionError,
-    OwletDevicesError,
-    OwletError,
-)
-
-from homeassistant.components.owlet.const import (
-    CONF_OWLET_EXPIRY,
-    CONF_OWLET_REFRESH,
-    DOMAIN,
-)
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import CONF_API_TOKEN, CONF_REGION, CONF_USERNAME, Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import device_registry as dr, entity_registry as er
-
-from . import async_init_integration
-
-PLATFORMS: list[Platform] = [Platform.BINARY_SENSOR, Platform.SENSOR]
-
-
-async def test_async_setup_entry(hass: HomeAssistant) -> None:
-    """Test setting up entry."""
-    entry = await async_init_integration(hass)
-
-    assert entry.state == ConfigEntryState.LOADED
-
-    device_registry = dr.async_get(hass)
-
-    device_entry = device_registry.async_get_or_create(
-        config_entry_id=entry.entry_id, identifiers={(DOMAIN, "SERIAL_NUMBER")}
-    )
-
-    assert device_entry.name == "Owlet Baby Care Sock"
-
-    entity_registry = er.async_get(hass)
-
-    entities = er.async_entries_for_device(entity_registry, device_entry.id)
-
-    assert len(entities) == 8
-
-    await entry.async_unload(hass)
-
-    assert entry.state == ConfigEntryState.NOT_LOADED
-
-
-async def test_async_setup_entry_new_tokens(hass: HomeAssistant) -> None:
-    """Test setting up entry and getting new tokens."""
-    entry = await async_init_integration(
-        hass, devices_fixture="get_devices_with_tokens.json"
-    )
-
-    assert entry.data == {
-        CONF_REGION: "europe",
-        CONF_USERNAME: "sample@gmail.com",
-        CONF_API_TOKEN: "new_api_token",
-        CONF_OWLET_EXPIRY: 200,
-        CONF_OWLET_REFRESH: "new_refresh_token",
-    }
-
-    assert entry.state == ConfigEntryState.LOADED
-
-    await entry.async_unload(hass)
-
-    assert entry.state == ConfigEntryState.NOT_LOADED
-
-
-async def test_async_setup_entry_auth_error(hass: HomeAssistant) -> None:
-    """Test setting up entry with auth error."""
-    entry = await async_init_integration(hass, skip_setup=True)
-
-    with patch(
-        "homeassistant.components.owlet.OwletAPI.authenticate",
-        side_effect=OwletAuthenticationError(),
-    ):
-        await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
-
-        assert entry.state == ConfigEntryState.SETUP_ERROR
-
-        await entry.async_unload(hass)
-
-
-async def test_async_setup_entry_connection_error(hass: HomeAssistant) -> None:
-    """Test setting up entry with connection error."""
-    entry = await async_init_integration(hass, skip_setup=True)
-
-    with patch(
-        "homeassistant.components.owlet.OwletAPI.authenticate",
-        side_effect=OwletConnectionError(),
-    ):
-        await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
-
-        assert entry.state == ConfigEntryState.SETUP_RETRY
-
-        await entry.async_unload(hass)
-
-
-async def test_async_setup_entry_devices_error(hass: HomeAssistant) -> None:
-    """Test setting up entry with device error."""
-    entry = await async_init_integration(hass, skip_setup=True)
-
-    with patch(
-        "homeassistant.components.owlet.OwletAPI.authenticate", return_value=None
-    ), patch(
-        "homeassistant.components.owlet.OwletAPI.get_devices",
-        side_effect=OwletDevicesError(),
-    ):
-        await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
-
-        assert entry.state == ConfigEntryState.SETUP_ERROR
-        await entry.async_unload(hass)
-
-
-async def test_async_setup_entry_error(hass: HomeAssistant) -> None:
-    """Test setting up entry with unknown error."""
-    entry = await async_init_integration(hass, skip_setup=True)
-
-    with patch(
-        "homeassistant.components.owlet.OwletAPI.authenticate",
-        side_effect=OwletError(),
-    ):
-        await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
-
-        assert entry.state == ConfigEntryState.SETUP_ERROR
-
-        await entry.async_unload(hass)
--- a/tests/test_sensor.py
+++ b/tests/test_sensor.py
@@ -1,109 +0,0 @@
-"""Test Owlet Sensor."""
-from __future__ import annotations
-
-from homeassistant.core import HomeAssistant
-
-from . import async_init_integration
-
-
-async def test_sensors_asleep(hass: HomeAssistant) -> None:
-    """Test sensor values."""
-    await async_init_integration(
-        hass, properties_fixture="update_properties_asleep.json"
-    )
-
-    assert len(hass.states.async_all("sensor")) == 8
-
-    assert (
-        hass.states.get("sensor.owlet_baby_care_sock_battery_percentage").state
-        == "50.0"
-    )
-    assert (
-        hass.states.get("sensor.owlet_baby_care_sock_battery_remaining").state
-        == "400.0"
-    )
-    assert hass.states.get("sensor.owlet_baby_care_sock_heart_rate").state == "97.0"
-    assert hass.states.get("sensor.owlet_baby_care_sock_o2_saturation").state == "99.0"
-    assert (
-        hass.states.get(
-            "sensor.owlet_baby_care_sock_o2_saturation_10_minute_average"
-        ).state
-        == "97.0"
-    )
-
-    assert (
-        hass.states.get("sensor.owlet_baby_care_sock_signal_strength").state == "30.0"
-    )
-    assert hass.states.get("sensor.owlet_baby_care_sock_skin_temperature").state == "34"
-    assert (
-        hass.states.get("sensor.owlet_baby_care_sock_sleep_state").state
-        == "light_sleep"
-    )
-
-
-async def test_sensors_awake(hass: HomeAssistant) -> None:
-    """Test sensor values."""
-    await async_init_integration(
-        hass, properties_fixture="update_properties_awake.json"
-    )
-
-    assert len(hass.states.async_all("sensor")) == 8
-
-    assert (
-        hass.states.get("sensor.owlet_baby_care_sock_battery_percentage").state
-        == "80.0"
-    )
-    assert (
-        hass.states.get("sensor.owlet_baby_care_sock_battery_remaining").state
-        == "600.0"
-    )
-    assert hass.states.get("sensor.owlet_baby_care_sock_heart_rate").state == "110.0"
-    assert hass.states.get("sensor.owlet_baby_care_sock_o2_saturation").state == "98.0"
-    assert (
-        hass.states.get(
-            "sensor.owlet_baby_care_sock_o2_saturation_10_minute_average"
-        ).state
-        == "98.0"
-    )
-    assert (
-        hass.states.get("sensor.owlet_baby_care_sock_signal_strength").state == "34.0"
-    )
-    assert hass.states.get("sensor.owlet_baby_care_sock_skin_temperature").state == "35"
-    assert hass.states.get("sensor.owlet_baby_care_sock_sleep_state").state == "awake"
-
-
-async def test_sensors_charging(hass: HomeAssistant) -> None:
-    """Test sensor values."""
-    await async_init_integration(
-        hass, properties_fixture="update_properties_charging.json"
-    )
-
-    assert len(hass.states.async_all("sensor")) == 8
-
-    assert (
-        hass.states.get("sensor.owlet_baby_care_sock_battery_percentage").state
-        == "100.0"
-    )
-    assert (
-        hass.states.get("sensor.owlet_baby_care_sock_battery_remaining").state
-        == "unknown"
-    )
-    assert hass.states.get("sensor.owlet_baby_care_sock_heart_rate").state == "unknown"
-    assert (
-        hass.states.get("sensor.owlet_baby_care_sock_o2_saturation").state == "unknown"
-    )
-    assert (
-        hass.states.get(
-            "sensor.owlet_baby_care_sock_o2_saturation_10_minute_average"
-        ).state
-        == "unknown"
-    )
-
-    assert (
-        hass.states.get("sensor.owlet_baby_care_sock_signal_strength").state == "34.0"
-    )
-    assert (
-        hass.states.get("sensor.owlet_baby_care_sock_skin_temperature").state
-        == "unknown"
-    )
-    assert hass.states.get("sensor.owlet_baby_care_sock_sleep_state").state == "unknown"