aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-18 14:34:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renaming to LndServiceViewModel, used both by grpc and rest

Browse Source
This commit is contained in:
rockstardev
2019-11-03 13:18:09 -06:00
parent bf59114a00
commit a126ec1718
4 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
BTCPayServer/Controllers/ServerController.cs
View File

@@ -491,6 +491,8 @@ namespace BTCPayServer.Controllers
{ {
var result = new ServicesViewModel(); var result = new ServicesViewModel();
result.ExternalServices = _Options.ExternalServices.ToList(); result.ExternalServices = _Options.ExternalServices.ToList();
// other services
foreach (var externalService in _Options.OtherExternalServices) foreach (var externalService in _Options.OtherExternalServices)
{ {
result.OtherExternalServices.Add(new ServicesViewModel.OtherExternalService() result.OtherExternalServices.Add(new ServicesViewModel.OtherExternalService()
@@ -536,6 +538,7 @@ namespace BTCPayServer.Controllers
} }
} }
// external storage services
var storageSettings = await _SettingsRepository.GetSettingAsync<StorageSettings>(); var storageSettings = await _SettingsRepository.GetSettingAsync<StorageSettings>();
result.ExternalStorageServices.Add(new ServicesViewModel.OtherExternalService() result.ExternalStorageServices.Add(new ServicesViewModel.OtherExternalService()
{ {
@@ -647,7 +650,7 @@ namespace BTCPayServer.Controllers
private IActionResult LndServices(ExternalService service, ExternalConnectionString connectionString, uint? nonce) private IActionResult LndServices(ExternalService service, ExternalConnectionString connectionString, uint? nonce)
{ {
var model = new LndGrpcServicesViewModel(); var model = new LndServicesViewModel();
if (service.Type == ExternalServiceTypes.LNDGRPC) if (service.Type == ExternalServiceTypes.LNDGRPC)
{ {
model.Host = $"{connectionString.Server.DnsSafeHost}:{connectionString.Server.Port}"; model.Host = $"{connectionString.Server.DnsSafeHost}:{connectionString.Server.Port}";

14
BTCPayServer/Models/ServerViewModels/LndRestServicesViewModel.cs
View File

@@ -1,14 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace BTCPayServer.Models.ServerViewModels
{
public class LndRestServicesViewModel
{
public string BaseApiUrl { get; set; }
public string Macaroon { get; set; }
public string CertificateThumbprint { get; set; }
}
}

8
BTCPayServer/Models/ServerViewModels/LndGrpcServicesViewModel.cs → BTCPayServer/Models/ServerViewModels/LndServicesViewModel.cs
View File

@@ -1,12 +1,8 @@
using System; using System.ComponentModel.DataAnnotations;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading.Tasks;
namespace BTCPayServer.Models.ServerViewModels namespace BTCPayServer.Models.ServerViewModels
{ {
public class LndGrpcServicesViewModel public class LndServicesViewModel
{ {
public string Host { get; set; } public string Host { get; set; }
public bool SSL { get; set; } public bool SSL { get; set; }

2
BTCPayServer/Views/Server/LndServices.cshtml
View File

@@ -1,4 +1,4 @@
@model LndGrpcServicesViewModel @model LndServicesViewModel
@{ @{
ViewData.SetActivePageAndTitle(ServerNavPages.Services); ViewData.SetActivePageAndTitle(ServerNavPages.Services);
} }