From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ronja.mits.lan by ronja.mits.lan with LMTP id gB+KF/yqcmbWLwAAxxbTJA (envelope-from ); Wed, 19 Jun 2024 11:55:08 +0200 Received: from proxmox-new.maurer-it.com (unknown [192.168.2.33]) by ronja.mits.lan (Postfix) with ESMTPS id 46994F63D90; Wed, 19 Jun 2024 11:55:08 +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 2CC5C47C8B; Wed, 19 Jun 2024 11:55:08 +0200 (CEST) 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 (4096 bits)) (No client certificate requested) by proxmox-new.maurer-it.com (Proxmox) with ESMTPS; Wed, 19 Jun 2024 11:55:07 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EBE3B18A7; Wed, 19 Jun 2024 11:55:06 +0200 (CEST) From: Shannon Sterz To: pbs-devel@lists.proxmox.com Date: Wed, 19 Jun 2024 11:54:17 +0200 Message-Id: <20240619095418.126368-7-s.sterz@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240619095418.126368-1-s.sterz@proxmox.com> References: <20240619095418.126368-1-s.sterz@proxmox.com> MIME-Version: 1.0 Subject: [pbs-devel] [PATCH proxmox v3 6/7] access: move to flatten `User` into `UserWithToken` 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: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" X-SPAM-LEVEL: Spam detection results: 0 DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods MAILING_LIST_MULTI -2 Multiple indicators imply a widely-seen list manager RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - Signed-off-by: Shannon Sterz --- proxmox-access-control/src/types.rs | 46 ++++------------------------- 1 file changed, 6 insertions(+), 40 deletions(-) diff --git a/proxmox-access-control/src/types.rs b/proxmox-access-control/src/types.rs index 9ed4e9cd..88b91a9f 100644 --- a/proxmox-access-control/src/types.rs +++ b/proxmox-access-control/src/types.rs @@ -40,32 +40,9 @@ pub const EMAIL_SCHEMA: Schema = StringSchema::new("E-Mail Address.") #[api( properties: { - userid: { - type: Userid, - }, - comment: { - optional: true, - schema: COMMENT_SCHEMA, - }, - enable: { - optional: true, - schema: ENABLE_USER_SCHEMA, - }, - expire: { - optional: true, - schema: EXPIRE_USER_SCHEMA, - }, - firstname: { - optional: true, - schema: FIRST_NAME_SCHEMA, - }, - lastname: { - schema: LAST_NAME_SCHEMA, - optional: true, - }, - email: { - schema: EMAIL_SCHEMA, - optional: true, + user: { + type: User, + flatten: true, }, tokens: { type: Array, @@ -91,19 +68,8 @@ pub const EMAIL_SCHEMA: Schema = StringSchema::new("E-Mail Address.") #[serde(rename_all = "kebab-case")] /// User properties with added list of ApiTokens pub struct UserWithTokens { - pub userid: Userid, - #[serde(skip_serializing_if = "Option::is_none")] - pub comment: Option, - #[serde(skip_serializing_if = "Option::is_none")] - pub enable: Option, - #[serde(skip_serializing_if = "Option::is_none")] - pub expire: Option, - #[serde(skip_serializing_if = "Option::is_none")] - pub firstname: Option, - #[serde(skip_serializing_if = "Option::is_none")] - pub lastname: Option, - #[serde(skip_serializing_if = "Option::is_none")] - pub email: Option, + #[serde(flatten)] + pub user: User, #[serde(skip_serializing_if = "Vec::is_empty", default)] pub tokens: Vec, #[serde(skip_serializing_if = "bool_is_false", default)] @@ -193,7 +159,7 @@ impl ApiToken { }, } )] -#[derive(Serialize, Deserialize, Updater, PartialEq, Eq)] +#[derive(Serialize, Deserialize, Updater, PartialEq, Eq, Clone)] /// User properties. pub struct User { #[updater(skip)] -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel