Proxmox-Port/proxmox
1
0
Fork 0
forked from proxmox-mirrors/proxmox
Code Pull Requests Activity

access-control: move to flatten User into UserWithToken

Browse Source 
Signed-off-by: Shannon Sterz <s.sterz@proxmox.com>
This commit is contained in:
Shannon Sterz 2024-06-19 11:54:17 +02:00 committed by Wolfgang Bumiller
parent 48bd72763f
commit 1dc88b5e3c
1 changed files with 6 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
proxmox-access-control/src/types.rs
View File

@ -40,32 +40,9 @@ pub const EMAIL_SCHEMA: Schema = StringSchema::new("E-Mail Address.")
#[api( #[api(
properties: { properties: {
userid: { user: {
type: Userid, type: User,
}, flatten: true,
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,
}, },
tokens: { tokens: {
type: Array, type: Array,
@ -91,19 +68,8 @@ pub const EMAIL_SCHEMA: Schema = StringSchema::new("E-Mail Address.")
#[serde(rename_all = "kebab-case")] #[serde(rename_all = "kebab-case")]
/// User properties with added list of ApiTokens /// User properties with added list of ApiTokens
pub struct UserWithTokens { pub struct UserWithTokens {
pub userid: Userid, #[serde(flatten)]
#[serde(skip_serializing_if = "Option::is_none")] pub user: User,
pub comment: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
pub enable: Option<bool>,
#[serde(skip_serializing_if = "Option::is_none")]
pub expire: Option<i64>,
#[serde(skip_serializing_if = "Option::is_none")]
pub firstname: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
pub lastname: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
pub email: Option<String>,
#[serde(skip_serializing_if = "Vec::is_empty", default)] #[serde(skip_serializing_if = "Vec::is_empty", default)]
pub tokens: Vec<ApiToken>, pub tokens: Vec<ApiToken>,
#[serde(skip_serializing_if = "bool_is_false", default)] #[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. /// User properties.
pub struct User { pub struct User {
#[updater(skip)] #[updater(skip)]