From f6cb8b4cca3a3e7c5fa3cd17f56b54eb460119a6 Mon Sep 17 00:00:00 2001 From: Guy Khmelnitsky Date: Wed, 14 Feb 2024 11:37:04 +0200 Subject: [PATCH] Ruff fixes --- src/data.py | 4 ++-- src/iec_api_client.py | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/data.py b/src/data.py index 00e90c4..cea4017 100644 --- a/src/data.py +++ b/src/data.py @@ -37,7 +37,7 @@ def _get_url(url, headers): def get_customer(token: JWT) -> Customer: """Get customer data response from IEC API.""" - headers = add_jwt_to_headers(HEADERS_WITH_AUTH, token.access_token) + headers = add_jwt_to_headers(HEADERS_WITH_AUTH, token.id_token) # sending get request and saving the response as response object response = _get_url(url=GET_CONSUMER_URL, headers=headers) @@ -54,7 +54,7 @@ def get_customer(token: JWT) -> Customer: def get_remote_reading(token: JWT, meter_serial_number: str, meter_code: int, last_invoice_date: str, from_date: str, resolution: int) -> RemoteReadingResponse: - headers = add_jwt_to_headers(HEADERS_WITH_AUTH, token.access_token) + headers = add_jwt_to_headers(HEADERS_WITH_AUTH, token.id_token) req = RemoteReadingRequest(meterSerialNumber=meter_serial_number, meterCode=meter_code, lastInvoiceDate=last_invoice_date, fromDate=from_date, resolution=resolution) diff --git a/src/iec_api_client.py b/src/iec_api_client.py index 9d0ee50..2787dab 100644 --- a/src/iec_api_client.py +++ b/src/iec_api_client.py @@ -31,7 +31,8 @@ def __init__(self, user_id, automatically_login: bool = False): self._factor_id: str | None = None # Factor ID for multi-factor authentication self._session_token: str | None = None # Token for maintaining the user's session self.logged_in: bool = False # Flag to indicate if the user is logged in - self._token: JWT = JWT(access_token="", refresh_token="", token_type="", expires_in=0, scope="", id_token="") # Token for authentication + self._token: JWT = JWT(access_token="", refresh_token="", token_type="", expires_in=0, + scope="", id_token="") # Token for authentication self._user_id: str = user_id # User ID associated with the instance self._login_response: str | None = None # Response from the login attempt self._bp_number: str | None = None # BP Number associated with the instance @@ -205,8 +206,8 @@ def get_remote_reading(self, meter_serial_number: str, meter_code: int, last_inv RemoteReadingResponse: The response containing the remote reading. """ self.check_token() - return data.get_remote_reading(self._token.id_token, meter_serial_number, meter_code, last_invoice_date, from_date, - resolution) + return data.get_remote_reading(self._token.id_token, meter_serial_number, meter_code, + last_invoice_date, from_date, resolution) def get_device_type(self, bp_number: str, contract_id: str) -> DeviceType: @@ -271,4 +272,4 @@ def save_token(self, file_path: str = "token.json"): """ Save token to file. """ - login.save_token_to_file(self._token, file_path) \ No newline at end of file + login.save_token_to_file(self._token, file_path)