Browse Source

chore: run rustfmt and document permissions bool shape for clippy

pull/7638/head
Sacha ATHIAS 2 weeks ago
parent
commit
2724ca6ce4
No known key found for this signature in database GPG Key ID: 550F6AACDC845984
  1. 11
      src/api/core/organizations.rs
  2. 1
      src/db/models/organization.rs

11
src/api/core/organizations.rs

@ -20,8 +20,8 @@ use crate::{
models::{ models::{
Cipher, CipherId, Collection, CollectionCipher, CollectionGroup, CollectionId, CollectionUser, EventType, Cipher, CipherId, Collection, CollectionCipher, CollectionGroup, CollectionId, CollectionUser, EventType,
Group, GroupId, GroupUser, Invitation, Membership, MembershipId, MembershipStatus, MembershipType, Group, GroupId, GroupUser, Invitation, Membership, MembershipId, MembershipStatus, MembershipType,
OrgPolicy, OrgPolicyType, Organization, OrganizationApiKey, OrganizationId, OrgPolicy, OrgPolicyType, Organization, OrganizationApiKey, OrganizationId, OrganizationUserPermissions,
OrganizationUserPermissions, User, UserId, User, UserId,
}, },
}, },
mail, mail,
@ -133,9 +133,7 @@ fn resolve_membership_custom_permissions(
let custom_permissions = parse_custom_permissions(raw_type, permissions)?; let custom_permissions = parse_custom_permissions(raw_type, permissions)?;
let access_all = new_type >= MembershipType::Admin let access_all = new_type >= MembershipType::Admin
|| custom_permissions || custom_permissions.as_ref().is_some_and(OrganizationUserPermissions::has_manage_all_collections);
.as_ref()
.is_some_and(OrganizationUserPermissions::has_manage_all_collections);
let permissions_json = match custom_permissions { let permissions_json = match custom_permissions {
Some(custom_permissions) => match custom_permissions.to_db_json() { Some(custom_permissions) => match custom_permissions.to_db_json() {
@ -1194,8 +1192,7 @@ async fn send_invite(
err!("Only Owners can invite Managers, Admins or Owners") err!("Only Owners can invite Managers, Admins or Owners")
} }
let (access_all, permissions_json) = let (access_all, permissions_json) = resolve_membership_custom_permissions(raw_type, new_type, &data.permissions)?;
resolve_membership_custom_permissions(raw_type, new_type, &data.permissions)?;
let mut user_created: bool = false; let mut user_created: bool = false;
for email in &data.emails { for email in &data.emails {

1
src/db/models/organization.rs

@ -61,6 +61,7 @@ pub struct Membership {
pub permissions: Option<String>, pub permissions: Option<String>,
} }
#[allow(clippy::struct_excessive_bools)]
#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)] #[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
#[serde(default, rename_all = "camelCase")] #[serde(default, rename_all = "camelCase")]
pub struct OrganizationUserPermissions { pub struct OrganizationUserPermissions {

Loading…
Cancel
Save