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

Merge pull request #4622 from dennisreimann/domain-mapping

Browse Source
This commit is contained in:
Andrew Camilleri
2023-02-13 13:41:34 +01:00
committed by GitHub
parent 72a9e676c1 3c344331af
commit b5abcd5ae5
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
BTCPayServer/Filters/DomainMappingConstraintAttribute.cs
View File

@@ -38,8 +38,9 @@ namespace BTCPayServer.Filters
if (matchedDomainMapping != null)
{
var req = context.RouteContext.HttpContext.Request;
var url = new UriBuilder(req.Scheme, matchedDomainMapping.Domain).ToString();
context.RouteContext.HttpContext.Response.Redirect(url);
var uri = new UriBuilder(req.Scheme, matchedDomainMapping.Domain);
if (req.Host.Port.HasValue) uri.Port = req.Host.Port.Value;
context.RouteContext.HttpContext.Response.Redirect(uri.ToString());
return true;
}
}
@@ -55,15 +56,17 @@ namespace BTCPayServer.Filters
return false;
if (appType != matchedDomainMapping.AppType)
return false;
context.RouteContext.RouteData.Values.Add("appId", matchedDomainMapping.AppId);
return true;
if (!hasAppId)
{
context.RouteContext.RouteData.Values.Add("appId", matchedDomainMapping.AppId);
return true;
}
}
}
if (AppType == policies.RootAppType)
if (AppType == policies.RootAppType && !hasAppId && !string.IsNullOrEmpty(policies.RootAppId))
{
context.RouteContext.RouteData.Values.Add("appId", policies.RootAppId);
return true;
}