mirror of
https://github.com/sunnypilot/sunnypilot.git
synced 2026-02-19 06:33:57 +08:00
cf03d69f71
* Fix for issue #19776
PyJWT 2.0.0 does not return `bytes` for `encode()` instead returns `str`. So converted the `str` to `bytes` and returned the resulting value
* added check for jwt.encode return type
* Update __init__.py
* Updated with suggested change
* Test to check return type of get_token()
The `get_token()` must return a `str` but for PyJWT version < 2.0.0 the `jwt.encode()` returns `bytes`. This test is to make sure if token returned by `get_token()` is `str`.
* Update test_get_token.py
* Update test_get_token.py
* Delete test_get_token.py
Co-authored-by: Willem Melching <willem.melching@gmail.com>
old-commit-hash: 236743a4e2
46 lines
1.3 KiB
Python
46 lines
1.3 KiB
Python
import jwt
|
|
import requests
|
|
from datetime import datetime, timedelta
|
|
from common.basedir import PERSIST
|
|
from selfdrive.version import version
|
|
|
|
class Api():
|
|
def __init__(self, dongle_id):
|
|
self.dongle_id = dongle_id
|
|
with open(PERSIST+'/comma/id_rsa') as f:
|
|
self.private_key = f.read()
|
|
|
|
def get(self, *args, **kwargs):
|
|
return self.request('GET', *args, **kwargs)
|
|
|
|
def post(self, *args, **kwargs):
|
|
return self.request('POST', *args, **kwargs)
|
|
|
|
def request(self, method, endpoint, timeout=None, access_token=None, **params):
|
|
return api_get(endpoint, method=method, timeout=timeout, access_token=access_token, **params)
|
|
|
|
def get_token(self):
|
|
now = datetime.utcnow()
|
|
payload = {
|
|
'identity': self.dongle_id,
|
|
'nbf': now,
|
|
'iat': now,
|
|
'exp': now + timedelta(hours=1)
|
|
}
|
|
token = jwt.encode(payload, self.private_key, algorithm='RS256')
|
|
if isinstance(token, bytes):
|
|
token = token.decode('utf8')
|
|
return token
|
|
|
|
|
|
def api_get(endpoint, method='GET', timeout=None, access_token=None, **params):
|
|
backend = "https://api.commadotai.com/"
|
|
|
|
headers = {}
|
|
if access_token is not None:
|
|
headers['Authorization'] = "JWT "+access_token
|
|
|
|
headers['User-Agent'] = "openpilot-" + version
|
|
|
|
return requests.request(method, backend+endpoint, timeout=timeout, headers=headers, params=params)
|