bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2026-01-16 15:33:19 +00:00
Code Issues Releases Wiki Activity

Allow for deletion of pending providers (#5679)

Browse Source
This commit is contained in:
Alex Morask
2025-04-28 15:50:40 -04:00
committed by GitHub
parent 07a2c0e9d2
commit 00b9ba2392
2 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Admin/AdminConsole/Controllers/ProvidersController.cs
View File

@@ -470,6 +470,19 @@ public class ProvidersController : Controller
[RequirePermission(Permission.Provider_Edit)]
public async Task<IActionResult> Delete(Guid id, string providerName)
{
var provider = await _providerRepository.GetByIdAsync(id);
if (provider is null)
{
return BadRequest("Provider does not exist");
}
if (provider.Status == ProviderStatusType.Pending)
{
await _providerService.DeleteAsync(provider);
return NoContent();
}
if (string.IsNullOrWhiteSpace(providerName))
{
return BadRequest("Invalid provider name");
@@ -482,13 +495,6 @@ public class ProvidersController : Controller
return BadRequest("You must unlink all clients before you can delete a provider");
}
var provider = await _providerRepository.GetByIdAsync(id);
if (provider is null)
{
return BadRequest("Provider does not exist");
}
if (!string.Equals(providerName.Trim(), provider.DisplayName(), StringComparison.OrdinalIgnoreCase))
{
return BadRequest("Invalid provider name");