Mirrors/vaultwarden
2
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden synced 2024-11-21 19:33:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

make access_all optional (#4812)

Browse source 
* make access_all optional

* use #[serde(default)] instead of unwrapping
This commit is contained in:
Stefan Melmuk 2024-08-01 19:45:42 +02:00 committed by GitHub
parent c28246cf34
commit 39d4d31080
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/api/core/organizations.rs
View file

@ -844,7 +844,8 @@ struct InviteData {
groups: Vec<String>, groups: Vec<String>,
r#type: NumberOrString, r#type: NumberOrString,
collections: Option<Vec<CollectionData>>, collections: Option<Vec<CollectionData>>,
access_all: Option<bool>, #[serde(default)]
access_all: bool,
} }
#[post("/organizations/<org_id>/users/invite", data = "<data>")] #[post("/organizations/<org_id>/users/invite", data = "<data>")]
@ -896,7 +897,7 @@ async fn send_invite(org_id: &str, data: Json<InviteData>, headers: AdminHeaders
}; };
let mut new_user = UserOrganization::new(user.uuid.clone(), String::from(org_id)); let mut new_user = UserOrganization::new(user.uuid.clone(), String::from(org_id));
let access_all = data.access_all.unwrap_or(false); let access_all = data.access_all;
new_user.access_all = access_all; new_user.access_all = access_all;
new_user.atype = new_type; new_user.atype = new_type;
new_user.status = user_org_status; new_user.status = user_org_status;
@ -1297,6 +1298,7 @@ struct EditUserData {
r#type: NumberOrString, r#type: NumberOrString,
collections: Option<Vec<CollectionData>>, collections: Option<Vec<CollectionData>>,
groups: Option<Vec<String>>, groups: Option<Vec<String>>,
#[serde(default)]
access_all: bool, access_all: bool,
} }
@ -2223,7 +2225,8 @@ async fn get_groups(org_id: &str, _headers: ManagerHeadersLoose, mut conn: DbCon
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
struct GroupRequest { struct GroupRequest {
name: String, name: String,
access_all: Option<bool>, #[serde(default)]
access_all: bool,
external_id: Option<String>, external_id: Option<String>,
collections: Vec<SelectionReadOnly>, collections: Vec<SelectionReadOnly>,
users: Vec<String>, users: Vec<String>,
@ -2231,17 +2234,12 @@ struct GroupRequest {
impl GroupRequest { impl GroupRequest {
pub fn to_group(&self, organizations_uuid: &str) -> Group { pub fn to_group(&self, organizations_uuid: &str) -> Group {
Group::new( Group::new(String::from(organizations_uuid), self.name.clone(), self.access_all, self.external_id.clone())
String::from(organizations_uuid),
self.name.clone(),
self.access_all.unwrap_or(false),
self.external_id.clone(),
)
} }
pub fn update_group(&self, mut group: Group) -> Group { pub fn update_group(&self, mut group: Group) -> Group {
group.name.clone_from(&self.name); group.name.clone_from(&self.name);
group.access_all = self.access_all.unwrap_or(false); group.access_all = self.access_all;
// Group Updates do not support changing the external_id // Group Updates do not support changing the external_id
// These input fields are in a disabled state, and can only be updated/added via ldap_import // These input fields are in a disabled state, and can only be updated/added via ldap_import