aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-17 05:54:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Keep status messages on custom domain redirect

Browse Source 
Ensures the temp data doesn't get cleared on domain mapping redirect.

Fixes #6636.
This commit is contained in:
Dennis Reimann
2025-03-24 13:26:03 +01:00
parent fcd49ff729
commit 6cc2f45817
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
BTCPayServer/Filters/DomainMappingConstraintAttribute.cs
View File

@@ -3,6 +3,7 @@ using System.Linq;
using BTCPayServer.Abstractions.Extensions; using BTCPayServer.Abstractions.Extensions;
using BTCPayServer.Services; using BTCPayServer.Services;
using Microsoft.AspNetCore.Mvc.ActionConstraints; using Microsoft.AspNetCore.Mvc.ActionConstraints;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
namespace BTCPayServer.Filters namespace BTCPayServer.Filters
@@ -23,8 +24,10 @@ namespace BTCPayServer.Filters
public bool Accept(ActionConstraintContext context) public bool Accept(ActionConstraintContext context)
{ {
var req = context.RouteContext.HttpContext.Request; var routeContext = context.RouteContext;
var policies = context.RouteContext.HttpContext.RequestServices.GetService<PoliciesSettings>(); var httpContext = routeContext.HttpContext;
var req = httpContext.Request;
var policies = httpContext.RequestServices.GetService<PoliciesSettings>();
var mapping = policies?.DomainToAppMapping?.ToList() ?? []; var mapping = policies?.DomainToAppMapping?.ToList() ?? [];
if (policies is { RootAppId: { } rootAppId, RootAppType: { } rootAppType }) if (policies is { RootAppId: { } rootAppId, RootAppType: { } rootAppType })
{ {
@@ -37,7 +40,7 @@ namespace BTCPayServer.Filters
} }
// If we have an appId, we can redirect to the canonical domain // If we have an appId, we can redirect to the canonical domain
if ((string)context.RouteContext.RouteData.Values["appId"] is { } appId) if ((string)routeContext.RouteData.Values["appId"] is { } appId)
{ {
var redirectDomain = mapping.FirstOrDefault(item => item.AppId == appId)?.Domain; var redirectDomain = mapping.FirstOrDefault(item => item.AppId == appId)?.Domain;
// App is accessed via path, redirect to canonical domain // App is accessed via path, redirect to canonical domain
@@ -48,7 +51,13 @@ namespace BTCPayServer.Filters
uri.Port = req.Host.Port.Value; uri.Port = req.Host.Port.Value;
if (req.QueryString.HasValue) if (req.QueryString.HasValue)
uri.Query = req.QueryString.Value!; uri.Query = req.QueryString.Value!;
context.RouteContext.HttpContext.Response.Redirect(uri.ToString());
// keep status messages
var tempDataFactory = httpContext.RequestServices.GetRequiredService<ITempDataDictionaryFactory>();
var tempData = tempDataFactory.GetTempData(httpContext);
tempData.Keep();
httpContext.Response.Redirect(uri.ToString());
} }
return true; return true;
} }
@@ -59,7 +68,7 @@ namespace BTCPayServer.Filters
{ {
if (AppType is null || AppType != matchedDomainMapping.AppType) if (AppType is null || AppType != matchedDomainMapping.AppType)
return false; return false;
context.RouteContext.RouteData.Values.Add("appId", matchedDomainMapping.AppId); routeContext.RouteData.Values.Add("appId", matchedDomainMapping.AppId);
return true; return true;
} }