From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 0DFF08025B for ; Wed, 17 Nov 2021 09:35:42 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F02131FD2A for ; Wed, 17 Nov 2021 09:35:11 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 85E7D1FD21 for ; Wed, 17 Nov 2021 09:35:11 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 5FD4B43D1A for ; Wed, 17 Nov 2021 09:35:11 +0100 (CET) From: Wolfgang Bumiller To: pve-devel@lists.proxmox.com Date: Wed, 17 Nov 2021 09:35:10 +0100 Message-Id: <20211117083510.51050-1-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.467 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH widget-toolkit] improve error handling when adding webauthn entries X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Nov 2021 08:35:42 -0000 There are cases where we directly throw a string error (particularly, when navigator.credentials.create() fails, for example when trying to register the same WA device to the same user twice), which would end up with the WA window simply not closing before. Signed-off-by: Wolfgang Bumiller --- src/window/AddWebauthn.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/window/AddWebauthn.js b/src/window/AddWebauthn.js index f4a0b10..77d0914 100644 --- a/src/window/AddWebauthn.js +++ b/src/window/AddWebauthn.js @@ -141,7 +141,12 @@ Ext.define('Proxmox.window.AddWebauthn', { params, }); } catch (response) { - let error = response.result.message; + let error = response; + if (typeof error !== "string") { + // in case it came from an api request: + error = error.result.message; + } + console.error(error); // for debugging if it's not displayable... Ext.Msg.alert(gettext('Error'), error); } -- 2.30.2