fix: update LifeTime API and add debugging ability to API

Author: GuyLewin

custom_components/lifetime_fitness/__init__.py

@@ -4,6 +4,7 @@
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers.aiohttp_client import async_create_clientsession
 
 from .api import Api
 from .const import DOMAIN, VERSION, ISSUE_URL, PLATFORM, CONF_USERNAME, CONF_PASSWORD
@@ -20,7 +21,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         ISSUE_URL,
     )
     username, password = entry.data[CONF_USERNAME], entry.data[CONF_PASSWORD]
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = Api(hass, username, password)
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = Api(async_create_clientsession(hass), username, password)
 
     entry.async_on_unload(entry.add_update_listener(options_update_listener))
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)

custom_components/lifetime_fitness/api.py

@@ -1,11 +1,9 @@
 """API client for Life Time Fitness"""
-from aiohttp import ClientError, ClientResponseError, ClientConnectionError
+from aiohttp import ClientSession, ClientError, ClientResponseError, ClientConnectionError
 from datetime import date
 from http import HTTPStatus
 import logging
 
-from homeassistant.helpers.aiohttp_client import async_create_clientsession
-
 from .const import (
     API_AUTH_ENDPOINT,
     API_AUTH_REQUEST_USERNAME_JSON_KEY,
@@ -54,10 +52,10 @@ def handle_authentication_response_json(response_json: dict):
 
 
 class Api:
-    def __init__(self, hass, username: str, password: str) -> None:
+    def __init__(self, client_session: ClientSession, username: str, password: str) -> None:
         self._username = username
         self._password = password
-        self._clientsession = async_create_clientsession(hass)
+        self._client_session = client_session
         self._sso_token = None
 
         self.update_successful = True
@@ -68,7 +66,7 @@ def get_username(self):
 
     async def authenticate(self):
         try:
-            async with self._clientsession.post(
+            async with self._client_session.post(
                 API_AUTH_ENDPOINT,
                 json={
                     API_AUTH_REQUEST_USERNAME_JSON_KEY: self._username,
@@ -94,12 +92,15 @@ async def _get_visits_between_dates(self, start_date: date, end_date: date):
             raise ApiAuthRequired
 
         try:
-            async with self._clientsession.get(
+            async with self._client_session.get(
                 API_CLUB_VISITS_ENDPOINT_FORMATSTRING.format(
                     start_date=start_date.strftime(API_CLUB_VISITS_ENDPOINT_DATE_FORMAT),
                     end_date=end_date.strftime(API_CLUB_VISITS_ENDPOINT_DATE_FORMAT),
                 ),
-                headers={API_CLUB_VISITS_AUTH_HEADER: self._sso_token},
+                headers={
+                    API_CLUB_VISITS_AUTH_HEADER: self._sso_token,
+                    API_AUTH_REQUEST_SUBSCRIPTION_KEY_HEADER: API_AUTH_REQUEST_SUBSCRIPTION_KEY_HEADER_VALUE
+                },
             ) as response:
                 response_json = await response.json()
                 return response_json
@@ -160,3 +161,18 @@ class ApiAuthRequired(Exception):
 
 class ApiAuthExpired(Exception):
     """Authentication has expired"""
+
+
+# Test the API client by running this script with username and password:
+async def main():
+    import sys, aiohttp
+    username, password = sys.argv[1:]
+    async with aiohttp.ClientSession() as client_session:
+        api = Api(client_session, username, password)
+        await api.authenticate()
+        await api.update()
+        print(api.result_json)
+
+if __name__ == "__main__":
+    import asyncio
+    asyncio.run(main())

custom_components/lifetime_fitness/config_flow.py

@@ -10,6 +10,7 @@
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.data_entry_flow import FlowResult
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.aiohttp_client import async_create_clientsession
 
 from .const import (
     DOMAIN,
@@ -37,7 +38,7 @@ async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> dict[str,
     Data has the keys from STEP_USER_DATA_SCHEMA with values provided by the user.
     """
     username, password = data[CONF_USERNAME], data[CONF_PASSWORD]
-    api_client = Api(hass, username, password)
+    api_client = Api(async_create_clientsession(hass), username, password)
 
     try:
         await api_client.authenticate()

custom_components/lifetime_fitness/const.py

@@ -32,7 +32,7 @@
 API_AUTH_STATUS_JSON_KEY = "status"
 
 API_CLUB_VISITS_ENDPOINT_FORMATSTRING = \
-    "https://myaccount.lifetimefitness.com/myaccount/api/member/clubvisits?end_date={end_date}&start_date={start_date}"
+    "https://api.lifetimefitness.com/myaccount/member/clubvisits?end_date={end_date}&start_date={start_date}"
 API_CLUB_VISITS_ENDPOINT_DATE_FORMAT = "%Y-%m-%d"
 API_CLUB_VISITS_AUTH_HEADER = "X-LTF-SSOID"
 API_CLUB_VISITS_TIMESTAMP_JSON_KEY = "usageDateTime"

requirements.dev.txt

@@ -0,0 +1 @@
+aiohttp=3