Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-01-31 23:21:22 +01:00
Code Issues Projects Releases Wiki Activity

fix: remove delete from cs/billing and create new RequestDelete perm, refs PM-17014 (#5258)

Browse Source
This commit is contained in:
Vincent Salucci 2025-01-13 14:54:32 -06:00 committed by GitHub
parent 6c7b881e51
commit 82508fb7a9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Admin/AdminConsole/Views/Organizations/Edit.cshtml
View File

@ -10,6 +10,7 @@
var canViewOrganizationInformation = AccessControlService.UserHasPermission(Permission.Org_OrgInformation_View); var canViewOrganizationInformation = AccessControlService.UserHasPermission(Permission.Org_OrgInformation_View);
var canViewBillingInformation = AccessControlService.UserHasPermission(Permission.Org_BillingInformation_View); var canViewBillingInformation = AccessControlService.UserHasPermission(Permission.Org_BillingInformation_View);
var canInitiateTrial = AccessControlService.UserHasPermission(Permission.Org_InitiateTrial); var canInitiateTrial = AccessControlService.UserHasPermission(Permission.Org_InitiateTrial);
var canRequestDelete = AccessControlService.UserHasPermission(Permission.Org_RequestDelete);
var canDelete = AccessControlService.UserHasPermission(Permission.Org_Delete); var canDelete = AccessControlService.UserHasPermission(Permission.Org_Delete);
var canUnlinkFromProvider = AccessControlService.UserHasPermission(Permission.Provider_Edit); var canUnlinkFromProvider = AccessControlService.UserHasPermission(Permission.Provider_Edit);
} }
@ -120,12 +121,15 @@
Unlink provider Unlink provider
</button> </button>
} }
@if (canDelete) @if (canRequestDelete)
{ {
<form asp-action="DeleteInitiation" asp-route-id="@Model.Organization.Id" id="initiate-delete-form"> <form asp-action="DeleteInitiation" asp-route-id="@Model.Organization.Id" id="initiate-delete-form">
<input type="hidden" name="AdminEmail" id="AdminEmail" /> <input type="hidden" name="AdminEmail" id="AdminEmail" />
<button class="btn btn-danger me-2" type="submit">Request Delete</button> <button class="btn btn-danger me-2" type="submit">Request Delete</button>
</form> </form>
}
@if (canDelete)
{
<form asp-action="Delete" asp-route-id="@Model.Organization.Id" <form asp-action="Delete" asp-route-id="@Model.Organization.Id"
onsubmit="return confirm('Are you sure you want to hard delete this organization?')"> onsubmit="return confirm('Are you sure you want to hard delete this organization?')">
<button class="btn btn-outline-danger" type="submit">Delete</button> <button class="btn btn-outline-danger" type="submit">Delete</button>

1
src/Admin/Enums/Permissions.cs
View File

@ -24,6 +24,7 @@ public enum Permission
Org_CheckEnabledBox, Org_CheckEnabledBox,
Org_BusinessInformation_View, Org_BusinessInformation_View,
Org_InitiateTrial, Org_InitiateTrial,
Org_RequestDelete,
Org_Delete, Org_Delete,
Org_BillingInformation_View, Org_BillingInformation_View,
Org_BillingInformation_DownloadInvoice, Org_BillingInformation_DownloadInvoice,

6
src/Admin/Utilities/RolePermissionMapping.cs
View File

@ -30,6 +30,7 @@ public static class RolePermissionMapping
Permission.Org_BusinessInformation_View, Permission.Org_BusinessInformation_View,
Permission.Org_InitiateTrial, Permission.Org_InitiateTrial,
Permission.Org_Delete, Permission.Org_Delete,
Permission.Org_RequestDelete,
Permission.Org_BillingInformation_View, Permission.Org_BillingInformation_View,
Permission.Org_BillingInformation_DownloadInvoice, Permission.Org_BillingInformation_DownloadInvoice,
Permission.Org_Plan_View, Permission.Org_Plan_View,
@ -74,6 +75,7 @@ public static class RolePermissionMapping
Permission.Org_GeneralDetails_View, Permission.Org_GeneralDetails_View,
Permission.Org_BusinessInformation_View, Permission.Org_BusinessInformation_View,
Permission.Org_Delete, Permission.Org_Delete,
Permission.Org_RequestDelete,
Permission.Org_BillingInformation_View, Permission.Org_BillingInformation_View,
Permission.Org_BillingInformation_DownloadInvoice, Permission.Org_BillingInformation_DownloadInvoice,
Permission.Org_BillingInformation_CreateEditTransaction, Permission.Org_BillingInformation_CreateEditTransaction,
@ -114,7 +116,6 @@ public static class RolePermissionMapping
Permission.User_Billing_LaunchGateway, Permission.User_Billing_LaunchGateway,
Permission.Org_List_View, Permission.Org_List_View,
Permission.Org_OrgInformation_View, Permission.Org_OrgInformation_View,
Permission.Org_Delete,
Permission.Org_GeneralDetails_View, Permission.Org_GeneralDetails_View,
Permission.Org_BusinessInformation_View, Permission.Org_BusinessInformation_View,
Permission.Org_BillingInformation_View, Permission.Org_BillingInformation_View,
@ -124,6 +125,7 @@ public static class RolePermissionMapping
Permission.Org_Licensing_View, Permission.Org_Licensing_View,
Permission.Org_Billing_View, Permission.Org_Billing_View,
Permission.Org_Billing_LaunchGateway, Permission.Org_Billing_LaunchGateway,
Permission.Org_RequestDelete,
Permission.Provider_List_View, Permission.Provider_List_View,
Permission.Provider_View Permission.Provider_View
} }
@ -157,7 +159,7 @@ public static class RolePermissionMapping
Permission.Org_Billing_View, Permission.Org_Billing_View,
Permission.Org_Billing_Edit, Permission.Org_Billing_Edit,
Permission.Org_Billing_LaunchGateway, Permission.Org_Billing_LaunchGateway,
Permission.Org_Delete, Permission.Org_RequestDelete,
Permission.Provider_Edit, Permission.Provider_Edit,
Permission.Provider_View, Permission.Provider_View,
Permission.Provider_List_View, Permission.Provider_List_View,