Merge pull request #213 from quexten/fix/wrong_server_in_gui

Fix server not being set when logging in from UI
quexten · May 11, 2024 · b8b0dd9 · b8b0dd9
2 parents 08f419a + 3fa3ec2
commit b8b0dd9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/gui/src/gui/login.py b/gui/src/gui/login.py
@@ -50,7 +50,7 @@ def on_login(self):
         client_id = self.client_id_row.get_text()
         client_secret = self.client_secret_row.get_text()
         server = self.server_row.get_text()
-        goldwarden.set_url(server)
+        print("setting server to", server, "with result", goldwarden.set_server(server))
         if client_id != "":
             print("set client id result", goldwarden.set_client_id(client_id.strip()))
         if client_secret != "":

diff --git a/gui/src/gui/quickaccess.py b/gui/src/gui/quickaccess.py
@@ -69,6 +69,9 @@ def key_press(self, event, keyval, keycode, state):
         auto_type_combo = state & Gdk.ModifierType.CONTROL_MASK and state & Gdk.ModifierType.SHIFT_MASK
         copy_combo = state & Gdk.ModifierType.CONTROL_MASK and not state & Gdk.ModifierType.SHIFT_MASK
 
+        if not len(self.filtered_logins) > 0:
+            return
+
         # totp code
         if keyval == Gdk.KEY_t or keyval == Gdk.KEY_T:
             if self.filtered_logins[self.selected_index]["totp"] == "":

diff --git a/gui/src/services/goldwarden.py b/gui/src/services/goldwarden.py
@@ -70,8 +70,8 @@ def set_notification_url(url):
 def set_vault_url(url):
     send_authenticated_command(f"config set-vault-url {url}")
 
-def set_url(url):
-    send_authenticated_command(f"config set-url {url}")
+def set_server(url):
+    send_authenticated_command(f"config set-server {url}")
 
 def get_environment():
     result = send_authenticated_command(f"config get-environment")