mirror of
https://github.com/bitwarden/server.git
synced 2025-04-05 05:00:19 -05:00
Add limit item deletion server code (#5308)
This commit is contained in:
parent
6d7bdb6ec0
commit
93f5b34223
@ -57,6 +57,7 @@ public class OrganizationResponseModel : ResponseModel
|
|||||||
MaxAutoscaleSmServiceAccounts = organization.MaxAutoscaleSmServiceAccounts;
|
MaxAutoscaleSmServiceAccounts = organization.MaxAutoscaleSmServiceAccounts;
|
||||||
LimitCollectionCreation = organization.LimitCollectionCreation;
|
LimitCollectionCreation = organization.LimitCollectionCreation;
|
||||||
LimitCollectionDeletion = organization.LimitCollectionDeletion;
|
LimitCollectionDeletion = organization.LimitCollectionDeletion;
|
||||||
|
LimitItemDeletion = organization.LimitItemDeletion;
|
||||||
AllowAdminAccessToAllCollectionItems = organization.AllowAdminAccessToAllCollectionItems;
|
AllowAdminAccessToAllCollectionItems = organization.AllowAdminAccessToAllCollectionItems;
|
||||||
UseRiskInsights = organization.UseRiskInsights;
|
UseRiskInsights = organization.UseRiskInsights;
|
||||||
}
|
}
|
||||||
@ -102,6 +103,7 @@ public class OrganizationResponseModel : ResponseModel
|
|||||||
public int? MaxAutoscaleSmServiceAccounts { get; set; }
|
public int? MaxAutoscaleSmServiceAccounts { get; set; }
|
||||||
public bool LimitCollectionCreation { get; set; }
|
public bool LimitCollectionCreation { get; set; }
|
||||||
public bool LimitCollectionDeletion { get; set; }
|
public bool LimitCollectionDeletion { get; set; }
|
||||||
|
public bool LimitItemDeletion { get; set; }
|
||||||
public bool AllowAdminAccessToAllCollectionItems { get; set; }
|
public bool AllowAdminAccessToAllCollectionItems { get; set; }
|
||||||
public bool UseRiskInsights { get; set; }
|
public bool UseRiskInsights { get; set; }
|
||||||
}
|
}
|
||||||
|
@ -67,6 +67,7 @@ public class ProfileOrganizationResponseModel : ResponseModel
|
|||||||
AccessSecretsManager = organization.AccessSecretsManager;
|
AccessSecretsManager = organization.AccessSecretsManager;
|
||||||
LimitCollectionCreation = organization.LimitCollectionCreation;
|
LimitCollectionCreation = organization.LimitCollectionCreation;
|
||||||
LimitCollectionDeletion = organization.LimitCollectionDeletion;
|
LimitCollectionDeletion = organization.LimitCollectionDeletion;
|
||||||
|
LimitItemDeletion = organization.LimitItemDeletion;
|
||||||
AllowAdminAccessToAllCollectionItems = organization.AllowAdminAccessToAllCollectionItems;
|
AllowAdminAccessToAllCollectionItems = organization.AllowAdminAccessToAllCollectionItems;
|
||||||
UserIsManagedByOrganization = organizationIdsManagingUser.Contains(organization.OrganizationId);
|
UserIsManagedByOrganization = organizationIdsManagingUser.Contains(organization.OrganizationId);
|
||||||
UseRiskInsights = organization.UseRiskInsights;
|
UseRiskInsights = organization.UseRiskInsights;
|
||||||
@ -128,6 +129,7 @@ public class ProfileOrganizationResponseModel : ResponseModel
|
|||||||
public bool AccessSecretsManager { get; set; }
|
public bool AccessSecretsManager { get; set; }
|
||||||
public bool LimitCollectionCreation { get; set; }
|
public bool LimitCollectionCreation { get; set; }
|
||||||
public bool LimitCollectionDeletion { get; set; }
|
public bool LimitCollectionDeletion { get; set; }
|
||||||
|
public bool LimitItemDeletion { get; set; }
|
||||||
public bool AllowAdminAccessToAllCollectionItems { get; set; }
|
public bool AllowAdminAccessToAllCollectionItems { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Indicates if the organization manages the user.
|
/// Indicates if the organization manages the user.
|
||||||
|
@ -47,6 +47,7 @@ public class ProfileProviderOrganizationResponseModel : ProfileOrganizationRespo
|
|||||||
ProductTierType = StaticStore.GetPlan(organization.PlanType).ProductTier;
|
ProductTierType = StaticStore.GetPlan(organization.PlanType).ProductTier;
|
||||||
LimitCollectionCreation = organization.LimitCollectionCreation;
|
LimitCollectionCreation = organization.LimitCollectionCreation;
|
||||||
LimitCollectionDeletion = organization.LimitCollectionDeletion;
|
LimitCollectionDeletion = organization.LimitCollectionDeletion;
|
||||||
|
LimitItemDeletion = organization.LimitItemDeletion;
|
||||||
AllowAdminAccessToAllCollectionItems = organization.AllowAdminAccessToAllCollectionItems;
|
AllowAdminAccessToAllCollectionItems = organization.AllowAdminAccessToAllCollectionItems;
|
||||||
UseRiskInsights = organization.UseRiskInsights;
|
UseRiskInsights = organization.UseRiskInsights;
|
||||||
}
|
}
|
||||||
|
@ -7,12 +7,14 @@ public class OrganizationCollectionManagementUpdateRequestModel
|
|||||||
{
|
{
|
||||||
public bool LimitCollectionCreation { get; set; }
|
public bool LimitCollectionCreation { get; set; }
|
||||||
public bool LimitCollectionDeletion { get; set; }
|
public bool LimitCollectionDeletion { get; set; }
|
||||||
|
public bool LimitItemDeletion { get; set; }
|
||||||
public bool AllowAdminAccessToAllCollectionItems { get; set; }
|
public bool AllowAdminAccessToAllCollectionItems { get; set; }
|
||||||
|
|
||||||
public virtual Organization ToOrganization(Organization existingOrganization, IFeatureService featureService)
|
public virtual Organization ToOrganization(Organization existingOrganization, IFeatureService featureService)
|
||||||
{
|
{
|
||||||
existingOrganization.LimitCollectionCreation = LimitCollectionCreation;
|
existingOrganization.LimitCollectionCreation = LimitCollectionCreation;
|
||||||
existingOrganization.LimitCollectionDeletion = LimitCollectionDeletion;
|
existingOrganization.LimitCollectionDeletion = LimitCollectionDeletion;
|
||||||
|
existingOrganization.LimitItemDeletion = LimitItemDeletion;
|
||||||
existingOrganization.AllowAdminAccessToAllCollectionItems = AllowAdminAccessToAllCollectionItems;
|
existingOrganization.AllowAdminAccessToAllCollectionItems = AllowAdminAccessToAllCollectionItems;
|
||||||
return existingOrganization;
|
return existingOrganization;
|
||||||
}
|
}
|
||||||
|
@ -23,6 +23,7 @@ public class OrganizationAbility
|
|||||||
UsePolicies = organization.UsePolicies;
|
UsePolicies = organization.UsePolicies;
|
||||||
LimitCollectionCreation = organization.LimitCollectionCreation;
|
LimitCollectionCreation = organization.LimitCollectionCreation;
|
||||||
LimitCollectionDeletion = organization.LimitCollectionDeletion;
|
LimitCollectionDeletion = organization.LimitCollectionDeletion;
|
||||||
|
LimitItemDeletion = organization.LimitItemDeletion;
|
||||||
AllowAdminAccessToAllCollectionItems = organization.AllowAdminAccessToAllCollectionItems;
|
AllowAdminAccessToAllCollectionItems = organization.AllowAdminAccessToAllCollectionItems;
|
||||||
UseRiskInsights = organization.UseRiskInsights;
|
UseRiskInsights = organization.UseRiskInsights;
|
||||||
}
|
}
|
||||||
@ -41,6 +42,7 @@ public class OrganizationAbility
|
|||||||
public bool UsePolicies { get; set; }
|
public bool UsePolicies { get; set; }
|
||||||
public bool LimitCollectionCreation { get; set; }
|
public bool LimitCollectionCreation { get; set; }
|
||||||
public bool LimitCollectionDeletion { get; set; }
|
public bool LimitCollectionDeletion { get; set; }
|
||||||
|
public bool LimitItemDeletion { get; set; }
|
||||||
public bool AllowAdminAccessToAllCollectionItems { get; set; }
|
public bool AllowAdminAccessToAllCollectionItems { get; set; }
|
||||||
public bool UseRiskInsights { get; set; }
|
public bool UseRiskInsights { get; set; }
|
||||||
}
|
}
|
||||||
|
@ -56,6 +56,7 @@ public class OrganizationUserOrganizationDetails
|
|||||||
public int? SmServiceAccounts { get; set; }
|
public int? SmServiceAccounts { get; set; }
|
||||||
public bool LimitCollectionCreation { get; set; }
|
public bool LimitCollectionCreation { get; set; }
|
||||||
public bool LimitCollectionDeletion { get; set; }
|
public bool LimitCollectionDeletion { get; set; }
|
||||||
|
public bool LimitItemDeletion { get; set; }
|
||||||
public bool AllowAdminAccessToAllCollectionItems { get; set; }
|
public bool AllowAdminAccessToAllCollectionItems { get; set; }
|
||||||
public bool UseRiskInsights { get; set; }
|
public bool UseRiskInsights { get; set; }
|
||||||
}
|
}
|
||||||
|
@ -146,6 +146,7 @@ public class SelfHostedOrganizationDetails : Organization
|
|||||||
OwnersNotifiedOfAutoscaling = OwnersNotifiedOfAutoscaling,
|
OwnersNotifiedOfAutoscaling = OwnersNotifiedOfAutoscaling,
|
||||||
LimitCollectionCreation = LimitCollectionCreation,
|
LimitCollectionCreation = LimitCollectionCreation,
|
||||||
LimitCollectionDeletion = LimitCollectionDeletion,
|
LimitCollectionDeletion = LimitCollectionDeletion,
|
||||||
|
LimitItemDeletion = LimitItemDeletion,
|
||||||
AllowAdminAccessToAllCollectionItems = AllowAdminAccessToAllCollectionItems,
|
AllowAdminAccessToAllCollectionItems = AllowAdminAccessToAllCollectionItems,
|
||||||
Status = Status
|
Status = Status
|
||||||
};
|
};
|
||||||
|
@ -42,6 +42,7 @@ public class ProviderUserOrganizationDetails
|
|||||||
public PlanType PlanType { get; set; }
|
public PlanType PlanType { get; set; }
|
||||||
public bool LimitCollectionCreation { get; set; }
|
public bool LimitCollectionCreation { get; set; }
|
||||||
public bool LimitCollectionDeletion { get; set; }
|
public bool LimitCollectionDeletion { get; set; }
|
||||||
|
public bool LimitItemDeletion { get; set; }
|
||||||
public bool AllowAdminAccessToAllCollectionItems { get; set; }
|
public bool AllowAdminAccessToAllCollectionItems { get; set; }
|
||||||
public bool UseRiskInsights { get; set; }
|
public bool UseRiskInsights { get; set; }
|
||||||
public ProviderType ProviderType { get; set; }
|
public ProviderType ProviderType { get; set; }
|
||||||
|
@ -62,4 +62,5 @@ public class OrganizationCollectionManagementPushNotification
|
|||||||
public Guid OrganizationId { get; init; }
|
public Guid OrganizationId { get; init; }
|
||||||
public bool LimitCollectionCreation { get; init; }
|
public bool LimitCollectionCreation { get; init; }
|
||||||
public bool LimitCollectionDeletion { get; init; }
|
public bool LimitCollectionDeletion { get; init; }
|
||||||
|
public bool LimitItemDeletion { get; init; }
|
||||||
}
|
}
|
||||||
|
@ -246,7 +246,8 @@ public class NotificationHubPushNotificationService : IPushNotificationService
|
|||||||
{
|
{
|
||||||
OrganizationId = organization.Id,
|
OrganizationId = organization.Id,
|
||||||
LimitCollectionCreation = organization.LimitCollectionCreation,
|
LimitCollectionCreation = organization.LimitCollectionCreation,
|
||||||
LimitCollectionDeletion = organization.LimitCollectionDeletion
|
LimitCollectionDeletion = organization.LimitCollectionDeletion,
|
||||||
|
LimitItemDeletion = organization.LimitItemDeletion
|
||||||
},
|
},
|
||||||
false
|
false
|
||||||
);
|
);
|
||||||
|
@ -239,6 +239,7 @@ public class AzureQueuePushNotificationService : IPushNotificationService
|
|||||||
{
|
{
|
||||||
OrganizationId = organization.Id,
|
OrganizationId = organization.Id,
|
||||||
LimitCollectionCreation = organization.LimitCollectionCreation,
|
LimitCollectionCreation = organization.LimitCollectionCreation,
|
||||||
LimitCollectionDeletion = organization.LimitCollectionDeletion
|
LimitCollectionDeletion = organization.LimitCollectionDeletion,
|
||||||
|
LimitItemDeletion = organization.LimitItemDeletion
|
||||||
}, false);
|
}, false);
|
||||||
}
|
}
|
||||||
|
@ -248,6 +248,7 @@ public class NotificationsApiPushNotificationService : BaseIdentityClientService
|
|||||||
{
|
{
|
||||||
OrganizationId = organization.Id,
|
OrganizationId = organization.Id,
|
||||||
LimitCollectionCreation = organization.LimitCollectionCreation,
|
LimitCollectionCreation = organization.LimitCollectionCreation,
|
||||||
LimitCollectionDeletion = organization.LimitCollectionDeletion
|
LimitCollectionDeletion = organization.LimitCollectionDeletion,
|
||||||
|
LimitItemDeletion = organization.LimitItemDeletion
|
||||||
}, false);
|
}, false);
|
||||||
}
|
}
|
||||||
|
@ -273,7 +273,8 @@ public class RelayPushNotificationService : BaseIdentityClientService, IPushNoti
|
|||||||
{
|
{
|
||||||
OrganizationId = organization.Id,
|
OrganizationId = organization.Id,
|
||||||
LimitCollectionCreation = organization.LimitCollectionCreation,
|
LimitCollectionCreation = organization.LimitCollectionCreation,
|
||||||
LimitCollectionDeletion = organization.LimitCollectionDeletion
|
LimitCollectionDeletion = organization.LimitCollectionDeletion,
|
||||||
|
LimitItemDeletion = organization.LimitItemDeletion
|
||||||
},
|
},
|
||||||
false
|
false
|
||||||
);
|
);
|
||||||
|
@ -101,6 +101,7 @@ public class OrganizationRepository : Repository<Core.AdminConsole.Entities.Orga
|
|||||||
UsePolicies = e.UsePolicies,
|
UsePolicies = e.UsePolicies,
|
||||||
LimitCollectionCreation = e.LimitCollectionCreation,
|
LimitCollectionCreation = e.LimitCollectionCreation,
|
||||||
LimitCollectionDeletion = e.LimitCollectionDeletion,
|
LimitCollectionDeletion = e.LimitCollectionDeletion,
|
||||||
|
LimitItemDeletion = e.LimitItemDeletion,
|
||||||
AllowAdminAccessToAllCollectionItems = e.AllowAdminAccessToAllCollectionItems,
|
AllowAdminAccessToAllCollectionItems = e.AllowAdminAccessToAllCollectionItems,
|
||||||
UseRiskInsights = e.UseRiskInsights
|
UseRiskInsights = e.UseRiskInsights
|
||||||
}).ToListAsync();
|
}).ToListAsync();
|
||||||
|
@ -68,6 +68,7 @@ public class OrganizationUserOrganizationDetailsViewQuery : IQuery<OrganizationU
|
|||||||
SmServiceAccounts = o.SmServiceAccounts,
|
SmServiceAccounts = o.SmServiceAccounts,
|
||||||
LimitCollectionCreation = o.LimitCollectionCreation,
|
LimitCollectionCreation = o.LimitCollectionCreation,
|
||||||
LimitCollectionDeletion = o.LimitCollectionDeletion,
|
LimitCollectionDeletion = o.LimitCollectionDeletion,
|
||||||
|
LimitItemDeletion = o.LimitItemDeletion,
|
||||||
AllowAdminAccessToAllCollectionItems = o.AllowAdminAccessToAllCollectionItems,
|
AllowAdminAccessToAllCollectionItems = o.AllowAdminAccessToAllCollectionItems,
|
||||||
UseRiskInsights = o.UseRiskInsights,
|
UseRiskInsights = o.UseRiskInsights,
|
||||||
};
|
};
|
||||||
|
@ -46,6 +46,7 @@ public class ProviderUserOrganizationDetailsViewQuery : IQuery<ProviderUserOrgan
|
|||||||
PlanType = x.o.PlanType,
|
PlanType = x.o.PlanType,
|
||||||
LimitCollectionCreation = x.o.LimitCollectionCreation,
|
LimitCollectionCreation = x.o.LimitCollectionCreation,
|
||||||
LimitCollectionDeletion = x.o.LimitCollectionDeletion,
|
LimitCollectionDeletion = x.o.LimitCollectionDeletion,
|
||||||
|
LimitItemDeletion = x.o.LimitItemDeletion,
|
||||||
AllowAdminAccessToAllCollectionItems = x.o.AllowAdminAccessToAllCollectionItems,
|
AllowAdminAccessToAllCollectionItems = x.o.AllowAdminAccessToAllCollectionItems,
|
||||||
UseRiskInsights = x.o.UseRiskInsights,
|
UseRiskInsights = x.o.UseRiskInsights,
|
||||||
ProviderType = x.p.Type
|
ProviderType = x.p.Type
|
||||||
|
Loading…
x
Reference in New Issue
Block a user