Fixed server struct. Added version to panel

lib.py

@@ -12,11 +12,11 @@ logging.basicConfig(
 
 class ServerDict(TypedDict):
     server_id: str
+    local_server_id: str
     name: str
     url: str
     cert: str
     comment: str
-    server_id: str
     metrics_enabled: str
     created_timestamp_ms: int
     version: str
@@ -79,7 +79,7 @@ class Server:
         if config.get("name"):
             self.client.set_server_name(config.get("name"))
             self.log.info(
-                "Changed %s name to '%s'", self.data["server_id"], config.get("name")
+                "Changed %s name to '%s'", self.data["local_server_id"], config.get("name")
             )
         if config.get("metrics"):
             self.client.set_metrics_status(
@@ -87,7 +87,7 @@ class Server:
             )
             self.log.info(
                 "Changed %s metrics status to '%s'",
-                self.data["server_id"],
+                self.data["local_server_id"],
                 config.get("metrics"),
             )
         if config.get("port_for_new_access_keys"):
@@ -96,33 +96,33 @@ class Server:
             )
             self.log.info(
                 "Changed %s port_for_new_access_keys to '%s'",
-                self.data["server_id"],
+                self.data["local_server_id"],
                 config.get("port_for_new_access_keys"),
             )
         if config.get("hostname_for_access_keys"):
             self.client.set_hostname(config.get("hostname_for_access_keys"))
             self.log.info(
                 "Changed %s hostname_for_access_keys to '%s'",
-                self.data["server_id"],
+                self.data["local_server_id"],
                 config.get("hostname_for_access_keys"),
             )
         if config.get("comment"):
             with open(CFG_PATH, "r") as file:
                 config_file = yaml.safe_load(file) or {}
-            config_file["servers"][self.data["server_id"]]["comment"] = config.get(
+            config_file["servers"][self.data["local_server_id"]]["comment"] = config.get(
                 "comment"
             )
             with open(CFG_PATH, "w") as file:
                 yaml.safe_dump(config_file, file)
             self.log.info(
                 "Changed %s comment to '%s'",
-                self.data["server_id"],
+                self.data["local_server_id"],
                 config.get("comment"),
             )
 
     def create_key(self, key_name):
         self.log.info("New key created: %s", key_name)
-        return self.client.create_key(key_name)
+        return self.client.create_key(name=key_name)
 
     def rename_key(self, key_id, new_name):
         self.log.info("Key %s renamed: %s", key_id, new_name)

main.py

@@ -31,6 +31,7 @@ log = logging.getLogger("OutFleet")
 
 SERVERS = list()
 CLIENTS = dict()
+VERSION = '1'
 HOSTNAME = ""
 app = Flask(__name__)
 CORS(app)
@@ -92,6 +93,7 @@ def index():
         return render_template(
             "index.html",
             SERVERS=SERVERS,
+            VERSION=VERSION,
             nt=request.args.get("nt"),
             nl=request.args.get("nl"),
             selected_server=request.args.get("selected_server"),

templates/base.html

@@ -23,6 +23,7 @@
                     <li class="pure-menu-item"><a href="/clients" class="pure-menu-link">Clients</a></li>
                     <li class="pure-menu-item"><a href="/sync" class="pure-menu-link">Sync status</a></li>
                 </ul>
+		{{ VERSION }}
             </div>
         </div>
     </div>