v1.0.11

Author: rickbutterfield

src/Umbraco.Community.Sustainability/Controllers/SustainabilityController.cs

@@ -103,21 +103,23 @@ public async Task<IActionResult> CheckPage([FromQuery] Guid pageKey)
                 return Ok("Page not found");
             }
 
+            var nodeUrl = contentItem.Url(mode: UrlMode.Absolute);
+
             var applicationUri = HttpContext.Request.GetApplicationUri(_webRoutingSettings);
-            var url = contentItem.Url(mode: UrlMode.Absolute);
-            var sustainabilityData = await _sustainabilityService.GetSustainabilityData(url, applicationUri.AbsoluteUri);
+            var hostWithSchemeAndPort = $"{applicationUri.Scheme}://{applicationUri.Authority}";
+
+#if DEBUG
+            nodeUrl = "https://rickbutterfield.dev/";
+#endif
+
+            var sustainabilityData = await _sustainabilityService.GetSustainabilityData(nodeUrl, hostWithSchemeAndPort);
 
             return Ok(sustainabilityData);
         }
 
         [HttpPost]
         public async Task<IActionResult> SavePageData([FromQuery] Guid pageKey, [FromBody] SustainabilityResponse data)
         {
-            if (data.TotalSize == 0)
-            {
-                return Ok("Missing data to update");
-            }
-
             var pageMetric = new PageMetric()
             {
                 NodeKey = pageKey,

src/Umbraco.Community.Sustainability/CorsMiddleware.cs

@@ -0,0 +1,26 @@
+using Microsoft.AspNetCore.Http;
+
+namespace Umbraco.Community.Sustainability
+{
+    public class CorsMiddleware
+    {
+        private readonly RequestDelegate _next;
+
+        public CorsMiddleware(RequestDelegate next)
+        {
+            _next = next;
+        }
+
+        public async Task InvokeAsync(HttpContext context)
+        {
+            if (context.Request.Path.Value?.StartsWith("/App_Plugins/UmbracoCommunitySustainability/") == true)
+            {
+                context.Response.Headers.Append("Access-Control-Allow-Origin", "*");
+                context.Response.Headers.Append("Access-Control-Allow-Methods", "GET, POST, OPTIONS");
+                context.Response.Headers.Append("Access-Control-Allow-Headers", "Content-Type, Authorization");
+            }
+
+            await _next(context);
+        }
+    }
+}

src/Umbraco.Community.Sustainability/Services/SustainabilityService.cs

@@ -1,29 +1,29 @@
 using System.Text.Json;
 using Microsoft.Playwright;
 using Umbraco.Community.Sustainability.Models;
+using Umbraco.Extensions;
 
 namespace Umbraco.Community.Sustainability.Services
 {
     public interface ISustainabilityService
     {
-        Task<SustainabilityResponse> GetSustainabilityData(string url, string applicationUrl = "");
+        public Task<SustainabilityResponse> GetSustainabilityData(string url, string applicationUrl = "");
     }
 
     public class SustainabilityService : ISustainabilityService
     {
         public async Task<SustainabilityResponse> GetSustainabilityData(string url, string applicationUrl = "")
         {
             using var playwright = await Playwright.CreateAsync();
-            await using var browser = await playwright.Chromium.LaunchAsync(new BrowserTypeLaunchOptions() {
-                Headless = true,
-                Args = new[] { "--disable-web-security" }
+            await using var browser = await playwright.Chromium.LaunchAsync(new BrowserTypeLaunchOptions()
+            {
+                Headless = true
             });
 
             var baseUri = new Uri(url);
             var context = await browser.NewContextAsync(new()
             {
-                BypassCSP = true,
-                IgnoreHTTPSErrors = true
+                BypassCSP = true
             });
 
             var page = await context.NewPageAsync();
@@ -40,7 +40,7 @@ public async Task<SustainabilityResponse> GetSustainabilityData(string url, stri
 
             try
             {
-                string scriptUrl = string.Concat(applicationUrl, "App_Plugins/UmbracoCommunitySustainability/js/resource-checker.js");
+                string scriptUrl = string.Concat(applicationUrl.EnsureEndsWith('/'), "App_Plugins/UmbracoCommunitySustainability/js/resource-checker.js");
 
                 var scriptResponse = await page.EvaluateAsync($@"() => {{  
                     import('{scriptUrl}')  

src/Umbraco.Community.Sustainability/SustainabilityComposer.cs

@@ -1,7 +1,9 @@
+using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Notifications;
+using Umbraco.Cms.Web.Common.ApplicationBuilder;
 using Umbraco.Community.Sustainability.ContentApps;
 using Umbraco.Community.Sustainability.Notifications;
 using Umbraco.Community.Sustainability.Sections;
@@ -47,6 +49,14 @@ public void Compose(IUmbracoBuilder builder)
 
             builder.Services.AddScoped<IPageMetricService, PageMetricService>();
             builder.Services.AddSingleton<ISustainabilityService, SustainabilityService>();
+
+            builder.Services.Configure<UmbracoPipelineOptions>(options =>
+            {
+                options.AddFilter(new UmbracoPipelineFilter(nameof(CorsMiddleware))
+                {
+                    PrePipeline = prePipeline => prePipeline.UseMiddleware<CorsMiddleware>()
+                });
+            });
         }
     }
 }

src/Umbraco.Community.Sustainability/Umbraco.Community.Sustainability.csproj

@@ -16,7 +16,7 @@
     <RootNamespace>Umbraco.Community.Sustainability</RootNamespace>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 
-    <VersionPrefix>1.0.10</VersionPrefix>
+    <VersionPrefix>1.0.11</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <Authors>Umbraco Sustainability Community Team</Authors>
     <Copyright>$([System.DateTime]::UtcNow.ToString(`yyyy`)) © Umbraco Sustainability Community Team</Copyright>
@@ -30,7 +30,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Playwright" Version="1.51.0" />
+    <PackageReference Include="Microsoft.Playwright" Version="1.52.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">