mart-w/kanidm
1
0
Fork 0
mirror of https://github.com/kanidm/kanidm.git synced 2025-02-23 12:37:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix attribute scim sync attribute naming (#3159)

Browse source
This commit is contained in:
Firstyear 2024-10-29 14:26:51 +10:00 committed by GitHub
parent d2c329f330
commit 53dcb5265a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
proto/src/scim_v1/synch.rs
View file

@ -85,19 +85,19 @@ pub struct ScimSshPubKey {
#[skip_serializing_none] #[skip_serializing_none]
#[derive(Serialize, Deserialize, Debug, Clone)] #[derive(Serialize, Deserialize, Debug, Clone)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "snake_case")]
pub struct ScimSyncPerson { pub struct ScimSyncPerson {
#[serde(flatten)] #[serde(flatten)]
pub entry: ScimEntryHeader, pub entry: ScimEntryHeader,
pub user_name: String, pub name: String,
pub display_name: String, pub displayname: String,
pub gidnumber: Option<u32>, pub gidnumber: Option<u32>,
pub password_import: Option<String>, pub password_import: Option<String>,
pub unix_password_import: Option<String>, pub unix_password_import: Option<String>,
#[serde(default, skip_serializing_if = "Vec::is_empty")] #[serde(default, skip_serializing_if = "Vec::is_empty")]
pub totp_import: Vec<ScimTotp>, pub totp_import: Vec<ScimTotp>,
pub login_shell: Option<String>, pub loginshell: Option<String>,
#[serde(default, skip_serializing_if = "Vec::is_empty")] #[serde(default, skip_serializing_if = "Vec::is_empty")]
pub mail: Vec<MultiValueAttr>, pub mail: Vec<MultiValueAttr>,
#[serde(default, skip_serializing_if = "Vec::is_empty")] #[serde(default, skip_serializing_if = "Vec::is_empty")]
@ -119,7 +119,7 @@ pub struct ScimSyncPersonBuilder {
} }
impl ScimSyncPerson { impl ScimSyncPerson {
pub fn builder(id: Uuid, user_name: String, display_name: String) -> ScimSyncPersonBuilder { pub fn builder(id: Uuid, name: String, displayname: String) -> ScimSyncPersonBuilder {
ScimSyncPersonBuilder { ScimSyncPersonBuilder {
inner: ScimSyncPerson { inner: ScimSyncPerson {
entry: ScimEntryHeader { entry: ScimEntryHeader {
@ -131,13 +131,13 @@ impl ScimSyncPerson {
external_id: None, external_id: None,
meta: None, meta: None,
}, },
user_name, name,
display_name, displayname,
gidnumber: None, gidnumber: None,
password_import: None, password_import: None,
unix_password_import: None, unix_password_import: None,
totp_import: Vec::with_capacity(0), totp_import: Vec::with_capacity(0),
login_shell: None, loginshell: None,
mail: Vec::with_capacity(0), mail: Vec::with_capacity(0),
ssh_publickey: Vec::with_capacity(0), ssh_publickey: Vec::with_capacity(0),
account_valid_from: None, account_valid_from: None,
@ -173,8 +173,8 @@ impl ScimSyncPersonBuilder {
self self
} }
pub fn set_login_shell(mut self, login_shell: Option<String>) -> Self { pub fn set_login_shell(mut self, loginshell: Option<String>) -> Self {
self.inner.login_shell = login_shell; self.inner.loginshell = loginshell;
self self
} }
@ -221,7 +221,7 @@ pub struct ScimExternalMember {
} }
#[derive(Serialize, Deserialize, Debug, Clone)] #[derive(Serialize, Deserialize, Debug, Clone)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "snake_case")]
pub struct ScimSyncGroup { pub struct ScimSyncGroup {
#[serde(flatten)] #[serde(flatten)]
pub entry: ScimEntryHeader, pub entry: ScimEntryHeader,