Rename proxyCert to verifyCert

lib/TWCManager/Vehicle/TeslaAPI.py

@@ -28,7 +28,7 @@ class TeslaAPI:
         'CN': 'https://fleet-api.prd.cn.vn.cloud.tesla.cn/api/1/vehicles',
     }
     refreshClientID = "ownerapi"
-    proxyCert = True
+    verifyCert = True
     carApiLastErrorTime = 0
     carApiBearerToken = ""
     carApiRefreshToken = ""
@@ -75,7 +75,7 @@ def __init__(self, master):
             proxyURL = self.config["config"].get("teslaProxy", "")
             if proxyURL:
                 self.baseURL = proxyURL + "/api/1/vehicles"
-                self.proxyCert = self.config["config"].get("teslaProxyCert", True)
+                self.verifyCert = self.config["config"].get("teslaProxyCert", True)
             self.refreshClientID = self.config["config"].get(
                 "teslaApiClientID", "ownerapi"
             )
@@ -242,7 +242,7 @@ def car_api_available(
                     "Authorization": "Bearer " + self.getCarApiBearerToken(),
                 }
                 try:
-                    req = requests.get(url, headers=headers, verify=self.proxyCert)
+                    req = requests.get(url, headers=headers, verify=self.verifyCert)
                     logger.log(logging.INFO8, "Car API cmd vehicles " + str(req))
                     apiResponseDict = json.loads(req.text)
                 except requests.exceptions.RequestException:
@@ -666,7 +666,7 @@ def car_api_charge(self, charge):
             # Retry up to 3 times on certain errors.
             for _ in range(0, 3):
                 try:
-                    req = requests.post(url, headers=headers, verify=self.proxyCert)
+                    req = requests.post(url, headers=headers, verify=self.verifyCert)
                     logger.log(
                         logging.INFO8,
                         "Car API cmd charge_" + startOrStop + " " + str(req),
@@ -1112,7 +1112,7 @@ def setCarApiBearerToken(self, token=None):
                     decoded = jwt.decode(token, options={"verify_signature": False, "verify_aud": False}, leeway=datetime.timedelta(days=300))
                     if 'owner-api' in ''.join(decoded.get('aud', '')):
                         self.baseURL = self.regionURL['OwnerAPI']
-                    elif decoder.get('ou_code', '') in self.regionURL:
+                    elif decoded.get('ou_code', '') in self.regionURL:
                         self.baseURL = self.regionURL[decoded['ou_code']]
                 return True
         else:
@@ -1150,7 +1150,7 @@ def setChargeRate(self, charge_rate, vehicle=None, set_again=False):
         body = {"charging_amps": charge_rate}
 
         try:
-            req = requests.post(url, headers=headers, json=body, verify=self.proxyCert)
+            req = requests.post(url, headers=headers, json=body, verify=self.verifyCert)
             logger.log(
                 logging.INFO8,
                 f"Car API cmd set_charging_amps {charge_rate}A {str(req)}",
@@ -1208,7 +1208,7 @@ def wakeVehicle(self, vehicle):
             "Authorization": "Bearer " + self.getCarApiBearerToken(),
         }
         try:
-            req = requests.post(url, headers=headers, verify=self.proxyCert)
+            req = requests.post(url, headers=headers, verify=self.verifyCert)
             logger.log(logging.INFO8, "Car API cmd wake_up" + str(req))
             apiResponseDict = json.loads(req.text)
         except requests.exceptions.RequestException:
@@ -1236,7 +1236,7 @@ class CarApiVehicle:
     carapi = None
     __config = None
     debuglevel = 0
-    proxyCert = None
+    verifyCert = None
     ID = None
     name = ""
     syncSource = "TeslaAPI"
@@ -1270,7 +1270,7 @@ class CarApiVehicle:
     def __init__(self, json, carapi, config):
         self.carapi = carapi
         self.__config = config
-        self.proxyCert = config["config"].get("teslaProxyCert", True)
+        self.verifyCert = config["config"].get("teslaProxyCert", True)
         self.ID = json["id"]
         self.VIN = json["vin"]
         self.name = json["display_name"]
@@ -1340,7 +1340,7 @@ def ready(self):
     # Permits opportunistic API requests
     def is_awake(self):
         if self.syncSource == "TeslaAPI":
-            url = self.carapi.getCarApiBaseURL + "/" + str(self.VIN)
+            url = self.carapi.getCarApiBaseURL() + "/" + str(self.VIN)
             (result, response) = self.get_car_api(
                 url, checkReady=False, provesOnline=False
             )
@@ -1367,7 +1367,7 @@ def get_car_api(self, url, checkReady=True, provesOnline=True):
         # Retry up to 3 times on certain errors.
         for _ in range(0, 3):
             try:
-                req = requests.get(url, headers=headers, verify=self.proxyCert)
+                req = requests.get(url, headers=headers, verify=self.verifyCert)
                 logger.log(logging.INFO8, "Car API cmd " + url + " " + str(req))
                 apiResponseDict = json.loads(req.text)
                 # This error can happen here as well:
@@ -1426,7 +1426,7 @@ def update_location(self, cacheTime=60):
             return True
 
     def update_vehicle_data(self, cacheTime=60):
-        url = self.carapi.getCarApiBaseURL + "/"
+        url = self.carapi.getCarApiBaseURL() + "/"
         url = url + str(self.VIN) + "/vehicle_data"
         url = (
             url
@@ -1483,7 +1483,7 @@ def apply_charge_limit(self, limit):
 
         self.lastLimitAttemptTime = now
 
-        url = self.carapi.getCarApiBaseURL + "/"
+        url = self.carapi.getCarApiBaseURL() + "/"
         url = url + str(self.VIN) + "/command/set_charge_limit"
 
         headers = {
@@ -1495,7 +1495,7 @@ def apply_charge_limit(self, limit):
         for _ in range(0, 3):
             try:
                 req = requests.post(
-                    url, headers=headers, json=body, verify=self.proxyCert
+                    url, headers=headers, json=body, verify=self.verifyCert
                 )
                 logger.log(logging.INFO8, "Car API cmd set_charge_limit " + str(req))