Merge branch 'SP-157-sync-20240614' into SP-157-sync-priv-20240614

common/api/base.py

@@ -1,7 +1,7 @@
 import jwt
 import requests
 import unicodedata
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, UTC
 from openpilot.system.hardware.hw import Paths
 from openpilot.system.version import get_version
 
@@ -24,7 +24,7 @@ class BaseApi:
     return self.api_get(endpoint, method=method, timeout=timeout, access_token=access_token, **params)
 
   def _get_token(self, expiry_hours=1, **extra_payload):
-    now = datetime.utcnow()
+    now = datetime.now(UTC).replace(tzinfo=None)
     payload = {
       'identity': self.dongle_id,
       'nbf': now,