nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-30 23:52:50 -05:00
Code Activity

Revert "[SG-648] BEEEP-Refactor DuoApi class to use Httpclient (#2691)" (#2792)

Browse Source 
This reverts commit f11c58e396.
This commit is contained in:
SmithThe4th
2023-03-09 12:07:12 -05:00
committed by GitHub
parent 03bbc7195b
commit 15954fb679
4 changed files with 65 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Api/Controllers/TwoFactorController.cs
View File

@ -11,6 +11,7 @@ using Bit.Core.Repositories;
using Bit.Core.Services;
using Bit.Core.Settings;
using Bit.Core.Utilities;
using Bit.Core.Utilities.Duo;
using Fido2NetLib;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Identity;
@ -152,7 +153,7 @@ public class TwoFactorController : Controller
try
{
var duoApi = new DuoApi(model.IntegrationKey, model.SecretKey, model.Host);
await duoApi.JSONApiCall("GET", "/auth/v2/check");
duoApi.JSONApiCall<object>("GET", "/auth/v2/check");
}
catch (DuoException)
{
@ -209,7 +210,7 @@ public class TwoFactorController : Controller
try
{
var duoApi = new DuoApi(model.IntegrationKey, model.SecretKey, model.Host);
await duoApi.JSONApiCall("GET", "/auth/v2/check");
duoApi.JSONApiCall<object>("GET", "/auth/v2/check");
}
catch (DuoException)
{

3
src/Api/Models/Request/TwoFactorRequestModels.cs
View File

@ -3,7 +3,6 @@ using Bit.Api.Models.Request.Accounts;
using Bit.Core.Entities;
using Bit.Core.Enums;
using Bit.Core.Models;
using Bit.Core.Utilities;
using Fido2NetLib;
namespace Bit.Api.Models.Request;
@ -105,7 +104,7 @@ public class UpdateTwoFactorDuoRequestModel : SecretVerificationRequestModel, IV
public override IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
{
if (!DuoApi.ValidHost(Host))
if (!Core.Utilities.Duo.DuoApi.ValidHost(Host))
{
yield return new ValidationResult("Host is invalid.", new string[] { nameof(Host) });
}