From 46f33b4f89ce0a3bed44a11d8e48bb23cfbeb322 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Sat, 23 Apr 2022 15:54:14 +0200 Subject: [PATCH] Fix requesting app key on instance without `auth_dialog` --- DiscoverOctoPrintAction.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/DiscoverOctoPrintAction.py b/DiscoverOctoPrintAction.py index 4cc8a4e..dbd7e13 100644 --- a/DiscoverOctoPrintAction.py +++ b/DiscoverOctoPrintAction.py @@ -592,9 +592,12 @@ def _onRequestFinished(self, reply: QNetworkReply) -> None: "w", "Received invalid JSON from octoprint instance." ) + base_url = reply.url().toString() + base_url = base_url[:base_url.find("/plugin/appkeys/request")] + if json_data: app_token = json_data["app_token"] # unused; app_token is included in location header - auth_dialog_url = json_data["auth_dialog"] + auth_dialog_url = json_data["auth_dialog"] if "auth_dialog" in json_data else base_url else: ( instance,