nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-05 21:18:13 -05:00
Code

[PM-10961] Cannot delete MSP with apostrophe in name (#4846)

Browse Source
This commit is contained in:
Jonas Hendrickx 2024-10-06 08:14:02 +02:00 committed by GitHub
parent c44988694d
commit a1e4e47e40
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -367,7 +367,7 @@ public class ProvidersController : Controller
return BadRequest("Provider does not exist"); return BadRequest("Provider does not exist");
} }
if (!string.Equals(providerName.Trim(), provider.Name, StringComparison.OrdinalIgnoreCase)) if (!string.Equals(providerName.Trim(), provider.DisplayName(), StringComparison.OrdinalIgnoreCase))
{ {
return BadRequest("Invalid provider name"); return BadRequest("Invalid provider name");
} }

3
src/Admin/AdminConsole/Views/Providers/_ProviderScripts.cshtml
View File

@ -20,9 +20,10 @@
function deleteProvider(id) { function deleteProvider(id) {
const providerName = $('#DeleteModal input#provider-name').val(); const providerName = $('#DeleteModal input#provider-name').val();
const encodedProviderName = encodeURIComponent(providerName);
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: `@Url.Action("Delete", "Providers")?id=${id}&providerName=${providerName}`, url: `@Url.Action("Delete", "Providers")?id=${id}&providerName=${encodedProviderName}`,
dataType: 'json', dataType: 'json',
contentType: false, contentType: false,
processData: false, processData: false,