public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH widget-toolkit 1/2] window/AuthEditBase: handle differenc config api urls
Date: Mon, 12 Jul 2021 09:48:02 +0200	[thread overview]
Message-ID: <20210712074808.1103102-2-d.csapak@proxmox.com> (raw)
In-Reply-To: <20210712074808.1103102-1-d.csapak@proxmox.com>

necessary for pbs. also give an option to use the type as url path
e.g. /config/access/<TYPE>/<ID>

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 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





  reply	other threads:[~2021-07-12  7:48 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-12  7:48 [pbs-devel] [PATCH widget-toolkit/proxmox-backup] fix openid realm api usage Dominik Csapak
2021-07-12  7:48 ` Dominik Csapak [this message]
2021-07-12  7:48 ` [pbs-devel] [PATCH widget-toolkit 2/2] panel/AuthView: handle different baseUrls for configuring realms Dominik Csapak
2021-07-12  7:48 ` [pbs-devel] [PATCH proxmox-backup 1/5] ui: panel/AccessControl: define baseUrland useTypeInUrl for AuthView Dominik Csapak
2021-07-12  7:48 ` [pbs-devel] [PATCH proxmox-backup 2/5] api: config: access: openid: use correct parameter for matching Dominik Csapak
2021-07-12  7:48 ` [pbs-devel] [PATCH proxmox-backup 3/5] api: config: access: openid: use better Privilige Realm.Allocate Dominik Csapak
2021-07-12  7:48 ` [pbs-devel] [PATCH proxmox-backup 4/5] Revert "api: access: domains: add get/create/update/delete domain call" Dominik Csapak
2021-07-12  7:48 ` [pbs-devel] [PATCH proxmox-backup 5/5] Revert "api: access: domains: add ExtraRealmInfo and RealmInfo structs" Dominik Csapak
2021-07-12  8:26 ` [pbs-devel] applied-series: [PATCH widget-toolkit/proxmox-backup] fix openid realm api usage Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210712074808.1103102-2-d.csapak@proxmox.com \
    --to=d.csapak@proxmox.com \
    --cc=pbs-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal