Merge branch 'main' of github.com:ocpp-balanz/balanz

Author: jens-markussen

balanz/api.py

@@ -240,13 +240,13 @@ async def api_handler(websocket):
                     upgrade_from_versions = payload.get("upgrade_from_versions", "")
                     if firmware_id is None or firmware_id not in Firmware.firmware_list:
                         result = [MessageType.CallError, message_id, "IllegalArguments"]
-                    firmware = Firmware.firmware_list[firmware_id]
+                    firmware: Firmware = Firmware.firmware_list[firmware_id]
                     if charge_point_vendor is not None:
                         firmware.charge_point_vendor = charge_point_vendor
                     if charge_point_model is not None:
                         firmware.charge_point_model = charge_point_model
                     if firmware_version is not None:
-                        firmware.version = firmware_version
+                        firmware.firmware_version = firmware_version
                     if meter_type is not None:
                         firmware.meter_type = meter_type
                     if url is not None:
@@ -587,7 +587,7 @@ async def api_handler(websocket):
                             {"status": "NoSuchTag"},
                         ]
                     else:
-                        audit_logger.info(f"[TAG-DELETE] Deleted tag {id_tag} ({Tag.tag_list[id_tag].username})")
+                        audit_logger.info(f"[TAG-DELETE] Deleted tag {id_tag} ({Tag.tag_list[id_tag].user_name})")
                         del Tag.tag_list[id_tag]
                         Tag.write_csv(config["model"]["tags_csv"])
                         result = [

balanz/user.py

@@ -93,9 +93,9 @@ def check_auth(auth: str) -> UserType:
         auth_sha: str = gen_sha_256(auth)
         for user in User.user_list.values():
             if user.auth_sha == auth_sha:
-                audit_logger.info(f"Successful auth check. User {user.user_id}, type {user.user_type}")
+                logger.info(f"Successful auth check. User {user.user_id}, type {user.user_type}")
                 return user.user_type
-        audit_logger.info(f"Failed auth check. auth starts {auth[:5]}...")
+        logger.info(f"Failed auth check. auth starts {auth[:5]}...")
         return None
 
     @staticmethod