Skip to content

FIx DST issue #189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions PyTado/http.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import os
import pprint
import time
from datetime import datetime, timedelta
from datetime import datetime, timedelta, timezone
from json import dump as json_dump
from json import load as json_load
from pathlib import Path
Expand Down Expand Up @@ -174,7 +174,7 @@ def __init__(
else:
_LOGGER.setLevel(logging.WARNING)

self._refresh_at = datetime.now() + timedelta(minutes=10)
self._refresh_at = datetime.now(timezone.utc) + timedelta(minutes=10)
self._session = http_session or self._create_session()
self._session.hooks["response"].append(self._log_response)
self._headers = {"Referer": "https://app.tado.com/"}
Expand Down Expand Up @@ -346,7 +346,7 @@ def _set_oauth_header(self, data: dict[str, Any]) -> str:
refresh_token = data["refresh_token"]

self._token_refresh = refresh_token
self._refresh_at = datetime.now()
self._refresh_at = datetime.now(timezone.utc)
self._refresh_at = self._refresh_at + timedelta(seconds=expires_in)
# We subtract 30 seconds from the correct refresh time.
# Then we have a 30 seconds timespan to get a new refresh_token
Expand Down Expand Up @@ -396,7 +396,7 @@ def _refresh_token(self, refresh_token: str | None = None, force_refresh: bool =
and force_refresh is False.
"""

if self._refresh_at >= datetime.now() and not force_refresh:
if self._refresh_at >= datetime.now(timezone.utc) and not force_refresh:
return True

url = "https://login.tado.com/oauth2/token"
Expand Down Expand Up @@ -506,7 +506,7 @@ def _login_device_flow(self) -> DeviceActivationStatus:
_LOGGER.info("Please visit the following URL: %s", visit_url)

expires_in_seconds = self._device_flow_data["expires_in"]
self._expires_at = datetime.now() + timedelta(seconds=expires_in_seconds)
self._expires_at = datetime.now(timezone.utc) + timedelta(seconds=expires_in_seconds)

_LOGGER.info(
"Waiting for user to authorize the device. Expires at %s",
Expand All @@ -516,8 +516,10 @@ def _login_device_flow(self) -> DeviceActivationStatus:
return DeviceActivationStatus.PENDING

def _check_device_activation(self) -> bool:
if self._expires_at is not None and datetime.timestamp(datetime.now()) > datetime.timestamp(
self._expires_at
if (
self._expires_at is not None
and datetime.timestamp(datetime.now(timezone.utc))
> datetime.timestamp(self._expires_at)
):
raise TadoException("User took too long to enter key")

Expand Down
8 changes: 4 additions & 4 deletions tests/test_http.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""Test the Http class."""

from datetime import datetime, timedelta
from datetime import datetime, timedelta, timezone
import io
import json
import unittest
Expand Down Expand Up @@ -151,7 +151,7 @@ def test_refresh_token_success(self):
)

# Force token refresh
instance._refresh_at = datetime.now() - timedelta(seconds=1)
instance._refresh_at = datetime.now(timezone.utc) - timedelta(seconds=1)
instance._refresh_token()

assert refresh_token.call_count == 1
Expand All @@ -174,7 +174,7 @@ def test_refresh_token_failure(self):
)

# Force token refresh
instance._refresh_at = datetime.now() - timedelta(seconds=1)
instance._refresh_at = datetime.now(timezone.utc) - timedelta(seconds=1)

with self.assertRaises(TadoException):
instance._refresh_token()
Expand Down Expand Up @@ -221,7 +221,7 @@ def test_check_device_activation(self, mock_sleep):

http = Http()
http._device_flow_data = {"interval": 5, "device_code": "mock_code"}
http._expires_at = datetime.now() + timedelta(minutes=5)
http._expires_at = datetime.now(timezone.utc) + timedelta(minutes=5)

result = http._check_device_activation()
self.assertTrue(result)
Expand Down
Loading