From a3a03c797432a95fccd2d8602388cfbfe49316b1 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Mon, 11 Sep 2017 23:07:27 -0400 Subject: [PATCH] move private method to bottom --- src/Api/Controllers/TwoFactorController.cs | 37 +++++++++++----------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/src/Api/Controllers/TwoFactorController.cs b/src/Api/Controllers/TwoFactorController.cs index 1f0cdcac3d..6d3bdb3ef9 100644 --- a/src/Api/Controllers/TwoFactorController.cs +++ b/src/Api/Controllers/TwoFactorController.cs @@ -10,7 +10,6 @@ using Bit.Core.Models.Table; using Bit.Core.Enums; using System.Linq; using Bit.Core; -using Newtonsoft.Json; namespace Bit.Api.Controllers { @@ -145,24 +144,6 @@ namespace Bit.Api.Controllers return response; } - public async Task ValidateYubiKeyAsync(User user, string name, string value) - { - if(string.IsNullOrWhiteSpace(value) || value.Length == 12) - { - return; - } - - if(!await _userManager.VerifyTwoFactorTokenAsync(user, TwoFactorProviderType.YubiKey.ToString(), value)) - { - await Task.Delay(2000); - throw new BadRequestException(name, $"{name} is invalid."); - } - else - { - await Task.Delay(500); - } - } - [HttpPost("get-email")] public async Task GetEmail([FromBody]TwoFactorRequestModel model) { @@ -265,5 +246,23 @@ namespace Bit.Api.Controllers return user; } + + private async Task ValidateYubiKeyAsync(User user, string name, string value) + { + if(string.IsNullOrWhiteSpace(value) || value.Length == 12) + { + return; + } + + if(!await _userManager.VerifyTwoFactorTokenAsync(user, TwoFactorProviderType.YubiKey.ToString(), value)) + { + await Task.Delay(2000); + throw new BadRequestException(name, $"{name} is invalid."); + } + else + { + await Task.Delay(500); + } + } } }