From 99ac07d906054bd8bbf8090cd88c48ce4501a511 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Thu, 9 Sep 2021 13:14:28 +0200 Subject: [PATCH] cleanup User configuration: use Updater --- pbs-api-types/src/lib.rs | 5 +---- pbs-api-types/src/user.rs | 7 +++++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pbs-api-types/src/lib.rs b/pbs-api-types/src/lib.rs index 59bb6f6e..03f184ea 100644 --- a/pbs-api-types/src/lib.rs +++ b/pbs-api-types/src/lib.rs @@ -61,10 +61,7 @@ pub use userid::{PROXMOX_GROUP_ID_SCHEMA, PROXMOX_TOKEN_ID_SCHEMA, PROXMOX_TOKEN #[macro_use] mod user; -pub use user::{ApiToken, User, UserWithTokens}; -pub use user::{ - EMAIL_SCHEMA, ENABLE_USER_SCHEMA, EXPIRE_USER_SCHEMA, FIRST_NAME_SCHEMA, LAST_NAME_SCHEMA, -}; +pub use user::*; pub mod upid; pub use upid::UPID; diff --git a/pbs-api-types/src/user.rs b/pbs-api-types/src/user.rs index 9111ccea..8a7480ad 100644 --- a/pbs-api-types/src/user.rs +++ b/pbs-api-types/src/user.rs @@ -1,7 +1,9 @@ use serde::{Deserialize, Serialize}; use proxmox::api::api; -use proxmox::api::schema::{BooleanSchema, IntegerSchema, Schema, StringSchema}; +use proxmox::api::schema::{ + BooleanSchema, IntegerSchema, Schema, StringSchema, Updater, +}; use super::{SINGLE_LINE_COMMENT_FORMAT, SINGLE_LINE_COMMENT_SCHEMA}; use super::userid::{Authid, Userid, PROXMOX_TOKEN_ID_SCHEMA}; @@ -171,9 +173,10 @@ impl ApiToken { }, } )] -#[derive(Serialize,Deserialize)] +#[derive(Serialize,Deserialize,Updater)] /// User properties. pub struct User { + #[updater(skip)] pub userid: Userid, #[serde(skip_serializing_if="Option::is_none")] pub comment: Option,