From a2f7c09d0904a846cce27bba6675839f5f718b2b Mon Sep 17 00:00:00 2001
From: mmilavkin <mmilavkin@iponweb.net>
Date: Sun, 18 Feb 2024 16:57:41 +0200
Subject: [PATCH] fix sync&key bugs

---
 lib.py                 | 2 +-
 main.py                | 2 +-
 templates/clients.html | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib.py b/lib.py
index e26daeb..9f21623 100644
--- a/lib.py
+++ b/lib.py
@@ -64,7 +64,7 @@ class Server:
         # Looking for any users with provided name. len(result) != 1 is a problem.
         result = []
         for key in self.client.get_keys():
-            if key.name == name:
+            if key.key_id == name:
                 result.append(name)
                 self.log.info(f"check_client found client `{name}` config is correct.")
         if len(result) != 1:
diff --git a/main.py b/main.py
index cfc5838..c85bc4d 100644
--- a/main.py
+++ b/main.py
@@ -305,7 +305,7 @@ def dynamic(server_name, client_id):
             (item for item in SERVERS if item.info()["name"] == server_name), None
         )
         key = next(
-            (item for item in server.data["keys"] if item.name == client["name"]), None
+            (item for item in server.data["keys"] if item.key_id == client["name"]), None
         )
         if server and client and key:
             if server.data["local_server_id"] in client["servers"]:
diff --git a/templates/clients.html b/templates/clients.html
index 1312874..97d8ef5 100644
--- a/templates/clients.html
+++ b/templates/clients.html
@@ -108,7 +108,7 @@ Same keys will work simultaneously on many devices.
 
 {% if server.info()['local_server_id'] in client['servers'] %}
 {{server.info()['name']}}
-```{% for key in server.data["keys"] %}{% if key.name == client['name'] %}ssconf://{{ dynamic_hostname }}/dynamic/{{server.info()['name']}}/{{selected_client}}#{{server.info()['comment']}}{% endif %}{% endfor %}```
+```{% for key in server.data["keys"] %}{% if key.key_id == client['name'] %}ssconf://{{ dynamic_hostname }}/dynamic/{{server.info()['name']}}/{{selected_client}}#{{server.info()['comment']}}{% endif %}{% endfor %}```
 {% endif %}
 {%- endfor -%}</textarea>
         </div>
@@ -129,7 +129,7 @@ Same keys will work simultaneously on many devices.
                 <tr>
                     <td>{{ server.info()['name'] }}</td>
                     <td>
-                        <p style="font-size: 10pt">{% for key in server.data["keys"] %}{% if key.name == client['name'] %}ssconf://{{ dynamic_hostname }}/dynamic/{{server.info()['name']}}/{{selected_client}}#{{server.info()['comment']}}{% endif %}{% endfor %}</p>
+                        <p style="font-size: 10pt">{% for key in server.data["keys"] %}{% if key.key_id == client['name'] %}ssconf://{{ dynamic_hostname }}/dynamic/{{server.info()['name']}}/{{selected_client}}#{{server.info()['comment']}}{% endif %}{% endfor %}</p>
                     </td>
                 </tr>
                 {% endif %}
@@ -152,7 +152,7 @@ Same keys will work simultaneously on many devices.
                 <tr>
                     <td>{{ server.info()['name'] }}</td>
                     <td>
-                        <pre style="font-size: 10pt">{% for key in server.data["keys"] %}{% if key.name == client['name'] %}{{ key.access_url }}{% endif %}{% endfor %}</pre>
+                        <pre style="font-size: 10pt">{% for key in server.data["keys"] %}{% if key.key_id == client['name'] %}{{ key.access_url }}{% endif %}{% endfor %}</pre>
                     </td>
                 </tr>
                 {% endif %}