Merge pull request #213 from quexten/fix/wrong_server_in_gui

Fix server not being set when logging in from UI
This commit is contained in:
Bernd Schoolmann 2024-05-11 03:37:21 +02:00 committed by GitHub
commit b8b0dd9bf9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 3 deletions

View File

@ -50,7 +50,7 @@ class GoldwardenLoginApp(Adw.Application):
client_id = self.client_id_row.get_text() client_id = self.client_id_row.get_text()
client_secret = self.client_secret_row.get_text() client_secret = self.client_secret_row.get_text()
server = self.server_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 != "": if client_id != "":
print("set client id result", goldwarden.set_client_id(client_id.strip())) print("set client id result", goldwarden.set_client_id(client_id.strip()))
if client_secret != "": if client_secret != "":

View File

@ -69,6 +69,9 @@ class GoldwardenQuickAccessApp(Adw.Application):
auto_type_combo = state & Gdk.ModifierType.CONTROL_MASK and state & Gdk.ModifierType.SHIFT_MASK 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 copy_combo = state & Gdk.ModifierType.CONTROL_MASK and not state & Gdk.ModifierType.SHIFT_MASK
if not len(self.filtered_logins) > 0:
return
# totp code # totp code
if keyval == Gdk.KEY_t or keyval == Gdk.KEY_T: if keyval == Gdk.KEY_t or keyval == Gdk.KEY_T:
if self.filtered_logins[self.selected_index]["totp"] == "": if self.filtered_logins[self.selected_index]["totp"] == "":

View File

@ -70,8 +70,8 @@ def set_notification_url(url):
def set_vault_url(url): def set_vault_url(url):
send_authenticated_command(f"config set-vault-url {url}") send_authenticated_command(f"config set-vault-url {url}")
def set_url(url): def set_server(url):
send_authenticated_command(f"config set-url {url}") send_authenticated_command(f"config set-server {url}")
def get_environment(): def get_environment():
result = send_authenticated_command(f"config get-environment") result = send_authenticated_command(f"config get-environment")