diff --git a/Oqtane.Client/App.razor b/Oqtane.Client/Routes.razor similarity index 100% rename from Oqtane.Client/App.razor rename to Oqtane.Client/Routes.razor diff --git a/Oqtane.Client/Utilities/RenderModes.cs b/Oqtane.Client/Utilities/RenderModes.cs new file mode 100644 index 00000000..820dec37 --- /dev/null +++ b/Oqtane.Client/Utilities/RenderModes.cs @@ -0,0 +1,22 @@ +using Microsoft.AspNetCore.Components.Web; +using Microsoft.AspNetCore.Components; + +namespace Oqtane.Client.Utilities +{ + public static class RenderModes + { + public static IComponentRenderMode GetRenderMode(string renderMode) + { + switch (renderMode) + { + case "InteractiveServer": + return RenderMode.InteractiveServer; + case "InteractiveWebAssembly": + return RenderMode.InteractiveWebAssembly; + case "InteractiveAuto": + return RenderMode.InteractiveAuto; + } + return null; + } + } +} diff --git a/Oqtane.Server/Components/App.razor b/Oqtane.Server/Components/App.razor new file mode 100644 index 00000000..0d0f69e3 --- /dev/null +++ b/Oqtane.Server/Components/App.razor @@ -0,0 +1,386 @@ +@namespace Oqtane.Components +@using Microsoft.AspNetCore.Http +@using Microsoft.AspNetCore.Http.Extensions +@using Oqtane.Client +@using Oqtane.Client.Utilities +@using Oqtane.Repository +@using Oqtane.Infrastructure +@using Oqtane.Security +@using Oqtane.Models +@using Oqtane.Shared +@using Oqtane.Themes +@using System.Net +@using Microsoft.AspNetCore.Localization +@inject IConfigManager ConfigManager; +@inject ITenantManager TenantManager; +@inject ILocalizationManager LocalizationManager; +@inject ISiteRepository SiteRepository; +@inject IPageRepository PageRepository; +@inject IThemeRepository ThemeRepository; +@inject ILanguageRepository LanguageRepository; +@inject IServerStateManager ServerStateManager; + + + + + + + + + + + @if (!string.IsNullOrEmpty(_PWAScript)) + { + + } + @((MarkupString)_styleSheets) + + + + @((MarkupString)_headResources) + + + @if (string.IsNullOrEmpty(_message)) + { + + + + + + @if (!string.IsNullOrEmpty(_reconnectScript)) + { + @((MarkupString)_reconnectScript) + } + @if (!string.IsNullOrEmpty(_PWAScript)) + { + @((MarkupString)_PWAScript) + } + @((MarkupString)_bodyResources) + } + else + { +
@_message
+ } + + + +@code { + private string _interactiveRenderMode = "InteractiveServer"; + private string _language = "en"; + private string _remoteIPAddress = ""; + private string _headResources = ""; + private string _bodyResources = ""; + private string _styleSheets = ""; + private string _PWAScript = ""; + private string _reconnectScript = ""; + private string _message = ""; + + // CascadingParameter is required to access HttpContext + [CascadingParameter] + HttpContext Context { get; set; } + + protected override void OnInitialized() + { + _remoteIPAddress = Context.Connection.RemoteIpAddress?.ToString() ?? ""; + + // if framework is installed + if (ConfigManager.IsInstalled()) + { + var alias = TenantManager.GetAlias(); + if (alias != null) + { + var url = WebUtility.UrlDecode(Context.Request.GetEncodedUrl()); + + // redirect non-default alias unless you are trying to access site settings + // if (!alias.IsDefault && !url.Contains("admin/site")) + // { + // var aliases = AliasRepository.GetAliases().Where(item => item.TenantId == alias.TenantId && item.SiteId == alias.SiteId); + // if (aliases.Where(item => item.IsDefault).FirstOrDefault() != null) + // { + // return RedirectPermanent(url.Replace(alias.Name, aliases.Where(item => item.IsDefault).FirstOrDefault().Name)); + // } + // else // no default specified - use first alias + // { + // if (alias.Name.Trim() != aliases.First().Name.Trim()) + // { + // return RedirectPermanent(url.Replace(alias.Name, aliases.First().Name)); + // } + // } + // } + + var site = SiteRepository.GetSite(alias.SiteId); + if (site != null && (!site.IsDeleted || url.Contains("admin/site")) && site.Runtime != "Hybrid") + { + // if (!string.IsNullOrEmpty(site.Runtime)) + // { + // Runtime = site.Runtime; + // } + // if (!string.IsNullOrEmpty(site.RenderMode)) + // { + // RenderMode = site.RenderMode; + // } + + Route route = new Route(url, alias.Path); + var page = PageRepository.GetPage(route.PagePath, site.SiteId); + if (page == null && route.PagePath == "" && site.HomePageId != null) + { + page = PageRepository.GetPage(site.HomePageId.Value); + } + + // if (page == null || page.IsDeleted) + // { + // // page not found - look for url mapping + // var urlMapping = _urlMappings.GetUrlMapping(site.SiteId, route.PagePath); + // if (urlMapping != null && !string.IsNullOrEmpty(urlMapping.MappedUrl)) + // { + // url = (urlMapping.MappedUrl.StartsWith("http")) ? urlMapping.MappedUrl : route.SiteUrl + "/" + urlMapping.MappedUrl; + // return RedirectPermanent(url); + // } + // else + // { + // if (route.PagePath != "404") + // { + // return RedirectPermanent(route.SiteUrl + "/404"); + // } + // } + // } + + // if (site.VisitorTracking) + // { + // TrackVisitor(site.SiteId); + // } + + // get jwt token for downstream APIs + // if (User.Identity.IsAuthenticated) + // { + // var sitesettings = HttpContext.GetSiteSettings(); + // var secret = sitesettings.GetValue("JwtOptions:Secret", ""); + // if (!string.IsNullOrEmpty(secret)) + // { + // AuthorizationToken = _jwtManager.GenerateToken(alias, (ClaimsIdentity)User.Identity, secret, sitesettings.GetValue("JwtOptions:Issuer", ""), sitesettings.GetValue("JwtOptions:Audience", ""), int.Parse(sitesettings.GetValue("JwtOptions:Lifetime", "20"))); + // } + // } + + // stylesheets + var themes = ThemeRepository.GetThemes().ToList(); + var resources = new List(); + if (string.IsNullOrEmpty(page.ThemeType)) + { + page.ThemeType = site.DefaultThemeType; + } + var theme = themes.FirstOrDefault(item => item.Themes.Any(item => item.TypeName == page.ThemeType)); + if (theme?.Resources != null) + { + resources.AddRange(theme.Resources.Where(item => item.ResourceType == ResourceType.Stylesheet).ToList()); + } + var type = Type.GetType(page.ThemeType); + if (type != null) + { + var obj = Activator.CreateInstance(type) as IThemeControl; + if (obj?.Resources != null) + { + resources.AddRange(obj.Resources.Where(item => item.ResourceType == ResourceType.Stylesheet).ToList()); + } + } + ManageStyleSheets(resources, alias, theme.ThemeName); + + // scripts + if (_interactiveRenderMode == "InteractiveServer") + { + _reconnectScript = CreateReconnectScript(); + } + if (site.PwaIsEnabled && site.PwaAppIconFileId != null && site.PwaSplashIconFileId != null) + { + _PWAScript = CreatePWAScript(alias, site, route); + } + _headResources += ParseScripts(site.HeadContent); + _bodyResources += ParseScripts(site.BodyContent); + var scripts = ServerStateManager.GetServerState(alias.SiteKey).Scripts; + foreach (var script in scripts) + { + AddScript(script, alias); + } + + // set culture if not specified + string culture = Context.Request.Cookies[CookieRequestCultureProvider.DefaultCookieName]; + if (culture == null) + { + // get default language for site + var languages = LanguageRepository.GetLanguages(alias.SiteId); + if (languages.Any()) + { + // use default language if specified otherwise use first language in collection + culture = (languages.Where(l => l.IsDefault).SingleOrDefault() ?? languages.First()).Code; + } + else + { + culture = LocalizationManager.GetDefaultCulture(); + } + SetLocalizationCookie(culture); + } + + // set language for page + if (!string.IsNullOrEmpty(culture)) + { + // localization cookie value in form of c=en|uic=en + _language = culture.Split('|')[0]; + _language = _language.Replace("c=", ""); + } + } + else + { + _message = "Site Is Disabled"; + } + } + else + { + _message = "Site Not Configured Correctly - No Matching Alias Exists For Host Name"; + } + } + } + + private string CreatePWAScript(Alias alias, Site site, Route route) + { + return + "" + Environment.NewLine + + ""; + } + + private string CreateReconnectScript() + { + return + ""; + } + + private string ParseScripts(string content) + { + // iterate scripts + var scripts = ""; + if (!string.IsNullOrEmpty(content)) + { + var index = content.IndexOf("= 0) + { + scripts += content.Substring(index, content.IndexOf("", index) + 9 - index); + index = content.IndexOf(""; + } + else + { + // inline script + return ""; + } + } + + private void SetLocalizationCookie(string culture) + { + Context.Response.Cookies.Append( + CookieRequestCultureProvider.DefaultCookieName, + CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(culture))); + } + + private void ManageStyleSheets(List resources, Alias alias, string name) + { + if (resources != null) + { + int count = 0; + foreach (var resource in resources) + { + if (resource.Url.StartsWith("~")) + { + resource.Url = resource.Url.Replace("~", "/Themes/" + Utilities.GetTypeName(name) + "/").Replace("//", "/"); + } + if (!resource.Url.Contains("://") && alias.BaseUrl != "" && !resource.Url.StartsWith(alias.BaseUrl)) + { + resource.Url = alias.BaseUrl + resource.Url; + } + + if (!_styleSheets.Contains(resource.Url, StringComparison.OrdinalIgnoreCase)) + { + count++; + string id = "id=\"app-stylesheet-" + ResourceLevel.Page.ToString().ToLower() + "-" + DateTime.UtcNow.ToString("yyyyMMddHHmmssfff") + "-" + count.ToString("00") + "\" "; + _styleSheets += "" + Environment.NewLine; + } + } + } + } +} diff --git a/Oqtane.Server/Extensions/ComponentEndpointRouteBuilderExtensions.cs b/Oqtane.Server/Extensions/ComponentEndpointRouteBuilderExtensions.cs new file mode 100644 index 00000000..b464e81d --- /dev/null +++ b/Oqtane.Server/Extensions/ComponentEndpointRouteBuilderExtensions.cs @@ -0,0 +1,29 @@ +#nullable enable +using Oqtane.Components; +using Microsoft.AspNetCore.Components.Endpoints; +using Microsoft.AspNetCore.Routing; +using System; +using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.DependencyInjection; + +namespace OqtaneSSR.Extensions +{ + public static class ComponentEndpointRouteBuilderExtensions + { + public static void MapFallback(this IEndpointRouteBuilder endpoints) + { + ArgumentNullException.ThrowIfNull(endpoints); + + endpoints.MapFallback((ctx) => + { + var invoker = ctx.RequestServices.GetRequiredService(); + return invoker.Render(ctx); + }) + .Add(routeEndpointBuilder => + { + routeEndpointBuilder.Metadata.Add(new RootComponentMetadata(typeof(App))); + routeEndpointBuilder.Metadata.Add(new ComponentTypeMetadata(typeof(App))); + }); + } + } +} diff --git a/Oqtane.Server/Pages/_Host.cshtml b/Oqtane.Server/Pages/_Host.cshtml deleted file mode 100644 index af8444f8..00000000 --- a/Oqtane.Server/Pages/_Host.cshtml +++ /dev/null @@ -1,67 +0,0 @@ -@page "/" -@namespace Oqtane.Pages -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers -@model Oqtane.Pages.HostModel - - - - - - - - - - @if (!string.IsNullOrEmpty(Model.PWAScript)) - { - - } - @Html.Raw(Model.StyleSheets) - - - - @Html.Raw(Model.HeadResources) - - - @if (string.IsNullOrEmpty(Model.Message)) - { - @(Html.AntiForgeryToken()) - - - -
- - An error has occurred. This application may no longer respond until reloaded. - - - An unhandled exception has occurred. See browser dev tools for details. - - Reload - 🗙 -
- - - - @if (Model.Runtime == "WebAssembly") - { - - } - @if (Model.Runtime == "Server") - { - - } - @if (!string.IsNullOrEmpty(Model.ReconnectScript)) - { - @Html.Raw(Model.ReconnectScript) - } - @if (!string.IsNullOrEmpty(Model.PWAScript)) - { - @Html.Raw(Model.PWAScript) - } - @Html.Raw(Model.BodyResources) - } - else - { -
@Model.Message
- } - - diff --git a/Oqtane.Server/Pages/_Host.cshtml.cs b/Oqtane.Server/Pages/_Host.cshtml.cs deleted file mode 100644 index a451f5a0..00000000 --- a/Oqtane.Server/Pages/_Host.cshtml.cs +++ /dev/null @@ -1,525 +0,0 @@ -using Microsoft.AspNetCore.Mvc.RazorPages; -using Oqtane.Infrastructure; -using Oqtane.Shared; -using Oqtane.Models; -using System; -using System.Linq; -using Oqtane.Repository; -using Microsoft.AspNetCore.Localization; -using Microsoft.Extensions.Configuration; -using Microsoft.AspNetCore.Antiforgery; -using Microsoft.AspNetCore.Http.Extensions; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Net.Http.Headers; -using Microsoft.AspNetCore.Http; -using System.Security.Claims; -using System.Net; -using Microsoft.Extensions.Primitives; -using Oqtane.Enums; -using Oqtane.Security; -using Oqtane.Extensions; -using Oqtane.Themes; -using System.Collections.Generic; - -namespace Oqtane.Pages -{ - public class HostModel : PageModel - { - private IConfigManager _configuration; - private readonly ITenantManager _tenantManager; - private readonly ILocalizationManager _localizationManager; - private readonly ILanguageRepository _languages; - private readonly IAntiforgery _antiforgery; - private readonly IJwtManager _jwtManager; - private readonly ISiteRepository _sites; - private readonly IPageRepository _pages; - private readonly IUrlMappingRepository _urlMappings; - private readonly IVisitorRepository _visitors; - private readonly IAliasRepository _aliases; - private readonly ISettingRepository _settings; - private readonly IThemeRepository _themes; - private readonly IServerStateManager _serverState; - private readonly ILogManager _logger; - - public HostModel(IConfigManager configuration, ITenantManager tenantManager, ILocalizationManager localizationManager, ILanguageRepository languages, IAntiforgery antiforgery, IJwtManager jwtManager, ISiteRepository sites, IPageRepository pages, IUrlMappingRepository urlMappings, IVisitorRepository visitors, IAliasRepository aliases, ISettingRepository settings, IThemeRepository themes, IServerStateManager serverState, ILogManager logger) - { - _configuration = configuration; - _tenantManager = tenantManager; - _localizationManager = localizationManager; - _languages = languages; - _antiforgery = antiforgery; - _jwtManager = jwtManager; - _sites = sites; - _pages = pages; - _urlMappings = urlMappings; - _visitors = visitors; - _aliases = aliases; - _settings = settings; - _themes = themes; - _serverState = serverState; - _logger = logger; - } - - public string Language = "en"; - public string AntiForgeryToken = ""; - public string AuthorizationToken = ""; - public string Runtime = "Server"; - public string RenderMode = "ServerPrerendered"; - public int VisitorId = -1; - public string RemoteIPAddress = ""; - public string HeadResources = ""; - public string BodyResources = ""; - public string StyleSheets = ""; - public string PWAScript = ""; - public string ReconnectScript = ""; - public string Message = ""; - - public IActionResult OnGet() - { - AntiForgeryToken = _antiforgery.GetAndStoreTokens(HttpContext).RequestToken; - RemoteIPAddress = HttpContext.Connection.RemoteIpAddress?.ToString() ?? ""; - - if (_configuration.GetSection("Runtime").Exists()) - { - Runtime = _configuration.GetSection("Runtime").Value; - } - - if (_configuration.GetSection("RenderMode").Exists()) - { - RenderMode = _configuration.GetSection("RenderMode").Value; - } - - // if framework is installed - if (_configuration.IsInstalled()) - { - var alias = _tenantManager.GetAlias(); - if (alias != null) - { - var url = WebUtility.UrlDecode(HttpContext.Request.GetEncodedUrl()); - - // redirect non-default alias unless you are trying to access site settings - if (!alias.IsDefault && !url.Contains("admin/site")) - { - var aliases = _aliases.GetAliases().Where(item => item.TenantId == alias.TenantId && item.SiteId == alias.SiteId); - if (aliases.Where(item => item.IsDefault).FirstOrDefault() != null) - { - return RedirectPermanent(url.Replace(alias.Name, aliases.Where(item => item.IsDefault).FirstOrDefault().Name)); - } - else // no default specified - use first alias - { - if (alias.Name.Trim() != aliases.First().Name.Trim()) - { - return RedirectPermanent(url.Replace(alias.Name, aliases.First().Name)); - } - } - } - - var site = _sites.GetSite(alias.SiteId); - if (site != null && (!site.IsDeleted || url.Contains("admin/site")) && site.Runtime != "Hybrid") - { - Route route = new Route(url, alias.Path); - - if (!string.IsNullOrEmpty(site.Runtime)) - { - Runtime = site.Runtime; - } - if (!string.IsNullOrEmpty(site.RenderMode)) - { - RenderMode = site.RenderMode; - } - - var page = _pages.GetPage(route.PagePath, site.SiteId); - if (page == null && route.PagePath == "" && site.HomePageId != null) - { - page = _pages.GetPage(site.HomePageId.Value); - } - if (page == null || page.IsDeleted) - { - // page not found - look for url mapping - var urlMapping = _urlMappings.GetUrlMapping(site.SiteId, route.PagePath); - if (urlMapping != null && !string.IsNullOrEmpty(urlMapping.MappedUrl)) - { - url = (urlMapping.MappedUrl.StartsWith("http")) ? urlMapping.MappedUrl : route.SiteUrl + "/" + urlMapping.MappedUrl; - return RedirectPermanent(url); - } - else - { - if (route.PagePath != "404") - { - return RedirectPermanent(route.SiteUrl + "/404"); - } - } - } - - if (site.VisitorTracking) - { - TrackVisitor(site.SiteId); - } - - // get jwt token for downstream APIs - if (User.Identity.IsAuthenticated) - { - var sitesettings = HttpContext.GetSiteSettings(); - var secret = sitesettings.GetValue("JwtOptions:Secret", ""); - if (!string.IsNullOrEmpty(secret)) - { - AuthorizationToken = _jwtManager.GenerateToken(alias, (ClaimsIdentity)User.Identity, secret, sitesettings.GetValue("JwtOptions:Issuer", ""), sitesettings.GetValue("JwtOptions:Audience", ""), int.Parse(sitesettings.GetValue("JwtOptions:Lifetime", "20"))); - } - } - - // stylesheets - var themes = _themes.GetThemes().ToList(); - var resources = new List(); - if (string.IsNullOrEmpty(page.ThemeType)) - { - page.ThemeType = site.DefaultThemeType; - } - var theme = themes.FirstOrDefault(item => item.Themes.Any(item => item.TypeName == page.ThemeType)); - if (theme?.Resources != null) - { - resources.AddRange(theme.Resources.Where(item => item.ResourceType == ResourceType.Stylesheet).ToList()); - } - var type = Type.GetType(page.ThemeType); - if (type != null) - { - var obj = Activator.CreateInstance(type) as IThemeControl; - if (obj?.Resources != null) - { - resources.AddRange(obj.Resources.Where(item => item.ResourceType == ResourceType.Stylesheet).ToList()); - } - } - ManageStyleSheets(resources, alias, theme.ThemeName); - - // scripts - if (Runtime == "Server") - { - ReconnectScript = CreateReconnectScript(); - } - if (site.PwaIsEnabled && site.PwaAppIconFileId != null && site.PwaSplashIconFileId != null) - { - PWAScript = CreatePWAScript(alias, site, route); - } - HeadResources += ParseScripts(site.HeadContent); - BodyResources += ParseScripts(site.BodyContent); - var scripts = _serverState.GetServerState(alias.SiteKey).Scripts; - foreach (var script in scripts) - { - AddScript(script, alias); - } - - // set culture if not specified - string culture = HttpContext.Request.Cookies[CookieRequestCultureProvider.DefaultCookieName]; - if (culture == null) - { - // get default language for site - var languages = _languages.GetLanguages(alias.SiteId); - if (languages.Any()) - { - // use default language if specified otherwise use first language in collection - culture = (languages.Where(l => l.IsDefault).SingleOrDefault() ?? languages.First()).Code; - } - else - { - culture = _localizationManager.GetDefaultCulture(); - } - SetLocalizationCookie(culture); - } - - // set language for page - if (!string.IsNullOrEmpty(culture)) - { - // localization cookie value in form of c=en|uic=en - Language = culture.Split('|')[0]; - Language = Language.Replace("c=", ""); - } - } - else - { - Message = "Site Is Disabled"; - } - } - else - { - Message = "Site Not Configured Correctly - No Matching Alias Exists For Host Name"; - } - } - return Page(); - } - - private void TrackVisitor(int SiteId) - { - try - { - // get request attributes - string useragent = (Request.Headers[HeaderNames.UserAgent] != StringValues.Empty) ? Request.Headers[HeaderNames.UserAgent] : "(none)"; - useragent = (useragent.Length > 256) ? useragent.Substring(0, 256) : useragent; - string language = (Request.Headers[HeaderNames.AcceptLanguage] != StringValues.Empty) ? Request.Headers[HeaderNames.AcceptLanguage] : ""; - language = (language.Contains(",")) ? language.Substring(0, language.IndexOf(",")) : language; - language = (language.Contains(";")) ? language.Substring(0, language.IndexOf(";")) : language; - language = (language.Trim().Length == 0) ? "??" : language; - - // filter - string filter = Constants.DefaultVisitorFilter; - var settings = _settings.GetSettings(EntityNames.Site, SiteId); - if (settings.Any(item => item.SettingName == "VisitorFilter")) - { - filter = settings.First(item => item.SettingName == "VisitorFilter").SettingValue; - } - foreach (string term in filter.ToLower().Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(sValue => sValue.Trim()).ToArray()) - { - if (RemoteIPAddress.ToLower().Contains(term) || useragent.ToLower().Contains(term) || language.ToLower().Contains(term)) - { - return; - } - } - - // get other request attributes - string url = Request.GetEncodedUrl(); - string referrer = (Request.Headers[HeaderNames.Referer] != StringValues.Empty) ? Request.Headers[HeaderNames.Referer] : ""; - int? userid = null; - if (User.HasClaim(item => item.Type == ClaimTypes.NameIdentifier)) - { - userid = int.Parse(User.Claims.First(item => item.Type == ClaimTypes.NameIdentifier).Value); - } - - // check if cookie already exists - Visitor visitor = null; - bool addcookie = false; - var VisitorCookie = Constants.VisitorCookiePrefix + SiteId.ToString(); - if (!int.TryParse(Request.Cookies[VisitorCookie], out VisitorId)) - { - // if enabled use IP Address correlation - VisitorId = -1; - bool correlate = true; - if (settings.Any(item => item.SettingName == "VisitorCorrelation")) - { - correlate = bool.Parse(settings.First(item => item.SettingName == "VisitorCorrelation").SettingValue); - } - if (correlate) - { - visitor = _visitors.GetVisitor(SiteId, RemoteIPAddress); - if (visitor != null) - { - VisitorId = visitor.VisitorId; - addcookie = true; - } - } - } - - if (VisitorId == -1) - { - // create new visitor - visitor = new Visitor(); - visitor.SiteId = SiteId; - visitor.IPAddress = RemoteIPAddress; - visitor.UserAgent = useragent; - visitor.Language = language; - visitor.Url = url; - visitor.Referrer = referrer; - visitor.UserId = userid; - visitor.Visits = 1; - visitor.CreatedOn = DateTime.UtcNow; - visitor.VisitedOn = DateTime.UtcNow; - visitor = _visitors.AddVisitor(visitor); - VisitorId = visitor.VisitorId; - addcookie = true; - } - else - { - if (visitor == null) - { - // get visitor if it was not previously loaded - visitor = _visitors.GetVisitor(VisitorId); - } - if (visitor != null) - { - // update visitor - visitor.IPAddress = RemoteIPAddress; - visitor.UserAgent = useragent; - visitor.Language = language; - visitor.Url = url; - if (!string.IsNullOrEmpty(referrer)) - { - visitor.Referrer = referrer; - } - if (userid != null) - { - visitor.UserId = userid; - } - visitor.Visits += 1; - visitor.VisitedOn = DateTime.UtcNow; - _visitors.UpdateVisitor(visitor); - } - else - { - // remove cookie if VisitorId does not exist - Response.Cookies.Delete(VisitorCookie); - } - } - - // append cookie - if (addcookie) - { - Response.Cookies.Append( - VisitorCookie, - VisitorId.ToString(), - new CookieOptions() - { - Expires = DateTimeOffset.UtcNow.AddYears(1), - IsEssential = true - } - ); - } - } - catch (Exception ex) - { - _logger.Log(LogLevel.Error, this, LogFunction.Other, "Error Tracking Visitor {Error}", ex.Message); - } - } - - private string CreatePWAScript(Alias alias, Site site, Route route) - { - return - "" + Environment.NewLine + - ""; - } - - private string CreateReconnectScript() - { - return - ""; - } - - private string ParseScripts(string content) - { - // iterate scripts - var scripts = ""; - if (!string.IsNullOrEmpty(content)) - { - var index = content.IndexOf("= 0) - { - scripts += content.Substring(index, content.IndexOf("", index) + 9 - index); - index = content.IndexOf(""; - } - else - { - // inline script - return ""; - } - } - - private void SetLocalizationCookie(string culture) - { - HttpContext.Response.Cookies.Append( - CookieRequestCultureProvider.DefaultCookieName, - CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(culture))); - } - - private void ManageStyleSheets(List resources, Alias alias, string name) - { - if (resources != null) - { - int count = 0; - foreach (var resource in resources) - { - if (resource.Url.StartsWith("~")) - { - resource.Url = resource.Url.Replace("~", "/Themes/" + Utilities.GetTypeName(name) + "/").Replace("//", "/"); - } - if (!resource.Url.Contains("://") && alias.BaseUrl != "" && !resource.Url.StartsWith(alias.BaseUrl)) - { - resource.Url = alias.BaseUrl + resource.Url; - } - - if (!StyleSheets.Contains(resource.Url, StringComparison.OrdinalIgnoreCase)) - { - count++; - string id = "id=\"app-stylesheet-" + ResourceLevel.Page.ToString().ToLower() + "-" + DateTime.UtcNow.ToString("yyyyMMddHHmmssfff") + "-" + count.ToString("00") + "\" "; - StyleSheets += "" + Environment.NewLine; - } - } - } - } - } -} diff --git a/Oqtane.Server/Security/AutoValidateAntiforgeryTokenFilter.cs b/Oqtane.Server/Security/AutoValidateAntiforgeryTokenFilter.cs index f6fb29cf..2740ed33 100644 --- a/Oqtane.Server/Security/AutoValidateAntiforgeryTokenFilter.cs +++ b/Oqtane.Server/Security/AutoValidateAntiforgeryTokenFilter.cs @@ -50,6 +50,8 @@ namespace Oqtane.Security protected virtual bool ShouldValidate(AuthorizationFilterContext context) { + return false; + // ignore antiforgery validation if a bearer token was provided if (context.HttpContext.Request.Headers.ContainsKey("Authorization")) { diff --git a/Oqtane.Server/Startup.cs b/Oqtane.Server/Startup.cs index e777f4ed..f79561e2 100644 --- a/Oqtane.Server/Startup.cs +++ b/Oqtane.Server/Startup.cs @@ -17,6 +17,9 @@ using Oqtane.Security; using Oqtane.Shared; using Microsoft.AspNetCore.HttpOverrides; using Microsoft.Extensions.Logging; +using Oqtane.Components; +using Oqtane.UI; +using OqtaneSSR.Extensions; namespace Oqtane { @@ -36,6 +39,7 @@ namespace Oqtane .AddJsonFile("appsettings.json", false, true) .AddJsonFile($"appsettings.{env.EnvironmentName}.json", true, true) .AddEnvironmentVariables(); + Configuration = builder.Build(); _installedCultures = localizationManager.GetInstalledCultures(); @@ -64,17 +68,17 @@ namespace Oqtane services.AddOptions>().Bind(Configuration.GetSection(SettingKeys.AvailableDatabasesSection)); services.Configure(opts => opts.ShutdownTimeout = TimeSpan.FromSeconds(10)); // increase from default of 5 seconds - services.AddServerSideBlazor() - .AddCircuitOptions(options => - { - if (_env.IsDevelopment()) - { - options.DetailedErrors = true; - } - }) - .AddHubOptions(options => { - options.MaximumReceiveMessageSize = null; // no limit (for large amnounts of data ie. textarea components) - }); + //services.AddServerSideBlazor() + // .AddCircuitOptions(options => + // { + // if (_env.IsDevelopment()) + // { + // options.DetailedErrors = true; + // } + // }) + // .AddHubOptions(options => { + // options.MaximumReceiveMessageSize = null; // no limit (for large amnounts of data ie. textarea components) + // }); // setup HttpClient for server side in a client side compatible fashion ( with auth cookie ) services.AddHttpClients(); @@ -148,6 +152,10 @@ namespace Oqtane .AddOqtaneApplicationParts() // register any Controllers from custom modules .ConfigureOqtaneMvc(); // any additional configuration from IStartup classes + services.AddRazorComponents() + .AddInteractiveServerComponents() + .AddInteractiveWebAssemblyComponents(); + services.AddSwaggerGen(options => { options.CustomSchemaIds(type => type.ToString()); // Handle SchemaId already used for different type @@ -200,11 +208,30 @@ namespace Oqtane app.UseSwaggerUI(c => { c.SwaggerEndpoint("/swagger/" + Constants.Version + "/swagger.json", Constants.PackageId + " " + Constants.Version); }); } + //app.UseEndpoints(endpoints => + //{ + // endpoints.MapBlazorHub(); + // endpoints.MapControllers(); + // endpoints.MapFallbackToPage("/_Host"); + //}); + + app.UseAntiforgery(); app.UseEndpoints(endpoints => { - endpoints.MapBlazorHub(); endpoints.MapControllers(); - endpoints.MapFallbackToPage("/_Host"); + }); + + app.UseEndpoints(endpoints => + { + endpoints.MapRazorComponents() + .AddInteractiveServerRenderMode() + .AddInteractiveWebAssemblyRenderMode() + .AddAdditionalAssemblies(typeof(SiteRouter).Assembly); + }); + + app.UseEndpoints(endpoints => + { + endpoints.MapFallback(); }); // create a global sync event to identify server application startup