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)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id CDD3B7544D for ; Mon, 12 Jul 2021 09:48:10 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AA81D121B2 for ; Mon, 12 Jul 2021 09:48:10 +0200 (CEST) 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 362B51216F for ; Mon, 12 Jul 2021 09:48:09 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 12DFD4101A for ; Mon, 12 Jul 2021 09:48:09 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Mon, 12 Jul 2021 09:48:02 +0200 Message-Id: <20210712074808.1103102-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210712074808.1103102-1-d.csapak@proxmox.com> References: <20210712074808.1103102-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.479 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 POISEN_SPAM_PILL 0.1 Meta: its spam POISEN_SPAM_PILL_1 0.1 random spam to be learned in bayes POISEN_SPAM_PILL_3 0.1 random spam to be learned in bayes SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH widget-toolkit 1/2] window/AuthEditBase: handle differenc config api urls X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Jul 2021 07:48:10 -0000 necessary for pbs. also give an option to use the type as url path e.g. /config/access// Signed-off-by: Dominik Csapak --- src/window/AuthEditBase.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/window/AuthEditBase.js b/src/window/AuthEditBase.js index 4faea34..43a2fd6 100644 --- a/src/window/AuthEditBase.js +++ b/src/window/AuthEditBase.js @@ -7,16 +7,23 @@ Ext.define('Proxmox.window.AuthEditBase', { labelWidth: 120, }, + baseurl: '/access/domains', + useTypeInUrl: false, + initComponent: function() { var me = this; me.isCreate = !me.realm; + me.url = `/api2/extjs${me.baseUrl}`; + if (me.useTypeInUrl) { + me.url += `/${me.authType}`; + } + if (me.isCreate) { - me.url = '/api2/extjs/access/domains'; me.method = 'POST'; } else { - me.url = '/api2/extjs/access/domains/' + me.realm; + me.url += `/${me.realm}`; me.method = 'PUT'; } @@ -76,7 +83,8 @@ Ext.define('Proxmox.window.AuthEditBase', { success: function(response, options) { var data = response.result.data || {}; // just to be sure (should not happen) - if (data.type !== me.authType) { + // only check this when the type is not in the api path + if (!me.useTypeInUrl && data.type !== me.authType) { me.close(); throw "got wrong auth type"; } -- 2.30.2