From 9fbf1a08ee0a1b3718a192ae98658859504b436b Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Fri, 10 May 2024 11:31:24 +0200 Subject: [PATCH 1/3] Attempt to fix credentials not being set in gui --- gui/src/gui/login.py | 4 ++-- gui/src/services/goldwarden.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gui/src/gui/login.py b/gui/src/gui/login.py index 0a8179b..7953bbd 100644 --- a/gui/src/gui/login.py +++ b/gui/src/gui/login.py @@ -52,9 +52,9 @@ class GoldwardenLoginApp(Adw.Application): server = self.server_row.get_text() goldwarden.set_url(server) if client_id != "": - goldwarden.set_client_id(client_id) + print("set client id result", goldwarden.set_client_id(client_id.strip())) if client_secret != "": - goldwarden.set_client_secret(client_secret) + print("set client secret result", goldwarden.set_client_secret(client_secret.strip())) goldwarden.login_with_password(email, "") self.window.close() diff --git a/gui/src/services/goldwarden.py b/gui/src/services/goldwarden.py index d691c17..7239012 100644 --- a/gui/src/services/goldwarden.py +++ b/gui/src/services/goldwarden.py @@ -81,10 +81,10 @@ def get_environment(): return None def set_client_id(client_id): - send_authenticated_command(f"config set-client-id \"{client_id}\"") + return send_authenticated_command(f"config set-client-id {client_id}") def set_client_secret(client_secret): - send_authenticated_command(f"config set-client-secret \"{client_secret}\"") + return send_authenticated_command(f"config set-client-secret {client_secret}") def login_with_password(email, password): result = send_authenticated_command(f"vault login --email {email}") From d70dd90630195b511c019461e01192703b1bb9f7 Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Sat, 11 May 2024 03:35:30 +0200 Subject: [PATCH 2/3] Fix executable bit on main python file --- gui/goldwarden_ui_main.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 gui/goldwarden_ui_main.py diff --git a/gui/goldwarden_ui_main.py b/gui/goldwarden_ui_main.py old mode 100644 new mode 100755 From 3fa3ec2264158bbadf78a79d08766aa4e33193ac Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Sat, 11 May 2024 03:36:13 +0200 Subject: [PATCH 3/3] Fix server not being set when logging in from UI --- gui/src/gui/login.py | 2 +- gui/src/gui/quickaccess.py | 3 +++ gui/src/services/goldwarden.py | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gui/src/gui/login.py b/gui/src/gui/login.py index 0a8179b..a3e6e5c 100644 --- a/gui/src/gui/login.py +++ b/gui/src/gui/login.py @@ -50,7 +50,7 @@ class GoldwardenLoginApp(Adw.Application): 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 != "": goldwarden.set_client_id(client_id) if client_secret != "": diff --git a/gui/src/gui/quickaccess.py b/gui/src/gui/quickaccess.py index 100b2c6..4030814 100644 --- a/gui/src/gui/quickaccess.py +++ b/gui/src/gui/quickaccess.py @@ -69,6 +69,9 @@ class GoldwardenQuickAccessApp(Adw.Application): 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 index d691c17..41755cd 100644 --- 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")