Merge pull request #1068 from rockstardev/master

Cleanup U2F namespace to correspond to folder path

BTCPayServer.Common/Altcoins/Monero/RPC/JsonRpcClient.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 
-namespace BTCPayServer.Altcoins.Monero.RPC
+namespace BTCPayServer.Services.Altcoins.Monero.RPC
 {
     public class JsonRpcClient
     {

BTCPayServer.Common/Altcoins/Monero/RPC/Models/CreateAccountRequest.cs

@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace BTCPayServer.Altcoins.Monero.RPC.Models
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
 {
     public partial class CreateAccountRequest
     {

BTCPayServer.Common/Altcoins/Monero/RPC/Models/CreateAccountResponse.cs

@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace BTCPayServer.Altcoins.Monero.RPC.Models
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
 {
     public partial class CreateAccountResponse
     {

BTCPayServer.Common/Altcoins/Monero/RPC/Models/CreateAddressRequest.cs

@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace BTCPayServer.Altcoins.Monero.RPC.Models
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
 {
     public partial class CreateAddressRequest
     {

BTCPayServer.Common/Altcoins/Monero/RPC/Models/CreateAddressResponse.cs

@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace BTCPayServer.Altcoins.Monero.RPC.Models
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
 {
     public partial class CreateAddressResponse
     {

BTCPayServer.Common/Altcoins/Monero/RPC/Models/GetAccountsRequest.cs

@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace BTCPayServer.Altcoins.Monero.RPC.Models
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
 {
     public partial class GetAccountsRequest
     {

BTCPayServer.Common/Altcoins/Monero/RPC/Models/GetAccountsResponse.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
-namespace BTCPayServer.Altcoins.Monero.RPC.Models
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
 {
     public partial class GetAccountsResponse
     {

BTCPayServer.Common/Altcoins/Monero/RPC/Models/GetFeeEstimateRequest.cs

@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace BTCPayServer.Altcoins.Monero.RPC.Models
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
 {
     public class GetFeeEstimateRequest
     {

BTCPayServer.Common/Altcoins/Monero/RPC/Models/GetFeeEstimateResponse.cs

@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace BTCPayServer.Altcoins.Monero.RPC.Models
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
 {
     public class GetFeeEstimateResponse
     {

BTCPayServer.Common/Altcoins/Monero/RPC/Models/GetHeightResponse.cs

@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace BTCPayServer.Altcoins.Monero.RPC.Models
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
 {
     public partial class GetHeightResponse
     {

BTCPayServer.Common/Altcoins/Monero/RPC/Models/GetTransferByTransactionIdRequest.cs

@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace BTCPayServer.Altcoins.Monero.RPC.Models
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
 {
     public class GetTransferByTransactionIdRequest
     {

BTCPayServer.Common/Altcoins/Monero/RPC/Models/GetTransferByTransactionIdResponse.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
-namespace BTCPayServer.Altcoins.Monero.RPC.Models
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
 {
     public partial class GetTransferByTransactionIdResponse
     {

BTCPayServer.Common/Altcoins/Monero/RPC/Models/GetTransfersRequest.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
-namespace BTCPayServer.Altcoins.Monero.RPC.Models
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
 {
     public partial class GetTransfersRequest
     {

BTCPayServer.Common/Altcoins/Monero/RPC/Models/GetTransfersResponse.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
-namespace BTCPayServer.Altcoins.Monero.RPC.Models
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
 {
     public partial class GetTransfersResponse
     {

BTCPayServer.Common/Altcoins/Monero/RPC/Models/Info.cs

@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace BTCPayServer.Altcoins.Monero.RPC.Models
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
 {
     public partial class Info
     {

BTCPayServer.Common/Altcoins/Monero/RPC/Models/MakeUriRequest.cs

@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace BTCPayServer.Altcoins.Monero.RPC.Models
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
 {
     public partial class MakeUriRequest
     {

BTCPayServer.Common/Altcoins/Monero/RPC/Models/MakeUriResponse.cs

@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace BTCPayServer.Altcoins.Monero.RPC.Models
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
 {
     public partial class MakeUriResponse
     {

BTCPayServer.Common/Altcoins/Monero/RPC/Models/ParseStringConverter.cs

@@ -2,7 +2,7 @@ using System;
 using System.Globalization;
 using Newtonsoft.Json;
 
-namespace BTCPayServer.Altcoins.Monero.RPC.Models
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
 {
     internal class ParseStringConverter : JsonConverter
     {

BTCPayServer.Common/Altcoins/Monero/RPC/Models/Peer.cs

@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace BTCPayServer.Altcoins.Monero.RPC.Models
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
 {
     public partial class Peer
     {

BTCPayServer.Common/Altcoins/Monero/RPC/Models/SubaddrIndex.cs

@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace BTCPayServer.Altcoins.Monero.RPC.Models
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
 {
     public partial class SubaddrIndex
     {

BTCPayServer.Common/Altcoins/Monero/RPC/Models/SubaddressAccount.cs

@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace BTCPayServer.Altcoins.Monero.RPC.Models
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
 {
     public partial class SubaddressAccount
     {

BTCPayServer.Common/Altcoins/Monero/RPC/Models/SyncInfoResponse.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
-namespace BTCPayServer.Altcoins.Monero.RPC.Models
+namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
 {
     public partial class SyncInfoResponse
     {

BTCPayServer.Common/Altcoins/Monero/Utils/MoneroMoney.cs

@@ -1,6 +1,6 @@
 using System.Globalization;
 
-namespace BTCPayServer.Altcoins.Monero.Utils
+namespace BTCPayServer.Services.Altcoins.Monero.Utils
 {
     public class MoneroMoney
     {

BTCPayServer.Tests/UnitTest1.cs

@@ -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
 {

BTCPayServer/Authentication/OpenId/PasswordGrantTypeEventHandler.cs

@@ -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;

BTCPayServer/BTCPayServer.csproj

@@ -5,19 +5,19 @@
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Remove="Build\dockerfiles\**" />
+    <Compile Remove="Build\**" />
     <Compile Remove="wwwroot\bundles\jqueryvalidate\**" />
     <Compile Remove="wwwroot\css\**" />
     <Compile Remove="wwwroot\vendor\jquery-nice-select\**" />
-    <Content Remove="Build\dockerfiles\**" />
+    <Content Remove="Build\**" />
     <Content Remove="wwwroot\bundles\jqueryvalidate\**" />
     <Content Remove="wwwroot\css\**" />
     <Content Remove="wwwroot\vendor\jquery-nice-select\**" />
-    <EmbeddedResource Remove="Build\dockerfiles\**" />
+    <EmbeddedResource Remove="Build\**" />
     <EmbeddedResource Remove="wwwroot\bundles\jqueryvalidate\**" />
     <EmbeddedResource Remove="wwwroot\css\**" />
     <EmbeddedResource Remove="wwwroot\vendor\jquery-nice-select\**" />
-    <None Remove="Build\dockerfiles\**" />
+    <None Remove="Build\**" />
     <None Remove="wwwroot\bundles\jqueryvalidate\**" />
     <None Remove="wwwroot\css\**" />
     <None Remove="wwwroot\vendor\jquery-nice-select\**" />
@@ -121,8 +121,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" />

BTCPayServer/Controllers/AccountController.cs

@@ -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;

BTCPayServer/Controllers/ManageController.U2F.cs

@@ -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

BTCPayServer/Controllers/ManageController.cs

@@ -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

BTCPayServer/Hosting/BTCPayServerServices.cs

@@ -1,5 +1,5 @@
 using BTCPayServer.Configuration;
-using BTCPayServer.Altcoins.Monero;
+using BTCPayServer.Services.Altcoins.Monero;
 using Microsoft.Extensions.Logging;
 using System;
 using System.IdentityModel.Tokens.Jwt;
@@ -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;
 

BTCPayServer/Models/AccountViewModels/SecondaryLoginViewModel.cs

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

BTCPayServer/Payments/PaymentTypes.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using BTCPayServer.Altcoins.Monero.Payments;
+using BTCPayServer.Services.Altcoins.Monero.Payments;
 using BTCPayServer.Services.Invoices;
 using Newtonsoft.Json.Linq;
 

BTCPayServer/Security/BTCPayClaimsFilter.cs

@@ -10,7 +10,6 @@ using Microsoft.Extensions.Options;
 
 namespace BTCPayServer.Security
 {
-
     public class BTCPayClaimsFilter : IAsyncAuthorizationFilter, IConfigureOptions<MvcOptions>
     {
         UserManager<ApplicationUser> _userManager;

BTCPayServer/Services/Altcoins/Monero/Configuration/MoneroLikeConfiguration.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace BTCPayServer.Altcoins.Monero.Configuration
+namespace BTCPayServer.Services.Altcoins.Monero.Configuration
 {
     public class MoneroLikeConfiguration
     {

BTCPayServer/Services/Altcoins/Monero/MoneroLikeExtensions.cs

@@ -2,14 +2,14 @@ using System;
 using System.Linq;
 using BTCPayServer.Configuration;
 using BTCPayServer.Contracts;
-using BTCPayServer.Altcoins.Monero.Configuration;
-using BTCPayServer.Altcoins.Monero.Payments;
-using BTCPayServer.Altcoins.Monero.Services;
+using BTCPayServer.Services.Altcoins.Monero.Configuration;
+using BTCPayServer.Services.Altcoins.Monero.Payments;
+using BTCPayServer.Services.Altcoins.Monero.Services;
 using BTCPayServer.Payments;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace BTCPayServer.Altcoins.Monero
+namespace BTCPayServer.Services.Altcoins.Monero
 {
     public static class MoneroLikeExtensions
     {

BTCPayServer/Services/Altcoins/Monero/MoneroStoreNavExtension.cs

@@ -1,6 +1,6 @@
 using BTCPayServer.Contracts;
 
-namespace BTCPayServer.Altcoins.Monero
+namespace BTCPayServer.Services.Altcoins.Monero
 {
     public class MoneroStoreNavExtension: IStoreNavExtension
     {

BTCPayServer/Services/Altcoins/Monero/Payments/MoneroLikeOnChainPaymentMethodDetails.cs

@@ -1,6 +1,6 @@
 using BTCPayServer.Payments;
 
-namespace BTCPayServer.Altcoins.Monero.Payments
+namespace BTCPayServer.Services.Altcoins.Monero.Payments
 {
     public class MoneroLikeOnChainPaymentMethodDetails : IPaymentMethodDetails
     {

BTCPayServer/Services/Altcoins/Monero/Payments/MoneroLikePaymentData.cs

@@ -1,9 +1,9 @@
 using BTCPayServer.Data;
-using BTCPayServer.Altcoins.Monero.Utils;
+using BTCPayServer.Services.Altcoins.Monero.Utils;
 using BTCPayServer.Payments;
 using BTCPayServer.Services.Invoices;
 
-namespace BTCPayServer.Altcoins.Monero.Payments
+namespace BTCPayServer.Services.Altcoins.Monero.Payments
 {
     public class MoneroLikePaymentData : CryptoPaymentData
     {

BTCPayServer/Services/Altcoins/Monero/Payments/MoneroLikePaymentMethodHandler.cs

@@ -6,16 +6,16 @@ using BTCPayServer.Data;
 using BTCPayServer.Lightning;
 using BTCPayServer.Models;
 using BTCPayServer.Models.InvoicingModels;
-using BTCPayServer.Altcoins.Monero.RPC.Models;
-using BTCPayServer.Altcoins.Monero.Services;
-using BTCPayServer.Altcoins.Monero.Utils;
+using BTCPayServer.Services.Altcoins.Monero.RPC.Models;
+using BTCPayServer.Services.Altcoins.Monero.Services;
+using BTCPayServer.Services.Altcoins.Monero.Utils;
 using BTCPayServer.Payments;
 using BTCPayServer.Rating;
 using BTCPayServer.Services.Invoices;
 using BTCPayServer.Services.Rates;
 using NBitcoin;
 
-namespace BTCPayServer.Altcoins.Monero.Payments
+namespace BTCPayServer.Services.Altcoins.Monero.Payments
 {
     public class MoneroLikePaymentMethodHandler : PaymentMethodHandlerBase<MoneroSupportedPaymentMethod, MoneroLikeSpecificBtcPayNetwork>
     {

BTCPayServer/Services/Altcoins/Monero/Payments/MoneroPaymentType.cs

@@ -4,7 +4,7 @@ using BTCPayServer.Services.Invoices;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace BTCPayServer.Altcoins.Monero.Payments
+namespace BTCPayServer.Services.Altcoins.Monero.Payments
 {
     public class MoneroPaymentType: PaymentType
     {

BTCPayServer/Services/Altcoins/Monero/Payments/MoneroSupportedPaymentMethod.cs

@@ -1,6 +1,6 @@
 using BTCPayServer.Payments;
 
-namespace BTCPayServer.Altcoins.Monero.Payments
+namespace BTCPayServer.Services.Altcoins.Monero.Payments
 {
     public class MoneroSupportedPaymentMethod : ISupportedPaymentMethod
     {

BTCPayServer/Services/Altcoins/Monero/RPC/MoneroDaemonCallbackController.cs

@@ -1,7 +1,7 @@
 using BTCPayServer.Filters;
 using Microsoft.AspNetCore.Mvc;
 
-namespace BTCPayServer.Altcoins.Monero.RPC
+namespace BTCPayServer.Services.Altcoins.Monero.RPC
 {
     [Route("[controller]")]
     [OnlyIfSupportAttribute("XMR")]

BTCPayServer/Services/Altcoins/Monero/RPC/MoneroEvent.cs

@@ -1,4 +1,4 @@
-namespace BTCPayServer.Altcoins.Monero.RPC
+namespace BTCPayServer.Services.Altcoins.Monero.RPC
 {
     public class MoneroEvent
     {

BTCPayServer/Services/Altcoins/Monero/Services/MoneroLikeSummaryUpdaterHostedService.cs

@@ -2,11 +2,11 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Logging;
-using BTCPayServer.Altcoins.Monero.Configuration;
+using BTCPayServer.Services.Altcoins.Monero.Configuration;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
-namespace BTCPayServer.Altcoins.Monero.Services
+namespace BTCPayServer.Services.Altcoins.Monero.Services
 {
     public class MoneroLikeSummaryUpdaterHostedService: IHostedService
     {

BTCPayServer/Services/Altcoins/Monero/Services/MoneroListener.cs

@@ -6,10 +6,10 @@ using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Data;
 using BTCPayServer.Events;
-using BTCPayServer.Altcoins.Monero.Configuration;
-using BTCPayServer.Altcoins.Monero.Payments;
-using BTCPayServer.Altcoins.Monero.RPC;
-using BTCPayServer.Altcoins.Monero.RPC.Models;
+using BTCPayServer.Services.Altcoins.Monero.Configuration;
+using BTCPayServer.Services.Altcoins.Monero.Payments;
+using BTCPayServer.Services.Altcoins.Monero.RPC;
+using BTCPayServer.Services.Altcoins.Monero.RPC.Models;
 using BTCPayServer.Payments;
 using BTCPayServer.Services.Invoices;
 using Microsoft.Extensions.Hosting;
@@ -17,7 +17,7 @@ using Microsoft.Extensions.Logging;
 using NBitcoin;
 using NBXplorer;
 
-namespace BTCPayServer.Altcoins.Monero.Services
+namespace BTCPayServer.Services.Altcoins.Monero.Services
 {
     public class MoneroListener : IHostedService
     {
@@ -231,7 +231,7 @@ namespace BTCPayServer.Altcoins.Monero.Services
         public Task StopAsync(CancellationToken cancellationToken)
         {
             leases.Dispose();
-            _Cts.Cancel();
+            _Cts?.Cancel();
             return Task.CompletedTask;
         }
 

BTCPayServer/Services/Altcoins/Monero/Services/MoneroRPCProvider.cs

@@ -3,12 +3,12 @@ using System.Collections.Concurrent;
 using System.Collections.Immutable;
 using System.Net.Http;
 using System.Threading.Tasks;
-using BTCPayServer.Altcoins.Monero.Configuration;
-using BTCPayServer.Altcoins.Monero.RPC;
-using BTCPayServer.Altcoins.Monero.RPC.Models;
+using BTCPayServer.Services.Altcoins.Monero.Configuration;
+using BTCPayServer.Services.Altcoins.Monero.RPC;
+using BTCPayServer.Services.Altcoins.Monero.RPC.Models;
 using NBitcoin;
 
-namespace BTCPayServer.Altcoins.Monero.Services
+namespace BTCPayServer.Services.Altcoins.Monero.Services
 {
     public class MoneroRPCProvider
     {

BTCPayServer/Services/Altcoins/Monero/UI/MoneroLikeStoreController.cs

@@ -8,10 +8,10 @@ using System.Linq;
 using System.Threading.Tasks;
 using BTCPayServer.Data;
 using BTCPayServer.Models;
-using BTCPayServer.Altcoins.Monero.Configuration;
-using BTCPayServer.Altcoins.Monero.Payments;
-using BTCPayServer.Altcoins.Monero.RPC.Models;
-using BTCPayServer.Altcoins.Monero.Services;
+using BTCPayServer.Services.Altcoins.Monero.Configuration;
+using BTCPayServer.Services.Altcoins.Monero.Payments;
+using BTCPayServer.Services.Altcoins.Monero.RPC.Models;
+using BTCPayServer.Services.Altcoins.Monero.Services;
 using BTCPayServer.Payments;
 using BTCPayServer.Security;
 using BTCPayServer.Services.Stores;
@@ -21,7 +21,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using BTCPayServer.Filters;
 
-namespace BTCPayServer.Altcoins.Monero.UI
+namespace BTCPayServer.Services.Altcoins.Monero.UI
 {
     [Route("stores/{storeId}/monerolike")]
     [OnlyIfSupportAttribute("XMR")]

BTCPayServer/Services/Altcoins/Monero/UI/MoneroPaymentViewModel.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace BTCPayServer.Altcoins.Monero.UI
+namespace BTCPayServer.Services.Altcoins.Monero.UI
 {
     public class MoneroPaymentViewModel
     {

BTCPayServer/U2F/Models/AddU2FDeviceViewModel.cs

@@ -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; }
     }
-}
+}

BTCPayServer/U2F/Models/LoginWithU2FViewModel.cs

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

BTCPayServer/U2F/Models/ServerChallenge.cs

@@ -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; }
     }
-}
+}

BTCPayServer/U2F/Models/ServerRegisterResponse.cs

@@ -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; }
     }
-}
+}

BTCPayServer/U2F/Models/U2FAuthenticationViewModel.cs

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

BTCPayServer/U2F/Models/U2FDeviceAuthenticationRequest.cs

@@ -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; }
     }
-}
+}

BTCPayServer/U2F/U2FService.cs

@@ -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
     {

BTCPayServer/Views/Account/LoginWithU2F.cshtml

@@ -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" />

BTCPayServer/Views/Manage/AddU2FDevice.cshtml

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

BTCPayServer/Views/Manage/U2FAuthentication.cshtml

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

BTCPayServer/Views/MoneroLikeStore/GetStoreMoneroLikePaymentMethod.cshtml

@@ -1,6 +1,6 @@
 @using BTCPayServer.Controllers
 @using BTCPayServer.Views.Stores
-@model BTCPayServer.Altcoins.Monero.UI.MoneroLikeStoreController.MoneroLikePaymentMethodViewModel
+@model BTCPayServer.Services.Altcoins.Monero.UI.MoneroLikeStoreController.MoneroLikePaymentMethodViewModel
 
 @{
     Layout = "../Shared/_NavLayout.cshtml";

BTCPayServer/Views/MoneroLikeStore/GetStoreMoneroLikePaymentMethods.cshtml

@@ -1,5 +1,5 @@
 @using BTCPayServer.Views.Stores
-@model BTCPayServer.Altcoins.Monero.UI.MoneroLikeStoreController.MoneroLikePaymentMethodListViewModel
+@model BTCPayServer.Services.Altcoins.Monero.UI.MoneroLikeStoreController.MoneroLikePaymentMethodListViewModel
 
 @{
     Layout = "../Shared/_NavLayout.cshtml";

BTCPayServer/Views/Shared/Monero/StoreNavMoneroExtension.cshtml

@@ -1,6 +1,6 @@
 @using BTCPayServer.Controllers
-@using BTCPayServer.Altcoins.Monero.Configuration
-@using BTCPayServer.Altcoins.Monero.UI
+@using BTCPayServer.Services.Altcoins.Monero.Configuration
+@using BTCPayServer.Services.Altcoins.Monero.UI
 @inject SignInManager<ApplicationUser> SignInManager;
 @inject MoneroLikeConfiguration MoneroLikeConfiguration;
 @{

BTCPayServer/Views/Shared/Monero/ViewMoneroLikePaymentData.cshtml

@@ -1,7 +1,7 @@
 @using System.Globalization
 @using BTCPayServer.Controllers
-@using BTCPayServer.Altcoins.Monero.Payments
-@using BTCPayServer.Altcoins.Monero.UI
+@using BTCPayServer.Services.Altcoins.Monero.Payments
+@using BTCPayServer.Services.Altcoins.Monero.UI
 @model IEnumerable<BTCPayServer.Services.Invoices.PaymentEntity>
 
 @{