aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2026-01-06 07:34:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

HTML lang setting and Head tags for POS and Crowdfund public pages (#6229)

Browse Source 
* HTML lang setting and Head tags for POS and Crowdfund public pages

* updates #6229

* updates 6229

* resolve conflict

* updated according to Nicolas' recommendations

* updates #6229

* Add RawMeta method in safe.cs

* ...

* resolve conflicts

* resolve conflict

* resolve conflicts

* Updates as Nicolas request

* updates

---------

Co-authored-by: d11n <mail@dennisreimann.de>
This commit is contained in:
Nisaba
2025-01-15 05:49:25 +00:00
committed by GitHub
parent e1f47b2738
commit 2250853b3e
14 changed files with 174 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
BTCPayServer/Plugins/Crowdfund/Controllers/UICrowdfundController.cs
View File

@@ -8,6 +8,7 @@ using BTCPayServer.Abstractions.Contracts;
using BTCPayServer.Abstractions.Extensions;
using BTCPayServer.Abstractions.Form;
using BTCPayServer.Abstractions.Models;
using BTCPayServer.Abstractions.Services;
using BTCPayServer.Client;
using BTCPayServer.Client.Models;
using BTCPayServer.Controllers;
@@ -22,6 +23,7 @@ using BTCPayServer.Services.Apps;
using BTCPayServer.Services.Invoices;
using BTCPayServer.Services.Rates;
using BTCPayServer.Services.Stores;
using Ganss.Xss;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Cors;
using Microsoft.AspNetCore.Identity;
@@ -51,7 +53,8 @@ namespace BTCPayServer.Plugins.Crowdfund.Controllers
UserManager<ApplicationUser> userManager,
FormDataService formDataService,
IStringLocalizer stringLocalizer,
CrowdfundAppType app)
CrowdfundAppType app,
Safe safe)
{
_currencies = currencies;
_appService = appService;
@@ -64,6 +67,7 @@ namespace BTCPayServer.Plugins.Crowdfund.Controllers
_invoiceController = invoiceController;
FormDataService = formDataService;
StringLocalizer = stringLocalizer;
_safe = safe;
}
private readonly EventAggregator _eventAggregator;
@@ -75,6 +79,8 @@ namespace BTCPayServer.Plugins.Crowdfund.Controllers
private readonly UIInvoiceController _invoiceController;
private readonly UserManager<ApplicationUser> _userManager;
private readonly CrowdfundAppType _app;
private readonly Safe _safe;
public FormDataService FormDataService { get; }
public IStringLocalizer StringLocalizer { get; }
@@ -403,6 +409,8 @@ namespace BTCPayServer.Plugins.Crowdfund.Controllers
Enabled = settings.Enabled,
EnforceTargetAmount = settings.EnforceTargetAmount,
StartDate = settings.StartDate,
HtmlMetaTags= settings.HtmlMetaTags,
Language = settings.Language,
TargetCurrency = settings.TargetCurrency,
MainImageUrl = settings.MainImageUrl == null ? null : await _uriResolver.Resolve(Request.GetAbsoluteRootUri(), settings.MainImageUrl),
Description = settings.Description,
@@ -524,6 +532,8 @@ namespace BTCPayServer.Plugins.Crowdfund.Controllers
app.Name = vm.AppName;
app.Archived = vm.Archived;
bool wasHtmlModified;
var newSettings = new CrowdfundSettings
{
Title = vm.Title,
@@ -531,6 +541,8 @@ namespace BTCPayServer.Plugins.Crowdfund.Controllers
EnforceTargetAmount = vm.EnforceTargetAmount,
StartDate = vm.StartDate?.ToUniversalTime(),
TargetCurrency = vm.TargetCurrency,
HtmlMetaTags= _safe.RawMeta(vm.HtmlMetaTags, out wasHtmlModified),
Language = vm.Language,
Description = vm.Description,
EndDate = vm.EndDate?.ToUniversalTime(),
TargetAmount = vm.TargetAmount,
@@ -574,7 +586,14 @@ namespace BTCPayServer.Plugins.Crowdfund.Controllers
StoreId = app.StoreDataId,
Settings = newSettings
});
TempData[WellKnownTempData.SuccessMessage] = StringLocalizer["App updated"].Value;
if (wasHtmlModified)
{
TempData[WellKnownTempData.ErrorMessage] = StringLocalizer["Only meta tags are allowed in HTML headers. Your HTML code has been cleaned up accordingly."].Value;
}
else
{
TempData[WellKnownTempData.SuccessMessage] = StringLocalizer["App updated"].Value;
}
return RedirectToAction(nameof(UpdateCrowdfund), new { appId });
}

2
BTCPayServer/Plugins/Crowdfund/CrowdfundPlugin.cs
View File

@@ -194,6 +194,8 @@ namespace BTCPayServer.Plugins.Crowdfund
{
Title = settings.Title,
Tagline = settings.Tagline,
Lang = settings.Language,
HtmlMetaTags= settings.HtmlMetaTags,
Description = settings.Description,
StoreName = store.StoreName,
StoreId = appData.StoreDataId,

7
BTCPayServer/Plugins/Crowdfund/Models/UpdateCrowdfundViewModel.cs
View File

@@ -28,6 +28,13 @@ namespace BTCPayServer.Plugins.Crowdfund.Models
public string Tagline { get; set; }
public string Language { get; set; }
[Display(Name = "HTML Meta Tags")]
public string HtmlMetaTags{ get; set; }
[Required]
public string Description { get; set; }

2
BTCPayServer/Plugins/Crowdfund/Models/ViewCrowdfundViewModel.cs
View File

@@ -14,6 +14,8 @@ namespace BTCPayServer.Plugins.Crowdfund.Models
public string AppId { get; set; }
public string Title { get; set; }
public string Description { get; set; }
public string Lang { get; set; }
public string HtmlMetaTags{ get; set; }
public string MainImageUrl { get; set; }
public string StoreName { get; set; }
public DateTime? StartDate { get; set; }

22
BTCPayServer/Plugins/PointOfSale/Controllers/UIPointOfSaleController.cs
View File

@@ -2,6 +2,7 @@ using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Text;
using System.Text.Encodings.Web;
using System.Text.RegularExpressions;
@@ -11,6 +12,7 @@ using BTCPayServer.Abstractions.Constants;
using BTCPayServer.Abstractions.Extensions;
using BTCPayServer.Abstractions.Form;
using BTCPayServer.Abstractions.Models;
using BTCPayServer.Abstractions.Services;
using BTCPayServer.Client;
using BTCPayServer.Client.Models;
using BTCPayServer.Controllers;
@@ -26,6 +28,7 @@ using BTCPayServer.Services.Apps;
using BTCPayServer.Services.Invoices;
using BTCPayServer.Services.Rates;
using BTCPayServer.Services.Stores;
using Ganss.Xss;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Cors;
using Microsoft.AspNetCore.Http.Extensions;
@@ -55,7 +58,8 @@ namespace BTCPayServer.Plugins.PointOfSale.Controllers
IStringLocalizer stringLocalizer,
DisplayFormatter displayFormatter,
IRateLimitService rateLimitService,
IAuthorizationService authorizationService)
IAuthorizationService authorizationService,
Safe safe)
{
_currencies = currencies;
_appService = appService;
@@ -66,6 +70,7 @@ namespace BTCPayServer.Plugins.PointOfSale.Controllers
_displayFormatter = displayFormatter;
_rateLimitService = rateLimitService;
_authorizationService = authorizationService;
_safe = safe;
StringLocalizer = stringLocalizer;
FormDataService = formDataService;
}
@@ -79,6 +84,7 @@ namespace BTCPayServer.Plugins.PointOfSale.Controllers
private readonly DisplayFormatter _displayFormatter;
private readonly IRateLimitService _rateLimitService;
private readonly IAuthorizationService _authorizationService;
private readonly Safe _safe;
public FormDataService FormDataService { get; }
public IStringLocalizer StringLocalizer { get; }
@@ -132,6 +138,8 @@ namespace BTCPayServer.Plugins.PointOfSale.Controllers
CustomTipPercentages = settings.CustomTipPercentages,
AppId = appId,
StoreId = store.Id,
Lang = settings.Language,
HtmlMetaTags= settings.HtmlMetaTags,
Description = settings.Description,
});
}
@@ -611,6 +619,8 @@ namespace BTCPayServer.Plugins.PointOfSale.Controllers
CustomButtonText = settings.CustomButtonText ?? PointOfSaleSettings.CUSTOM_BUTTON_TEXT_DEF,
CustomTipText = settings.CustomTipText ?? PointOfSaleSettings.CUSTOM_TIP_TEXT_DEF,
CustomTipPercentages = settings.CustomTipPercentages != null ? string.Join(",", settings.CustomTipPercentages) : string.Join(",", PointOfSaleSettings.CUSTOM_TIP_PERCENTAGES_DEF),
Language = settings.Language,
HtmlMetaTags= settings.HtmlMetaTags,
Description = settings.Description,
NotificationUrl = settings.NotificationUrl,
RedirectUrl = settings.RedirectUrl,
@@ -687,6 +697,7 @@ namespace BTCPayServer.Plugins.PointOfSale.Controllers
return View("PointOfSale/UpdatePointOfSale", vm);
}
bool wasHtmlModified;
var settings = new PointOfSaleSettings
{
Title = vm.Title,
@@ -705,6 +716,8 @@ namespace BTCPayServer.Plugins.PointOfSale.Controllers
CustomTipPercentages = ListSplit(vm.CustomTipPercentages),
NotificationUrl = vm.NotificationUrl,
RedirectUrl = vm.RedirectUrl,
Language = vm.Language,
HtmlMetaTags = _safe.RawMeta(vm.HtmlMetaTags, out wasHtmlModified),
Description = vm.Description,
RedirectAutomatically = string.IsNullOrEmpty(vm.RedirectAutomatically) ? null : bool.Parse(vm.RedirectAutomatically),
FormId = vm.FormId
@@ -714,7 +727,12 @@ namespace BTCPayServer.Plugins.PointOfSale.Controllers
app.Archived = vm.Archived;
app.SetSettings(settings);
await _appService.UpdateOrCreateApp(app);
TempData[WellKnownTempData.SuccessMessage] = StringLocalizer["App updated"].Value;
if (wasHtmlModified)
{
TempData[WellKnownTempData.ErrorMessage] = StringLocalizer["Only meta tags are allowed in HTML headers. Your HTML code has been cleaned up accordingly."].Value;
} else {
TempData[WellKnownTempData.SuccessMessage] = StringLocalizer["App updated"].Value;
}
return RedirectToAction(nameof(UpdatePointOfSale), new { appId });
}

5
BTCPayServer/Plugins/PointOfSale/Models/UpdatePointOfSaleViewModel.cs
View File

@@ -86,6 +86,11 @@ namespace BTCPayServer.Plugins.PointOfSale.Models
new() { Text = "Use Store Settings", Value = "" }
}, nameof(SelectListItem.Value), nameof(SelectListItem.Text), RedirectAutomatically);
public string Language { get; set; }
[Display(Name = "HTML Meta Tags")]
public string HtmlMetaTags{ get; set; }
public string Description { get; set; }
[Display(Name = "Request customer data on checkout")]

2
BTCPayServer/Plugins/PointOfSale/Models/ViewPointOfSaleViewModel.cs
View File

@@ -68,6 +68,8 @@ namespace BTCPayServer.Plugins.PointOfSale.Models
public string CustomButtonText { get; set; }
public string CustomTipText { get; set; }
public int[] CustomTipPercentages { get; set; }
public string Lang { get; set; }
public string HtmlMetaTags{ get; set; }
public string Description { get; set; }
public SelectList AllCategories { get; set; }
public string StoreId { get; set; }