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

Make checkout CSS and logo paths relative (#4354)

Browse Source 
* Make sure custom logo and CSS paths are relative

* match request host and scheme before replacing

* Fix the issue for greenfield as well

Co-authored-by: nicolas.dorier <nicolas.dorier@gmail.com>
This commit is contained in:
Umar Bolatov 2022-12-21 22:05:56 -08:00 committed by GitHub
parent b83eb41df3
commit ea03b6c19c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BTCPayServer/Controllers/GreenField/GreenfieldStoresController.cs
View File

@ -12,6 +12,7 @@ using BTCPayServer.Security;
using BTCPayServer.Services.Stores;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Cors;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Mvc;
using StoreData = BTCPayServer.Data.StoreData;
@ -149,7 +150,7 @@ namespace BTCPayServer.Controllers.Greenfield
};
}
private static void ToModel(StoreBaseData restModel, Data.StoreData model, PaymentMethodId defaultPaymentMethod)
private void ToModel(StoreBaseData restModel, Data.StoreData model, PaymentMethodId defaultPaymentMethod)
{
var blob = model.GetStoreBlob();
model.StoreName = restModel.Name;
@ -185,6 +186,7 @@ namespace BTCPayServer.Controllers.Greenfield
blob.LightningDescriptionTemplate = restModel.LightningDescriptionTemplate;
blob.PaymentTolerance = restModel.PaymentTolerance;
blob.PayJoinEnabled = restModel.PayJoinEnabled;
blob.NormalizeToRelativeLinks(Request);
model.SetStoreBlob(blob);
}

4
BTCPayServer/Controllers/UIStoresController.cs
View File

@ -505,7 +505,7 @@ namespace BTCPayServer.Controllers
{
blob.OnChainWithLnInvoiceFallback = model.OnChainWithLnInvoiceFallback;
}
blob.RequiresRefundEmail = model.RequiresRefundEmail;
blob.LazyPaymentMethods = model.LazyPaymentMethods;
blob.RedirectAutomatically = model.RedirectAutomatically;
@ -515,7 +515,7 @@ namespace BTCPayServer.Controllers
blob.HtmlTitle = string.IsNullOrWhiteSpace(model.HtmlTitle) ? null : model.HtmlTitle;
blob.AutoDetectLanguage = model.AutoDetectLanguage;
blob.DefaultLang = model.DefaultLang;
blob.NormalizeToRelativeLinks(Request);
if (CurrentStore.SetStoreBlob(blob))
{
needUpdate = true;

25
BTCPayServer/Data/StoreBlob.cs
View File

@ -12,6 +12,7 @@ using BTCPayServer.Payments;
using BTCPayServer.Rating;
using BTCPayServer.Services.Mails;
using BTCPayServer.Services.Rates;
using Microsoft.AspNetCore.Http;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
@ -239,6 +240,30 @@ namespace BTCPayServer.Data
ExcludedPaymentMethods = methods.ToArray();
#pragma warning restore CS0618 // Type or member is obsolete
}
// Replace absolute URL with relative to avoid this issue: https://github.com/btcpayserver/btcpayserver/discussions/4195
public void NormalizeToRelativeLinks(HttpRequest request)
{
var schemeAndHost = $"{request.Scheme}://{request.Host.ToString()}/";
this.CustomLogo = EnsureRelativeLinks(this.CustomLogo, schemeAndHost);
this.CustomCSS = EnsureRelativeLinks(this.CustomCSS, schemeAndHost);
}
/// <summary>
/// Make a link relative if possible
/// </summary>
/// <param name="value">Example: https://mystore.com/toto.png</param>
/// <param name="schemeAndHost">Example: https://mystore.com/</param>
/// <returns>/toto.png</returns>
private string EnsureRelativeLinks(string value, string schemeAndHost)
{
if (value is null)
return null;
value = value.Trim();
if (value.StartsWith(schemeAndHost, StringComparison.OrdinalIgnoreCase))
return value.Substring(schemeAndHost.Length - 1);
return value;
}
}
public class PaymentMethodCriteria
{