From c36863da56260ab82dbd4bd6aadff12d23da8c5e Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 22 Nov 2021 11:59:23 +0100 Subject: [PATCH] Only call failed_callback if provided Otherwise we'd crash because NoneType can't be called. Contributes to issue CURA-8539. --- cura/OAuth2/AuthorizationHelpers.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cura/OAuth2/AuthorizationHelpers.py b/cura/OAuth2/AuthorizationHelpers.py index d84da46c5f..28b07cf17c 100644 --- a/cura/OAuth2/AuthorizationHelpers.py +++ b/cura/OAuth2/AuthorizationHelpers.py @@ -132,20 +132,23 @@ class AuthorizationHelpers: """ if reply.error() != QNetworkReply.NetworkError.NoError: Logger.warning(f"Could not access account information. QNetworkError {reply.errorString()}") - failed_callback() + if failed_callback is not None: + failed_callback() return profile_data = HttpRequestManager.getInstance().readJSON(reply) if profile_data is None or "data" not in profile_data: Logger.warning("Could not parse user data from token.") - failed_callback() + if failed_callback is not None: + failed_callback() return profile_data = profile_data["data"] required_fields = {"user_id", "username"} if "user_id" not in profile_data or "username" not in profile_data: Logger.warning(f"User data missing required field(s): {required_fields - set(profile_data.keys())}") - failed_callback() + if failed_callback is not None: + failed_callback() return success_callback(UserProfile(