mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2024-11-19 09:54:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup U2F namespace to correspond to folder path

Browse Source
This commit is contained in:
rockstardev 2019-10-02 12:32:41 -05:00
parent 639f5d2fc4
commit 7282199c31
18 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BTCPayServer.Tests/UnitTest1.cs
View File

@ -57,11 +57,11 @@ using System.Security;
using System.Runtime.CompilerServices;
using System.Net;
using BTCPayServer.Models.AccountViewModels;
using BTCPayServer.Services.U2F.Models;
using Microsoft.AspNetCore.Http.Internal;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.DependencyInjection;
using NBXplorer.DerivationStrategy;
using BTCPayServer.U2F.Models;
namespace BTCPayServer.Tests
{

2
BTCPayServer/Authentication/OpenId/PasswordGrantTypeEventHandler.cs
View File

@ -2,7 +2,7 @@ using System.Threading.Tasks;
using AspNet.Security.OpenIdConnect.Primitives;
using BTCPayServer.Data;
using BTCPayServer.Models;
using BTCPayServer.Services.U2F;
using BTCPayServer.U2F;
using Microsoft.AspNetCore.Identity;
using Microsoft.Extensions.Options;
using OpenIddict.Abstractions;

5
BTCPayServer/BTCPayServer.csproj
View File

@ -6,18 +6,22 @@
</PropertyGroup>
<ItemGroup>
<Compile Remove="Build\dockerfiles\**" />
<Compile Remove="U2F\Services\**" />
<Compile Remove="wwwroot\bundles\jqueryvalidate\**" />
<Compile Remove="wwwroot\css\**" />
<Compile Remove="wwwroot\vendor\jquery-nice-select\**" />
<Content Remove="Build\dockerfiles\**" />
<Content Remove="U2F\Services\**" />
<Content Remove="wwwroot\bundles\jqueryvalidate\**" />
<Content Remove="wwwroot\css\**" />
<Content Remove="wwwroot\vendor\jquery-nice-select\**" />
<EmbeddedResource Remove="Build\dockerfiles\**" />
<EmbeddedResource Remove="U2F\Services\**" />
<EmbeddedResource Remove="wwwroot\bundles\jqueryvalidate\**" />
<EmbeddedResource Remove="wwwroot\css\**" />
<EmbeddedResource Remove="wwwroot\vendor\jquery-nice-select\**" />
<None Remove="Build\dockerfiles\**" />
<None Remove="U2F\Services\**" />
<None Remove="wwwroot\bundles\jqueryvalidate\**" />
<None Remove="wwwroot\css\**" />
<None Remove="wwwroot\vendor\jquery-nice-select\**" />
@ -122,7 +126,6 @@
<ItemGroup>
<Folder Include="Authentication\OpenId\Models\" />
<Folder Include="Build\" />
<Folder Include="U2F\Services" />
<Folder Include="wwwroot\vendor\clipboard.js\" />
<Folder Include="wwwroot\vendor\highlightjs\" />
<Folder Include="wwwroot\vendor\summernote" />

4
BTCPayServer/Controllers/AccountController.cs
View File

@ -18,8 +18,8 @@ using BTCPayServer.Services.Stores;
using BTCPayServer.Logging;
using BTCPayServer.Security;
using System.Globalization;
using BTCPayServer.Services.U2F;
using BTCPayServer.Services.U2F.Models;
using BTCPayServer.U2F;
using BTCPayServer.U2F.Models;
using Newtonsoft.Json;
using NicolasDorier.RateLimits;
using BTCPayServer.Data;

2
BTCPayServer/Controllers/ManageController.U2F.cs
View File

@ -1,7 +1,7 @@
using System;
using System.Threading.Tasks;
using BTCPayServer.Models;
using BTCPayServer.Services.U2F.Models;
using BTCPayServer.U2F.Models;
using Microsoft.AspNetCore.Mvc;
namespace BTCPayServer.Controllers

2
BTCPayServer/Controllers/ManageController.cs
View File

@ -18,7 +18,7 @@ using BTCPayServer.Services.Wallets;
using BTCPayServer.Services.Mails;
using System.Globalization;
using BTCPayServer.Security;
using BTCPayServer.Services.U2F;
using BTCPayServer.U2F;
using BTCPayServer.Data;
namespace BTCPayServer.Controllers

2
BTCPayServer/Hosting/BTCPayServerServices.cs
View File

@ -40,7 +40,7 @@ using NBXplorer.DerivationStrategy;
using NicolasDorier.RateLimits;
using Npgsql;
using BTCPayServer.Services.Apps;
using BTCPayServer.Services.U2F;
using BTCPayServer.U2F;
using BundlerMinifier.TagHelpers;
using OpenIddict.EntityFrameworkCore.Models;

2
BTCPayServer/Models/AccountViewModels/SecondaryLoginViewModel.cs
View File

@ -1,4 +1,4 @@
using BTCPayServer.Services.U2F.Models;
using BTCPayServer.U2F.Models;
namespace BTCPayServer.Models.AccountViewModels
{

4
BTCPayServer/U2F/Models/AddU2FDeviceViewModel.cs
View File

@ -1,4 +1,4 @@
namespace BTCPayServer.Services.U2F.Models
namespace BTCPayServer.U2F.Models
{
public class AddU2FDeviceViewModel
{
@ -9,4 +9,4 @@ namespace BTCPayServer.Services.U2F.Models
public string Name { get; set; }
}
}
}

2
BTCPayServer/U2F/Models/LoginWithU2FViewModel.cs
View File

@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace BTCPayServer.Services.U2F.Models
namespace BTCPayServer.U2F.Models
{
public class LoginWithU2FViewModel
{

4
BTCPayServer/U2F/Models/ServerChallenge.cs
View File

@ -1,4 +1,4 @@
namespace BTCPayServer.Services.U2F.Models
namespace BTCPayServer.U2F.Models
{
public class ServerChallenge
{
@ -7,4 +7,4 @@ namespace BTCPayServer.Services.U2F.Models
public string appId { get; set; }
public string keyHandle { get; set; }
}
}
}

4
BTCPayServer/U2F/Models/ServerRegisterResponse.cs
View File

@ -1,4 +1,4 @@
namespace BTCPayServer.Services.U2F.Models
namespace BTCPayServer.U2F.Models
{
public class ServerRegisterResponse
{
@ -6,4 +6,4 @@ namespace BTCPayServer.Services.U2F.Models
public string Challenge { get; set; }
public string Version { get; set; }
}
}
}

2
BTCPayServer/U2F/Models/U2FAuthenticationViewModel.cs
View File

@ -1,7 +1,7 @@
using System.Collections.Generic;
using BTCPayServer.Data;
namespace BTCPayServer.Services.U2F.Models
namespace BTCPayServer.U2F.Models
{
public class U2FAuthenticationViewModel
{

4
BTCPayServer/U2F/Models/U2FDeviceAuthenticationRequest.cs
View File

@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
namespace BTCPayServer.Services.U2F.Models
namespace BTCPayServer.U2F.Models
{
public class U2FDeviceAuthenticationRequest
{
@ -12,4 +12,4 @@ namespace BTCPayServer.Services.U2F.Models
[Required] [StringLength(50)] public string Version { get; set; }
}
}
}

4
BTCPayServer/U2F/U2FService.cs
View File

@ -5,14 +5,14 @@ using System.Linq;
using System.Threading.Tasks;
using BTCPayServer.Data;
using BTCPayServer.Models;
using BTCPayServer.Services.U2F.Models;
using BTCPayServer.U2F.Models;
using Microsoft.AspNetCore.Identity;
using Microsoft.EntityFrameworkCore;
using NBitcoin;
using U2F.Core.Models;
using U2F.Core.Utils;
namespace BTCPayServer.Services.U2F
namespace BTCPayServer.U2F
{
public class U2FService
{

2
BTCPayServer/Views/Account/LoginWithU2F.cshtml
View File

@ -1,4 +1,4 @@
@model BTCPayServer.Services.U2F.Models.LoginWithU2FViewModel
@model BTCPayServer.U2F.Models.LoginWithU2FViewModel
<form id="u2fForm" asp-action="LoginWithU2F" method="post" asp-route-returnUrl="@ViewData["ReturnUrl"]">
<input type="hidden" asp-for="Version" />

2
BTCPayServer/Views/Manage/AddU2FDevice.cshtml
View File

@ -1,4 +1,4 @@
@model BTCPayServer.Services.U2F.Models.AddU2FDeviceViewModel
@model BTCPayServer.U2F.Models.AddU2FDeviceViewModel
@{
ViewData.SetActivePageAndTitle(ManageNavPages.U2F, "Add U2F device");
}

2
BTCPayServer/Views/Manage/U2FAuthentication.cshtml
View File

@ -1,4 +1,4 @@
@model BTCPayServer.Services.U2F.Models.U2FAuthenticationViewModel
@model BTCPayServer.U2F.Models.U2FAuthenticationViewModel
@{
ViewData.SetActivePageAndTitle(ManageNavPages.U2F, "Manage your registered U2F devices");
}