mirror of
https://github.com/dani-garcia/vaultwarden
synced 2024-11-10 06:14:16 +00:00
make access_all optional (#4812)
* make access_all optional * use #[serde(default)] instead of unwrapping
This commit is contained in:
parent
c28246cf34
commit
39d4d31080
1 changed files with 8 additions and 10 deletions
|
@ -844,7 +844,8 @@ struct InviteData {
|
|||
groups: Vec<String>,
|
||||
r#type: NumberOrString,
|
||||
collections: Option<Vec<CollectionData>>,
|
||||
access_all: Option<bool>,
|
||||
#[serde(default)]
|
||||
access_all: bool,
|
||||
}
|
||||
|
||||
#[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 access_all = data.access_all.unwrap_or(false);
|
||||
let access_all = data.access_all;
|
||||
new_user.access_all = access_all;
|
||||
new_user.atype = new_type;
|
||||
new_user.status = user_org_status;
|
||||
|
@ -1297,6 +1298,7 @@ struct EditUserData {
|
|||
r#type: NumberOrString,
|
||||
collections: Option<Vec<CollectionData>>,
|
||||
groups: Option<Vec<String>>,
|
||||
#[serde(default)]
|
||||
access_all: bool,
|
||||
}
|
||||
|
||||
|
@ -2223,7 +2225,8 @@ async fn get_groups(org_id: &str, _headers: ManagerHeadersLoose, mut conn: DbCon
|
|||
#[serde(rename_all = "camelCase")]
|
||||
struct GroupRequest {
|
||||
name: String,
|
||||
access_all: Option<bool>,
|
||||
#[serde(default)]
|
||||
access_all: bool,
|
||||
external_id: Option<String>,
|
||||
collections: Vec<SelectionReadOnly>,
|
||||
users: Vec<String>,
|
||||
|
@ -2231,17 +2234,12 @@ struct GroupRequest {
|
|||
|
||||
impl GroupRequest {
|
||||
pub fn to_group(&self, organizations_uuid: &str) -> Group {
|
||||
Group::new(
|
||||
String::from(organizations_uuid),
|
||||
self.name.clone(),
|
||||
self.access_all.unwrap_or(false),
|
||||
self.external_id.clone(),
|
||||
)
|
||||
Group::new(String::from(organizations_uuid), self.name.clone(), self.access_all, self.external_id.clone())
|
||||
}
|
||||
|
||||
pub fn update_group(&self, mut group: Group) -> Group {
|
||||
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
|
||||
// These input fields are in a disabled state, and can only be updated/added via ldap_import
|
||||
|
||||
|
|
Loading…
Reference in a new issue