mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2025-03-12 10:30:47 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make sure NotificationUrl and RedirectUrl are of type Uri

Browse source
This commit is contained in:
nicolas.dorier 2019-09-04 18:20:36 +09:00
parent f17a359893
commit c247e275f6
No known key found for this signature in database
GPG key ID: 6618763EF09186FE
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
BTCPayServer/Controllers/InvoiceController.UI.cs
View file

@ -67,7 +67,7 @@ namespace BTCPayServer.Controllers
TaxIncluded = _CurrencyNameTable.DisplayFormatCurrency(prodInfo.TaxIncluded, prodInfo.Currency), TaxIncluded = _CurrencyNameTable.DisplayFormatCurrency(prodInfo.TaxIncluded, prodInfo.Currency),
NotificationEmail = invoice.NotificationEmail, NotificationEmail = invoice.NotificationEmail,
NotificationUrl = invoice.NotificationURL, NotificationUrl = invoice.NotificationURL,
RedirectUrl = invoice.RedirectURL, RedirectUrl = invoice.RedirectURL.AbsoluteUri,
ProductInformation = invoice.ProductInformation, ProductInformation = invoice.ProductInformation,
StatusException = invoice.ExceptionStatus, StatusException = invoice.ExceptionStatus,
Events = invoice.Events, Events = invoice.Events,
@ -250,7 +250,7 @@ namespace BTCPayServer.Controllers
MaxTimeMinutes = (int)(invoice.ExpirationTime - invoice.InvoiceTime).TotalMinutes, MaxTimeMinutes = (int)(invoice.ExpirationTime - invoice.InvoiceTime).TotalMinutes,
ItemDesc = invoice.ProductInformation.ItemDesc, ItemDesc = invoice.ProductInformation.ItemDesc,
Rate = ExchangeRate(paymentMethod), Rate = ExchangeRate(paymentMethod),
MerchantRefLink = invoice.RedirectURL ?? "/", MerchantRefLink = invoice.RedirectURL?.AbsoluteUri ?? "/",
RedirectAutomatically = invoice.RedirectAutomatically, RedirectAutomatically = invoice.RedirectAutomatically,
StoreName = store.StoreName, StoreName = store.StoreName,
PeerInfo = (paymentMethodDetails as LightningLikePaymentMethodDetails)?.NodeInfo, PeerInfo = (paymentMethodDetails as LightningLikePaymentMethodDetails)?.NodeInfo,
@ -424,7 +424,7 @@ namespace BTCPayServer.Controllers
Date = invoice.InvoiceTime, Date = invoice.InvoiceTime,
InvoiceId = invoice.Id, InvoiceId = invoice.Id,
OrderId = invoice.OrderId ?? string.Empty, OrderId = invoice.OrderId ?? string.Empty,
RedirectUrl = invoice.RedirectURL ?? string.Empty, RedirectUrl = invoice.RedirectURL?.AbsoluteUri ?? string.Empty,
AmountCurrency = _CurrencyNameTable.DisplayFormatCurrency(invoice.ProductInformation.Price, invoice.ProductInformation.Currency), AmountCurrency = _CurrencyNameTable.DisplayFormatCurrency(invoice.ProductInformation.Price, invoice.ProductInformation.Currency),
CanMarkInvalid = state.CanMarkInvalid(), CanMarkInvalid = state.CanMarkInvalid(),
CanMarkComplete = state.CanMarkComplete(), CanMarkComplete = state.CanMarkComplete(),

2
BTCPayServer/HostedServices/InvoiceNotificationManager.cs
View file

@ -87,7 +87,7 @@ namespace BTCPayServer.HostedServices
Name = invoiceEvent.Name Name = invoiceEvent.Name
}, },
ExtendedNotification = extendedNotification, ExtendedNotification = extendedNotification,
NotificationURL = invoice.NotificationURL NotificationURL = invoice.NotificationURL?.AbsoluteUri
}; };
// For lightning network payments, paid, confirmed and completed come all at once. // For lightning network payments, paid, confirmed and completed come all at once.

8
BTCPayServer/Services/Invoices/InvoiceEntity.cs
View file

@ -297,14 +297,14 @@ namespace BTCPayServer.Services.Invoices
} }
[JsonIgnore] [JsonIgnore]
public string RedirectURL => FillPlaceholdersUri(RedirectURLTemplate); public Uri RedirectURL => FillPlaceholdersUri(RedirectURLTemplate);
private string FillPlaceholdersUri(string v) private Uri FillPlaceholdersUri(string v)
{ {
var uriStr = (v ?? string.Empty).Replace("{OrderId}", OrderId ?? "", StringComparison.OrdinalIgnoreCase) var uriStr = (v ?? string.Empty).Replace("{OrderId}", OrderId ?? "", StringComparison.OrdinalIgnoreCase)
.Replace("{InvoiceId}", Id ?? "", StringComparison.OrdinalIgnoreCase); .Replace("{InvoiceId}", Id ?? "", StringComparison.OrdinalIgnoreCase);
if (Uri.TryCreate(uriStr, UriKind.Absolute, out var uri) && (uri.Scheme == "http" || uri.Scheme == "https")) if (Uri.TryCreate(uriStr, UriKind.Absolute, out var uri) && (uri.Scheme == "http" || uri.Scheme == "https"))
return uri.AbsoluteUri; return uri;
return null; return null;
} }
@ -339,7 +339,7 @@ namespace BTCPayServer.Services.Invoices
} }
[JsonIgnore] [JsonIgnore]
public string NotificationURL => FillPlaceholdersUri(NotificationURLTemplate); public Uri NotificationURL => FillPlaceholdersUri(NotificationURLTemplate);
public string ServerUrl public string ServerUrl
{ {
get; get;