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 EF6D1754AB for ; Mon, 12 Jul 2021 09:48:11 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9FC0A121E4 for ; Mon, 12 Jul 2021 09:48:11 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id EA07612199 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 C154F40FC6 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:08 +0200 Message-Id: <20210712074808.1103102-8-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.976 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% ENA_SUBJ_ODD_CASE 3.2 Subject has odd case 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: [pbs-devel] [PATCH proxmox-backup 5/5] Revert "api: access: domains: add ExtraRealmInfo and RealmInfo structs" 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:12 -0000 This reverts commit da7ec1d2af1c28503052e1cd5954dfada81058cd. not necessary, since we have the api in config/access/openid Signed-off-by: Dominik Csapak --- src/api2/access/domain.rs | 65 --------------------------------------- 1 file changed, 65 deletions(-) diff --git a/src/api2/access/domain.rs b/src/api2/access/domain.rs index bfc7c184..afa69269 100644 --- a/src/api2/access/domain.rs +++ b/src/api2/access/domain.rs @@ -9,7 +9,6 @@ use proxmox::api::{api, Permission, Router, RpcEnvironment}; use crate::config; use crate::api2::types::*; -use crate::config::domains::{OpenIdRealmConfig, OpenIdUserAttribute}; #[api] #[derive(Deserialize, Serialize, PartialEq, Eq)] @@ -52,70 +51,6 @@ pub struct BasicRealmInfo { pub comment: Option, } -#[api( - properties: { - "issuer-url": { - description: "OpenID Issuer Url", - type: String, - optional: true, - }, - "client-id": { - description: "OpenID Client ID", - type: String, - optional: true, - }, - "client-key": { - description: "OpenID Client Key", - type: String, - optional: true, - }, - autocreate: { - description: "Automatically create users if they do not exist.", - optional: true, - type: bool, - default: false, - }, - "username-claim": { - type: OpenIdUserAttribute, - optional: true, - }, - }, -)] -#[derive(Deserialize, Serialize)] -#[serde(rename_all = "kebab-case")] -/// Extra Information about a realm -pub struct ExtraRealmInfo { - #[serde(skip_serializing_if = "Option::is_none")] - pub issuer_url: Option, - #[serde(skip_serializing_if = "Option::is_none")] - pub client_id: Option, - #[serde(skip_serializing_if = "Option::is_none")] - pub client_key: Option, - #[serde(skip_serializing_if = "Option::is_none")] - pub autocreate: Option, - #[serde(skip_serializing_if = "Option::is_none")] - pub username_claim: Option, -} - -#[api( - properties: { - "info": { - type: BasicRealmInfo, - }, - "extra": { - type: ExtraRealmInfo, - }, - }, -)] -#[derive(Deserialize, Serialize)] -#[serde(rename_all = "kebab-case")] -/// Information about a realm -pub struct RealmInfo { - #[serde(flatten)] - pub info: BasicRealmInfo, - #[serde(flatten)] - pub extra: ExtraRealmInfo, -} #[api( returns: { -- 2.30.2