Allowing for displaying of app directly on website root

BTCPayServer/Controllers/AppsPublicController.cs

@@ -32,7 +32,7 @@ namespace BTCPayServer.Controllers
 {
     public class AppsPublicController : Controller
     {
-        public AppsPublicController(AppService AppService, 
+        public AppsPublicController(AppService AppService,
             InvoiceController invoiceController,
             UserManager<ApplicationUser> userManager)
         {
@@ -86,34 +86,34 @@ namespace BTCPayServer.Controllers
                 AppId = appId
             });
         }
-        
+
-        
+
         [HttpGet]
         [Route("/apps/{appId}/crowdfund")]
         [XFrameOptionsAttribute(XFrameOptionsAttribute.XFrameOptions.AllowAll)]
         public async Task<IActionResult> ViewCrowdfund(string appId, string statusMessage)
-        
         {
             var app = await _AppService.GetApp(appId, AppType.Crowdfund, true);
-            
+
             if (app == null)
                 return NotFound();
             var settings = app.GetSettings<CrowdfundSettings>();
-            
+
             var isAdmin = await _AppService.GetAppDataIfOwner(GetUserId(), appId, AppType.Crowdfund) != null;
-            
+
-            var hasEnoughSettingsToLoad = !string.IsNullOrEmpty(settings.TargetCurrency );
+            var hasEnoughSettingsToLoad = !string.IsNullOrEmpty(settings.TargetCurrency);
             if (!hasEnoughSettingsToLoad)
             {
-                if(!isAdmin)
+                if (!isAdmin)
                     return NotFound();
 
                 return NotFound("A Target Currency must be set for this app in order to be loadable.");
             }
             var appInfo = (ViewCrowdfundViewModel)(await _AppService.GetAppInfo(appId));
             appInfo.HubPath = AppHub.GetHubPath(this.Request);
-            if (settings.Enabled) return View(appInfo);
+            if (settings.Enabled)
-            if(!isAdmin)
+                return View(appInfo);
+            if (!isAdmin)
                 return NotFound();
 
             return View(appInfo);
@@ -135,7 +135,8 @@ namespace BTCPayServer.Controllers
 
             var isAdmin = await _AppService.GetAppDataIfOwner(GetUserId(), appId, AppType.Crowdfund) != null;
 
-            if (!settings.Enabled && !isAdmin) {
+            if (!settings.Enabled && !isAdmin)
+            {
                 return NotFound("Crowdfund is not currently active");
             }
 
@@ -193,7 +194,7 @@ namespace BTCPayServer.Controllers
                 if (request.RedirectToCheckout)
                 {
                     return RedirectToAction(nameof(InvoiceController.Checkout), "Invoice",
-                        new {invoiceId = invoice.Data.Id});
+                        new { invoiceId = invoice.Data.Id });
                 }
                 else
                 {
@@ -204,7 +205,7 @@ namespace BTCPayServer.Controllers
             {
                 return BadRequest(e.Message);
             }
-            
+
         }
 
         [HttpPost]
@@ -257,28 +258,28 @@ namespace BTCPayServer.Controllers
             var store = await _AppService.GetStore(app);
             store.AdditionalClaims.Add(new Claim(Policies.CanCreateInvoice.Key, store.Id));
             var invoice = await _InvoiceController.CreateInvoiceCore(new CreateInvoiceRequest()
-                {
+            {
-                    ItemCode = choice?.Id,
+                ItemCode = choice?.Id,
-                    ItemDesc = title,
+                ItemDesc = title,
-                    Currency = settings.Currency,
+                Currency = settings.Currency,
-                    Price = price,
+                Price = price,
-                    BuyerEmail = email,
+                BuyerEmail = email,
-                    OrderId = orderId,
+                OrderId = orderId,
-                    NotificationURL =
+                NotificationURL =
                         string.IsNullOrEmpty(notificationUrl) ? settings.NotificationUrl : notificationUrl,
-                    NotificationEmail = settings.NotificationEmail,
+                NotificationEmail = settings.NotificationEmail,
-                    RedirectURL = redirectUrl ?? Request.GetDisplayUrl(),
+                RedirectURL = redirectUrl ?? Request.GetDisplayUrl(),
-                    FullNotifications = true,
+                FullNotifications = true,
-                    ExtendedNotifications = true,
+                ExtendedNotifications = true,
-                    PosData = string.IsNullOrEmpty(posData) ? null : posData,
+                PosData = string.IsNullOrEmpty(posData) ? null : posData,
-                    RedirectAutomatically =  settings.RedirectAutomatically,
+                RedirectAutomatically = settings.RedirectAutomatically,
-                }, store, HttpContext.Request.GetAbsoluteRoot(),
+            }, store, HttpContext.Request.GetAbsoluteRoot(),
-                new List<string>() {AppService.GetAppInternalTag(appId)},
+                new List<string>() { AppService.GetAppInternalTag(appId) },
                 cancellationToken);
             return RedirectToAction(nameof(InvoiceController.Checkout), "Invoice", new { invoiceId = invoice.Data.Id });
         }
-        
+
-        
+
         private string GetUserId()
         {
             return _UserManager.GetUserId(User);

BTCPayServer/Controllers/HomeController.cs

@@ -8,19 +8,39 @@ using System.Net.Http;
 using Newtonsoft.Json.Linq;
 using NBitcoin;
 using Newtonsoft.Json;
+using BTCPayServer.Services;
+using BTCPayServer.HostedServices;
 
 namespace BTCPayServer.Controllers
 {
     public class HomeController : Controller
     {
+        private readonly CssThemeManager _cachedServerSettings;
+
         public IHttpClientFactory HttpClientFactory { get; }
 
-        public HomeController(IHttpClientFactory httpClientFactory)
+        public HomeController(IHttpClientFactory httpClientFactory, CssThemeManager cachedServerSettings)
         {
             HttpClientFactory = httpClientFactory;
+            _cachedServerSettings = cachedServerSettings;
         }
-        public IActionResult Index()
+        
+        public async Task<IActionResult> Index()
         {
+            if (_cachedServerSettings.RootAppType == Services.Apps.AppType.Crowdfund)
+            {
+                var serviceProvider = HttpContext.RequestServices;
+                var controller = (AppsPublicController)serviceProvider.GetService(typeof(AppsPublicController));
+                controller.Url = Url;
+                controller.ControllerContext = ControllerContext;
+                var res = await controller.ViewCrowdfund(_cachedServerSettings.RootAppId, null) as ViewResult;
+                if (res != null)
+                {
+                    res.ViewName = "/Views/AppsPublic/ViewCrowdfund.cshtml";
+                    return res; // return 
+                }
+            }
+
             return View("Home");
         }
 

BTCPayServer/HostedServices/CssThemeManager.cs

@@ -13,6 +13,7 @@ using BTCPayServer.Events;
 using BTCPayServer.Services;
 using Microsoft.AspNetCore.Mvc.Filters;
 using BTCPayServer.Security;
+using BTCPayServer.Services.Apps;
 
 namespace BTCPayServer.HostedServices
 {
@@ -44,13 +45,30 @@ namespace BTCPayServer.HostedServices
             get { return _creativeStartUri; }
         }
 
+
         public bool ShowRegister { get; set; }
         public bool DiscourageSearchEngines { get; set; }
 
+        public AppType? RootAppType { get; set; }
+        public string RootAppId { get; set; }
+
         internal void Update(PoliciesSettings data)
         {
             ShowRegister = !data.LockSubscription;
             DiscourageSearchEngines = data.DiscourageSearchEngines;
+
+            RootAppType = null;
+            RootAppId = null;
+            try
+            {
+                var arr = data.DisplayAppOnRoot.Split('/');
+                RootAppType = Enum.Parse(typeof(AppType), arr[0], true) as AppType?;
+                RootAppId = arr[1];
+            }
+            catch
+            {
+                // ignore parsing errors
+            }
         }
     }
 

BTCPayServer/Hosting/Startup.cs

@@ -78,7 +78,7 @@ namespace BTCPayServer.Hosting
                 //    StyleSrc = "'self' 'unsafe-inline'",
                 //    ScriptSrc = "'self' 'unsafe-inline'"
                 //});
-            });
+            }).AddControllersAsServices();
             services.TryAddScoped<ContentSecurityPolicies>();
             services.Configure<IdentityOptions>(options =>
             {

BTCPayServer/Services/PoliciesSettings.cs

@@ -10,17 +10,17 @@ namespace BTCPayServer.Services
     public class PoliciesSettings
     {
         [Display(Name = "Requires a confirmation mail for registering")]
-        public bool RequiresConfirmedEmail
+        public bool RequiresConfirmedEmail { get; set; }
-        {
-            get; set;
-        }
 
         [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
         [Display(Name = "Disable registration")]
         public bool LockSubscription { get; set; }
-        
+
         [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
         [Display(Name = "Discourage search engines from indexing this site")]
         public bool DiscourageSearchEngines { get; set; }
+
+        [Display(Name = "Display app on website root")]
+        public string DisplayAppOnRoot { get; set; }
     }
 }

BTCPayServer/Views/AppsPublic/Crowdfund/MinimalCrowdfund.cshtml

@@ -135,7 +135,7 @@
                         </div>
                         <div class="col-md-4 col-sm-12">
                             <partial 
-                                name="Crowdfund/ContributeForm"
+                                name="/Views/AppsPublic/Crowdfund/ContributeForm.cshtml"
                                 model="@(new ContributeToCrowdfund()
                                               {
                                                   ViewCrowdfundViewModel = Model,

BTCPayServer/Views/AppsPublic/ViewCrowdfund.cshtml

@@ -41,19 +41,19 @@
 <body>
 @if (Context.Request.Query.ContainsKey("simple"))
 {
-    @await Html.PartialAsync("Crowdfund/MinimalCrowdfund", Model)
+    @await Html.PartialAsync("/Views/AppsPublic/Crowdfund/MinimalCrowdfund.cshtml", Model)
 }
 else
 {
     <noscript>
-        @await Html.PartialAsync("Crowdfund/MinimalCrowdfund", Model)
+        @await Html.PartialAsync("/Views/AppsPublic/Crowdfund/MinimalCrowdfund.cshtml", Model)
     </noscript>
 
     if (Model.AnimationsEnabled)
     {
         <canvas id="fireworks"></canvas>
     }
-    @await Html.PartialAsync("Crowdfund/VueCrowdfund", Model)
+    @await Html.PartialAsync("/Views/AppsPublic/Crowdfund/VueCrowdfund.cshtml", Model)
 }
 
 </body>

BTCPayServer/Views/Server/Policies.cshtml

@@ -21,11 +21,16 @@
             <div class="form-group">
                 <label asp-for="LockSubscription"></label>
                 <input asp-for="LockSubscription" type="checkbox" class="form-check-inline" />
-            </div> 
+            </div>
             <div class="form-group">
                 <label asp-for="DiscourageSearchEngines"></label>
                 <input asp-for="DiscourageSearchEngines" type="checkbox" class="form-check-inline" />
             </div>
+            <div class="form-group">
+                <label asp-for="DisplayAppOnRoot"></label>
+                <input asp-for="DisplayAppOnRoot" class="form-control" />
+                <span asp-validation-for="DisplayAppOnRoot" class="text-danger"></span>
+            </div>
             <button type="submit" class="btn btn-primary" name="command" value="Save">Save</button>
         </form>
     </div>